From 8b363281b950c527c4f2b8ffeffe83cd7fcb77c7 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 15 三月 2024 16:09:35 +0800
Subject: [PATCH] 1.生产订单新增 销售业务员 字段
---
vue.config.js | 1 +
src/views/qualityManager/processCheck.vue | 2 +-
src/views/workOrder/produceOrderList.vue | 27 +++++++++++++++++++++++++--
src/views/workOrder/workOrderList.vue | 12 ++++++++++++
4 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/src/views/qualityManager/processCheck.vue b/src/views/qualityManager/processCheck.vue
index 860bacd..dbe4e3a 100644
--- a/src/views/qualityManager/processCheck.vue
+++ b/src/views/qualityManager/processCheck.vue
@@ -424,7 +424,7 @@
standvalue: j.standvalue,
lowervalue: j.lowervalue,
uppervalue: j.uppervalue,
-
+ stepcheckitem_seq: j.stepcheckitem_seq,
unit: j.unit,
stepcheckitem_desc: j.stepcheckitem_desc,
required: j.required, // 鏄惁蹇呭～
diff --git a/src/views/workOrder/produceOrderList.vue b/src/views/workOrder/produceOrderList.vue
index d0340cd..65c40f0 100644
--- a/src/views/workOrder/produceOrderList.vue
+++ b/src/views/workOrder/produceOrderList.vue
@@ -262,6 +262,18 @@
sortable="custom"
/>
<el-table-column
+ prop="clerkuser"
+ label="閿�鍞笟鍔″憳"
+ show-tooltip-when-overflow
+ width="150"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.clerkuser">{{ row.clerkuser }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
show-tooltip-when-overflow
@@ -438,6 +450,14 @@
style="width: 200px"
/>
</el-form-item>
+
+ <el-form-item label="閿�鍞笟鍔″憳" prop="">
+ <el-input
+ v-model="dialogForm.clerkuser"
+ disabled
+ style="width: 200px"
+ />
+ </el-form-item>
<el-form-item label="棰勮浜や粯鏃ユ湡" prop="saleOrderDeliveryDate">
<el-date-picker
v-model="dialogForm.saleOrderDeliveryDate"
@@ -451,7 +471,6 @@
:disabled="dialogForm.saleOrderDeliveryDateIsDisabled"
/>
</el-form-item>
-
</el-form>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
@@ -557,6 +576,8 @@
markqty: '', // 涓嬪崟鏁伴噺
ordernum: '', // 涓嬪崟鍗曟暟
relse_qty: '', // 宸蹭笅鍗曟暟閲�
+
+ clerkuser: '', // 閿�鍞笟鍔″憳
saleOrderDeliveryDate: '' // 棰勮浜や粯鏃ユ湡
},
@@ -786,6 +807,7 @@
'erpqty': i.qty,
'markqty': i.qty,
'ordernum': 1,
+ 'clerkuser': i.clerkuser,
'relse_qty': i.qty,
'saleordercode': i.saleOrderCode,
// 'saleOrderDeliveryDate': i.saleOrderDeliveryDate
@@ -848,6 +870,7 @@
this.dialogForm.markqty = parseFloat(row.qty) - parseFloat(row.relse_qty)
this.dialogForm.ordernum = 1
this.dialogForm.relse_qty = row.relse_qty
+ this.dialogForm.clerkuser = row.clerkuser
})
},
// 瀵硅瘽妗嗗叧闂簨浠�
@@ -906,7 +929,7 @@
'partcode': this.dialogForm.partcode,
'wkshopcode': this.dialogForm.wkshopcode,
'warehousecode': this.dialogForm.warehousecode,
-
+ 'clerkuser': this.dialogForm.clerkuser,
'erpqty': this.dialogForm.erpqty,
'markqty': this.dialogForm.markqty,
'ordernum': this.dialogForm.ordernum,
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index dec0654..af688a1 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -263,6 +263,18 @@
width="100"
/>
<el-table-column
+ prop="clerkuser"
+ label="閿�鍞笟鍔″憳"
+ sortable="custom"
+ show-tooltip-when-overflow
+ width="150"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.clerkuser">{{ row.clerkuser }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
show-tooltip-when-overflow
diff --git a/vue.config.js b/vue.config.js
index ab64f26..58fd452 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -52,6 +52,7 @@
},
proxy: {
[process.env.VUE_APP_BASE_API]: {
+ // target: 'http://192.168.18.245:8000', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
target: 'http://121.196.36.24:8021', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
// target: 'http://122.227.18.22:8000', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
--
Gitblit v1.9.3