From b012ab3a1e5495be068c543eb8f0482124db13b5 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 31 十二月 2022 16:48:22 +0800
Subject: [PATCH] 1.登录页文字跟随系统变化
---
src/views/scgl/sckbg.vue | 258 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 213 insertions(+), 45 deletions(-)
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 9ff54a6..04df723 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -12,9 +12,9 @@
v-model="form.orderstepqrcode"
name="produceCode"
style="width: 300px"
- @keyup.native="e=>judgeIsScanning(e,'produceCode')"
@keyup.enter.native="val=>enterNative(val,'produceCode')"
/>
+ <!-- @keyup.native="e=>judgeIsScanning(e,'produceCode')"-->
</div>
<div v-if="false" style="display: flex;padding-right: 10px">
@@ -31,6 +31,8 @@
<el-divider />
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="isIpad? (tableHeight+50):tableHeight"
border
@@ -49,6 +51,7 @@
/>
<el-table-column
prop="status"
+ show-tooltip-when-overflow
label="鐘舵��"
sortable="custom"
width="80"
@@ -58,6 +61,8 @@
<div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
<div v-if="row.status==='START'">寮�宸�</div>
<div v-if="row.status==='CLOSED'">瀹屽伐</div>
+ <div v-if="row.status==='NOSCHED'">寰呮帓绋�</div>
+ <div v-if="row.status==='SCHED'">宸叉帓绋�</div>
</template>
</el-table-column>
<el-table-column
@@ -72,6 +77,7 @@
label="浜у搧缂栫爜"
min-width="110"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="partname"
@@ -103,10 +109,12 @@
label="浠诲姟鏁伴噺"
width="110"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
label="鏈姤宸ユ暟閲�"
width="120"
+ show-tooltip-when-overflow
>
<!-- sortable="custom"-->
<template slot-scope="{row}">
@@ -115,6 +123,7 @@
</el-table-column>
<el-table-column
prop="good_qty"
+ show-tooltip-when-overflow
label="宸叉姤宸ユ暟閲�"
sortable="custom"
width="160"
@@ -122,6 +131,7 @@
<el-table-column
prop="ng_qty"
label="涓嶈壇鏁伴噺"
+ show-tooltip-when-overflow
width="150"
sortable="custom"
/>
@@ -129,16 +139,18 @@
prop="bad_qty"
label="宸叉姤搴熸暟閲�"
width="120"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="plan_startdate"
label="璁″垝寮�宸ユ棩鏈�"
+ show-tooltip-when-overflow
width="150"
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.plan_startdate">{{ row.plan_startdate.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>
@@ -147,10 +159,11 @@
label="璁″垝瀹屽伐鏃ユ湡"
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-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -201,9 +214,10 @@
v-model="WXform.orderstepqrcode"
name="WXproduceCode"
style="width: 300px"
- @keyup.native="e=>judgeIsScanning(e,'WXproduceCode')"
@keyup.enter.native="val=>enterNative(val,'WXproduceCode')"
/>
+ <!-- @keyup.native="e=>judgeIsScanning(e,'WXproduceCode')"-->
+
</div>
<div v-if="false" style="display: flex;padding-right: 10px">
<el-button @click="WXsend">
@@ -219,6 +233,8 @@
<el-divider />
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="WXtableData"
:height="isIpad? (tableHeight+50):tableHeight"
border
@@ -238,6 +254,7 @@
<el-table-column
prop="status"
label="鐘舵��"
+ show-tooltip-when-overflow
sortable="custom"
width="80"
>
@@ -258,6 +275,7 @@
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
+ show-tooltip-when-overflow
width="110"
sortable="custom"
/>
@@ -272,6 +290,7 @@
prop="stepname"
label="宸ュ簭"
width="120"
+ show-tooltip-when-overflow
sortable="custom"
/>
<!-- <el-table-column-->
@@ -288,12 +307,14 @@
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
+ show-tooltip-when-overflow
width="110"
sortable="custom"
/>
<el-table-column
- label="鏈姤宸ユ暟閲�"
+ label="鏈敹鏂欐暟閲�"
width="120"
+ show-tooltip-when-overflow
>
<!-- sortable="custom"-->
<template slot-scope="{row}">
@@ -303,12 +324,14 @@
<el-table-column
prop="good_qty"
label="宸叉敹鏂欐暟閲�"
+ show-tooltip-when-overflow
sortable="custom"
width="160"
/>
<el-table-column
prop="ng_qty"
label="涓嶈壇鏁伴噺"
+ show-tooltip-when-overflow
width="150"
sortable="custom"
/>
@@ -317,27 +340,30 @@
label="宸叉姤搴熸暟閲�"
min-width="120"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="plan_startdate"
label="璁″垝寮�宸ユ棩鏈�"
+ show-tooltip-when-overflow
width="150"
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.plan_startdate">{{ row.plan_startdate.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="plan_enddate"
label="璁″垝瀹屽伐鏃ユ湡"
+ 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-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -376,14 +402,17 @@
v-model="badForm.orderstepqrcode"
name="badProduceCode"
style="width: 300px"
- @keyup.native="e=>judgeIsScanning(e,'badProduceCode')"
@keyup.enter.native="val=>enterNative(val,'badProduceCode')"
/>
+ <!-- @keyup.native="e=>judgeIsScanning(e,'badProduceCode')"-->
+
</div>
</div>
<el-divider />
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="badTableData"
:height="isIpad? (tableHeight+50):tableHeight"
border
@@ -401,18 +430,21 @@
fixed
/>
<el-table-column
+ show-tooltip-when-overflow
prop="wo_code"
label="宸ュ崟鍙�"
min-width="160"
sortable="custom"
/>
<el-table-column
+ show-tooltip-when-overflow
prop="partcode"
label="浜у搧缂栫爜"
min-width="110"
sortable="custom"
/>
<el-table-column
+ show-tooltip-when-overflow
prop="partname"
min-width="160"
label="浜у搧鍚嶇О"
@@ -421,6 +453,7 @@
<el-table-column
prop="stepname"
label="宸ュ簭"
+ show-tooltip-when-overflow
min-width="120"
sortable="custom"
/>
@@ -428,6 +461,7 @@
prop="plan_qty"
label="浠诲姟鏁伴噺"
width="110"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
@@ -435,11 +469,13 @@
label="宸叉姤宸ユ暟閲�"
sortable="custom"
min-width="160"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="ng_qty"
label="涓嶈壇鏁伴噺"
width="150"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
@@ -447,6 +483,7 @@
label="宸叉姤搴熸暟閲�"
width="120"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
label="鎿嶄綔"
@@ -598,6 +635,7 @@
placeholder="璇烽�夋嫨"
:disabled="parseFloat(dialogForm.noputqty)===0||dialogForm.noputqty.trim()===''"
multiple
+ collapse-tags
>
<el-option
v-for="item in badArr"
@@ -628,11 +666,13 @@
<el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />
</el-form-item>
<div v-if="dialogTitle==='鑷埗鎶ュ伐'">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 浜哄憳鍒楄〃
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 浜哄憳鍒楄〃
<el-button type="primary" style="margin: 10px 0" @click="userAdd">澧炶</el-button>
<el-table
+ ref="userTableDataRef"
:data="userTableData"
border
+ class="tableFixed"
:row-class-name="tableRowClassName"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@@ -649,6 +689,7 @@
<el-table-column
prop="username"
label="浜哄憳鍚嶇О"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.isVisible===0">{{ row.username }}</div>
@@ -813,6 +854,7 @@
v-model="dialogForm.badcode"
style="width: 200px;"
multiple
+ collapse-tags
:disabled="parseFloat(dialogForm.noputqty)===0||dialogForm.noputqty.trim()===''"
placeholder="璇烽�夋嫨"
>
@@ -824,20 +866,20 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="鏀舵枡浜猴細">
- <el-select
- v-model="dialogForm.operation"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in OperationArr"
- :key="item.usercode"
- :label="item.username"
- :value="item.usercode"
- />
- </el-select>
- </el-form-item>
+ <!-- <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="鏀舵枡浜猴細">-->
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.operation"-->
+ <!-- style="width: 200px;"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in OperationArr"-->
+ <!-- :key="item.usercode"-->
+ <!-- :label="item.username"-->
+ <!-- :value="item.usercode"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
<el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="澶囨敞锛�">
<el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />
</el-form-item>
@@ -845,10 +887,48 @@
<span slot="footer" class="dialog-footer">
<div class="footerButton">
<el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
- <el-button v-if="dialogTitle==='鑷埗寮�濮�'" type="primary" @click="dialogVisibleConfirm">寮� 宸�</el-button>
- <el-button v-if="dialogTitle==='鑷埗鎶ュ伐'" type="primary" @click="dialogVisibleConfirm">鎻愪氦/鎵撳嵃</el-button>
- <el-button v-if="dialogTitle==='澶栧崗鍙戞枡'" type="primary" @click="dialogVisibleConfirm">鍙戞枡</el-button>
- <el-button v-if="dialogTitle==='澶栧崗鏀舵枡'" type="primary" @click="dialogVisibleConfirm">鏀舵枡/鎵撳嵃</el-button>
+ <el-button
+ v-if="dialogTitle==='鑷埗寮�濮�'"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ type="primary"
+ @click="dialogVisibleConfirm"
+ >寮� 宸�</el-button>
+ <el-button
+ v-if="dialogTitle==='鑷埗鎶ュ伐'&&dialogForm.nextstepname===''"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ type="primary"
+ @click="dialogVisibleConfirm"
+ >鎻愪氦/鎵撳嵃</el-button>
+ <el-button
+ v-if="dialogTitle==='鑷埗鎶ュ伐'&&dialogForm.nextstepname!==''"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ type="primary"
+ @click="dialogVisibleConfirm"
+ >鎻愪氦</el-button>
+ <el-button
+ v-if="dialogTitle==='澶栧崗鍙戞枡'"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ type="primary"
+ @click="dialogVisibleConfirm"
+ >鍙戞枡</el-button>
+ <el-button
+ v-if="dialogTitle==='澶栧崗鏀舵枡'&&dialogForm.nextstepname===''"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ type="primary"
+ @click="dialogVisibleConfirm"
+ >鏀舵枡/鎵撳嵃</el-button>
+ <el-button
+ v-if="dialogTitle==='澶栧崗鏀舵枡'&&dialogForm.nextstepname!==''"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ type="primary"
+ @click="dialogVisibleConfirm"
+ >鏀舵枡</el-button>
</div>
</span>
</el-dialog>
@@ -875,7 +955,9 @@
>
<div id="qrCode2" ref="qrCodeDiv2" style="overflow-y: hidden;height:60px;position: absolute;left: 14px;" />
</div>
- <div style="display: flex;height: 30px;justify-content: flex-start;border-bottom:1px solid #000;align-items: center">
+ <div
+ style="display: flex;height: 30px;justify-content: flex-start;border-bottom:1px solid #000;align-items: center"
+ >
<div style="margin-left: 5px;width: 28px">鏁伴噺:</div>
{{ qrForm.startqty }}
</div>
@@ -988,7 +1070,7 @@
</el-form>
<div style="margin-bottom:20px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 涓嶈壇淇℃伅鏄庣粏锛�
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 涓嶈壇淇℃伅鏄庣粏锛�
</div>
<div class="elTableDiv">
<el-table
@@ -1086,7 +1168,12 @@
<span slot="footer" class="dialog-footer">
<div class="footerButton">
<el-button @click="badDialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="badDialogVisibleConfirm ">淇� 瀛�/鎵� 鍗�</el-button>
+ <el-button
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="badDialogVisibleConfirm "
+ >淇� 瀛�/鎵� 鍗�</el-button>
</div>
</span>
</el-dialog>
@@ -1196,7 +1283,7 @@
taskqty: '', // 浠诲姟鏁伴噺
fqty: '', // 鍙戞枡鏁伴噺
- inuser: '', // 鏀舵枡浜哄憳
+ inuser: getCookie('navTabId'), // 鏀舵枡浜哄憳
sqty: '', // 鏀舵枡鏁伴噺
ngqty: '', // 涓嶈壇鏁伴噺
badcode: '', // 涓嶈壇鍘熷洜缂栫爜
@@ -1305,7 +1392,8 @@
badTableDataDialog: [], // 涓嶈壇瀵硅瘽妗唗able琛ㄦ牸
OperationArr: [], // 浜哄憳鏁扮粍
sendButtonIsDisabled: false, // 涓嬭揪鎸夐挳鏄惁鍙偣鍑�
- judgeIsScanningArr: []// 鍒ゆ柇鏄惁鎵爜鏁扮粍
+ judgeIsScanningArr: [], // 鍒ゆ柇鏄惁鎵爜鏁扮粍
+ countJudgeIsScanningInput: 0 // 鍒ゆ柇鎵爜妗嗙殑涓暟
}
},
watch: {
@@ -1470,13 +1558,68 @@
}
},
// 鍒ゆ柇鏄惁鏄壂鐮佹灙鎵爜
+ 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]) < 10
+ 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)()
@@ -1718,9 +1861,14 @@
})
this.ZZuserArr = [...this.ZZuserArr].filter(x => [...this.userTableData].every(y => y.usercode !== x.usercode))
+
+ this.$refs.tableDataRef.doLayout()
},
// 鐢ㄦ埛娣诲姞
userAdd() {
+ if (this.userTableData.find(i => i.isVisible === 1)) {
+ return this.$message.info('璇峰厛淇濆瓨褰撳墠琛屼俊鎭紒')
+ }
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
number = number === 0 ? (10 + Math.random()) : number
console.log(this.userTableData, 6)
@@ -1782,6 +1930,7 @@
},
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
+ this.judgeIsScanningArr = []
this.form.orderstepqrcode = ''
this.WXform.orderstepqrcode = ''
this.badForm.orderstepqrcode = ''
@@ -1805,7 +1954,7 @@
this.dialogForm.taskqty = '', // 浠诲姟鏁伴噺
this.dialogForm.fqty = '', // 鍙戞枡鏁伴噺
- this.dialogForm.inuser = '', // 鏀舵枡浜哄憳
+ this.dialogForm.inuser = getCookie('navTabId'), // 鏀舵枡浜哄憳 榛樿鐧诲綍浜哄憳
this.dialogForm.sqty = '', // 鏀舵枡鏁伴噺
this.dialogForm.ngqty = '', // 涓嶈壇鏁伴噺
this.dialogForm.badcode = '', // 涓嶈壇鍘熷洜缂栫爜
@@ -1850,11 +1999,13 @@
taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
fqty: this.dialogForm.fqty // 鍙戞枡鏁伴噺
}
+ this.$store.state.app.buttonIsDisabled = true
SavaMesOrderStepOut(data).then(res => {
if (res.code === '200') {
- this.$message.success('鍙戞枡鎴愬姛锛�')
this.dialogVisible = false
+ this.$message.success('鍙戞枡鎴愬姛锛�')
this.tabClick()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error('鍙戞枡澶辫触!')
}
@@ -1885,16 +2036,17 @@
ngqty: this.dialogForm.noputqty === '' ? 0 : this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 涓嶈壇鍘熷洜
}
+ this.$store.state.app.buttonIsDisabled = true
SavaMesOrderStepIn(data).then(res => {
if (res.code === '200') {
+ this.dialogVisible = false
this.$message.success('鏀舵枡鎴愬姛锛�')
-
if (this.dialogForm.nextstepcode === '') {
- this.WXprint2(this.OperationArr.find(item => item.usercode === this.dialogForm.operation).username)
+ this.WXprint2(this.OperationArr.find(item => item.usercode === this.dialogForm.inuser).username)
this.dialogVisible2 = true
}
- this.dialogVisible = false
this.tabClick()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error('鏀舵枡澶辫触!')
}
@@ -1911,11 +2063,13 @@
taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
startqty: this.dialogForm.startqty// 寮�濮嬫暟閲�
}
+ this.$store.state.app.buttonIsDisabled = true
SavaMesOrderStepStart(data).then(res => {
if (res.code === '200') {
- this.$message.success('寮�宸ユ垚鍔燂紒')
this.dialogVisible = false
+ this.$message.success('寮�宸ユ垚鍔燂紒')
this.tabClick()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error('寮�宸ュけ璐�!')
}
@@ -1960,17 +2114,17 @@
ngqty: this.dialogForm.noputqty === '' ? 0 : this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 涓嶈壇鍘熷洜
}
-
+ this.$store.state.app.buttonIsDisabled = true
SavaMesOrderStepReport(data).then(res => {
if (res.code === '200') {
+ this.dialogVisible = false
this.$message.success('鎶ュ伐鎴愬姛锛�')
-
if (this.dialogForm.nextstepcode === '') {
this.ZZprint2(this.OperationArr.find(item => item.usercode === this.dialogForm.operation).username)
this.dialogVisible2 = true
}
- this.dialogVisible = false
this.tabClick()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error('鎶ュ伐澶辫触!')
}
@@ -2039,6 +2193,7 @@
if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 50
}
+ this.$refs.tableDataRef.doLayout()
})
},
@@ -2055,13 +2210,16 @@
const data = {
Data: this.badTableDataDialog
}
+ this.$store.state.app.buttonIsDisabled = true
EditOrderNgStepSeave(data, this.badDialogForm.operation).then(res => {
if (res.code === '200' || res.code === '301') {
this.getBadList()
this.badDialogVisible = false
this.badPrint(this.OperationArr.find(item => item.usercode === this.badDialogForm.operation).username)
this.dialogVisible2 = true
- return this.$message.success('淇濆瓨鎴愬姛锛�')
+ this.$message.success('淇濆瓨鎴愬姛锛�')
+
+ this.$store.state.app.buttonIsDisabled = false
}
})
},
@@ -2074,7 +2232,7 @@
this.qrForm.nextstepname = this.badDialogForm.nextstepname
this.qrForm.operator = username
this.qrForm.operatorTime = handleDatetime2(new Date())
- console.log(this.qrForm, 22)
+
this.$nextTick(() => {
this.bindQRCode(this.qrForm.qrvalue)
})
@@ -2084,8 +2242,9 @@
this.badDialogForm = {}
this.badDialogForm.operation = getCookie('navTabId')
this.badTableDataDialog = []
+ this.judgeIsScanningArr = []
},
- async getMesOrderSelectUserAll() {
+ async getMesOrderSelectUserAll() {
const { data: res } = await MesOrderSelectUser({ usercode: '' })
this.OperationArr = res
},
@@ -2368,6 +2527,15 @@
margin-bottom: 0;
}
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
+ height: 100% !important;
+ }
+
+ ::v-deep .el-table__fixed {
+ height: 100% !important;
+ }
+}
</style>
<style>
--
Gitblit v1.9.3