From 09bc0a81c166562bc4523f3a3d3fc86203f64b1e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 02 十一月 2023 14:50:52 +0800
Subject: [PATCH] 1.生产管理、报表管理 新增销售单号查询
---
src/views/reportManager/subcontractingOperation.vue | 35 ++++++--
.env.development | 2
src/views/reportManager/defectDetailList.vue | 14 +++
src/views/reportManager/personSalaryList.vue | 30 ++++++-
src/views/produceManager/produceStartOrder.vue | 56 +++++++++++++
src/views/produceManager/workOrderBatchClose.vue | 18 ++++
src/views/reportManager/repairDetailList.vue | 14 +++
.env.production | 2
src/views/reportManager/groupSalaryList.vue | 27 +++++-
src/views/reportManager/produceSchedule.vue | 36 ++++++--
10 files changed, 197 insertions(+), 37 deletions(-)
diff --git a/.env.development b/.env.development
index 5a14e1b..57e8273 100644
--- a/.env.development
+++ b/.env.development
@@ -7,5 +7,5 @@
VUE_APP_BASE_API_BASE = '/base/'
# 鏂囦欢涓嬭浇鍦板潃 涓嬭浇鏁版嵁妯℃澘鍦板潃
-VUE_APP_BASE_API_FILE = 'http://121.196.36.24:8001'
+VUE_APP_BASE_API_FILE = 'http://121.196.36.24:8017'
diff --git a/.env.production b/.env.production
index 6314dc2..76048a5 100644
--- a/.env.production
+++ b/.env.production
@@ -7,4 +7,4 @@
VUE_APP_BASE_API_BASE = '/base/'
# 鏂囦欢涓嬭浇鍦板潃 涓嬭浇鏁版嵁妯℃澘鍦板潃
-VUE_APP_BASE_API_FILE = 'http://121.196.36.24:8001'
+VUE_APP_BASE_API_FILE = 'http://121.196.36.24:8017'
diff --git a/src/views/produceManager/produceStartOrder.vue b/src/views/produceManager/produceStartOrder.vue
index 8cfae53..da727e0 100644
--- a/src/views/produceManager/produceStartOrder.vue
+++ b/src/views/produceManager/produceStartOrder.vue
@@ -79,6 +79,17 @@
</template>
</el-table-column>
<el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ width="160"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ {{ row.saleOrderCode?row.saleOrderCode:'/' }}
+ </template>
+ </el-table-column>
+ <el-table-column
prop="wo_code"
label="宸ュ崟鍙�"
width="160"
@@ -279,6 +290,17 @@
</template>
</el-table-column>
<el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ width="160"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ {{ row.saleOrderCode?row.saleOrderCode:'/' }}
+ </template>
+ </el-table-column>
+ <el-table-column
prop="wo_code"
label="宸ュ崟鍙�"
width="160"
@@ -443,6 +465,17 @@
fixed
/>
<el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ width="160"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ {{ row.saleOrderCode?row.saleOrderCode:'/' }}
+ </template>
+ </el-table-column>
+ <el-table-column
show-tooltip-when-overflow
prop="wo_code"
label="宸ュ崟鍙�"
@@ -545,6 +578,9 @@
:model="dialogForm"
label-width="110px"
>
+ <el-form-item label="閿�鍞崟鍙凤細" style="margin: 0 10px 0 0">
+ <div style="width: 200px">{{ dialogForm.saleOrderCode?dialogForm.saleOrderCode:'/' }}</div>
+ </el-form-item>
<el-form-item label="宸ュ崟缂栧彿锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.wo_code }}</div>
</el-form-item>
@@ -682,8 +718,10 @@
<!-- oninput="value=value.replace(/[^0-9.]/g,'')"-->
<!-- style="width: 200px;"-->
<!-- />-->
+ <div style="width:200px">
+ {{ dialogForm.noputqty }}
+ </div>
- {{ dialogForm.noputqty }}
</el-form-item>
<el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="澶囨敞锛�">
@@ -982,6 +1020,7 @@
<el-input
v-model="dialogForm.sqty"
style="width: 200px"
+ :disabled="dialogForm.wxcode===''"
oninput="value=value.replace(/[^0-9.]/g,'')"
/>
</el-form-item>
@@ -991,7 +1030,10 @@
label="涓嶈壇鏁伴噺锛�"
prop="noputqty"
>
- {{ dialogForm.noputqty }}
+ <div style="width: 200px;">
+ {{ dialogForm.noputqty }}
+ </div>
+
<!-- <el-input-->
<!-- v-model="dialogForm.noputqty"-->
<!-- style="width: 200px"-->
@@ -1285,6 +1327,9 @@
:model="badDialogForm"
label-width="110px"
>
+ <el-form-item label="閿�鍞崟鍙凤細">
+ <div style="width: 200px">{{ badDialogForm.saleOrderCode? badDialogForm.saleOrderCode:'/' }}</div>
+ </el-form-item>
<el-form-item label="宸ュ崟缂栧彿锛�">
<div style="width: 200px">{{ badDialogForm.wo_code }}</div>
</el-form-item>
@@ -1532,6 +1577,7 @@
dialogVisible: false,
dialogTitle: '', // 鑷埗寮�濮嬨�佽嚜鍒舵姤宸ャ�佸鍗忓彂鏂欍�佸鍗忔敹鏂�
dialogForm: {
+ saleOrderCode: '',
wo_code: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -1990,6 +2036,7 @@
this.dialogVisible = true
this.$nextTick(() => {
+ this.dialogForm.saleOrderCode = obj.saleOrderCode
this.dialogForm.wo_code = obj.wo_code
this.dialogForm.partcode = obj.partnumber
this.dialogForm.partname = obj.partname
@@ -2014,7 +2061,7 @@
// }
this.dialogTitle = '鑷埗鎶ュ伐'
this.dialogVisible = true
-
+ this.dialogForm.saleOrderCode = obj.saleOrderCode
this.dialogForm.wo_code = obj.wo_code
this.dialogForm.partcode = obj.partnumber
this.dialogForm.partname = obj.partname
@@ -2063,6 +2110,7 @@
this.dialogVisible = true
this.$nextTick(() => {
+ this.dialogForm.saleOrderCode = obj.saleOrderCode
this.dialogForm.wo_code = obj.wo_code
this.dialogForm.partcode = obj.partnumber
this.dialogForm.partname = obj.partname
@@ -2102,6 +2150,7 @@
this.dialogVisible = true
this.$nextTick(() => {
+ this.dialogForm.saleOrderCode = obj.saleOrderCode
this.dialogForm.wo_code = obj.wo_code
this.dialogForm.partcode = obj.partnumber
this.dialogForm.partname = obj.partname
@@ -2791,6 +2840,7 @@
const { data: res } = await MesOrderNgSubStepSearch(data)
this.$nextTick(() => {
+ this.badDialogForm.saleOrderCode = res.data1.saleOrderCode
this.badDialogForm.wo_code = res.data1.wo_code
this.badDialogForm.partcode = res.data1.partnumber
this.badDialogForm.partname = res.data1.partname
diff --git a/src/views/produceManager/workOrderBatchClose.vue b/src/views/produceManager/workOrderBatchClose.vue
index 84284a1..6d2be1d 100644
--- a/src/views/produceManager/workOrderBatchClose.vue
+++ b/src/views/produceManager/workOrderBatchClose.vue
@@ -33,13 +33,16 @@
/>
</el-select>
</el-form-item>
+ <el-form-item label="閿�鍞崟鍙�" style=" display: flex;">
+ <el-input v-model="form.saleordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
<el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="form.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="婧愬崟鍗曞彿" style=" display: flex;">
<el-input v-model="form.sourceorder" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item label="鍗曟嵁绫诲瀷" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="鍗曟嵁绫诲瀷" style=" display: flex;">
<el-select v-model="form.ordertype" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in ordertypeArr"
@@ -144,6 +147,17 @@
<div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
<div v-if="row.status==='START'">寮�宸�</div>
<div v-if="row.status==='CLOSED'">瀹屽伐</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="saleOrderCode"
+ show-tooltip-when-overflow
+ label="閿�鍞崟鍙�"
+ sortable="custom"
+ min-width="160"
+ >
+ <template slot-scope="{row}">
+ {{ row.saleOrderCode?row.saleOrderCode:'/' }}
</template>
</el-table-column>
<el-table-column
@@ -399,6 +413,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ saleordercode: '', // 閿�鍞崟鍙�
mesorderstus: '', // 宸ュ崟鐘舵��
mesordercode: '', // 宸ュ崟缂栧彿
sourceorder: '', // 婧愬崟鍗曞彿
@@ -486,6 +501,7 @@
},
// 閲嶇疆
reset() {
+ this.form.saleordercode = ''
this.form.mesorderstus = ''
this.form.mesordercode = ''
this.form.sourceorder = ''
diff --git a/src/views/reportManager/defectDetailList.vue b/src/views/reportManager/defectDetailList.vue
index f4c3159..2988a9f 100644
--- a/src/views/reportManager/defectDetailList.vue
+++ b/src/views/reportManager/defectDetailList.vue
@@ -24,13 +24,16 @@
/>
</el-select>
</el-form-item>
+ <el-form-item label="閿�鍞崟鍙�" style=" display: flex;">
+ <el-input v-model="form.saleordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
<el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</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.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="瑙勬牸鍨嬪彿" style=" display: flex;">
@@ -113,6 +116,11 @@
label="搴忓彿"
/>
<el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ width="160"
+ sortable="custom"
+ /> <el-table-column
prop="wo_code"
label="宸ュ崟缂栧彿"
width="160"
@@ -314,6 +322,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ saleordercode: '',
wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 鎵�灞炶溅闂�
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -395,6 +404,7 @@
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
const data = {
+ saleordercode: this.form.saleordercode,
wocode: this.form.wocode,
partcode: this.form.partcode,
partname: this.form.partname,
@@ -442,6 +452,7 @@
}
const data = {
+ saleordercode: this.form.saleordercode,
wocode: this.form.wocode,
partcode: this.form.partcode,
partname: this.form.partname,
@@ -471,6 +482,7 @@
},
// 閲嶇疆
reset() {
+ this.form.saleordercode = ''
this.form.wocode = ''
this.form.partcode = ''
this.form.partname = ''
diff --git a/src/views/reportManager/groupSalaryList.vue b/src/views/reportManager/groupSalaryList.vue
index edab877..24aa029 100644
--- a/src/views/reportManager/groupSalaryList.vue
+++ b/src/views/reportManager/groupSalaryList.vue
@@ -50,13 +50,16 @@
/>
</el-select>
</el-form-item>
+ <el-form-item label="閿�鍞崟鍙�" style="display: flex;">
+ <el-input v-model="form.saleordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
<el-form-item label="宸ュ崟缂栧彿" style="display: flex;">
<el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</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.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<!-- <el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">-->
@@ -75,9 +78,9 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-show="isExpandForm" label="鎿嶄綔浜哄憳" style=" display: flex;">
- <el-input v-model="form.username" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
+ <!-- <el-form-item v-show="isExpandForm" label="鎿嶄綔浜哄憳" style=" display: flex;">-->
+ <!-- <el-input v-model="form.username" style="width: 200px" placeholder="璇疯緭鍏�" />-->
+ <!-- </el-form-item>-->
<el-form-item v-show="isExpandForm" label="鎶ュ伐鏃堕棿" style="display: flex;align-items: center">
<el-date-picker
v-model="form.operdate"
@@ -146,6 +149,12 @@
width="50"
fixed
label="搴忓彿"
+ />
+ <el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ width="160"
+ sortable="custom"
/>
<el-table-column
prop="wo_code"
@@ -322,6 +331,12 @@
width="50"
fixed
label="搴忓彿"
+ />
+ <el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ width="160"
+ sortable="custom"
/>
<el-table-column
prop="wo_code"
@@ -550,6 +565,7 @@
tableHeight: 0,
StepSelectArr: [], // 鍓旈櫎宸ュ簭鏁扮粍
form: {
+ saleordercode: '',
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -679,6 +695,7 @@
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
const data = {
+ saleordercode: this.form.saleordercode,
wocode: this.form.wocode,
partcode: this.form.partcode,
partname: this.form.partname,
@@ -738,6 +755,7 @@
}
const data = {
+ saleordercode: this.form.saleordercode,
wocode: this.form.wocode,
partcode: this.form.partcode,
partname: this.form.partname,
@@ -767,6 +785,7 @@
},
// 閲嶇疆
reset() {
+ this.form.saleordercode = ''
this.form.wocode = ''
this.form.partcode = ''
this.form.partname = ''
diff --git a/src/views/reportManager/personSalaryList.vue b/src/views/reportManager/personSalaryList.vue
index 60d6db9..4cf701a 100644
--- a/src/views/reportManager/personSalaryList.vue
+++ b/src/views/reportManager/personSalaryList.vue
@@ -50,13 +50,16 @@
/>
</el-select>
</el-form-item>
+ <el-form-item label="閿�鍞崟鍙�" style=" display: flex;">
+ <el-input v-model="form.saleordercode" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
<el-form-item label="宸ュ崟缂栧彿" style="display: flex;">
<el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</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.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<!-- <el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">-->
@@ -75,9 +78,9 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-show="isExpandForm" label="鎶ュ伐浜哄憳" style=" display: flex;">
- <el-input v-model="form.reportname" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
+ <!-- <el-form-item v-show="isExpandForm" label="鎶ュ伐浜哄憳" style=" display: flex;">-->
+ <!-- <el-input v-model="form.reportname" style="width: 200px" placeholder="璇疯緭鍏�" />-->
+ <!-- </el-form-item>-->
<el-form-item v-show="isExpandForm" label="鎶ュ伐鏃堕棿" style="display: flex;align-items: center">
<el-date-picker
v-model="form.reportdate"
@@ -145,6 +148,12 @@
width="50"
fixed
label="搴忓彿"
+ />
+ <el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ width="160"
+ sortable="custom"
/>
<el-table-column
prop="wo_code"
@@ -315,6 +324,12 @@
width="50"
fixed
label="搴忓彿"
+ />
+ <el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ width="160"
+ sortable="custom"
/>
<el-table-column
prop="wo_code"
@@ -525,6 +540,7 @@
tableHeight: 0,
StepSelectArr: [], // 鍓旈櫎宸ュ簭鏁扮粍
form: {
+ saleordercode: '',
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -611,7 +627,7 @@
this.WorkShopArr = res
},
// 鑾峰彇宸ュ簭涓嬫媺鎺ュ彛
- async getStepSelect() {
+ async getStepSelect() {
const { data: res } = await StepSelect()
this.StepSelectArr = res
},
@@ -661,6 +677,7 @@
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
const data = {
+ saleordercode: this.form.saleordercode,
wocode: this.form.wocode,
partcode: this.form.partcode,
partname: this.form.partname,
@@ -719,6 +736,7 @@
}
const data = {
+ saleordercode: this.form.saleordercode,
wocode: this.form.wocode,
partcode: this.form.partcode,
partname: this.form.partname,
@@ -732,6 +750,7 @@
}
const { data: res } = await PeopleSalaryReportExcelSearch(data)
+ // console.log(res, 1)
window.location.href = res
},
// 鏌ヨ
@@ -748,6 +767,7 @@
},
// 閲嶇疆
reset() {
+ this.form.saleordercode = ''
this.form.wocode = ''
this.form.partcode = ''
this.form.partname = ''
diff --git a/src/views/reportManager/produceSchedule.vue b/src/views/reportManager/produceSchedule.vue
index 01014fa..44f9351 100644
--- a/src/views/reportManager/produceSchedule.vue
+++ b/src/views/reportManager/produceSchedule.vue
@@ -38,8 +38,11 @@
<el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item label="宸ヨ壓璺嚎缂栫爜" style=" display: flex;">
- <el-input v-model="form.routecode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <!-- <el-form-item label="宸ヨ壓璺嚎缂栫爜" style=" display: flex;">-->
+ <!-- <el-input v-model="form.routecode" placeholder="璇疯緭鍏�" style="width: 200px" />-->
+ <!-- </el-form-item>-->
+ <el-form-item label="閿�鍞崟鍙�" style=" display: flex;">
+ <el-input v-model="form.saleordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="宸ヨ壓璺嚎鍚嶇О" style=" display: flex;">
<el-input v-model="form.routename" placeholder="璇疯緭鍏�" style="width: 200px" />
@@ -132,6 +135,17 @@
sortable="custom"
/>
<el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ width="155"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ {{ row.saleOrderCode?row.saleOrderCode:'/' }}
+ </template>
+ </el-table-column>
+ <el-table-column
prop="wo_code"
label="宸ュ崟缂栧彿"
width="155"
@@ -171,13 +185,13 @@
<div v-else>/</div>
</template>
</el-table-column>
- <el-table-column
- prop="route_code"
- label="宸ヨ壓璺嚎缂栫爜"
- width="130"
- show-tooltip-when-overflow
- sortable="custom"
- />
+ <!-- <el-table-column-->
+ <!-- prop="route_code"-->
+ <!-- label="宸ヨ壓璺嚎缂栫爜"-->
+ <!-- width="130"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- />-->
<el-table-column
prop="route_name"
label="宸ヨ壓璺嚎鍚嶇О"
@@ -287,6 +301,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ saleordercode: '',
status: '', // 宸ュ崟鐘舵��
wocode: '', // 宸ュ崟缂栧彿
routecode: '', // 宸ヨ壓璺嚎缂栫爜
@@ -335,6 +350,7 @@
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
const data = {
+ saleordercode: this.form.saleordercode,
status: this.form.status,
wocode: this.form.wocode,
routecode: this.form.routecode,
@@ -362,6 +378,7 @@
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
const data = {
+ saleordercode: this.form.saleordercode,
status: this.form.status,
wocode: this.form.wocode,
routecode: this.form.routecode,
@@ -395,6 +412,7 @@
},
// 閲嶇疆
reset() {
+ this.form.saleordercode = ''
this.form.status = ''
this.form.wocode = ''
this.form.routecode = ''
diff --git a/src/views/reportManager/repairDetailList.vue b/src/views/reportManager/repairDetailList.vue
index 15e1346..15c5436 100644
--- a/src/views/reportManager/repairDetailList.vue
+++ b/src/views/reportManager/repairDetailList.vue
@@ -24,13 +24,16 @@
/>
</el-select>
</el-form-item>
+ <el-form-item label="閿�鍞崟鍙�" style=" display: flex;">
+ <el-input v-model="form.saleordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
<el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</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.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="瑙勬牸鍨嬪彿" style=" display: flex;">
@@ -121,6 +124,11 @@
label="搴忓彿"
/>
<el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ width="160"
+ sortable="custom"
+ /> <el-table-column
prop="wo_code"
label="宸ュ崟缂栧彿"
width="160"
@@ -305,6 +313,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ saleordercode: '',
wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 鎵�灞炶溅闂�
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -390,6 +399,7 @@
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
const data = {
+ saleordercode: this.form.saleordercode,
wocode: this.form.wocode,
partcode: this.form.partcode,
partname: this.form.partname,
@@ -437,6 +447,7 @@
}
const data = {
+ saleordercode: this.form.saleordercode,
wocode: this.form.wocode,
partcode: this.form.partcode,
partname: this.form.partname,
@@ -466,6 +477,7 @@
},
// 閲嶇疆
reset() {
+ this.form.saleordercode = ''
this.form.wocode = ''
this.form.partcode = ''
this.form.partname = ''
diff --git a/src/views/reportManager/subcontractingOperation.vue b/src/views/reportManager/subcontractingOperation.vue
index cedb9d7..e2f9d58 100644
--- a/src/views/reportManager/subcontractingOperation.vue
+++ b/src/views/reportManager/subcontractingOperation.vue
@@ -24,13 +24,16 @@
/>
</el-select>
</el-form-item>
+ <el-form-item label="閿�鍞崟鍙�" style=" display: flex;">
+ <el-input v-model="form.saleordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
<el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</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.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<!-- <el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">-->
@@ -42,16 +45,16 @@
<el-form-item v-show="isExpandForm" label="渚涙柟鍚嶇О" style=" display: flex;">
<el-input v-model="form.suppername" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label="鎿嶄綔绫诲瀷" style=" display: flex;">
- <el-select v-model="form.type" style="width: 200px" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in typeArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </el-form-item>
+ <!-- <el-form-item v-show="isExpandForm" label="鎿嶄綔绫诲瀷" style=" display: flex;">-->
+ <!-- <el-select v-model="form.type" style="width: 200px" placeholder="璇烽�夋嫨">-->
+ <!-- <el-option-->
+ <!-- v-for="item in typeArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
<el-form-item
v-show="isExpandForm"
style="display: flex;align-items: center"
@@ -120,6 +123,12 @@
width="50"
fixed
label="搴忓彿"
+ />
+ <el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ width="160"
+ sortable="custom"
/>
<el-table-column
prop="wo_code"
@@ -355,6 +364,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ saleordercode: '',
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -432,6 +442,7 @@
}
const data = {
+ saleordercode: this.form.saleordercode,
wocode: this.form.wocode,
partcode: this.form.partcode,
partname: this.form.partname,
@@ -471,6 +482,7 @@
}
const data = {
+ saleordercode: this.form.saleordercode,
wocode: this.form.wocode,
partcode: this.form.partcode,
partname: this.form.partname,
@@ -499,6 +511,7 @@
},
// 閲嶇疆
reset() {
+ this.form.saleordercode = ''
this.form.wocode = ''
this.form.partcode = ''
this.form.partname = ''
--
Gitblit v1.9.3