From e65745f91e75a032ab1ed94ab871d20ddc2913d8 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期四, 26 九月 2024 10:05:27 +0800
Subject: [PATCH] 1.工单修改 注塑机号、客户、颜色
---
src/views/workOrder/workOrderList.vue | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 103 insertions(+), 5 deletions(-)
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index af688a1..691427b 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -263,6 +263,33 @@
width="100"
/>
<el-table-column
+ prop="injectnumber"
+ label="娉ㄥ鏈哄彿"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.injectnumber?row.injectnumber:'/' }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="customername"
+ label="瀹㈡埛鍚嶇О"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.customername?row.customername:'/' }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="colour"
+ label="棰滆壊"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template>
+ </el-table-column>
+ <el-table-column
prop="clerkuser"
label="閿�鍞笟鍔″憳"
sortable="custom"
@@ -348,7 +375,7 @@
:style="{color:$store.state.settings.theme}"
class="el-icon-printer"
style="cursor: pointer;margin-right: 15px"
- @click.stop="handlePrint(row.wo_code)"
+ @click.stop="handlePrint(row)"
/>
</el-tooltip>
@@ -655,6 +682,29 @@
placeholder="閫夋嫨鏃ユ湡"
/>
<!-- :disabled="dialogForm.deliverydate"-->
+ </el-form-item>
+
+ <el-form-item label="娉ㄥ鏈哄彿">
+ <el-input v-model="dialogForm.injectnumber" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="瀹㈡埛鍚嶇О">
+ <el-select
+ v-model="dialogForm.customercode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨瀹㈡埛"
+ >
+ <el-option
+ v-for="item in customerArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="棰滆壊">
+ <el-input v-model="dialogForm.colour" style="width: 200px" />
</el-form-item>
<el-divider content-position="left">宸ュ簭淇℃伅</el-divider>
@@ -1273,6 +1323,16 @@
</el-form-item>
<el-form-item label="宸ュ崟鏁伴噺:" class="formContent">
{{ formApprove.plan_qty }}
+ </el-form-item>
+
+ <el-form-item label="娉ㄥ鏈哄彿:" class="formContent">
+ {{ formApprove.injectnumber }}
+ </el-form-item>
+ <el-form-item label="瀹㈡埛鍚嶇О:" class="formContent">
+ {{ formApprove.customername }}
+ </el-form-item>
+ <el-form-item label="棰滆壊:" class="formContent">
+ {{ formApprove.colour }}
</el-form-item>
<!-- <el-form-item label="宸ヨ壓璺嚎:" class="formContent">-->
<!-- {{ formApprove.routename }}-->
@@ -1986,7 +2046,7 @@
UpdateMesOrderStepSearch
} from '@/api/WorkOrder'
import { PartSelect } from '@/api/ProductModel'
-import { PrentOrganization, PrentOrganizationNoCompany, StepData } from '@/api/GeneralBasicData'
+import { CustomerPermissions, PrentOrganization, PrentOrganizationNoCompany, StepData } from '@/api/GeneralBasicData'
import Sortable from 'sortablejs'
import ElDragSelect from '@/components/DragSelect'
import { MesOrderPrintSearch } from '@/api/GridReport' // base on element-ui
@@ -2055,8 +2115,14 @@
deliverydate: '', // 浜や粯鏃堕棿
data_sources: '', // 鏁版嵁鏉ユ簮
+ injectnumber: '', // 娉ㄥ鏈哄彿
+ customercode: '', // 瀹㈡埛缂栫爜
+ customername: '', // 瀹㈡埛鍚嶇О
+ colour: '', // 棰滆壊
+
mesmaxqty: 0// 宸ュ崟鐨勬渶澶у��
},
+ customerArr: [],
ordertypeArr: [// 宸ュ崟绫诲瀷
{ code: 'PO', name: '鏍囧噯宸ュ崟' },
{ code: 'FO', name: '鎶ュ簾琛ュ崟' }
@@ -2103,6 +2169,15 @@
],
bomId: [
{ required: true, message: '璇烽�夋嫨鐗╂枡娓呭崟', trigger: ['blur', 'change'] }
+ ],
+ injectnumber: [
+ { required: true, message: '璇疯緭鍏ユ敞濉戞満鍙�', trigger: ['blur', 'change'] }
+ ],
+ customercode: [
+ { required: true, message: '璇烽�夋嫨瀹㈡埛', trigger: ['blur', 'change'] }
+ ],
+ colour: [
+ { required: true, message: '璇疯緭鍏ラ鑹�', trigger: ['blur', 'change'] }
]
},
@@ -2276,6 +2351,10 @@
// })
},
methods: {
+ async getCustomerPermissions() {
+ const { data: res } = await CustomerPermissions()
+ this.customerArr = res
+ },
setSort() {
const el = this.$refs.stepTableDataRef.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
this.sortable = Sortable.create(el, {
@@ -2304,6 +2383,7 @@
if (res.code === '200') {
this.getSelect()
this.getPrentOrganizationNoCompany()
+ this.getCustomerPermissions()
}
})
},
@@ -2504,6 +2584,10 @@
this.dialogForm.deliverydate = row.saleOrderDeliveryDate.substring(0, 11)
this.dialogForm.mesqty = row.plan_qty
+ this.dialogForm.injectnumber = row.injectnumber
+ this.dialogForm.customercode = row.customercode
+ this.dialogForm.colour = row.colour
+
const data = {
sourceid: this.dialogForm.sourceorderid,
sourcewo: this.dialogForm.sourceorder,
@@ -2601,7 +2685,11 @@
wkshopname: '', // 鐢熶骇杞﹂棿鍚嶇О
deliverydate: '', // 浜や粯鏃堕棿
- data_sources: '' // 鏁版嵁鏉ユ簮
+ data_sources: '', // 鏁版嵁鏉ユ簮
+
+ injectnumber: '',
+ customercode: '',
+ colour: ''
}
this.stepSelectedValue = []
this.stepTableData = []
@@ -2650,6 +2738,12 @@
wkshopcode: this.dialogForm.wkshopcode,
woqty: this.dialogForm.mesqty, // 宸ュ崟鏁伴噺
deliverydate: this.dialogForm.deliverydate, // 浜や粯鏃堕棿
+
+ injectnumber: this.dialogForm.injectnumber,
+ customercode: this.dialogForm.customercode,
+ customername: this.customerArr.find(i => i.code === this.dialogForm.customercode).name,
+ colour: this.dialogForm.colour,
+
data_sources: this.dialogForm.data_sources, // 鏁版嵁鏉ユ簮
isstep: workListSub.length > 0 ? 'Y' : 'N', //
workListSub
@@ -2717,13 +2811,13 @@
this.dialogVisibleSearch = false
},
// 澶勭悊鎵撳嵃
- handlePrint(wo_code) {
+ handlePrint(row) {
// const number = Math.random() * Math.random()
// this.number = number === 0 ? (10 + Math.random()) : number
// console.log(number)
const data2 = {
- mesordercode: wo_code || this.dialogForm.mesordercode
+ mesordercode: row.wo_code || this.dialogForm.mesordercode
}
MesOrderPrintSearch(data2).then(res2 => {
if (res2.code === '200') {
@@ -2739,6 +2833,10 @@
this.formApprove.routename = localStorage.getItem('username') // 鎵撳嵃浜哄憳
this.formApprove.lm_date = res3[0].lm_date
+ this.formApprove.injectnumber = row.injectnumber || '/'
+ this.formApprove.customername = row.customername || '/'
+ this.formApprove.colour = row.colour || '/'
+
this.$nextTick(() => {
res3.forEach(i => {
this.bindQRCode(i.seq, i.stepqrcode, 'small')
--
Gitblit v1.9.3