From aa89a9747c151e54397426f6e92862105e6d0451 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 29 六月 2023 15:55:39 +0800
Subject: [PATCH] 1.项目优化
---
src/views/produceManager/produceStartOrder.vue | 136 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 103 insertions(+), 33 deletions(-)
diff --git a/src/views/produceManager/produceStartOrder.vue b/src/views/produceManager/produceStartOrder.vue
index b552629..ab1e97f 100644
--- a/src/views/produceManager/produceStartOrder.vue
+++ b/src/views/produceManager/produceStartOrder.vue
@@ -520,7 +520,7 @@
:visible.sync="dialogVisible"
width="850px"
class="dialogVisible"
- :top="dialogTitle==='鑷埗鎶ュ伐'?'5vh':'15vh'"
+ :top="dialogTitle==='鑷埗鎶ュ伐'?'15vh':'15vh'"
:close-on-click-modal="false"
@close="handleClose"
@closed="handleClose"
@@ -542,7 +542,7 @@
<div style="width: 200px">{{ dialogForm.partname }}</div>
</el-form-item>
<el-form-item label="浜у搧瑙勬牸锛�" style="margin: 0 10px 0 0">
- <div style="width: 200px">{{ dialogForm.partspec }}</div>
+ <div style="width: 200px">{{ dialogForm.partspec?dialogForm.partspec:'/' }}</div>
</el-form-item>
<el-form-item label="褰撳墠宸ュ簭锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.stepname }}</div>
@@ -594,6 +594,14 @@
<div style="width: 200px">{{ dialogForm.nextstepname }}</div>
</el-form-item>
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="杞﹂棿鍚嶇О锛�">
+ <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==='鑷埗鎶ュ伐'" prop="reckway" label="璁′欢鏂瑰紡锛�">
<el-radio-group v-model="dialogForm.reckway" style="width: 200px;" @change="reckwayChange">
@@ -634,20 +642,20 @@
</el-select>
</el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="璁惧鍚嶇О锛�" prop="eqpcode">
- <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="璁惧鍚嶇О锛�" prop="eqpcode">-->
+ <!-- <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="鍚堟牸鏁伴噺锛�" prop="startqty">
<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;" />-->
@@ -784,7 +792,7 @@
:page.sync="Userform.page"
:limit.sync="Userform.rows"
align="right"
- layout="total,prev, pager, next,sizes,jumper"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getMesOrderStepSearch"
/>
@@ -851,12 +859,13 @@
v-model="dialogForm.wxcode"
style="width: 200px;"
placeholder="璇烽�夋嫨"
+ @change="wxCodeChange"
>
<el-option
- v-for="item in WXouterprovide"
- :key="item.code"
- :label="item.name"
- :value="item.code"
+ v-for="item in WXouterprovide2"
+ :key="item.Name"
+ :label="item.tp"
+ :value="item.Name"
/>
</el-select>
</el-form-item>
@@ -939,6 +948,32 @@
<el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />
</el-form-item>
</el-form>
+ <div v-if="dialogTitle==='澶栧崗鏀舵枡'" style="display: flex;flex-direction: column">
+ <!--鏄庡ぉ鎺ョ潃鍐欏鍗忔敹鏂欙紝渚涘簲鍟嗗搴旂殑宸叉敹鏈敹璇︽儏-->
+ <div style="height: 30px;margin-left:30px;">
+ 鍙敹鏂欎緵搴斿晢锛�
+ </div>
+
+ <div
+ v-for="(item,index) in dialogForm.list"
+ v-if="item.acceptQty>0"
+ :key="item.Name"
+ style="display: flex;line-height: 26px;height: 26px;margin-left:30px;align-items: center"
+ >
+ <div
+ style="color: #fff;width: 22px;height: 22px;display: flex;justify-content: center;align-items: center;border-radius: 50%"
+ :style="{backgroundColor:$store.state.settings.theme}"
+ >{{ index+1 }}</div>
+ <div style="margin-left:30px;width: 160px;" class="ellipsis">
+ {{ item.tp }}
+ </div>
+ <div style="margin-left:30px;">
+ 鍙敹鏁伴噺锛歿{ item.acceptQty }}
+ </div>
+ </div>
+
+ </div>
+
<span slot="footer" class="dialog-footer">
<div class="footerButton">
<el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
@@ -1098,7 +1133,7 @@
<div style="width: 200px">{{ badDialogForm.partname }}</div>
</el-form-item>
<el-form-item label="浜у搧瑙勬牸锛�">
- <div style="width: 200px">{{ badDialogForm.partspec }}</div>
+ <div style="width: 200px">{{ badDialogForm.partspec?badDialogForm.partspec:'/' }}</div>
</el-form-item>
<el-form-item label="褰撳墠宸ュ簭锛�">
<div style="width: 200px">{{ badDialogForm.stepname }}</div>
@@ -1236,8 +1271,8 @@
v-waves
type="primary"
:loading="$store.state.app.buttonIsDisabled"
- :disabled="$store.state.app.buttonIsDisabled"
- @click="badDialogVisibleConfirm "
+ :disabled="$store.state.app.buttonIsDisabled||badTableDataDialog.length===0||badTableDataDialog.find(i=>i.isVisible===1)"
+ @click="badDialogVisibleConfirm"
>淇� 瀛�/鎵� 鍗�</el-button>
</div>
</span>
@@ -1367,7 +1402,7 @@
startqtySum: '', // 涓嶈兘瓒呰繃鐨勬暟鍊�
- reckway: 'group', // 璁′欢鏂瑰紡
+ reckway: 'person', // 璁′欢鏂瑰紡
operation: getCookie('navTabId'), // 鎶ュ伐浜猴紙鏀舵枡浜猴級
remarks: '', // 澶囨敞
@@ -1380,6 +1415,7 @@
ZZeqpArr: [], // 鑷埗璁惧鍚嶇О
badArr: [], // 涓嶈壇鍘熷洜鏁扮粍
WXouterprovide: [], // 澶栧崗渚涙柟鏁扮粍
+ WXouterprovide2: [], // 澶栧崗渚涙柟鏀舵枡鏁扮粍
WXoutuser: [], // 鍙戞枡浜哄憳鏁扮粍
userTableData: [], // 浜哄憳鍒楄〃
UserTotal: 0,
@@ -1718,6 +1754,10 @@
},
// 鎵爜閿洏鍥炶溅浜嬩欢
async enterNative(val, belong) {
+ if (getCookie('description') !== 'W') {
+ return this.$message.info('璇ヨ鑹叉棤姝ゆ搷浣滄潈闄愶紒')
+ }
+
console.log(val, belong, 89898989)
// 寮�宸ワ細code="200" count=0
// 鎶ュ伐锛歝ode="200" count=1
@@ -1729,10 +1769,15 @@
const data = {
OperType: 'ZZ',
orderstepqrcode: orderstepqrcode,
- SelectType: ''
+ SelectType: '',
+ stu_torgcode: getCookie('stu_torgcode')
}
const res = await MesOrderStepStart(data)
if (res.code === '200' && res.count === 0) {
+ // console.log(res, 777)
+ // if (parseFloat(res.data.startqty) === 0) {
+ // return this.$message.error('')
+ // }
await this.ZZstart(res.data)
}
if (res.code === '200' && res.count === 1) {
@@ -1744,6 +1789,7 @@
const data = {
OperType: 'WX',
orderstepqrcode: orderstepqrcode,
+ stu_torgcode: getCookie('stu_torgcode'),
SelectType: this.WXSelected// OUT銆両N
}
const res = await MesOrderStepStart(data)
@@ -1821,6 +1867,12 @@
this.dialogForm.startqtySum = obj.noreportqty
+ this.dialogForm.eqpname = obj.eqpname
+ this.dialogForm.eqpcode = obj.eqpcode
+
+ this.dialogForm.wkshopcode = obj.wkshopcode
+ this.dialogForm.wkshopname = obj.wkshopname
+
this.$refs.userTableDataRef.doLayout()
})
@@ -1859,11 +1911,24 @@
await this.getMesOrderStepSelectWX()
await this.getMesOrderSelectUser()
},
+ wxCodeChange(val) {
+ this.dialogForm.sqty = this.WXouterprovide2.find(i => i.Name === val).acceptQty
+ },
// 澶栧崗鏀舵枡
async WXback(obj) {
// if (this.WXform.orderstepqrcode === '') {
// return this.$message.info('璇峰厛杈撳叆宸ュ簭锛�')
// }
+ this.WXouterprovide2 = []
+ obj.list.forEach(i => {
+ i.acceptQty = parseFloat(i.fqty) - parseFloat(i.sqty) - parseFloat(i.ng_qty) - parseFloat(i.bad_qty)
+ if (i.acceptQty > 0) {
+ this.WXouterprovide2.push(i)
+ }
+ })
+
+ console.log(this.WXouterprovide2, 2)
+
this.dialogTitle = '澶栧崗鏀舵枡'
this.dialogVisible = true
@@ -1887,6 +1952,8 @@
this.dialogForm.sqty = obj.startqty
this.dialogForm.startqtySum = obj.startqty
+
+ this.dialogForm.list = obj.list
})
await this.getMesOrderStepSelectWX()
await this.getMesOrderSelectUser()
@@ -1899,7 +1966,7 @@
},
// 鑾峰彇鑷埗鎶ュ伐鐢熶骇鐝粍涓嬫媺鍒楄〃
async getMesOrderStepReportSelectUserGroup() {
- const { data: res } = await MesOrderStepReportSelectUserGroup()
+ const { data: res } = await MesOrderStepReportSelectUserGroup({ wkshopcode: this.dialogForm.wkshopcode })
this.ZZtreams = res
},
// 鑾峰彇鑷埗鎶ュ伐琛ㄦ牸user鎵�鏈�
@@ -2111,7 +2178,7 @@
// this.dialogForm.inbarcode = '' // 鍏ュ簱鐮�
- this.dialogForm.reckway = 'group'
+ this.dialogForm.reckway = 'person'
this.dialogForm.remarks = '' // 澶囨敞
this.dialogForm.operation = getCookie('navTabId') // 鎶ュ伐浜猴紙鏀舵枡浜猴級
@@ -2160,6 +2227,10 @@
return this.$message.info('鏀舵枡鏁伴噺鍔犱笉鑹暟閲忎笉鑳藉ぇ浜庝簡鏈敹鏁伴噺!')
}
+ 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.noputqty) > 0) {
if (this.dialogForm.badcode.length < 1) {
return this.$message.info('璇烽�夋嫨涓嶈壇鍘熷洜锛�')
@@ -2201,9 +2272,8 @@
this.dialogVisible = false
this.$message.success('鏀舵枡鎴愬姛锛�')
// if (this.dialogForm.nextstepcode === '') {
- // this.WXprint2(this.OperationArr.find(item => item.usercode === this.dialogForm.inuser).username)
- this.WXprint2(this.OperationArr.find(item => item.usercode === getCookie('navTabId')).username)
- this.dialogVisible2 = true
+ // this.WXprint2(this.OperationArr.find(item => item.usercode === getCookie('navTabId')).username)
+ // this.dialogVisible2 = true
// }
this.tabClick()
this.$store.state.app.buttonIsDisabled = false
@@ -2321,8 +2391,8 @@
this.$message.success('鎶ュ伐鎴愬姛锛�')
// this.dialogForm.nextstepcode==='' //褰撲负绌虹殑鏃跺�� 浠ｈ〃鏄湯閬撳伐搴�
// if (this.dialogForm.nextstepcode !== '') {
- this.ZZprint2(this.OperationArr.find(item => item.usercode === getCookie('navTabId')).username)
- this.dialogVisible2 = true
+ // this.ZZprint2(this.OperationArr.find(item => item.usercode === getCookie('navTabId')).username)
+ // this.dialogVisible2 = true
// }
this.tabClick()
this.$store.state.app.buttonIsDisabled = false
--
Gitblit v1.9.3