From 32ed9569dfafc13a01b35f8fa7e2602fac5f8350 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 27 三月 2024 13:52:25 +0800
Subject: [PATCH] 1.工单审核新增审核状态
---
src/views/workOrder/produceOrderList.vue | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/src/views/workOrder/produceOrderList.vue b/src/views/workOrder/produceOrderList.vue
index 9cc5d24..65c40f0 100644
--- a/src/views/workOrder/produceOrderList.vue
+++ b/src/views/workOrder/produceOrderList.vue
@@ -30,6 +30,22 @@
style="display: flex;"
>
<div class="elForm">
+ <el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
+ <el-select
+ v-model="form.wkshopcode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in wkshopcodeArr"
+ :key="item.torg_code"
+ :label="item.torg_name"
+ :value="item.torg_code"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
<el-select
v-model="form.erporderstus"
@@ -54,7 +70,7 @@
<el-input v-model="form.saleordercode" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item label="浜у搧缂栫爜" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="form.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
@@ -246,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
@@ -422,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"
@@ -435,7 +471,6 @@
:disabled="dialogForm.saleOrderDeliveryDateIsDisabled"
/>
</el-form-item>
-
</el-form>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
@@ -466,6 +501,7 @@
MarkSaveErpOrder
} from '@/api/WorkOrder'
import { SeaveSearchErpOrder } from '@/api/ErpSyncMes'
+import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -492,6 +528,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ wkshopcode: '', // 杞﹂棿缂栫爜
erporderstus: '', // 璁㈠崟鐘舵�佺爜
erpordercode: '', // 璁㈠崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -514,6 +551,7 @@
{ code: 'CREATED', name: '鍏ㄩ儴涓嬭揪' },
{ code: 'CLOSED', name: '宸插叧闂�' }
],
+ wkshopcodeArr: [],
total: 10,
radioSelectedId: '',
tableData: [],
@@ -538,6 +576,8 @@
markqty: '', // 涓嬪崟鏁伴噺
ordernum: '', // 涓嬪崟鍗曟暟
relse_qty: '', // 宸蹭笅鍗曟暟閲�
+
+ clerkuser: '', // 閿�鍞笟鍔″憳
saleOrderDeliveryDate: '' // 棰勮浜や粯鏃ユ湡
},
@@ -578,12 +618,18 @@
created() {
this.getErpOrderSearch()
// this.getPartSelect()// 鑾峰彇浜у搧缂栫爜淇℃伅
+
+ this.getPrentOrganizationNoCompany()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ async getPrentOrganizationNoCompany() {
+ const { data: res } = await PrentOrganizationNoCompany()
+ this.wkshopcodeArr = res
+ },
async getErpOrderSearch() {
console.log(this.form, 1)
let tempDate2 = this.form.paystartdate
@@ -597,6 +643,7 @@
}
const data = {
+ wkshopcode: this.form.wkshopcode,
erporderstus: this.form.erporderstus, // 璁㈠崟鐘舵�佺爜
erpordercode: this.form.erpordercode, // 璁㈠崟缂栧彿
partcode: this.form.partcode, // 浜у搧缂栫爜
@@ -667,6 +714,7 @@
},
// 閲嶇疆
reset() {
+ this.form.wkshopcode = ''
this.form.erporderstus = ''
this.form.erpordercode = ''
this.form.partcode = ''
@@ -759,6 +807,7 @@
'erpqty': i.qty,
'markqty': i.qty,
'ordernum': 1,
+ 'clerkuser': i.clerkuser,
'relse_qty': i.qty,
'saleordercode': i.saleOrderCode,
// 'saleOrderDeliveryDate': i.saleOrderDeliveryDate
@@ -821,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
})
},
// 瀵硅瘽妗嗗叧闂簨浠�
@@ -879,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,
--
Gitblit v1.9.3