From edd82d6c67f1f26b42e5b5a7b8a467247ffa3835 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 14 十一月 2023 10:59:43 +0800
Subject: [PATCH] 1. 生产开报工根据需求放出 开工数量可改
---
src/views/produceManager/produceStartOrder.vue | 487 +++++++++++++++++++++++++----------------------------
src/views/kanbanManager/zhkb.vue | 5
2 files changed, 235 insertions(+), 257 deletions(-)
diff --git a/src/views/kanbanManager/zhkb.vue b/src/views/kanbanManager/zhkb.vue
index ef51b9b..2da36ea 100644
--- a/src/views/kanbanManager/zhkb.vue
+++ b/src/views/kanbanManager/zhkb.vue
@@ -54,8 +54,8 @@
</div>
<div class="content02Parent">
<div class="content02">
- <div class="content02_1 ">浠诲姟</div>
- <div class="content02_2 borderTop ">{{ parseFloat(it.planqty) }}</div>
+ <div class="content02_1 ">寮�宸�</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(it.startqty) }}</div>
</div>
<div class="content02">
<div class="content02_1 ">鍚堟牸</div>
@@ -308,6 +308,7 @@
{ code: '205', name: '鍖呰杞﹂棿' },
{ code: '204', name: '鍠锋秱杞﹂棿' },
{ code: '203', name: '鎶涘厜杞﹂棿' },
+ // { code: '001', name: '鍘嬮摳杞﹂棿' }
{ code: '201', name: '鍘嬮摳杞﹂棿' }
],
title: '杞﹂棿缁煎悎'
diff --git a/src/views/produceManager/produceStartOrder.vue b/src/views/produceManager/produceStartOrder.vue
index da727e0..7c30240 100644
--- a/src/views/produceManager/produceStartOrder.vue
+++ b/src/views/produceManager/produceStartOrder.vue
@@ -9,37 +9,64 @@
<!-- oninput="value=value.replace(/[^0-9a-zA-Z;_]/g,'')"-->
<el-input
id="keyWords"
- v-model="form.orderstepqrcode"
+ v-model="form.wocode"
name="produceCode"
+ placeholder="璇锋壂鐮佹垨杈撳叆宸ュ崟鍙�"
style="width: 300px"
@keyup.enter.native="val=>enterNative(val,'produceCode')"
/>
- <!-- @keyup.native="e=>judgeIsScanning(e,'produceCode')"-->
- <div style="width: 90px;margin-left: 20px">鐢熶骇璁惧锛�</div>
- <el-select
- v-model="form.SelectType"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- @change="selectTypeChange"
- >
- <el-option
- v-for="item in ZZeqpArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
+ <!-- <div style="width: 90px;margin-left: 20px">鐢熶骇璁惧锛�</div>-->
+ <!-- <el-select-->
+ <!-- v-model="form.SelectType"-->
+ <!-- style="width: 200px;"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- @change="selectTypeChange"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in ZZeqpArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+
+ <div style="width: 90px;margin-left: 20px">浜у搧缂栫爜锛�</div>
+ <el-input
+ v-model="form.partcode"
+ placeholder="璇疯緭鍏�"
+ style="width: 200px"
+ @keyup.enter.native="val=>enterNative(val,'produceCode')"
+ />
+ <div style="width: 90px;margin-left: 20px">浜у搧鍚嶇О锛�</div>
+ <el-input
+ v-model="form.partname"
+ placeholder="璇疯緭鍏�"
+ style="width: 200px"
+ @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>
- <div v-if="false" style="display: flex;padding-right: 10px">
- <el-button v-waves @click="ZZstart">
- <svg-icon icon-class="start_time" style="margin-right: 2px" />
- 寮�濮�
- </el-button>
- <el-button v-waves @click="ZZreport">
- <svg-icon icon-class="report_work" style="margin-right: 2px" />
- 鎶ュ伐
- </el-button>
+ <div style="display: flex;padding-right: 10px">
+ <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
+ <!-- <div v-if="false" style="display: flex;padding-right: 10px">-->
+ <!-- <el-button v-waves @click="ZZstart">-->
+ <!-- <svg-icon icon-class="start_time" style="margin-right: 2px" />-->
+ <!-- 寮�濮�-->
+ <!-- </el-button>-->
+ <!-- <el-button v-waves @click="ZZreport">-->
+ <!-- <svg-icon icon-class="report_work" style="margin-right: 2px" />-->
+ <!-- 鎶ュ伐-->
+ <!-- </el-button>-->
+ <!-- </div>-->
</div>
<el-divider />
<div class="elTableDiv">
@@ -136,13 +163,24 @@
show-tooltip-when-overflow
/>
<el-table-column
+ prop="start_qty"
+ label="宸插紑宸ユ暟閲�"
+ width="110"
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ {{ row.start_qty }}
+ </template>
+ </el-table-column>
+ <el-table-column
label="鏈姤宸ユ暟閲�"
width="120"
show-tooltip-when-overflow
>
<!-- sortable="custom"-->
<template slot-scope="{row}">
- <div>{{ row.plan_qty - row.good_qty - row.ng_qty }}</div>
+ <!-- <div>{{ row.plan_qty - row.good_qty - row.ng_qty }}</div>-->
+ <div>{{ row.start_qty - row.good_qty - row.ng_qty-row.bad_qty }}</div>
</template>
</el-table-column>
<el-table-column
@@ -184,25 +222,24 @@
width="150"
sortable="custom"
show-tooltip-when-overflow
- fixed="right"
>
<template slot-scope="{row}">
<div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
- <!-- <el-table-column-->
- <!-- label="鎿嶄綔"-->
- <!-- width="150"-->
- <!-- fixed="right"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div class="operationClass">-->
- <!-- <el-button v-waves type="text" @click="edit('edit',row)">缂栬緫</el-button>-->
- <!-- <el-button v-waves type="text" @click="del(row)">鍒犻櫎</el-button>-->
- <!-- </div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
+ <el-table-column
+ label="鎿嶄綔"
+ width="150"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-button v-waves type="text" @click="ZZstart(row)">寮�宸�</el-button>
+ <el-button v-waves type="text" @click="ZZreport(row)">鎶ュ伐</el-button>
+ </div>
+ </template>
+ </el-table-column>
</el-table>
</div>
<!--鍒嗛〉-->
@@ -240,7 +277,6 @@
style="width: 300px"
@keyup.enter.native="val=>enterNative(val,'WXproduceCode')"
/>
- <!-- @keyup.native="e=>judgeIsScanning(e,'WXproduceCode')"-->
</div>
<div v-if="false" style="display: flex;padding-right: 10px">
@@ -395,25 +431,24 @@
show-tooltip-when-overflow
width="150"
sortable="custom"
- fixed="right"
>
<template slot-scope="{row}">
<div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
- <!-- <el-table-column-->
- <!-- label="鎿嶄綔"-->
- <!-- width="150"-->
- <!-- fixed="right"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div class="operationClass">-->
- <!-- <el-button v-waves type="text" @click="edit('edit',row)">缂栬緫</el-button>-->
- <!-- <el-button v-waves type="text" @click="del(row)">鍒犻櫎</el-button>-->
- <!-- </div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
+ <el-table-column
+ label="鎿嶄綔"
+ width="150"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-button v-if="WXSelected==='OUT'" v-waves type="text" @click="enterNative(WXform.orderstepqrcode=row.wo_code+';'+row.stepcode,'WXproduceCode')">鍙戞枡</el-button>
+ <el-button v-if="WXSelected==='IN'" v-waves type="text" @click="enterNative(WXform.orderstepqrcode=row.wo_code+';'+row.stepcode,'WXproduceCode')">鏀舵枡</el-button>
+ </div>
+ </template>
+ </el-table-column>
</el-table>
</div>
<!--鍒嗛〉-->
@@ -439,7 +474,6 @@
style="width: 300px"
@keyup.enter.native="val=>enterNative(val,'badProduceCode')"
/>
- <!-- @keyup.native="e=>judgeIsScanning(e,'badProduceCode')"-->
</div>
</div>
@@ -621,24 +655,24 @@
</el-form-item>
<!--鑷埗寮�濮�-->
<el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" label="寮�宸ユ暟閲忥細">
- <div style="width: 200px">{{ dialogForm.startqty }}</div>
- <!-- <div style="width: 200px">{{ dialogForm.noreportqty }}</div>-->
+ <!-- <div style="width: 200px">{{ dialogForm.startqty }}</div>-->
+ <el-input v-model="dialogForm.startqty" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px;" />
</el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" label="鐢熶骇璁惧锛�">
- <div style="width: 200px">{{ form.SelectType? ZZeqpArr.find(i=>i.code===form.SelectType).name:'' }}</div>
- <!-- <el-select-->
- <!-- v-model="dialogForm.eqpcode"-->
- <!-- style="width: 200px;"-->
- <!-- placeholder="璇烽�夋嫨"-->
- <!-- >-->
- <!-- <el-option-->
- <!-- v-for="item in ZZeqpArr"-->
- <!-- :key="item.code"-->
- <!-- :label="item.name"-->
- <!-- :value="item.code"-->
- <!-- />-->
- <!-- </el-select>-->
- </el-form-item>
+ <!-- <el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" label="鐢熶骇璁惧锛�">-->
+ <!-- <div style="width: 200px">{{ form.SelectType? ZZeqpArr.find(i=>i.code===form.SelectType).name:'' }}</div>-->
+ <!-- <!– <el-select–>-->
+ <!-- <!– v-model="dialogForm.eqpcode"–>-->
+ <!-- <!– style="width: 200px;"–>-->
+ <!-- <!– placeholder="璇烽�夋嫨"–>-->
+ <!-- <!– >–>-->
+ <!-- <!– <el-option–>-->
+ <!-- <!– v-for="item in ZZeqpArr"–>-->
+ <!-- <!– :key="item.code"–>-->
+ <!-- <!– :label="item.name"–>-->
+ <!-- <!– :value="item.code"–>-->
+ <!-- <!– />–>-->
+ <!-- <!– </el-select>–>-->
+ <!-- </el-form-item>-->
<!-- 鑷埗鎶ュ伐 -->
<el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嬮亾宸ュ簭锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.nextstepname }}</div>
@@ -648,9 +682,9 @@
<div style="width: 200px">{{ dialogForm.wkshopname }}</div>
</el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="璁惧鍚嶇О锛�" style="margin: 0 10px 0 0">
- <div style="width: 200px">{{ dialogForm.eqpname }}</div>
- </el-form-item>
+ <!-- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="璁惧鍚嶇О锛�" style="margin: 0 10px 0 0">-->
+ <!-- <div style="width: 200px">{{ dialogForm.eqpname }}</div>-->
+ <!-- </el-form-item>-->
<el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" prop="reckway" label="璁′欢鏂瑰紡锛�">
@@ -707,7 +741,7 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鍚堟牸鏁伴噺锛�" prop="startqty">
- <el-input v-model="dialogForm.startqty" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
+ <el-input v-model="dialogForm.startqty" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px;" />
<!-- <el-input v-model="dialogForm.noreportqty" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />-->
</el-form-item>
@@ -725,7 +759,7 @@
</el-form-item>
<el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="澶囨敞锛�">
- <el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />
+ <el-input v-model="dialogForm.remarks" type="textarea" style="width: 520px;" />
</el-form-item>
<!-- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嶈壇鍘熷洜锛�">-->
@@ -883,7 +917,7 @@
<el-input
v-if="row.isVisible===1||row.isVisible===2"
v-model="row.ratio"
- oninput="value=value.replace(/[^0-9.]/g,'')"
+ oninput="value=value.replace(/[^0-9]/g,'')"
placeholder="璇疯緭鍏�"
/>
<div v-else> {{ row.ratio }}</div>
@@ -966,7 +1000,7 @@
label="鍙戞枡鏁伴噺锛�"
prop="fqty"
>
- <el-input v-model="dialogForm.fqty" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
+ <el-input v-model="dialogForm.fqty" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px;" />
</el-form-item>
<!-- 澶栧崗鏀舵枡-->
<el-form-item
@@ -1021,7 +1055,7 @@
v-model="dialogForm.sqty"
style="width: 200px"
:disabled="dialogForm.wxcode===''"
- oninput="value=value.replace(/[^0-9.]/g,'')"
+ oninput="value=value.replace(/[^0-9]/g,'')"
/>
</el-form-item>
@@ -1550,8 +1584,13 @@
radioSelected: '', // 宸ュ簭閫変腑
WXradioSelected: '', // 宸ュ簭閫変腑
form: {
- orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜淇℃伅
- SelectType: '', // 璁惧缂栫爜
+ // orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜淇℃伅
+ // SelectType: '', // 璁惧缂栫爜
+ wocode: '',
+ partcode: '', // 浜у搧缂栫爜
+ partname: '', // 浜у搧鍚嶇О
+ partspec: '', // 瑙勬牸鍨嬪彿
+
prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
@@ -1616,6 +1655,8 @@
operation: getCookie('navTabId'), // 鎶ュ伐浜猴紙鏀舵枡浜猴級
remarks: '', // 澶囨敞
+
+ // isbott: true,
inbarcode: ''// 鏈亾宸ュ簭鏃� 鎵撳嵃鐨勫叆搴撶爜
@@ -1726,33 +1767,6 @@
countJudgeIsScanningInput: 0 // 鍒ゆ柇鎵爜妗嗙殑涓暟
}
},
- watch: {
- // 'form.orderstepqrcode': {
- // handler(newValue) {
- // this.form.orderstepqrcode = newValue
- //
- // // 鍦ㄨ繖閲岃皟鐢紝骞舵墽琛宼his.fnThrottle(this.search, 500, 2000)();
- // this.fnThrottle(this.enterNative, 500, 2000, 'produceCode')()
- // }
- // },
- // 'WXform.orderstepqrcode': {
- // handler(newValue) {
- // this.form.orderstepqrcode = newValue
- //
- // // 鍦ㄨ繖閲岃皟鐢紝骞舵墽琛宼his.fnThrottle(this.search, 500, 2000)();
- // this.fnThrottle(this.enterNative, 500, 2000, 'WXproduceCode')()
- // }
- // },
- // 'badForm.orderstepqrcode': {
- // handler(newValue) {
- // this.form.orderstepqrcode = newValue
- //
- // // 鍦ㄨ繖閲岃皟鐢紝骞舵墽琛宼his.fnThrottle(this.search, 500, 2000)();
- // this.fnThrottle(this.enterNative, 500, 2000, 'badProduceCode')()
- // }
- // }
- },
-
created() {
this.getMesOrderStepSearch()
this.tabClick()
@@ -1869,105 +1883,6 @@
})
}
},
- // 闃叉姈 //鎵爜鐢ㄧ殑鏄槻鎶�
- fnThrottle(method, delay, duration, belong) {
- var that = this
- var timer = this.timer
- var begin = new Date().getTime()
- return function() {
- var current = new Date().getTime()
- clearTimeout(timer)
- if (current - begin >= duration) {
- // method()
- // that.VALUE()
- begin = current
- } else {
- that.timer = setTimeout(function() {
- // method()
- if (belong === 'produceCode') {
- that.enterNative(that.form.orderstepqrcode, belong)
- }
- if (belong === 'WXproduceCode') {
- that.enterNative(that.WXform.orderstepqrcode, belong)
- }
- if (belong === 'badProduceCode') {
- that.enterNative(that.badForm.orderstepqrcode, belong)
- }
- }, delay)
- }
- }
- },
- // 鍒ゆ柇鏄惁鏄壂鐮佹灙鎵爜
- judgeIsScanning2(e, belong) {
- if (belong === 'produceCode' && this.form.orderstepqrcode.toString().length === 0) {
- this.judgeIsScanningArr = []
- this.countJudgeIsScanningInput = 0
- }
- if (belong === 'WXproduceCode' && this.WXform.orderstepqrcode.toString().length === 0) {
- this.judgeIsScanningArr = []
- this.countJudgeIsScanningInput = 0
- }
- const timenow = e.timeStamp
- // console.log(timenow, 1)
- // let flag = true
- let flag = false
- this.judgeIsScanningArr.push(timenow)
- let i
-
- for (i in this.judgeIsScanningArr) {
- console.log(Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]))
- // flag = Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]) < 0.1
- if (Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]) < 0.1) {
- this.countJudgeIsScanningInput++
- }
- if (this.countJudgeIsScanningInput >= 3) {
- flag = true
- }
- if (i > 0 && this.judgeIsScanningArr.length === parseInt(i) + 1) {
- if (flag) {
- console.log(flag, 1)
- this.fnThrottle(this.enterNative, 500, 2000, belong)()
- return
- }
- }
- }
-
- // // for (i in this.judgeIsScanningArr) {
- // // console.log(i)
- // // console.log( this.judgeIsScanningArr)
- // console.log(Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]))
- // if (Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]) < 10) {
- // this.countJudgeIsScanningInput++
- // }
- // if (this.countJudgeIsScanningInput > this.judgeIsScanningArr.length / 2) {
- // flag = true
- // }
- // // flag = Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]) < 0.1
- // // if (i > 0 && this.judgeIsScanningArr.length === parseInt(i) + 1) {
- // if (flag) {
- // console.log(flag, 2)
- // this.fnThrottle(this.enterNative, 500, 2000, belong)()
- // return
- // }
- // // }
- // // }
- },
- // 鍒ゆ柇鏄惁鏄壂鐮佹灙鎵爜
- judgeIsScanning(e, belong) {
- const timenow = e.timeStamp
- let flag = true
- this.judgeIsScanningArr.push(timenow)
- let i
- for (i in this.judgeIsScanningArr) {
- flag = Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]) < 0.1
- if (i > 0 && this.judgeIsScanningArr.length === parseInt(i) + 1) {
- if (flag) {
- this.fnThrottle(this.enterNative, 500, 2000, belong)()
- return
- }
- }
- }
- },
// 鎵爜閿洏鍥炶溅浜嬩欢
async enterNative(val, belong) {
if (getCookie('description') !== 'W') {
@@ -1981,8 +1896,9 @@
// 鏀舵枡锛歝ode="200" count=3
// 璧板垪琛ㄥ舰寮� code="200" count=4
if (belong === 'produceCode') {
- await this.getMesOrderStepStartSelectEqp()
-
+ // console.log('asd')
+ // await this.getMesOrderStepStartSelectEqp()
+ await this.getMesOrderStepSearch()
// const orderstepqrcode = this.form.orderstepqrcode
// const data = {
// OperType: 'ZZ',
@@ -2027,72 +1943,101 @@
search() {
this.getMesOrderStepSearch()
},
+ reset() {
+ this.form.wocode = ''
+ this.form.partcode = ''
+ this.form.partname = ''
+ this.form.partspec = ''
+ this.getMesOrderStepSearch()
+ },
// 鑷埗寮�濮�
async ZZstart(obj) {
// if (!this.ZZisExecutable) {
// return this.$message.info('璇峰厛鎵爜宸ュ簭浜岀淮鐮侊紒')
// }
+
+ // this.dialogForm.isbott = obj.isbott === 'Y'
+
+ const data = {
+ OperType: 'ZZ',
+ orderstepqrcode: obj.wo_code + ';' + obj.stepcode,
+ SelectType: 'START',
+ stu_torgcode: getCookie('stu_torgcode')
+ }
+
+ const { data: res } = await MesOrderStepStart(data)
+
+ // console.log(JSON.parse(JSON.stringify(res)), 321)
this.dialogTitle = '鑷埗寮�濮�'
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
- this.dialogForm.partspec = obj.partspec
- this.dialogForm.stepseq = obj.seq
- this.dialogForm.stepcode = obj.stepcode
- this.dialogForm.stepname = obj.stepname
- this.dialogForm.stepdesc = obj.stepdesc
- this.dialogForm.planqty = obj.planqty
- this.dialogForm.reportqty = obj.reportqty
- this.dialogForm.noreportqty = obj.noreportqty
+ this.dialogForm.saleOrderCode = res.saleOrderCode
+ this.dialogForm.wo_code = res.wo_code
+ this.dialogForm.partcode = res.partnumber
+ this.dialogForm.partname = res.partname
+ this.dialogForm.partspec = res.partspec
+ this.dialogForm.stepseq = res.seq
+ this.dialogForm.stepcode = res.stepcode
+ this.dialogForm.stepname = res.stepname
+ this.dialogForm.stepdesc = res.stepdesc
+ this.dialogForm.planqty = res.planqty
+ this.dialogForm.reportqty = res.reportqty
+ this.dialogForm.noreportqty = res.noreportqty
// this.dialogForm.startqty = obj.startqty
- this.dialogForm.startqty = obj.noreportqty
+ this.dialogForm.startqty = res.noreportqty
})
-
- // await this.getMesOrderStepStartSelectEqp()
},
// 鑷埗鎶ュ伐
async ZZreport(obj) {
// if (!this.ZZisExecutable) {
// return this.$message.info('璇峰厛鎵爜宸ュ簭浜岀淮鐮侊紒')
// }
+ const data = {
+ OperType: 'ZZ',
+ orderstepqrcode: obj.wo_code + ';' + obj.stepcode,
+ SelectType: 'REPORT',
+ stu_torgcode: getCookie('stu_torgcode')
+ }
+ this.form.orderstepqrcode = obj.wo_code + ';' + obj.stepcode
+ const { data: res } = await MesOrderStepStart(data)
+
+ // console.log(JSON.parse(JSON.stringify(res)), 322)
+
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
- this.dialogForm.partspec = obj.partspec
- this.dialogForm.stepseq = obj.seq
- this.dialogForm.stepcode = obj.stepcode
- this.dialogForm.stepname = obj.stepname
- this.dialogForm.stepdesc = obj.stepdesc
- this.dialogForm.planqty = obj.planqty
- this.dialogForm.reportqty = obj.reportqty
- this.dialogForm.noputqty = obj.noputqty
- this.dialogForm.noreportqty = obj.noreportqty
- // this.dialogForm.startqty = obj.startqty
- this.dialogForm.startqty = obj.noreportqty
- this.dialogForm.nextstepname = obj.nextstepname
- this.dialogForm.nextstepcode = obj.nextstepcode
+ this.dialogForm.saleOrderCode = res.saleOrderCode
+ this.dialogForm.wo_code = res.wo_code
+ this.dialogForm.partcode = res.partnumber
+ this.dialogForm.partname = res.partname
+ this.dialogForm.partspec = res.partspec
+ this.dialogForm.stepseq = res.seq
+ this.dialogForm.stepcode = res.stepcode
+ this.dialogForm.stepname = res.stepname
+ this.dialogForm.stepdesc = res.stepdesc
+ this.dialogForm.planqty = res.planqty
+ this.dialogForm.reportqty = res.reportqty
+ this.dialogForm.noputqty = res.noputqty
+ this.dialogForm.noreportqty = res.noreportqty
+ // this.dialogForm.startqty = res.startqty
+ this.dialogForm.startqty = res.noreportqty
- this.dialogForm.startqtySum = obj.noreportqty
+ this.dialogForm.nextstepname = res.nextstepname
+ this.dialogForm.nextstepcode = res.nextstepcode
- this.dialogForm.eqpname = obj.eqpname
- this.dialogForm.eqpcode = obj.eqpcode
- console.log(obj.wkshopcode, 7)
- this.dialogForm.wkshopcode = obj.wkshopcode
- this.dialogForm.wkshopname = obj.wkshopname
+ this.dialogForm.startqtySum = res.noreportqty
+ // console.log(this.dialogForm.startqtySum, 2)
+ this.dialogForm.eqpname = res.eqpname
+ this.dialogForm.eqpcode = res.eqpcode
+ console.log(res.wkshopcode, 7)
+ this.dialogForm.wkshopcode = res.wkshopcode
+ this.dialogForm.wkshopname = res.wkshopname
this.$nextTick(() => {
this.$refs.userTableDataRef.doLayout()
})
- // await this.getMesOrderStepStartSelectEqp()
await this.getMesOrderStepReportSelectUserGroup()
await this.getMesOrderStepSelectCause('ZZ')
await this.getMesOrderSelectUserZZ()
@@ -2184,8 +2129,6 @@
},
// 鑾峰彇鑷埗鎶ュ伐鐢熶骇鐝粍涓嬫媺鍒楄〃
async getMesOrderStepReportSelectUserGroup() {
- // this.dialogForm.wkshopcode
-
const { data: res } = await MesOrderStepReportSelectUserGroup({ wkshopcode: this.dialogForm.wkshopcode })
this.ZZtreams = res
},
@@ -2489,6 +2432,9 @@
if (parseFloat(this.dialogForm.fqty) > parseFloat(this.dialogForm.noreportqty)) {
return this.$message.info('鍙戞枡鏁伴噺涓嶈兘澶т簬鏈彂鏁伴噺!')
}
+ if (parseFloat(this.dialogForm.fqty) <= 0) {
+ return this.$message.info('鍙戞枡鏁伴噺瑕佸ぇ浜庨浂锛�')
+ }
const data = {
mesordercode: this.dialogForm.wo_code, // 宸ュ崟缂栧彿
partcode: this.dialogForm.partcode, // 浜у搧缂栫爜
@@ -2519,6 +2465,10 @@
if (this.WXouterprovide2.find(i => i.Name === this.dialogForm.wxcode).acceptQty < parseFloat(this.dialogForm.sqty) + parseFloat(this.dialogForm.noputqty)) {
return this.$message.info('鏀舵枡鏁伴噺鍔犱笉鑹暟閲忎笉鑳藉ぇ浜庤渚涘簲鍟嗗彲鏀舵暟閲�!')
+ }
+
+ if (parseFloat(this.dialogForm.sqty) <= 0) {
+ return this.$message.info('鏀舵枡鏁伴噺瑕佸ぇ浜庨浂锛�')
}
// if (parseFloat(this.dialogForm.noputqty) > 0) {
@@ -2576,12 +2526,34 @@
}
if (this.dialogTitle === '鑷埗寮�濮�') {
+ // console.log(parseFloat(this.dialogForm.startqty) + parseFloat(this.dialogForm.reportqty))
+ // console.log(parseFloat(this.dialogForm.planqty), 9)
+
+ if (parseFloat(this.dialogForm.startqty) > parseFloat(this.dialogForm.noreportqty)) {
+ return this.$message.info('寮�宸ユ暟閲忎箣鍜屼笉鑳藉ぇ浜庢湭寮�鏁伴噺锛�')
+ }
+ // if (this.dialogForm.isbott) {
+ // if (parseFloat(this.dialogForm.startqty) + parseFloat(this.dialogForm.reportqty) > parseFloat(this.dialogForm.planqty)) {
+ // return this.$message.info('寮�宸ユ暟閲忎箣鍜屼笉鑳藉ぇ浜庝换鍔℃暟閲忥紒')
+ // }
+ // }
+ //
+ // if (!this.dialogForm.isbott) {
+ // if (parseFloat(this.dialogForm.startqty) + parseFloat(this.dialogForm.reportqty) > parseFloat(this.dialogForm.noreportqty)) {
+ // return this.$message.info('寮�宸ユ暟閲忎箣鍜屼笉鑳藉ぇ浜庢湭寮�鏁伴噺锛�')
+ // }
+ // }
+
+ if (parseFloat(this.dialogForm.startqty) <= 0) {
+ return this.$message.info('寮�宸ユ暟閲忓繀椤诲ぇ浜庨浂锛�')
+ }
+
const data = {
mesordercode: this.dialogForm.wo_code, // 宸ュ崟缂栧彿
partcode: this.dialogForm.partcode, // 浜у搧缂栫爜
stepseq: this.dialogForm.stepseq, // 宸ュ簭搴忓彿 鏆傛椂缂�
stepcode: this.dialogForm.stepcode, // 宸ュ簭缂栫爜
- eqpcode: this.form.SelectType, // 鐢熶骇璁惧
+ eqpcode: '', // 鐢熶骇璁惧
taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
startqty: this.dialogForm.startqty// 寮�濮嬫暟閲�
}
@@ -2599,12 +2571,18 @@
}
if (this.dialogTitle === '鑷埗鎶ュ伐') {
+ console.log(parseFloat(this.dialogForm.startqtySum) < parseFloat(this.dialogForm.startqty) + parseFloat(this.dialogForm.noputqty))
if (parseFloat(this.dialogForm.startqtySum) < parseFloat(this.dialogForm.startqty) + parseFloat(this.dialogForm.noputqty)) {
return this.$message.info('鎶ュ伐鏁伴噺鍔犱笉鑹暟閲忎笉鑳藉ぇ浜庝簡鏈姤鏁伴噺!')
}
if (this.userTableData.length < 1 && this.dialogForm.reckway === 'group') {
return this.$message.info('浜哄憳鍒楄〃涓嶈兘涓虹┖!')
}
+
+ if (parseFloat(this.dialogForm.startqty) <= 0) {
+ return this.$message.info('鎶ュ伐鏁伴噺蹇呴』澶т簬闆讹紒')
+ }
+
// this.userTableData = [...new Set(this.userTableData)]// 鏁扮粍鍘婚噸
this.userTableData = this.userTableData.filter(item => item.usercode !== '')
// 鏁扮粍涓璞＄浉鍚岀殑鍘婚噸
@@ -2675,11 +2653,10 @@
// badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 涓嶈壇鍘熷洜
}
- console.log(JSON.parse(JSON.stringify(data)), 'data')
- console.log(JSON.stringify(data), 'data')
+ // console.log(JSON.parse(JSON.stringify(data)), 'data')
+ // console.log(JSON.stringify(data), 'data')
- // this.$store.state.app.buttonIsDisabled = true
-
+ this.$store.state.app.buttonIsDisabled = true
SavaMesOrderStepReport(data).then(res => {
if (res.code === '200') {
this.dialogVisible = false
--
Gitblit v1.9.3