From 447af08b0fc2fe0050d361746b2449e3d376ee5b Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 08 三月 2023 16:08:47 +0800
Subject: [PATCH] 1.流转标签新增60*40尺寸
---
src/views/scgl/gd.vue | 353 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 233 insertions(+), 120 deletions(-)
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index ed9761b..4bdd9c0 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -20,7 +20,7 @@
style="display: flex;justify-content: space-between"
>
<div class="elForm">
- <el-form-item label-width="70px" label="璁㈠崟鐘舵��" style=" display: flex;">
+ <el-form-item label-width="70px" label="宸ュ崟鐘舵��" style=" display: flex;">
<el-select
v-model="form.mesorderstus"
:popper-append-to-body="false"
@@ -37,7 +37,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="璁㈠崟缂栧彿" style=" display: flex;">
+ <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;">
@@ -158,7 +158,7 @@
/>
<el-table-column
prop="status"
- label="璁㈠崟鐘舵��"
+ label="宸ュ崟鐘舵��"
sortable="custom"
width="110"
>
@@ -446,7 +446,7 @@
label-width="110px"
>
<el-form-item
- label="璁㈠崟鐘舵��"
+ label="宸ュ崟鐘舵��"
prop="mesorderstus"
>
<el-select
@@ -814,13 +814,83 @@
style="display: flex;justify-content: space-between"
>
<div class="elForm" style="justify-content: flex-start">
+ <!-- <el-form-item-->
+ <!-- label="棰勮寮�宸ユ椂闂�"-->
+ <!-- label-width="100px"-->
+ <!-- style=" display: flex;font-size: 14px;margin-top: 3px"-->
+ <!-- >-->
+ <!-- <el-date-picker-->
+ <!-- v-model="sourceForm.paystartdate"-->
+ <!-- type="daterange"-->
+ <!-- range-separator="~"-->
+ <!-- class="timeMini"-->
+ <!-- size="mini"-->
+ <!-- style="width: 200px;display: flex;line-height: 34px;height: 34px;font-size: 14px!important;"-->
+ <!-- :clearable="false"-->
+ <!-- start-placeholder="寮�濮嬫棩鏈�"-->
+ <!-- end-placeholder="缁撴潫鏃ユ湡"-->
+ <!-- />-->
+ <!-- <!– :picker-options="expireTimeOption"–>-->
+
+ <!-- </el-form-item>-->
+ <!-- <el-form-item-->
+ <!-- label="棰勮瀹屽伐鏃堕棿"-->
+ <!-- label-width="100px"-->
+ <!-- style=" display: flex;font-size: 14px;margin-top: 3px"-->
+ <!-- >-->
+ <!-- <el-date-picker-->
+ <!-- v-model="sourceForm.payenddate"-->
+ <!-- type="daterange"-->
+ <!-- :clearable="false"-->
+ <!-- class="timeMini"-->
+ <!-- range-separator="~"-->
+ <!-- start-placeholder="寮�濮嬫棩鏈�"-->
+ <!-- style="width: 200px;display: flex;line-height: 34px ;height: 34px ;font-size: 14px !important;"-->
+ <!-- end-placeholder="缁撴潫鏃ユ湡"-->
+ <!-- size="mini"-->
+ <!-- />-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">-->
+ <!-- <el-select-->
+ <!-- v-model="sourceForm.mesordercode"-->
+ <!-- filterable-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in erporderstusArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
+ <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
+ <el-input v-model="sourceForm.sourceorder" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="浜у搧缂栫爜" style=" display: flex;">
+ <el-input v-model="sourceForm.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+
+ <el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-input v-model="sourceForm.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item v-show="isExpandDialog" label="浜у搧瑙勬牸" style=" display: flex;">
+ <el-input v-model="sourceForm.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item v-show="isExpandDialog" label="鍒涘缓浜哄憳" style=" display: flex;">
+ <el-input v-model="sourceForm.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+
<el-form-item
- label="棰勮寮�宸ユ椂闂�"
+ v-show="isExpandDialog"
+ label="鍒涘缓鏃堕棿"
label-width="100px"
style=" display: flex;font-size: 14px;margin-top: 3px"
>
<el-date-picker
- v-model="sourceForm.paystartdate"
+ v-model="sourceForm.createdate"
type="daterange"
range-separator="~"
class="timeMini"
@@ -832,55 +902,6 @@
/>
<!-- :picker-options="expireTimeOption"-->
- </el-form-item>
- <el-form-item
- label="棰勮瀹屽伐鏃堕棿"
- label-width="100px"
- style=" display: flex;font-size: 14px;margin-top: 3px"
- >
- <el-date-picker
- v-model="sourceForm.payenddate"
- type="daterange"
- :clearable="false"
- class="timeMini"
- range-separator="~"
- start-placeholder="寮�濮嬫棩鏈�"
- style="width: 200px;display: flex;line-height: 34px ;height: 34px ;font-size: 14px !important;"
- end-placeholder="缁撴潫鏃ユ湡"
- size="mini"
- />
- </el-form-item>
- <el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
- <el-select
- v-model="sourceForm.erporderstus"
- filterable
- :popper-append-to-body="false"
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in erporderstusArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </el-form-item>
- <el-form-item v-show="isExpandDialog" label="璁㈠崟缂栧彿" style=" display: flex;">
- <el-input v-model="sourceForm.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
- <el-form-item v-show="isExpandDialog" label="浜у搧缂栫爜" style=" display: flex;">
- <el-input v-model="sourceForm.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
-
- <el-form-item v-show="isExpandDialog" label="浜у搧鍚嶇О" style=" display: flex;">
- <el-input v-model="sourceForm.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
- <el-form-item v-show="isExpandDialog" label="浜у搧瑙勬牸" style=" display: flex;">
- <el-input v-model="sourceForm.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
- <el-form-item v-show="isExpandDialog" label="鍒涘缓浜哄憳" style=" display: flex;">
- <el-input v-model="sourceForm.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
@@ -913,14 +934,15 @@
<div class="elTableDiv">
<el-table
:data="sourceTableData"
- :height="isExpandDialog?(tableHeight+60)+'px':(tableHeight+140)+'px'"
+ :height="isExpandDialog?(tableHeight+60)+'px':(tableHeight+100)+'px'"
border
:row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:isExpandDialog?(tableHeight+60)+'px':(tableHeight+140)+'px',}"
+ :style="{width: 100+'%',height:isExpandDialog?(tableHeight+60)+'px':(tableHeight+100)+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sourceSortChange"
+ @row-click="getCurrentRowSource"
>
<!-- <el-table-column-->
<!-- type="selection"-->
@@ -935,8 +957,8 @@
v-model="radioSelectedId"
:label="row.id"
style="color: transparent;padding-left: 10px;"
- @change.native="getCurrentRowSource(row.id)"
/>
+ <!-- @change.native="getCurrentRowSource(row.id)"-->
</template>
</el-table-column>
<el-table-column
@@ -945,40 +967,50 @@
fixed
label="搴忓彿"
/>
+ <!-- <el-table-column-->
+ <!-- prop="status"-->
+ <!-- label="宸ュ崟鐘舵��"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- width="110"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.status==='NEW'">鏂板伐鍗�</div>-->
+ <!-- <div v-if="row.status==='CREATING'">閮ㄥ垎涓嬭揪</div>-->
+ <!-- <div v-if="row.status==='CREATED'">鍏ㄩ儴涓嬭揪</div>-->
+ <!-- <div v-if="row.status==='CLOSED'">宸插叧闂�</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
- prop="status"
- label="璁㈠崟鐘舵��"
- sortable="custom"
- width="110"
- >
- <template slot-scope="{row}">
- <div v-if="row.status==='NEW'">鏂拌鍗�</div>
- <div v-if="row.status==='CREATING'">閮ㄥ垎涓嬭揪</div>
- <div v-if="row.status==='CREATED'">鍏ㄩ儴涓嬭揪</div>
- <div v-if="row.status==='CLOSED'">宸插叧闂�</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="wo"
- label="璁㈠崟缂栧彿"
- sortable="custom"
+ label="宸ュ崟缂栧彿"
+ prop="wo_code"
+ show-tooltip-when-overflow
min-width="150"
- />
+ sortable="custom"
+ >
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.m_po">{{ row.m_po }}</div>-->
+ <!-- <div v-else>{{ row.wo_code }}</div>-->
+ <!-- </template>-->
+ </el-table-column>
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
sortable="custom"
+ show-tooltip-when-overflow
min-width="150"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
sortable="custom"
+ show-tooltip-when-overflow
min-width="150"
/>
<el-table-column
prop="partspec"
label="浜у搧瑙勬牸"
+ show-tooltip-when-overflow
sortable="custom"
min-width="110"
>
@@ -988,20 +1020,30 @@
</template>
</el-table-column>
<el-table-column
- prop="qty"
- label="璁㈠崟鏁伴噺"
+ prop="plan_qty"
+ label="浠诲姟鏁伴噺"
width="150"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
- prop="relse_qty"
- label="宸蹭笅鍗曟暟閲�"
+ prop="bad_qty"
+ label="鎶ュ簾鏁伴噺"
width="150"
+ show-tooltip-when-overflow
sortable="custom"
/>
+ <!-- <el-table-column-->
+ <!-- prop="relse_qty"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- label="宸蹭笅鍗曟暟閲�"-->
+ <!-- width="150"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
<el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
+ show-tooltip-when-overflow
sortable="custom"
width="150"
>
@@ -1011,46 +1053,50 @@
</template>
</el-table-column>
<el-table-column
- prop="planstartdate"
+ prop="plan_startdate"
label="棰勮寮�宸ユ椂闂�"
+ show-tooltip-when-overflow
sortable="custom"
width="130"
>
<template slot-scope="{row}">
- <div v-if="row.planstartdate">{{ row.planstartdate.substring(0, 11) }}</div>
+ <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
- prop="planenddate"
+ prop="plan_enddate"
label="棰勮瀹屽伐鏃堕棿"
+ show-tooltip-when-overflow
sortable="custom"
width="130"
>
<template slot-scope="{row}">
- <div v-if="row.planenddate">{{ row.planenddate.substring(0, 11) }}</div>
+ <div v-if="row.plan_enddate">{{ row.plan_enddate.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
- prop="createuser"
+ prop="lm_user"
label="鍒涘缓浜哄憳"
+ show-tooltip-when-overflow
sortable="custom"
width="150"
>
<template slot-scope="{row}">
- <div v-if="row.createuser">{{ row.createuser }}</div>
+ <div v-if="row.lm_user">{{ row.lm_user }}</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
- prop="createdate"
+ prop="lm_date"
label="鍒涘缓鏃堕棿"
+ show-tooltip-when-overflow
width="130"
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.createdate">{{ row.createdate.substring(0, 11) }}</div>
+ <div v-if="row.lm_date">{{ row.lm_date.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -1062,7 +1108,7 @@
<!-- <template slot-scope="{row}">-->
<!-- <div class="operationClass">-->
<!-- <el-tooltip class="item" effect="dark" content="涓嬭揪" placement="top">-->
- <!-- <!– <el-button type="text" @click="edit('edit',row)">涓嬭揪</el-button>–>-->
+ <!-- <!– <el-button type="text" @click="edit('edit',row)">涓嬭揪</el-button>–>-->
<!-- <i-->
<!-- class="el-icon-bottom"-->
<!-- style="color:#42b983;cursor: pointer;margin-left: 5px"-->
@@ -1082,7 +1128,7 @@
align="right"
layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
- @pagination="getErpOrderSearch"
+ @pagination="getMesBadOrderSearch"
/>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
@@ -1384,6 +1430,68 @@
</div>
<div
+ v-if="printSize===2"
+ class="printSize2"
+ style="display: flex;width: 220px;height: 130px;border: 1px solid #000;text-align: center;font-size: 12px"
+ >
+
+ <div style="width: 70px;display: flex;flex-direction: column;border-right: 1px solid #000">
+ <div
+ style="display: flex;height: 60%;border-bottom:1px solid #000;
+ justify-content: center;align-items: center;position: relative"
+ >
+ <div
+ id="qrCode2"
+ ref="qrCodeDiv2"
+ style="overflow-y: hidden;height:71%;position: absolute;left: 7px;"
+ />
+ </div>
+ <div
+ style="display: flex;height: 20%;justify-content: flex-start;border-bottom:1px solid #000;align-items: center"
+ >
+ <div style="margin-left: 3px; ">鏁伴噺:{{ qrForm.startqty }}</div>
+ </div>
+ <div style="display: flex;height: 20%;justify-content: flex-start;align-items: center;">
+ <div style="margin-left: 3px; ">鎿嶄綔:{{ qrForm.operator }}</div>
+
+ </div>
+ </div>
+
+ <div style="width:150px;display: flex;flex-direction: column">
+ <div
+ style="display: flex;height: 20%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center;text-align: left"
+ >
+ <div style="margin-left: 3px;">缂栧彿:{{ qrForm.wo_code }}</div>
+
+ </div>
+ <div
+ style="display: flex;height: 20%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center ;text-align: left"
+ >
+ <div style="margin-left: 3px;">浜у搧缂栫爜:{{ qrForm.partcode }}</div>
+
+ </div>
+ <div
+ style="display: flex;height: 20%;border-bottom:1px solid #000 ;justify-content: flex-start;align-items: center;text-align: left"
+ >
+ <div style="margin-left: 3px;">浜у搧鍚嶇О:{{ qrForm.partname }}</div>
+
+ </div>
+ <div
+ style="display: flex;height: 20%;border-bottom:1px solid #000 ;justify-content: flex-start;align-items: center;text-align: left"
+ >
+ <div style="margin-left: 3px;">涓嬮亾宸ュ簭:{{ qrForm.nextstepname }}</div>
+
+ </div>
+ <div style="display: flex;height: 20%;justify-content: flex-start;align-items: center;text-align: left">
+ <div style=" margin-left: 3px;">鏃堕棿: {{ qrForm.operatorTime }}</div>
+ <!-- <div>{{ qrForm.operatorTime?qrForm.operatorTime.substring(5):'' }}</div>-->
+ <!-- <div>{{ qrForm.operatorTime }}</div>-->
+ </div>
+
+ </div>
+
+ </div>
+ <div
v-if="printSize===5"
style="display: flex;width: 140px;height: 80px;border: 1px solid #000;text-align: center;font-size: 10px;"
>
@@ -1614,7 +1722,7 @@
import {
AddUpdateMesOrder,
ClosedMesOrder,
- DeleteMesOrder, ErpOrderSearch,
+ DeleteMesOrder, ErpOrderSearch, MesBadOrderSearch,
MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep, SearchWorkStepSopList, SelectRouteOrWkshop,
SelectRouteStep
} from '@/api/scgl'
@@ -1705,7 +1813,7 @@
operation: '',
dialogFormRules: {
mesorderstus: [
- { required: true, message: '璇烽�夋嫨璁㈠崟鐘舵��', trigger: ['blur', 'change'] }
+ { required: true, message: '璇烽�夋嫨宸ュ崟鐘舵��', trigger: ['blur', 'change'] }
],
partcode: [
{ required: true, message: '璇烽�夋嫨浜у搧淇℃伅', trigger: ['blur', 'change'] }
@@ -1807,17 +1915,18 @@
dialogVisibleSource: false,
sourceTableData: [],
sourceForm: {
- erporderstus: '', // 璁㈠崟鐘舵�佺爜
- erpordercode: '', // 璁㈠崟缂栧彿
+ mesordercode: '', // 宸ュ崟鐘舵�佺爜
+ sourceorder: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
creatuser: '', // 鍒涘缓浜哄憳
// paystartdate: '', // 浜や粯鏃堕棿
- paystartdate: '', // 棰勮寮�宸ユ椂闂�
- payenddate: '', // 棰勮瀹屽伐鏃堕棿
+ // paystartdate: '', // 棰勮寮�宸ユ椂闂�
+ // payenddate: '', // 棰勮瀹屽伐鏃堕棿
createdate: '', // 鍒涘缓鏃堕棿
- prop: 'createdate', // 鎺掑簭瀛楁
+
+ prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
@@ -1835,10 +1944,11 @@
defaultroute_codeArr: '', // 榛樿宸ヨ壓璺嚎鏁扮粍
projectTableData: [], // 璁惧鍒楄〃
tableDataDetail: [], // 鐐瑰嚮宸ュ崟琛ㄧ殑琛� 鏄剧ず璇︾粏淇℃伅
- printSize: 1,
+ printSize: 2,
printSizeSelectArr: [// 瀹�*楂�
{ code: 0, name: '80*50' },
- { code: 1, name: '78*60' }
+ { code: 1, name: '78*60' },
+ { code: 2, name: '60*40' }
// { code: 2, name: '50*60' },
// { code: 3, name: '50*40' },
// { code: 4, name: '50*80' },
@@ -1911,7 +2021,7 @@
const { data: res1 } = await PartSelect()
this.partArr = res1
},
- // 璁㈠崟鐘舵�佹敼鍙樻椂
+ // 宸ュ崟鐘舵�佹敼鍙樻椂
erporderstusChange(val) {
this.form.mesorderstus = val
},
@@ -1938,7 +2048,7 @@
}
this.sourceForm.order = order
this.sourceForm.prop = prop
- this.getErpOrderSearch()
+ this.getMesBadOrderSearch()
},
// 鏌ヨ
search() {
@@ -2018,6 +2128,7 @@
const { data: res2 } = await RouteSelectWkshop(data)
this.wkshopArr = res2
this.dialogForm.wkshopcode = ''
+ this.sumbitBottonIsDisabled = false
},
// 棰勮
async check(row) {
@@ -2433,8 +2544,8 @@
bindQRCode2(text) {
new QRCode(this.$refs.qrCodeDiv2, {
text: text,
- width: 60,
- height: 60,
+ width: this.printSize !== 2 ? 60 : 55,
+ height: this.printSize !== 2 ? 60 : 55,
colorDark: '#000', // 浜岀淮鐮侀鑹�
colorLight: '#ffffff', // 浜岀淮鐮佽儗鏅壊
correctLevel: QRCode.CorrectLevel.L// 瀹归敊鐜囷紝L/M/H
@@ -2446,30 +2557,31 @@
return this.$message.info('宸ュ崟绫诲瀷涓烘姤搴熻ˉ鍗曟儏鍐典笅鍙�夋嫨锛�')
}
- this.getErpOrderSearch()
+ this.getMesBadOrderSearch()
this.dialogVisibleSource = true
},
- async getErpOrderSearch() {
- let tempDate2 = this.sourceForm.paystartdate
- if (tempDate2.length > 0) {
- tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
- }
+ async getMesBadOrderSearch() {
+ // let tempDate2 = this.sourceForm.paystartdate
+ // if (tempDate2.length > 0) {
+ // tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
+ // }
- let tempDate = this.sourceForm.payenddate
+ let tempDate = this.sourceForm.createdate
if (tempDate.length > 0) {
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
const data = {
- erporderstus: this.sourceForm.erporderstus, // 璁㈠崟鐘舵�佺爜
- erpordercode: this.sourceForm.erpordercode, // 璁㈠崟缂栧彿
+ mesordercode: this.sourceForm.mesordercode, // 宸ュ崟鐘舵�佺爜
+ sourceorder: this.sourceForm.sourceorder, // 宸ュ崟缂栧彿
partcode: this.sourceForm.partcode, // 浜у搧缂栫爜
partname: this.sourceForm.partname, // 浜у搧鍚嶇О
partspec: this.sourceForm.partspec, // 浜у搧瑙勬牸
- paystartdate: tempDate2, // 浜や粯鏃堕棿
- payenddate: tempDate, // 浜や粯鏃堕棿
+ // paystartdate: tempDate2, // 浜や粯鏃堕棿
+ // payenddate: tempDate, // 浜や粯鏃堕棿
creatuser: this.sourceForm.creatuser, // 鍒涘缓浜哄憳
+ createdate: tempDate, // 鍒涘缓鏃堕棿
prop: this.sourceForm.prop, // 鎺掑簭瀛楁
order: this.sourceForm.order, // 鎺掑簭瀛楁
@@ -2478,16 +2590,17 @@
}
- const res = await ErpOrderSearch(data)
- this.sourceTableData = res.data.filter(item => item.status !== 'NEW')
+ const res = await MesBadOrderSearch(data)
+ this.sourceTableData = res.data
this.sourceFormTotal = res.count
},
// 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
- getCurrentRowSource(id) {
- this.radioSelectedId = id
+ getCurrentRowSource(row, event, column) {
+ this.radioSelectedId = row.id
+ this.dialogForm.mesqty = row.bad_qty
},
sourceSearch() {
- this.getErpOrderSearch()
+ this.getMesBadOrderSearch()
},
sourceReset() {
this.sourceForm.erporderstus = ''
@@ -2499,7 +2612,7 @@
this.sourceForm.payenddate = ''
this.sourceForm.creatuser = ''
this.sourceForm.createdate = ''
- this.getErpOrderSearch()
+ this.getMesBadOrderSearch()
},
dialogVisibleSourceClose() {
this.radioSelectedId = ''
@@ -2524,7 +2637,7 @@
console.log(this.radioSelectedId)
this.sourceTableData.forEach(item => {
if (item.id === this.radioSelectedId) {
- this.dialogForm.sourceorder = item.wo
+ this.dialogForm.sourceorder = item.wo_code
this.dialogForm.partcode = item.partcode
this.dialogForm.partspec = item.partspec
}
--
Gitblit v1.9.3