From 56a9035af0b19f88d28cd64e9fb8e813f3ea2d1d Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 22 九月 2023 16:27:27 +0800
Subject: [PATCH] 1.打印工单时 放出销售订单号
---
src/views/produceManager/workOrder.vue | 180 ++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 102 insertions(+), 78 deletions(-)
diff --git a/src/views/produceManager/workOrder.vue b/src/views/produceManager/workOrder.vue
index 31e11ab..3e881ca 100644
--- a/src/views/produceManager/workOrder.vue
+++ b/src/views/produceManager/workOrder.vue
@@ -43,7 +43,10 @@
<el-form-item label="婧愬崟鍗曞彿" style="display: flex;">
<el-input v-model="form.sourceorder" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item label="鍗曟嵁绫诲瀷" style=" display: flex;">
+ <el-form-item label="閿�鍞鍗�" style="display: flex;">
+ <el-input v-model="form.saleordercode" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="鍗曟嵁绫诲瀷" style=" display: flex;">
<el-select
v-model="form.ordertype"
:popper-append-to-body="false"
@@ -197,6 +200,18 @@
</template>
</el-table-column>
<el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞鍗�"
+ sortable="custom"
+ show-tooltip-when-overflow
+ min-width="160"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
prop="wotype"
label="鍗曟嵁绫诲瀷"
sortable="custom"
@@ -345,7 +360,7 @@
:style="{color:$store.state.settings.theme}"
class="el-icon-printer"
style="cursor: pointer;margin-right: 15px"
- @click="handlePrint(row.wo_code)"
+ @click="handlePrint(row.wo_code,row.saleOrderCode)"
/>
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
@@ -647,80 +662,73 @@
/>
</el-select>
</el-form-item>
- <!-- <el-button-->
- <!-- v-waves-->
- <!-- type="primary"-->
- <!-- style="padding: 0 10px;margin-left: -8px;margin-top:3px"-->
- <!-- class="el-icon-search"-->
- <!-- @click="searchClick"-->
- <!-- />-->
- <!-- :disabled="dialogForm.routecode===''"-->
- <!-- </div>-->
- <!-- </div>-->
- <el-form-item label="鏄惁鎺掔▼" prop="isAps">
- <el-radio-group v-model="dialogForm.isAps" style="width:200px" @change="changeIsAps">
- <el-radio key="Y" label="Y" value="Y">鏄�</el-radio>
- <el-radio key="N" label="N" value="N">鍚�</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="鐗╂枡娓呭崟" :prop="dialogForm.isAps==='Y'?'bomId':''">
- <el-select
- v-model="dialogForm.bomId"
- filterable
- :disabled="dialogForm.isAps==='N'"
- :popper-append-to-body="false"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in bomIdArr"
- :key="item.id"
- :label="item.version"
- :value="item.id"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="璁″垝寮�濮嬫椂闂�" prop="planstartdate">
- <el-date-picker
- v-model="dialogForm.planstartdate"
- type="date"
- :clearable="false"
- value-format="yyyy-MM-dd"
- :picker-options="pickerOptions"
- style="width: 200px"
- placeholder="閫夋嫨鏃ユ湡"
- />
- </el-form-item>
- <el-form-item label="璁″垝瀹屾垚鏃堕棿" prop="planenddate">
- <el-date-picker
- v-model="dialogForm.planenddate"
- type="date"
- :clearable="false"
- value-format="yyyy-MM-dd"
- style="width: 200px"
- placeholder="閫夋嫨鏃ユ湡"
- :picker-options="pickerOptions"
- />
- </el-form-item>
- <el-form-item label="宸ュ崟绛夌骇" prop="orderlev">
- <el-select
- v-model="dialogForm.orderlev"
- filterable
- :popper-append-to-body="false"
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in orderlevArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </el-form-item>
+ <!-- <el-form-item label="鏄惁鎺掔▼" prop="isAps">-->
+ <!-- <el-radio-group v-model="dialogForm.isAps" style="width:200px" @change="changeIsAps">-->
+ <!-- <el-radio key="Y" label="Y" value="Y">鏄�</el-radio>-->
+ <!-- <el-radio key="N" label="N" value="N">鍚�</el-radio>-->
+ <!-- </el-radio-group>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="鐗╂枡娓呭崟" :prop="dialogForm.isAps==='Y'?'bomId':''">-->
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.bomId"-->
+ <!-- filterable-->
+ <!-- :disabled="dialogForm.isAps==='N'"-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- style="width: 200px;"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in bomIdArr"-->
+ <!-- :key="item.id"-->
+ <!-- :label="item.version"-->
+ <!-- :value="item.id"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="璁″垝寮�濮嬫椂闂�" prop="planstartdate">-->
+ <!-- <el-date-picker-->
+ <!-- v-model="dialogForm.planstartdate"-->
+ <!-- type="date"-->
+ <!-- :clearable="false"-->
+ <!-- value-format="yyyy-MM-dd"-->
+ <!-- :picker-options="pickerOptions"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="閫夋嫨鏃ユ湡"-->
+ <!-- />-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="璁″垝瀹屾垚鏃堕棿" prop="planenddate">-->
+ <!-- <el-date-picker-->
+ <!-- v-model="dialogForm.planenddate"-->
+ <!-- type="date"-->
+ <!-- :clearable="false"-->
+ <!-- value-format="yyyy-MM-dd"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="閫夋嫨鏃ユ湡"-->
+ <!-- :picker-options="pickerOptions"-->
+ <!-- />-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="宸ュ崟绛夌骇" prop="orderlev">-->
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.orderlev"-->
+ <!-- filterable-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in orderlevArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
</el-form>
+ <div style="display: flex;justify-content: flex-end">
+ {{ routeStepArr }}
+ </div>
<!-- 宸ヨ壓璺嚎鏀惧ぇ闀滃璇濇-->
<el-dialog
@@ -1269,11 +1277,14 @@
style="display: flex;justify-content: space-between"
>
<div class="elForm">
- <el-form-item label="宸ュ崟缂栧彿:" class="formContent">
- {{ formApprove.mesordercode }}
+ <el-form-item label="閿�鍞崟鍙�:" class="formContent">
+ {{ formApprove.saleOrderCode }}
</el-form-item>
<el-form-item label="婧愬崟鍗曞彿:" class="formContent">
{{ formApprove.m_po }}
+ </el-form-item>
+ <el-form-item label="宸ュ崟缂栧彿:" class="formContent">
+ {{ formApprove.mesordercode }}
</el-form-item>
<el-form-item label="浜у搧缂栫爜:" class="formContent">
{{ formApprove.partcode }}
@@ -2022,6 +2033,7 @@
partcode: '', // 浜у搧缂栫爜
ordertype: '', // ordertype
sourceorder: '', // 婧愬崟鍗曞彿
+ saleordercode: '', // 閿�鍞鍗�
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
creatuser: '', // 鍒涘缓浜哄憳
@@ -2242,7 +2254,9 @@
lastPrintArr: [], // 鏈亾鎵撳嵃鐨勬暟缁�(鎵�鏈�)
lastPrintArrSelected: [], // 鏈亾鎵撳嵃鐨勬暟缁�(閫変腑)
- switchButton: false
+ switchButton: false,
+
+ routeStepArr: ''
}
},
created() {
@@ -2280,6 +2294,7 @@
partspec: this.form.partspec, // 浜у搧瑙勬牸
creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
sourceorder: this.form.sourceorder, // 婧愬崟鍗曞彿
+ saleordercode: this.form.saleordercode, // 閿�鍞鍗�
ordertype: this.form.ordertype, // 鍗曟嵁绫诲瀷
createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 鍒涘缓鏃堕棿
prop: this.form.prop, // 鎺掑簭瀛楁
@@ -2401,7 +2416,13 @@
wkshopcode: this.dialogForm.wkshopcode
}
await SelectRouteOrWkshop(data).then((res) => {
- // console.log(res, 1)
+ console.log(res, 1)
+
+ SelectRouteStep({ routecode: this.dialogForm.routecode }).then(res2 => {
+ console.log(res2)
+ this.routeStepArr = res2.data.map(i => i.stepname).join('锛�')
+ })
+
this.submitButtonIsDisabled = false
}).catch(err => {
// console.log(err, 2)
@@ -2575,6 +2596,7 @@
},
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
+ this.routeStepArr = ''
this.dialogForm.partname = '' // 浜у搧鍚嶇О
this.dialogForm.partspec = '' // 浜у搧瑙勬牸
this.dialogForm.wkshopname = '' // 鐢熶骇杞﹂棿鍚嶇О
@@ -2698,11 +2720,12 @@
this.dialogVisibleSearch = false
},
// 澶勭悊鎵撳嵃
- handlePrint(wo_code) {
+ handlePrint(wo_code, saleOrderCode) {
// const number = Math.random() * Math.random()
// this.number = number === 0 ? (10 + Math.random()) : number
// console.log(number)
+ this.formApprove.saleOrderCode = saleOrderCode
const data2 = {
username: getCookie('admin'),
mesordercode: wo_code || this.dialogForm.mesordercode
@@ -2790,6 +2813,7 @@
dialogVisibleConfirmClose() {
// this.dialogForm.mesordercode = ''
+ this.formApprove.saleOrderCode = ''
this.formApprove.mesordercode = ''
this.formApprove.m_po = ''
this.formApprove.partcode = ''
--
Gitblit v1.9.3