From 17f529afef9f804f228857f6b47d0a446e55a707 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 12 十二月 2022 15:30:12 +0800
Subject: [PATCH] 1.综合看板兼容八道工序样式排版
---
src/views/jcsz/yhqd.vue | 2
src/views/zzmx/jpgj.vue | 3
vue.config.js | 2
src/views/kb/zhkbc.vue | 101 ++++++++++++++++++-
src/views/kb/zhkb.vue | 125 ++++++++++++++++++++++++
src/views/bbgl/rygz.vue | 10 +-
6 files changed, 228 insertions(+), 15 deletions(-)
diff --git a/src/views/bbgl/rygz.vue b/src/views/bbgl/rygz.vue
index fc188eb..cc6d6dd 100644
--- a/src/views/bbgl/rygz.vue
+++ b/src/views/bbgl/rygz.vue
@@ -188,13 +188,13 @@
</template>
</el-table-column>
<el-table-column
- prop="usermoney"
+ prop="moneys"
label="涓汉璁颁欢宸ヨ祫"
- width="130"
+ min-width="130"
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.usermoney">{{ row.usermoney }} 鍏�</div>
+ <div v-if="row.moneys">{{ row.moneys }} 鍏�</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -359,12 +359,12 @@
const sums = []
columns.forEach((column, index) => {
- if (index === 10) {
+ if (index === 9) {
sums[index] = '鎬讳环'
return
}
const values = data.map(item => Number(item[column.property]))
- if (column.property === 'usermoney') {
+ if (column.property === 'moneys') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index 20a2285..bf47021 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -314,7 +314,7 @@
@change="dialogCascaderChange"
/>
</el-form-item>
- <el-form-item label="鎵�灞炵彮缁�" prop="groupcode">
+ <el-form-item label="鎵�灞炵彮缁�">
<el-select
v-model="dialogForm.groupcode"
:popper-append-to-body="false"
diff --git a/src/views/kb/zhkb.vue b/src/views/kb/zhkb.vue
index 2bdb36a..7fb62bf 100644
--- a/src/views/kb/zhkb.vue
+++ b/src/views/kb/zhkb.vue
@@ -28,7 +28,11 @@
<div class="kb_left_top kb_pd10">
<div class="kb_left_top02">
- <div v-for="item in lineContent3" :key="item.workcode" class="kb_left_top_block">
+ <div
+ v-for="item in lineContent3"
+ :key="item.workcode+JSON.stringify(item.children[0])"
+ class="kb_left_top_block"
+ >
<div class="kb_block02 kb_pd10">
<div>
<div>閿�鍞崟鍙�:{{ item.saleordercode }}</div>
@@ -458,6 +462,125 @@
getShopSearchLine() {
let length, count
LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ this.lineContent = res.data // 璋冪敤鎺ュ彛杩斿洖鐨勬暟鎹�
+ this.number1 = this.lineContent.length // 浜х嚎鍔犲伐涓换鍔� 鍗曟暟
+
+ const newData = []
+ if (this.lineContent.length > 0) {
+ this.lineContent.forEach(item => {
+ if (item.children.length > 5) {
+ newData.push({
+ workcode: item.workcode,
+ partname: item.partname,
+ partnumber: item.partnumber,
+ partspec: item.partspec,
+ qty: item.qty,
+ saleordercode: item.saleordercode,
+ uom: item.uom,
+ children: item.children.slice(0, 5)
+ })
+
+ newData.push({
+ workcode: item.workcode,
+ partname: item.partname,
+ partnumber: item.partnumber,
+ partspec: item.partspec,
+ qty: item.qty,
+ saleordercode: item.saleordercode,
+ uom: item.uom,
+ children: item.children.slice(5, 8)
+ })
+ } else {
+ newData.push({
+ workcode: item.workcode,
+ partname: item.partname,
+ partnumber: item.partnumber,
+ partspec: item.partspec,
+ qty: item.qty,
+ saleordercode: item.saleordercode,
+ uom: item.uom,
+ children: item.children
+ })
+ }
+ })
+
+ console.log(newData.length, 9777)
+ }
+
+ this.lineContent = newData
+ length = this.lineContent.length
+ count = Math.ceil(length / 3) // 闇�瑕佽疆鎾殑缁勬暟 3涓负涓�缁�
+ this.lineContent3 = this.lineContent.slice(0, 3)
+ })
+
+ let start = 0
+ this.ShopSearchLineTask = setInterval(() => {
+ if (Math.floor(start / 3) === count && count !== 0) {
+ start = 0
+ LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ this.lineContent = res.data // 璋冪敤鎺ュ彛杩斿洖鐨勬暟鎹�
+ this.number1 = this.lineContent.length // 浜х嚎鍔犲伐涓换鍔� 鍗曟暟
+
+ const newData = []
+ if (this.lineContent.length > 0) {
+ this.lineContent.forEach(item => {
+ if (item.children.length > 5) {
+ newData.push({
+ workcode: item.workcode,
+ partname: item.partname,
+ partnumber: item.partnumber,
+ partspec: item.partspec,
+ qty: item.qty,
+ saleordercode: item.saleordercode,
+ uom: item.uom,
+ children: item.children.slice(0, 5)
+ }
+ )
+
+ newData.push({
+ workcode: item.workcode,
+ partname: item.partname,
+ partnumber: item.partnumber,
+ partspec: item.partspec,
+ qty: item.qty,
+ saleordercode: item.saleordercode,
+ uom: item.uom,
+ children: item.children.slice(5, 8)
+ })
+ } else {
+ newData.push({
+ workcode: item.workcode,
+ partname: item.partname,
+ partnumber: item.partnumber,
+ partspec: item.partspec,
+ qty: item.qty,
+ saleordercode: item.saleordercode,
+ uom: item.uom,
+ children: item.children
+ })
+ }
+ })
+ }
+
+ this.lineContent = newData
+ length = this.lineContent.length
+ count = Math.ceil(length / 3) // 闇�瑕佽疆鎾殑缁勬暟 3涓负涓�缁�
+ this.lineContent3 = this.lineContent.slice(0, 3)
+ })
+ } else if (count === 0) {
+ clearInterval(this.ShopSearchLineTask)
+ this.getShopSearchLine()
+ }
+
+ this.lineContent3 = this.lineContent.slice(start, start + 3)
+ start = start + 3
+ }, 1000 * 3)
+ },
+
+ // 浜х嚎鍔犲伐涓换鍔� 澶囦唤鏂规硶
+ getShopSearchLine2() {
+ let length, count
+ LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
this.lineContent = res.data
length = this.lineContent.length
count = Math.ceil(length / 3) // 闇�瑕佽疆鎾殑缁勬暟 3涓负涓�缁�
diff --git a/src/views/kb/zhkbc.vue b/src/views/kb/zhkbc.vue
index 2a19c79..77be60b 100644
--- a/src/views/kb/zhkbc.vue
+++ b/src/views/kb/zhkbc.vue
@@ -3,7 +3,7 @@
<div class="kb_dashboard">
<div class="kb_header">
<div class="flex_c_c kb_header_text">
- 涓嬫枡杞﹂棿鐪嬫澘
+ {{ ShopArr[0] == 21 ? '涓嬫枡杞﹂棿鐪嬫澘' : ShopArr[0] == 22 ? '閲戝伐杞﹂棿鐪嬫澘' : ShopArr[0] == 23 ? '鎶涘厜杞﹂棿鐪嬫澘' : '瑁呴厤杞﹂棿鐪嬫澘' }}
</div>
<div class="kb_headerPic" />
<div class="kb_headTime">
@@ -455,15 +455,59 @@
}, 1000 * 30)
},
// 浜х嚎鍔犲伐涓换鍔�
+ // 浜х嚎鍔犲伐涓换鍔�
getShopSearchLine() {
let length, count
LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
- this.lineContent = res.data
+ this.lineContent = res.data // 璋冪敤鎺ュ彛杩斿洖鐨勬暟鎹�
+ this.number1 = this.lineContent.length // 浜х嚎鍔犲伐涓换鍔� 鍗曟暟
+
+ const newData = []
+ if (this.lineContent.length > 0) {
+ this.lineContent.forEach(item => {
+ if (item.children.length > 5) {
+ newData.push({
+ workcode: item.workcode,
+ partname: item.partname,
+ partnumber: item.partnumber,
+ partspec: item.partspec,
+ qty: item.qty,
+ saleordercode: item.saleordercode,
+ uom: item.uom,
+ children: item.children.slice(0, 5)
+ })
+
+ newData.push({
+ workcode: item.workcode,
+ partname: item.partname,
+ partnumber: item.partnumber,
+ partspec: item.partspec,
+ qty: item.qty,
+ saleordercode: item.saleordercode,
+ uom: item.uom,
+ children: item.children.slice(5, 8)
+ })
+ } else {
+ newData.push({
+ workcode: item.workcode,
+ partname: item.partname,
+ partnumber: item.partnumber,
+ partspec: item.partspec,
+ qty: item.qty,
+ saleordercode: item.saleordercode,
+ uom: item.uom,
+ children: item.children
+ })
+ }
+ })
+
+ console.log(newData.length, 9777)
+ }
+
+ this.lineContent = newData
length = this.lineContent.length
count = Math.ceil(length / 3) // 闇�瑕佽疆鎾殑缁勬暟 3涓负涓�缁�
this.lineContent3 = this.lineContent.slice(0, 3)
-
- this.number1 = this.lineContent.length
})
let start = 0
@@ -471,17 +515,60 @@
if (Math.floor(start / 3) === count && count !== 0) {
start = 0
LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
- this.lineContent = res.data
+ this.lineContent = res.data // 璋冪敤鎺ュ彛杩斿洖鐨勬暟鎹�
+ this.number1 = this.lineContent.length // 浜х嚎鍔犲伐涓换鍔� 鍗曟暟
+
+ const newData = []
+ if (this.lineContent.length > 0) {
+ this.lineContent.forEach(item => {
+ if (item.children.length > 5) {
+ newData.push({
+ workcode: item.workcode,
+ partname: item.partname,
+ partnumber: item.partnumber,
+ partspec: item.partspec,
+ qty: item.qty,
+ saleordercode: item.saleordercode,
+ uom: item.uom,
+ children: item.children.slice(0, 5)
+ }
+ )
+
+ newData.push({
+ workcode: item.workcode,
+ partname: item.partname,
+ partnumber: item.partnumber,
+ partspec: item.partspec,
+ qty: item.qty,
+ saleordercode: item.saleordercode,
+ uom: item.uom,
+ children: item.children.slice(5, 8)
+ })
+ } else {
+ newData.push({
+ workcode: item.workcode,
+ partname: item.partname,
+ partnumber: item.partnumber,
+ partspec: item.partspec,
+ qty: item.qty,
+ saleordercode: item.saleordercode,
+ uom: item.uom,
+ children: item.children
+ })
+ }
+ })
+ }
+
+ this.lineContent = newData
length = this.lineContent.length
count = Math.ceil(length / 3) // 闇�瑕佽疆鎾殑缁勬暟 3涓负涓�缁�
this.lineContent3 = this.lineContent.slice(0, 3)
-
- this.number1 = this.lineContent.length
})
} else if (count === 0) {
clearInterval(this.ShopSearchLineTask)
this.getShopSearchLine()
}
+
this.lineContent3 = this.lineContent.slice(start, start + 3)
start = start + 3
}, 1000 * 3)
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index 8c67361..2137b81 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -533,6 +533,7 @@
partcode: '',
routecode: '',
stepcode: '',
+ steptype: '',
page: 1,
rows: 10,
prop: 'eqpcode',
@@ -669,11 +670,13 @@
},
async getEqpTable(val) {
if (typeof val === 'string') {
+ this.eqpTable.steptype = this.stepDialogArr.find(item => item.name === val).flag
this.eqpTable.partcode = this.dialogForm.partcode
this.eqpTable.routecode = this.dialogForm.routecode
this.eqpTable.stepcode = this.stepDialogArr.find(item => item.name === val).code
// } else if (typeof val === 'number') {
} else {
+ this.eqpTable.steptype = this.stepDialogArr[0].flag
this.eqpTable.partcode = this.dialogForm.partcode
this.eqpTable.routecode = this.dialogForm.routecode
this.eqpTable.stepcode = this.stepDialogArr[0].code
diff --git a/vue.config.js b/vue.config.js
index 3b6ce57..f591afb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -51,7 +51,7 @@
proxy: {
[process.env.VUE_APP_BASE_API]: {
target: 'http://121.196.36.24:8005', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴鏈嶅姟鍣�(鐏电繑)
- // target: 'http://192.168.2.138:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�(鐏电繑)
+ // target: 'http://192.168.0.230:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�(鐏电繑)
changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃
['^' + process.env.VUE_APP_BASE_API]: '/api/'
--
Gitblit v1.9.3