From 9c2dd43fb70b6cdeaba40aa0173d4ceb759cd46a Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 22 十一月 2023 16:57:46 +0800
Subject: [PATCH] 1.开报工放出 销售订单查询 条件
---
src/views/produceManager/produceStartOrder.vue | 36 +++++++++++++++++++++++-------------
src/views/produceManager/workOrder.vue | 17 +++++++++--------
2 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/src/views/produceManager/produceStartOrder.vue b/src/views/produceManager/produceStartOrder.vue
index 7c30240..b0fe0e7 100644
--- a/src/views/produceManager/produceStartOrder.vue
+++ b/src/views/produceManager/produceStartOrder.vue
@@ -5,14 +5,14 @@
<el-tab-pane label="鐢熶骇鍒楄〃">
<div style="margin-left: 10px;margin-top:10px;display: flex;justify-content: space-between">
<div style="display: flex;align-items: center">
- <div style="width: 90px">鎵弿鏉＄爜锛�</div>
+ <div style="width: 70px">鎵弿鏉＄爜</div>
<!-- oninput="value=value.replace(/[^0-9a-zA-Z;_]/g,'')"-->
<el-input
id="keyWords"
v-model="form.wocode"
name="produceCode"
placeholder="璇锋壂鐮佹垨杈撳叆宸ュ崟鍙�"
- style="width: 300px"
+ style="width: 260px"
@keyup.enter.native="val=>enterNative(val,'produceCode')"
/>
<!-- <div style="width: 90px;margin-left: 20px">鐢熶骇璁惧锛�</div>-->
@@ -30,27 +30,35 @@
<!-- />-->
<!-- </el-select>-->
- <div style="width: 90px;margin-left: 20px">浜у搧缂栫爜锛�</div>
+ <div style="width: 70px;margin-left: 20px">閿�鍞崟鍙�</div>
+ <el-input
+ v-model="form.saleOrderCode"
+ placeholder="璇疯緭鍏�"
+ style="width: 180px"
+ @keyup.enter.native="val=>enterNative(val,'produceCode')"
+ />
+
+ <div style="width: 70px;margin-left: 20px">浜у搧缂栫爜</div>
<el-input
v-model="form.partcode"
placeholder="璇疯緭鍏�"
- style="width: 200px"
+ style="width: 180px"
@keyup.enter.native="val=>enterNative(val,'produceCode')"
/>
- <div style="width: 90px;margin-left: 20px">浜у搧鍚嶇О锛�</div>
+ <div style="width: 70px;margin-left: 20px">浜у搧鍚嶇О</div>
<el-input
v-model="form.partname"
placeholder="璇疯緭鍏�"
- style="width: 200px"
+ style="width:180px"
@keyup.enter.native="val=>enterNative(val,'produceCode')"
/>
- <div style="width: 90px;margin-left: 20px">瑙勬牸鍨嬪彿锛�</div>
- <el-input
- v-model="form.partspec"
- placeholder="璇疯緭鍏�"
- style="width: 200px"
- @keyup.enter.native="val=>enterNative(val,'produceCode')"
- />
+ <!-- <div style="width: 70px;margin-left: 20px">瑙勬牸鍨嬪彿</div>-->
+ <!-- <el-input-->
+ <!-- v-model="form.partspec"-->
+ <!-- placeholder="璇疯緭鍏�"-->
+ <!-- style="width:180px"-->
+ <!-- @keyup.enter.native="val=>enterNative(val,'produceCode')"-->
+ <!-- />-->
</div>
<div style="display: flex;padding-right: 10px">
@@ -1587,6 +1595,7 @@
// orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜淇℃伅
// SelectType: '', // 璁惧缂栫爜
wocode: '',
+ saleOrderCode: '', // 閿�鍞崟鍙�
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
partspec: '', // 瑙勬牸鍨嬪彿
@@ -1945,6 +1954,7 @@
},
reset() {
this.form.wocode = ''
+ this.form.saleOrderCode = ''
this.form.partcode = ''
this.form.partname = ''
this.form.partspec = ''
diff --git a/src/views/produceManager/workOrder.vue b/src/views/produceManager/workOrder.vue
index 332a110..def635c 100644
--- a/src/views/produceManager/workOrder.vue
+++ b/src/views/produceManager/workOrder.vue
@@ -176,8 +176,8 @@
<div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
<div v-if="row.status==='START'">寮�宸�</div>
<div v-if="row.status==='CLOSED'">瀹屽伐</div>
- <div v-if="row.status==='NOSCHED'">寰呮帓绋�</div>
- <div v-if="row.status==='SCHED'">宸叉帓绋�</div>
+ <!-- <div v-if="row.status==='NOSCHED'">寰呮帓绋�</div>-->
+ <!-- <div v-if="row.status==='SCHED'">宸叉帓绋�</div>-->
</template>
</el-table-column>
<el-table-column
@@ -2063,9 +2063,9 @@
// { code: 'CREATED', name: '宸插叧闂�' }
{ code: 'ALLO', name: '宸叉淳鍙�' },
{ code: 'START', name: '寮�宸�' },
- { code: 'CLOSED', name: '瀹屽伐' },
- { code: 'NOSCHED', name: '寰呮帓绋�' },
- { code: 'SCHED', name: '宸叉帓绋�' }
+ { code: 'CLOSED', name: '瀹屽伐' }
+ // { code: 'NOSCHED', name: '寰呮帓绋�' },
+ // { code: 'SCHED', name: '宸叉帓绋�' }
],
total: 10,
radioSelected: '',
@@ -2581,9 +2581,10 @@
console.log('宸ュ崟鍏抽棴浜嬩欢')
this.tableData.forEach(item => {
if (item.wo_code === this.radioSelected) {
- if (item.status === 'START') {
- return this.$message.info('褰撳墠宸ュ崟鏈畬宸ワ紝鏃犳硶鍏抽棴锛�')
- } else if (item.status === 'CLOSED') {
+ // if (item.status === 'START') {
+ // return this.$message.info('褰撳墠宸ュ崟鏈畬宸ワ紝鏃犳硶鍏抽棴锛�')
+ // } else
+ if (item.status === 'CLOSED') {
return this.$message.info('宸ュ崟宸插叧闂紝鏃犻渶鍐嶅叧闂紒')
} else {
this.$confirm('鏄惁纭鍏抽棴宸ュ崟?', '鎻愮ず', {
--
Gitblit v1.9.3