From b08411e811e003ae2711e7ba8d92deaec9239de3 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 24 三月 2023 14:01:44 +0800
Subject: [PATCH] 1.生产开报工优化
---
src/views/scgl/sckbg.vue | 94 +++++++++++++++++++++++++++++------------------
1 files changed, 58 insertions(+), 36 deletions(-)
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 6e0f512..80685d2 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -532,19 +532,19 @@
:model="dialogForm"
label-width="110px"
>
- <el-form-item label="宸ュ崟缂栧彿锛�">
+ <el-form-item label="宸ュ崟缂栧彿锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.wo_code }}</div>
</el-form-item>
- <el-form-item label="浜у搧缂栫爜锛�">
+ <el-form-item label="浜у搧缂栫爜锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.partcode }}</div>
</el-form-item>
- <el-form-item label="浜у搧鍚嶇О锛�">
+ <el-form-item label="浜у搧鍚嶇О锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.partname }}</div>
</el-form-item>
- <el-form-item label="浜у搧瑙勬牸锛�">
+ <el-form-item label="浜у搧瑙勬牸锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.partspec }}</div>
</el-form-item>
- <el-form-item label="褰撳墠宸ュ簭锛�">
+ <el-form-item label="褰撳墠宸ュ簭锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.stepname }}</div>
</el-form-item>
<el-form-item v-if="false" label="宸ュ簭鎻忚堪锛�">
@@ -554,20 +554,20 @@
</div>
<!-- </el-tooltip>-->
</el-form-item>
- <el-form-item label="浠诲姟鏁伴噺锛�">
+ <el-form-item label="浠诲姟鏁伴噺锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.planqty }}</div>
</el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" label="鏈紑/宸插紑锛�">
+ <el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" label="鏈紑/宸插紑锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
</el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鏈姤/宸叉姤锛�">
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鏈姤/宸叉姤锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
</el-form-item>
- <el-form-item v-if="dialogTitle==='澶栧崗鍙戞枡'" label="鏈彂/宸插彂锛�">
+ <el-form-item v-if="dialogTitle==='澶栧崗鍙戞枡'" label="鏈彂/宸插彂锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
</el-form-item>
- <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="鏈敹/宸叉敹锛�">
+ <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="鏈敹/宸叉敹锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
</el-form-item>
<!--鑷埗寮�濮�-->
@@ -590,7 +590,7 @@
</el-select>
</el-form-item>
<!-- 鑷埗鎶ュ伐 -->
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嬮亾宸ュ簭锛�">
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嬮亾宸ュ簭锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.nextstepname }}</div>
</el-form-item>
@@ -694,8 +694,11 @@
<el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />
</el-form-item>
<div v-if="dialogTitle==='鑷埗鎶ュ伐'&&dialogForm.reckway==='group'">
- <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 浜哄憳鍒楄〃
- <el-button v-waves type="primary" style="margin: 10px 0" @click="userAdd">澧炶</el-button>
+ <div style="display: flex;align-items:center;height: 40px;margin-bottom: 10px">
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" />
+ <div style="margin: 0 15px 0 5px;">浜哄憳鍒楄〃</div>
+ <el-button v-waves type="primary" style="margin: 10px 0" @click="userAdd">澧炶</el-button>
+ </div>
<el-table
ref="userTableDataRef"
:data="userTableData"
@@ -704,7 +707,7 @@
:row-class-name="tableRowClassName"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
- height="180"
+ height="188"
highlight-current-row
style="width: 100%"
>
@@ -761,7 +764,13 @@
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button v-if="(row.isVisible===1&&!userIsSave)||row.isVisible===2" v-waves type="text" @click="userSave(row)">淇濆瓨</el-button>
+ <el-button
+ v-if="(row.isVisible===1&&!userIsSave)||row.isVisible===2"
+ v-waves
+ type="text"
+ @click="userSave(row)"
+ >淇濆瓨
+ </el-button>
<el-button v-if="row.isVisible===1" v-waves type="text" @click="userCancel(row)">鍙栨秷</el-button>
<el-button v-if="row.isVisible===0" v-waves type="text" @click="userDel(row)">鍒犻櫎</el-button>
<el-button v-if="row.isVisible===0" v-waves type="text" @click="editRatio(row)">淇敼姣斾緥</el-button>
@@ -1496,7 +1505,7 @@
this.getHeight()
this.$nextTick(() => {
- $("input[name='produceCode']")[0].focus()
+ $('input[name=\'produceCode\']')[0].focus()
// this.bindQRCode('10001;001')
})
// webapp_urlprotocol_startup()
@@ -1510,6 +1519,7 @@
this.dialogForm.usergroupcode = ''
this.dialogForm.operation = ''
this.userTableData = []
+ this.UserTotal = 0
// console.log(this.$refs.dialogForm, 'log')
// this.$nextTick(() => {
// this.$refs.dialogForm.resetFields()
@@ -1583,21 +1593,21 @@
if (this.$refs.elTabs.currentName === '0') {
this.$nextTick(() => {
this.getMesOrderStepSearch()
- $("input[name='produceCode']")[0].focus()
+ $('input[name=\'produceCode\']')[0].focus()
this.WXform.orderstepqrcode = ''
})
}
if (this.$refs.elTabs.currentName === '1') {
this.$nextTick(() => {
this.getMesOrderWxStepSearch()
- $("input[name='WXproduceCode']")[0].focus()
+ $('input[name=\'WXproduceCode\']')[0].focus()
this.form.orderstepqrcode = ''
})
}
if (this.$refs.elTabs.currentName === '2') {
this.$nextTick(() => {
this.getBadList()
- $("input[name='badProduceCode']")[0].focus()
+ $('input[name=\'badProduceCode\']')[0].focus()
this.badForm.orderstepqrcode = ''
})
}
@@ -1802,9 +1812,11 @@
this.dialogForm.startqty = obj.noreportqty
this.dialogForm.nextstepname = obj.nextstepname
- this.dialogForm.nextstepcode = obj.nextstepcode
+ this.dialogForm.nextstepcode = obj.nextstepcode ? obj.nextstepcode : obj.stepcode
this.dialogForm.startqtySum = obj.noreportqty
+
+ this.$refs.userTableDataRef.doLayout()
})
await this.getMesOrderStepStartSelectEqp()
@@ -1863,7 +1875,7 @@
this.dialogForm.stepcode = obj.stepcode
this.dialogForm.nextstepname = obj.nextstepname
- this.dialogForm.nextstepcode = obj.nextstepcode
+ this.dialogForm.nextstepcode = obj.nextstepcode ? obj.nextstepcode : obj.stepcode
this.dialogForm.noputqty = obj.noputqty
this.dialogForm.stepseq = obj.seq
@@ -1926,6 +1938,7 @@
async getUserTableData() {
const { data: res } = await MesOrderGroupSelectUser({ usergroupcode: this.dialogForm.usergroupcode })
this.userTableData = res
+ this.UserTotal = res.length
this.userTableData.forEach(item => {
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
number = number === 0 ? (10 + Math.random()) : number
@@ -1937,19 +1950,24 @@
this.ZZuserArr = [...this.ZZuserArr].filter(x => [...this.userTableData].every(y => y.usercode !== x.usercode))
this.calculatedValue()
- this.$refs.tableDataRef.doLayout()
+ this.$nextTick(() => {
+ this.$refs.tableDataRef.doLayout()
+ this.$refs.userTableDataRef.doLayout()
+ })
},
calculatedValue() {
- const total = 100; let value = 0
+ const total = 100
+ let value = 0
this.userTableData.forEach(item => {
item.ratio = parseFloat((100 / this.userTableData.length).toFixed(2))
value += item.ratio
})
console.log(value, 1)
+ this.UserTotal = this.userTableData.length
if (value !== total) {
// let temp = this.userTableData
// temp[temp.length-1].ratio=temp[temp.length-1].ratio+(total-value)
- this.userTableData[ this.userTableData.length - 1].ratio = parseFloat((this.userTableData[ this.userTableData.length - 1].ratio + (total - value)).toFixed(2))
+ this.userTableData[this.userTableData.length - 1].ratio = parseFloat((this.userTableData[this.userTableData.length - 1].ratio + (total - value)).toFixed(2))
}
},
// 淇敼鍒嗛厤姣斿垪
@@ -2026,6 +2044,7 @@
this.userTableData.splice(index, 1)
}
})
+ this.UserTotal = this.userTableData.length
},
// 鐢ㄦ埛鍒楄〃浜哄憳鍚嶇О鍊奸�変腑
usernameChange(val, row) {
@@ -2158,11 +2177,11 @@
if (res.code === '200') {
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
- }
+ // 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.tabClick()
this.$store.state.app.buttonIsDisabled = false
} else {
@@ -2211,9 +2230,9 @@
if (this.dialogForm.reckway === 'group') {
let sum = 0
this.userTableData.forEach(item => {
- sum += item.ratio
+ sum += parseFloat(item.ratio)
})
- if (sum !== 100) {
+ if (Math.round(sum * 100) / 100 !== 100) {
return this.$message.info('鍒嗛厤姣斾緥鎬诲拰蹇呴』涓�100锛�')
}
}
@@ -2235,7 +2254,10 @@
eqpcode: this.dialogForm.eqpcode, // 璁惧缂栫爜
usergroupcode: this.dialogForm.usergroupcode, // 鐝粍缂栫爜
// reportuser: reportuser, // 鎶ュ伐浜哄憳
- reportuser: this.dialogForm.reckway === 'group' ? this.userTableData : [{ usercode: this.dialogForm.operation, ratio: 100 }],
+ reportuser: this.dialogForm.reckway === 'group' ? this.userTableData : [{
+ usercode: this.dialogForm.operation,
+ ratio: 100
+ }],
taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
// startqty: this.dialogForm.startqty, // 寮�宸ユ暟閲�
startqty: this.dialogForm.reportqty, // 寮�宸ユ暟閲�
@@ -2254,10 +2276,10 @@
if (res.code === '200') {
this.dialogVisible = false
this.$message.success('鎶ュ伐鎴愬姛锛�')
- if (this.dialogForm.nextstepcode === '') {
- this.ZZprint2(this.OperationArr.find(item => item.usercode === getCookie('navTabId')).username)
- this.dialogVisible2 = true
- }
+ // if (this.dialogForm.nextstepcode === '') {
+ this.ZZprint2(this.OperationArr.find(item => item.usercode === getCookie('navTabId')).username)
+ this.dialogVisible2 = true
+ // }
this.tabClick()
this.$store.state.app.buttonIsDisabled = false
} else {
--
Gitblit v1.9.3