From 43f4de1ab1d1d8a66721281d7162c5f042670b71 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期四, 08 一月 2026 09:37:58 +0800
Subject: [PATCH] 1.打印优化2.模具模块优化
---
src/views/mouldManager/mouldMaintainRecord.vue | 2
src/views/mouldManager/mouldMaintainStand.vue | 4
src/views/mouldManager/mouldCheckRecord.vue | 2
src/views/mouldManager/mouldCheckStand.vue | 4
.env.production | 4
src/views/kanbanManager/zhkb.vue | 40 +------
src/views/mouldManager/mouldOutInRecord.vue | 2
src/views/mouldManager/mouldCirculateRecord.vue | 2
src/views/mouldManager/mouldUpDownRecord.vue | 2
src/views/workOrder/workOrderList.vue | 72 +++++++++-----
src/views/workOrder/workOrderSend.vue | 146 ++++++++++++++--------------
11 files changed, 135 insertions(+), 145 deletions(-)
diff --git a/.env.production b/.env.production
index a4a5155..24e3589 100644
--- a/.env.production
+++ b/.env.production
@@ -6,7 +6,7 @@
# 鏂囦欢涓嬭浇鍦板潃 涓嬭浇鏁版嵁妯℃澘鍦板潃
# 鏈湴鏈嶅姟鍣�
-VUE_APP_BASE_API_FILE = 'http://121.196.36.24:8049/'
+# VUE_APP_BASE_API_FILE = 'http://121.196.36.24:8049/'
# 瀹㈡埛 浼樻
-# VUE_APP_BASE_API_FILE = 'http://192.168.0.120:8000/'
+VUE_APP_BASE_API_FILE = 'http://192.168.0.120:8000/'
diff --git a/src/views/kanbanManager/zhkb.vue b/src/views/kanbanManager/zhkb.vue
index ba803e3..81119bb 100644
--- a/src/views/kanbanManager/zhkb.vue
+++ b/src/views/kanbanManager/zhkb.vue
@@ -101,9 +101,9 @@
display: flex;justify-content: flex-start;
flex-wrap: wrap;"
>
- <div v-for="i in LeftBottomData01" :key="i.wkshp_code" style="margin:0 18px" class="flex_c_s">
+ <div v-for="i in LeftBottomData01" :key="i.torg_code" style="margin:0 18px" class="flex_c_s">
<div class="all_block01 flex_c_s">
- <div class="flex_c_c all_block02" style="">{{ i.wkshp_name }}</div>
+ <div class="flex_c_c all_block02" style="">{{ i.torg_name }}</div>
<div class="" style="display: flex;justify-content:space-between">
<div class="all_block02 flex_c_c" style="width: 49% ">浠诲姟鏁�</div>
<div class="all_block02 flex_c_c" style="width: 49% ">{{ i.plan_qty }}</div>
@@ -269,47 +269,19 @@
}, 1000 * 40)
const temp2 = [
- { wkshp_code: '1', wkshp_name: '鏈哄姞宸�' },
- { wkshp_code: '2', wkshp_name: '鍙伴捇' },
- { wkshp_code: '3', wkshp_name: '淇' },
- { wkshp_code: '4', wkshp_name: '鍠锋紗' },
- { wkshp_code: '5', wkshp_name: '缁勮' }
+ { wkshp_code: 'CJ001', wkshp_name: '閲戝伐杞﹂棿' },
+ { wkshp_code: 'YBCS003', wkshp_name: '浼樻鐢熶骇閮�' }
]
// 宸︿笅 鐢熶骇璁㈠崟
const res4 = await WorkShopCompreLeftTop({ wkshopcode: temp2.map(i => i.wkshp_code).join(',') })
- for (const res4Key in res4.data.LeftTop) {
- const data = {
- good_qty: 0,
- plan_qty: 0,
- wkshp_code: '',
- wkshp_name: ''
- }
- data.good_qty = res4.data.LeftTop[res4Key][0].good_qty
- data.plan_qty = res4.data.LeftTop[res4Key][0].plan_qty
- data.wkshp_code = res4.data.LeftTop[res4Key][0].wkshp_code
- data.wkshp_name = temp2.find(i => i.wkshp_code === data.wkshp_code).wkshp_name
- this.LeftBottomData01.push(data)
- }
+ this.LeftBottomData01 = res4.data
setInterval(() => {
WorkShopCompreLeftTop({ wkshopcode: temp2.map(i => i.wkshp_code).join(',') }).then(res2 => {
this.LeftBottomData01 = []
this.LeftBottomData02 = []
- for (const res4Key in res4.data.LeftTop) {
- const data = {
- good_qty: 0,
- plan_qty: 0,
- wkshp_code: '',
- wkshp_name: ''
- }
-
- data.good_qty = res2.data.LeftTop[res4Key][0].good_qty
- data.plan_qty = res2.data.LeftTop[res4Key][0].plan_qty
- data.wkshp_code = res2.data.LeftTop[res4Key][0].wkshp_code
- data.wkshp_name = temp2.find(i => i.wkshp_code === data.wkshp_code).wkshp_name
- this.LeftBottomData01.push(data)
- }
+ this.LeftBottomData01 = res4.data
})
}, 1000 * 30)
diff --git a/src/views/mouldManager/mouldCheckRecord.vue b/src/views/mouldManager/mouldCheckRecord.vue
index ecf56d0..45bdc68 100644
--- a/src/views/mouldManager/mouldCheckRecord.vue
+++ b/src/views/mouldManager/mouldCheckRecord.vue
@@ -130,7 +130,7 @@
/>
<el-table-column
prop="mould_spec"
- label="浜у搧瑙勬牸"
+ label="瑙勬牸鍨嬪彿"
show-tooltip-when-overflow
sortable="custom"
>
diff --git a/src/views/mouldManager/mouldCheckStand.vue b/src/views/mouldManager/mouldCheckStand.vue
index 9dd6c62..2df9e9b 100644
--- a/src/views/mouldManager/mouldCheckStand.vue
+++ b/src/views/mouldManager/mouldCheckStand.vue
@@ -541,8 +541,8 @@
// 淇敼鍓嶈姹傛帴鍙�
async getViewDeviceCheckStanedSearch(checkstand_code) {
const { data: res } = await ViewMouldCheckStanedSearch({ checkstand_code })
- this.tableDataDialog = res.data
- this.checkSelectedValue = res.data.map(i => i.code)
+ this.tableDataDialog = res.Data
+ this.checkSelectedValue = res.Data.map(i => i.code)
this.dialogForm.code = res.code
this.dialogForm.name = res.name
diff --git a/src/views/mouldManager/mouldCirculateRecord.vue b/src/views/mouldManager/mouldCirculateRecord.vue
index b649729..fd1f9f8 100644
--- a/src/views/mouldManager/mouldCirculateRecord.vue
+++ b/src/views/mouldManager/mouldCirculateRecord.vue
@@ -122,7 +122,7 @@
/>
<el-table-column
prop="mould_spec"
- label="浜у搧瑙勬牸"
+ label="瑙勬牸鍨嬪彿"
show-tooltip-when-overflow
sortable="custom"
>
diff --git a/src/views/mouldManager/mouldMaintainRecord.vue b/src/views/mouldManager/mouldMaintainRecord.vue
index 0e62a0d..e018e98 100644
--- a/src/views/mouldManager/mouldMaintainRecord.vue
+++ b/src/views/mouldManager/mouldMaintainRecord.vue
@@ -130,7 +130,7 @@
/>
<el-table-column
prop="mould_spec"
- label="浜у搧瑙勬牸"
+ label="瑙勬牸鍨嬪彿"
show-tooltip-when-overflow
sortable="custom"
>
diff --git a/src/views/mouldManager/mouldMaintainStand.vue b/src/views/mouldManager/mouldMaintainStand.vue
index ff2ceba..eba46a0 100644
--- a/src/views/mouldManager/mouldMaintainStand.vue
+++ b/src/views/mouldManager/mouldMaintainStand.vue
@@ -542,8 +542,8 @@
// 淇敼鍓嶈姹傛帴鍙�
async getViewMouldRepairStanedSearch(repairstand_code) {
const { data: res } = await ViewMouldRepairStanedSearch({ repairstand_code })
- this.tableDataDialog = res.data
- this.checkSelectedValue = res.data.map(i => i.code)
+ this.tableDataDialog = res.Data
+ this.checkSelectedValue = res.Data.map(i => i.code)
this.dialogForm.code = res.code
this.dialogForm.name = res.name
diff --git a/src/views/mouldManager/mouldOutInRecord.vue b/src/views/mouldManager/mouldOutInRecord.vue
index 01ff08e..eb6f515 100644
--- a/src/views/mouldManager/mouldOutInRecord.vue
+++ b/src/views/mouldManager/mouldOutInRecord.vue
@@ -128,7 +128,7 @@
/>
<el-table-column
prop="mould_spec"
- label="浜у搧瑙勬牸"
+ label="瑙勬牸鍨嬪彿"
show-tooltip-when-overflow
sortable="custom"
>
diff --git a/src/views/mouldManager/mouldUpDownRecord.vue b/src/views/mouldManager/mouldUpDownRecord.vue
index f12cea3..857673c 100644
--- a/src/views/mouldManager/mouldUpDownRecord.vue
+++ b/src/views/mouldManager/mouldUpDownRecord.vue
@@ -125,7 +125,7 @@
/>
<el-table-column
prop="mould_spec"
- label="浜у搧瑙勬牸"
+ label="瑙勬牸鍨嬪彿"
show-tooltip-when-overflow
sortable="custom"
>
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index 59fe59e..88c5739 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -1525,6 +1525,7 @@
</div>
<div
id="qrCode0"
+ :key="formApprove.mesordercode"
style="width: 22%;height:90px;
margin-top: 20px;
overflow-y: scroll;display: flex;
@@ -1555,22 +1556,29 @@
width="70"
align="center"
/>
+ <!-- <el-table-column-->
+ <!-- id="column1"-->
+ <!-- prop="stepqrcode"-->
+ <!-- label="宸ュ簭浜岀淮鐮�"-->
+ <!-- width="100"-->
+ <!-- align="center"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+
+ <!-- <div :id="'qrCode'+row.seq" :ref="'qrCodeDiv'+row.seq" :key="'qrCodeDiv'+row.seq" class="tableColumn" />-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
id="column1"
- prop="stepqrcode"
- label="宸ュ簭浜岀淮鐮�"
+ prop="stepcode"
+ label="宸ュ簭缂栫爜"
width="100"
align="center"
- >
- <template slot-scope="{row}">
-
- <div :id="'qrCode'+row.seq" :ref="'qrCodeDiv'+row.seq" :key="'qrCodeDiv'+row.seq" class="tableColumn" />
- </template>
- </el-table-column>
+ />
<el-table-column
id="column2"
prop="stepname"
- label="宸ュ簭"
+ label="宸ュ簭鍚嶇О"
width="120"
align="center"
/>
@@ -1654,6 +1662,7 @@
</div>
<div
id="qrCode1"
+ :key="formApprove.mesordercode"
style="width: 22%;height:90px;
margin-top: 20px;
overflow-y: scroll;display: flex;
@@ -1684,18 +1693,25 @@
width="70"
align="center"
/>
+ <!-- <el-table-column-->
+ <!-- id="column1"-->
+ <!-- prop="stepqrcode"-->
+ <!-- label="宸ュ簭浜岀淮鐮�"-->
+ <!-- width="100"-->
+ <!-- align="center"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+
+ <!-- <div :id="'qrCode'+row.seq" :ref="'qrCodeDiv'+row.seq" :key="'qrCodeDiv'+row.seq" class="tableColumn" />-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
id="column1"
- prop="stepqrcode"
- label="宸ュ簭浜岀淮鐮�"
+ prop="stepcode"
+ label="宸ュ簭缂栫爜"
width="100"
align="center"
- >
- <template slot-scope="{row}">
-
- <div :id="'qrCode'+row.seq" :ref="'qrCodeDiv'+row.seq" :key="'qrCodeDiv'+row.seq" class="tableColumn" />
- </template>
- </el-table-column>
+ />
<el-table-column
id="column2"
prop="stepname"
@@ -4051,8 +4067,10 @@
res3 = res2.data.recordset
}
+ console.log(JSON.parse(JSON.stringify(res2.data.recordset)))
+
// this.tableDataPrint = res3
- this.tableDataPrint = this.chunkArray(res3, 8)
+ this.tableDataPrint = this.chunkArray(res3, 15)
this.formApprove.mesordercode = res3[0].wo_code
this.formApprove.m_po = res3[0].m_po || '/'
@@ -4129,15 +4147,15 @@
correctLevel: QRCode.CorrectLevel.L// 瀹归敊鐜囷紝L/M/H
})
} else {
- new QRCode(this.$refs['qrCodeDiv' + seq], {
- text: text,
- width: size === 'big' ? 90 : 60,
- height: size === 'big' ? 90 : 60,
- // colorDark: '#333333', // 浜岀淮鐮侀鑹�
- colorDark: '#000', // 浜岀淮鐮侀鑹�
- colorLight: '#ffffff', // 浜岀淮鐮佽儗鏅壊
- correctLevel: QRCode.CorrectLevel.L// 瀹归敊鐜囷紝L/M/H
- })
+ // new QRCode(this.$refs['qrCodeDiv' + seq], {
+ // text: text,
+ // width: size === 'big' ? 90 : 60,
+ // height: size === 'big' ? 90 : 60,
+ // // colorDark: '#333333', // 浜岀淮鐮侀鑹�
+ // colorDark: '#000', // 浜岀淮鐮侀鑹�
+ // colorLight: '#ffffff', // 浜岀淮鐮佽儗鏅壊
+ // correctLevel: QRCode.CorrectLevel.L// 瀹归敊鐜囷紝L/M/H
+ // })
}
},
diff --git a/src/views/workOrder/workOrderSend.vue b/src/views/workOrder/workOrderSend.vue
index 66b444f..622b737 100644
--- a/src/views/workOrder/workOrderSend.vue
+++ b/src/views/workOrder/workOrderSend.vue
@@ -265,66 +265,66 @@
show-tooltip-when-overflow
width="100"
/>
-<!-- <el-table-column-->
-<!-- prop="priuserdefnvc1"-->
-<!-- label="瀹㈡埛鍚嶇О"-->
-<!-- width="110"-->
-<!-- sortable="custom"-->
-<!-- >-->
-<!-- <template slot-scope="{row}">-->
-<!-- {{ row.priuserdefnvc1 ? row.priuserdefnvc1 : '/' }}-->
-<!-- </template>-->
-<!-- </el-table-column>-->
-<!-- <el-table-column-->
-<!-- prop="priuserdefnvc6"-->
-<!-- label="瀹㈡埛缂栫爜"-->
-<!-- width="110"-->
-<!-- sortable="custom"-->
-<!-- >-->
-<!-- <template slot-scope="{row}">-->
-<!-- {{ row.priuserdefnvc6 ? row.priuserdefnvc6 : '/' }}-->
-<!-- </template>-->
-<!-- </el-table-column>-->
-<!-- <el-table-column-->
-<!-- prop="priuserdefnvc2"-->
-<!-- label="瀵瑰唴鍚嶇О"-->
-<!-- width="110"-->
-<!-- sortable="custom"-->
-<!-- >-->
-<!-- <template slot-scope="{row}">-->
-<!-- {{ row.priuserdefnvc2 ? row.priuserdefnvc2 : '/' }}-->
-<!-- </template>-->
-<!-- </el-table-column>-->
-<!-- <el-table-column-->
-<!-- prop="priuserdefnvc3"-->
-<!-- label="CTP鏃ユ湡"-->
-<!-- width="110"-->
-<!-- sortable="custom"-->
-<!-- >-->
-<!-- <template slot-scope="{row}">-->
-<!-- {{ row.priuserdefnvc3 ? row.priuserdefnvc3 : '/' }}-->
-<!-- </template>-->
-<!-- </el-table-column>-->
-<!-- <el-table-column-->
-<!-- prop="priuserdefnvc4"-->
-<!-- label="閽㈠垁缂栧彿"-->
-<!-- width="110"-->
-<!-- sortable="custom"-->
-<!-- >-->
-<!-- <template slot-scope="{row}">-->
-<!-- {{ row.priuserdefnvc4 ? row.priuserdefnvc4 : '/' }}-->
-<!-- </template>-->
-<!-- </el-table-column>-->
-<!-- <el-table-column-->
-<!-- prop="priuserdefnvc5"-->
-<!-- label="鐩掑瀷"-->
-<!-- width="110"-->
-<!-- sortable="custom"-->
-<!-- >-->
-<!-- <template slot-scope="{row}">-->
-<!-- {{ row.priuserdefnvc5 ? row.priuserdefnvc5 : '/' }}-->
-<!-- </template>-->
-<!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="priuserdefnvc1"-->
+ <!-- label="瀹㈡埛鍚嶇О"-->
+ <!-- width="110"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- {{ row.priuserdefnvc1 ? row.priuserdefnvc1 : '/' }}-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="priuserdefnvc6"-->
+ <!-- label="瀹㈡埛缂栫爜"-->
+ <!-- width="110"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- {{ row.priuserdefnvc6 ? row.priuserdefnvc6 : '/' }}-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="priuserdefnvc2"-->
+ <!-- label="瀵瑰唴鍚嶇О"-->
+ <!-- width="110"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- {{ row.priuserdefnvc2 ? row.priuserdefnvc2 : '/' }}-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="priuserdefnvc3"-->
+ <!-- label="CTP鏃ユ湡"-->
+ <!-- width="110"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- {{ row.priuserdefnvc3 ? row.priuserdefnvc3 : '/' }}-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="priuserdefnvc4"-->
+ <!-- label="閽㈠垁缂栧彿"-->
+ <!-- width="110"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- {{ row.priuserdefnvc4 ? row.priuserdefnvc4 : '/' }}-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="priuserdefnvc5"-->
+ <!-- label="鐩掑瀷"-->
+ <!-- width="110"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- {{ row.priuserdefnvc5 ? row.priuserdefnvc5 : '/' }}-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
@@ -389,19 +389,19 @@
<i class="el-icon-delete" :style="{color:$store.state.settings.theme}" @click.stop="del(row)" />
</el-tooltip>
- <el-tooltip class="item" effect="dark" content="鎵撳嵃宸ュ崟" placement="top">
- <!-- <i-->
- <!-- class="el-icon-tickets"-->
- <!-- style="cursor: pointer;color: #42b983;margin-right: 15px"-->
- <!-- @click="check(row)"-->
- <!-- />-->
- <i
- :style="{color:$store.state.settings.theme}"
- class="el-icon-printer"
- style="cursor: pointer;margin-right: 15px"
- @click.stop="handlePrint(row.wo_code)"
- />
- </el-tooltip>
+ <!-- <el-tooltip class="item" effect="dark" content="鎵撳嵃宸ュ崟" placement="top">-->
+ <!-- <!– <i–>-->
+ <!-- <!– class="el-icon-tickets"–>-->
+ <!-- <!– style="cursor: pointer;color: #42b983;margin-right: 15px"–>-->
+ <!-- <!– @click="check(row)"–>-->
+ <!-- <!– />–>-->
+ <!-- <i-->
+ <!-- :style="{color:$store.state.settings.theme}"-->
+ <!-- class="el-icon-printer"-->
+ <!-- style="cursor: pointer;margin-right: 15px"-->
+ <!-- @click.stop="handlePrint(row.wo_code)"-->
+ <!-- />-->
+ <!-- </el-tooltip>-->
<el-tooltip class="item" effect="dark" content="璇︽儏" placement="top">
<i
--
Gitblit v1.9.3