From b46bc2dba51a3885a68e4c58316b41a31ea16bb2 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 14 二月 2023 13:35:03 +0800
Subject: [PATCH] 1.存货档案修改
---
src/views/zlgl/gxjy.vue | 303 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 216 insertions(+), 87 deletions(-)
diff --git a/src/views/zlgl/gxjy.vue b/src/views/zlgl/gxjy.vue
index fccc514..1d75f7f 100644
--- a/src/views/zlgl/gxjy.vue
+++ b/src/views/zlgl/gxjy.vue
@@ -3,7 +3,7 @@
<div class="body" :style="{height:mainHeight+'px'}">
<div style="padding-top: 10px;display: flex;flex-direction: column">
<div style="margin-bottom: 15px;font-size: 14px">
- <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />鎵爜淇℃伅
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin-right: 5px" />鎵爜淇℃伅
</div>
<div style="display: flex;align-items: center">
<div style="width: 90px;display: flex">
@@ -16,37 +16,39 @@
style="width: 300px"
@keyup.enter.native="val=>enterNative(val,'GXproduceCode')"
/>
+ <!-- @keyup.native="e=>judgeIsScanning(e,'GXproduceCode')"-->
+
</div>
<!-- 鍏」淇℃伅 -->
<div v-if="!isIpad" style="background:#f8f8fa ;display:flex;margin-top: 10px;align-items: center; line-height: 50px">
<div style="display: flex; margin-left: 10px">
<div style="display: flex;margin-right: 50px">
<div style="width: 90px">宸ュ崟缂栫爜锛�</div>
- <div style="width: 200px">{{ form.wo_code }}</div>
+ <div style="width: 150px">{{ form.wo_code }}</div>
</div>
<div style="display: flex;">
<div style="width: 90px">浜у搧缂栫爜锛�</div>
- <div style="width: 100px">{{ form.partcode }}</div>
+ <div style="width: 150px">{{ form.partcode }}</div>
</div>
</div>
<div style="display: flex;margin-left: 30px;">
<div style="display: flex;margin-right: 50px">
<div style="width: 90px">浜у搧鍚嶇О锛�</div>
- <div style="width: 100px">{{ form.partname }}</div>
+ <div style="width: 150px">{{ form.partname }}</div>
</div>
<div style="display: flex;">
<div style="width: 90px">浜у搧瑙勬牸锛�</div>
- <div style="width: 100px">{{ form.partspec }}</div>
+ <div style="width: 150px">{{ form.partspec }}</div>
</div>
</div>
<div style=" display: flex;margin-left: 30px;">
<div style="display: flex;margin-right: 50px">
<div style="width: 90px">宸ュ簭缂栫爜锛�</div>
- <div style="width: 100px">{{ form.stepcode }}</div>
+ <div style="width: 150px">{{ form.stepcode }}</div>
</div>
<div style="display: flex;">
<div style="width: 90px">宸ュ簭鍚嶇О锛�</div>
- <div style="width: 100px">{{ form.stepname }}</div>
+ <div style="width: 150px">{{ form.stepname }}</div>
</div>
</div>
</div>
@@ -86,7 +88,7 @@
</div>
<div style="margin: 15px 0;font-size: 14px">
- <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />妫�楠屾爣鍑嗕俊鎭�
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin-right: 5px" />妫�楠屾爣鍑嗕俊鎭�
</div>
<div style="display: flex;align-items: center">
<div style="width: 90px;display: flex">
@@ -124,12 +126,47 @@
:value="item.usercode"
/>
</el-select>
+ <div style="width: 90px;margin-left: 50px;display: flex">
+ <div style="color: red;width:10px">*</div>
+ 妫�楠屾暟閲忥細
+ </div>
+ <el-input v-model="checkqty" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
</div>
+
+ <!-- 妫�楠岀粨鏋� 鍜� 妫�楠屽娉� -->
+ <div style="display: flex;margin-top: 20px;align-items: center">
+
+ <div style="display: flex;margin-right: 50px;align-items: center">
+ <div style="width: 90px;display: flex">
+ <div style="color: red;width:10px">*</div>
+ 妫�楠岀粨鏋滐細
+ </div>
+ <el-select
+ v-model="checkResult"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ filterable
+ >
+ <el-option
+ v-for="item in checkResultSelect"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </div>
+ <div style="display: flex;align-items: center">
+ <div style="width: 90px">妫�楠屽娉細</div>
+ <el-input v-model="checkdescr" style="width: 540px" placeholder="璇疯緭鍏�" />
+ </div>
+
+ </div>
+
<div style="margin: 15px 0;font-size: 14px">
- <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />妫�楠岄」淇℃伅
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin-right: 5px" />妫�楠岄」淇℃伅
</div>
<div>
- <el-button type="primary" @click="add">鏂板</el-button>
+ <el-button v-waves type="primary" @click="add">鏂板</el-button>
</div>
<div style="margin-top: 10px">
<el-table
@@ -151,41 +188,86 @@
width="100"
fixed
/>
+
<!-- <el-table-column-->
<!-- prop="code"-->
- <!-- label="妫�楠岄」鐩紪鐮�"-->
- <!-- sortable="custom"-->
- <!-- />-->
+ <!-- label="妫�楠岄」鐩紪鐮�(鍚嶇О)"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.isVisible===0" style="display: flex;">-->
+ <!-- <div>{{ row.code }}</div>-->
+ <!-- <div style="margin-left: 10px">{{ row.name }}</div>-->
+ <!-- </div>-->
+
+ <!-- <el-select-->
+ <!-- v-if="row.isVisible===1"-->
+ <!-- v-model="row.code"-->
+ <!-- filterable-->
+ <!-- style="width: 400px;"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- @change="val=>changeCode(val,row)"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in JYSelectArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.code+''+item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+
<el-table-column
prop="code"
- label="妫�楠岄」鐩紪鐮�(鍚嶇О)"
+ label="妫�楠屾爣鍑嗙紪鐮�"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
- <div v-if="row.isVisible===0" style="display: flex;">
- <div>{{ row.code }}</div>
- <div style="margin-left: 10px">{{ row.name }}</div>
- </div>
-
+ <div v-if="row.isVisible===0">{{ row.code }}</div>
<el-select
v-if="row.isVisible===1"
v-model="row.code"
- filterable
- style="width: 400px;"
+ style="width: 200px;"
placeholder="璇烽�夋嫨"
- @change="val=>changeCode(val,row)"
+ @change="val=>changeName(val,row)"
>
<el-option
v-for="item in JYSelectArr"
- :key="item.code"
- :label="item.code+''+item.name"
- :value="item.code"
+ :key="item.name"
+ :label="item.code"
+ :value="item.name"
/>
</el-select>
</template>
</el-table-column>
<el-table-column
+ prop="name"
+ label="妫�楠屾爣鍑嗗悕绉�"
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">{{ row.name }}</div>
+ <el-select
+ v-if="row.isVisible===1"
+ v-model="row.name"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ @change="val=>changeName(val,row)"
+ >
+ <el-option
+ v-for="item in JYSelectArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </template>
+ </el-table-column>
+
+ <el-table-column
prop="stepcheckitem_desc"
label="妫�楠屾爣鍑嗘弿杩�"
+ show-tooltip-when-overflow
>
<template slot-scope="scope">
<el-input
@@ -206,6 +288,7 @@
prop="result"
label="妫�楠岀粨鏋�"
width="100"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.result==='OK'">鍚堟牸</div>
@@ -242,51 +325,24 @@
<el-table-column
label="鎿嶄綔"
+ fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button v-if="row.isVisible===0" type="text" @click="del(row)">鍒犻櫎</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="confirm(row)">纭</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="cancel(row)">鍙栨秷</el-button>
+ <el-button v-if="row.isVisible===0" v-waves type="text" @click="del(row)">鍒犻櫎</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="confirm(row)">纭</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="cancel(row)">鍙栨秷</el-button>
</div>
</template>
</el-table-column>
</el-table>
</div>
- <!-- 妫�楠岀粨鏋� 鍜� 妫�楠屽娉� -->
- <div style="display: flex;margin-top: 20px;align-items: center">
-
- <div style="display: flex;margin-right: 50px;align-items: center">
- <div style="width: 90px;display: flex">
- <div style="color: red;width:10px">*</div>
- 妫�楠岀粨鏋滐細
- </div>
- <el-select
- v-model="checkResult"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- filterable
- >
- <el-option
- v-for="item in checkResultSelect"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </div>
- <div style="display: flex;align-items: center">
- <div style="width: 90px">妫�楠屽娉細</div>
- <el-input v-model="checkdescr" style="width: 300px" placeholder="璇疯緭鍏�" />
- </div>
-
- </div>
<div style="display: flex;margin: 30px 0;align-items: center">
- <el-button type="primary" @click="submitButton('FirstCheck')">棣栨淇濆瓨</el-button>
- <el-button type="primary" style="margin-left: 50px" @click="submitButton('PatroCheck')">宸℃淇濆瓨</el-button>
- <el-button type="primary" style="margin-left: 50px" @click="submitButton('EndCheck')">瀹屽伐妫�淇濆瓨</el-button>
- <el-button type="info" style="margin-left: 50px" @click="submitButton('Cancel')">鍙栨秷</el-button>
+ <el-button v-waves type="primary" @click="submitButton('FirstCheck')">棣栨淇濆瓨</el-button>
+ <el-button v-waves type="primary" style="margin-left: 50px" @click="submitButton('PatroCheck')">宸℃淇濆瓨</el-button>
+ <el-button v-waves type="primary" style="margin-left: 50px" @click="submitButton('EndCheck')">瀹屽伐妫�淇濆瓨</el-button>
+ <el-button v-waves type="info" style="margin-left: 50px" @click="submitButton('Cancel')">鍙栨秷</el-button>
</div>
</div>
</div>
@@ -306,12 +362,15 @@
StepCheckItemSelect
} from '@/api/zlgl'
import { MesOrderSelectUser } from '@/api/scgl'
+import { getCookie } from '@/utils/auth'
+import waves from '@/directive/waves'
export default {
name: 'QXDY',
// components: {
// Pagination
// },
+ directives: { waves },
data() {
return {
isIpad: false,
@@ -329,7 +388,8 @@
},
checkStandard: '', // 妫�楠屾爣鍑�
checkStandardSelect: [], // 妫�楠屾爣鍑嗕笅鎷夋暟缁�
- checkUser: '', // 妫�楠屼汉鍛�
+ checkUser: getCookie('navTabId'), // 妫�楠屼汉鍛�
+ checkqty: 0, // 妫�楠屾暟閲�
checkUserSelect: [], // 妫�楠屼汉鍛樹笅鎷夋暟缁�
checkResult: '', // 妫�楠岀粨鏋�
checkResultSelect: [
@@ -340,11 +400,13 @@
JYTableData: [], // 妫�楠岄」淇℃伅琛ㄦ牸
JYSelectArr: [], // 妫�楠屼笅鎷夋暟缁�
- JYSelectedArr: [], // 宸查�夋楠岄」鐩暟缁�
+ // JYSelectedArr: [], // 宸查�夋楠岄」鐩暟缁�
+ JYIsCancel: true,
multipleSelection: [], // 琛ㄦ牸澶氶�夋
tabClickIndex: null, // 鐐瑰嚮鐨勫崟鍏冩牸
tabClickLabel: '', // 褰撳墠鐐瑰嚮鐨勫垪鍚�
- isCancel: false// 鏄惁鐐瑰嚮鍙栨秷鎸夐挳
+ isCancel: false, // 鏄惁鐐瑰嚮鍙栨秷鎸夐挳
+ judgeIsScanningArr: []// 鍒ゆ柇鏄惁鎵爜鏁扮粍
}
},
created() {
@@ -390,10 +452,14 @@
},
// 妫�楠屾爣鍑嗕笅鎷夊�兼敼鍙�
async changeCheckStandard(val) {
+ await this.getJYSelectArr()
this.isCancel = false
- this.JYSelectedArr = []
+
const { data: res } = await MesOrderStepCheckItemList({ checkstandcode: val })
this.JYTableData = res
+
+ // let arr = [鈥].filter(x => [鈥].every(y => y.id !== x.id));
+ this.JYSelectArr = [...this.JYSelectArr].filter(x => [...this.JYTableData].every(y => y.code !== x.code))
this.JYTableData.forEach(item => {
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
@@ -404,7 +470,6 @@
item.isVisible = 0
item.number = number
- this.JYSelectedArr.push(item.code)
})
this.$refs.multipleTable.toggleAllSelection()
},
@@ -436,9 +501,49 @@
}
},
// 妫�楠岄」鐩紪鐮侊紙鍚嶇О锛�
- changeCode(val, row) {
- row.stepcheckitem_desc = this.JYSelectArr.find(it => it.code === val).descr
- row.name = this.JYSelectArr.find(it => it.code === val).name
+ changeName(val, row) {
+ const res = this.JYSelectArr.find(item => {
+ return item.code === val || item.name === val
+ })
+ row.code = res.code
+ row.name = res.name
+ row.stepcheckitem_desc = res.descr
+ },
+ // 闃叉姈 //鎵爜鐢ㄧ殑鏄槻鎶�
+ 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()
+ that.enterNative(that.form.orderstepqrcode, belong)
+ }, delay)
+ }
+ }
+ },
+ // 鍒ゆ柇鏄惁鏄壂鐮佹灙鎵爜
+ 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) {
@@ -455,6 +560,9 @@
// 鏂板
add() {
+ if (this.JYTableData.length === 0) {
+ return this.$message.info('璇峰厛閫夋嫨妫�楠屾爣鍑嗭紒')
+ }
if (this.JYTableData.length > 0 && this.JYTableData[this.JYTableData.length - 1].isVisible === 1) {
return this.$message.info('璇峰厛纭畾鎴栧彇娑堟湰鏉¤褰曪紒')
}
@@ -464,19 +572,25 @@
const data = { result: 'OK', code: '', name: '', stepcheckitem_desc: '', isVisible: 1, number }
this.JYTableData.push(data)
this.$refs.multipleTable.toggleRowSelection(data, true)
+
+ this.JYIsCancel = false
},
// 纭
confirm(row) {
if (row.code === '') {
- return this.$message.info('妫�楠岄」鐩紪鐮�(鍚嶇О)涓嶈兘涓虹┖锛�')
+ return this.$message.info('妫�楠岄」鐩紪鐮佷笉鑳戒负绌猴紒')
+ }
+ if (row.name === '') {
+ return this.$message.info('妫�楠岄」鐩悕绉颁笉鑳戒负绌猴紒')
}
- if (this.JYSelectedArr.find(item => item === row.code) !== undefined) {
- return this.$message.info('妫�楠岄」鐩紪鐮�(鍚嶇О)涓嶈兘閲嶅锛�')
- } else {
- this.JYSelectedArr.push(row.code)
- }
+ this.JYSelectArr.forEach((item, index) => {
+ if (item.code === row.code) {
+ this.JYSelectArr.splice(index, 1)
+ }
+ })
+
this.JYTableData.forEach((item, index) => {
if (item.number === row.number) {
item.isVisible = 0
@@ -501,24 +615,27 @@
}
})
- this.JYSelectedArr.forEach((item, index) => {
- if (item === row.code) {
- this.JYSelectedArr.splice(index, 1)
- }
- })
+ if (this.JYIsCancel && row.code.toString().length > 0) {
+ this.JYSelectArr.splice(0, 0, {
+ code: row.code,
+ name: row.name,
+ descr: row.stepcheckitem_desc
+ })
+ }
+ this.JYIsCancel = true
},
// 鍒犻櫎
del(row) {
+ this.JYSelectArr.splice(0, 0, {
+ code: row.code,
+ name: row.name,
+ descr: row.stepcheckitem_desc
+ })
+
this.JYTableData.forEach((item, index) => {
if (item.number === row.number) {
this.JYTableData.splice(index, 1)
- }
- })
-
- this.JYSelectedArr.forEach((item, index) => {
- if (item === row.code) {
- this.JYSelectedArr.splice(index, 1)
}
})
},
@@ -528,11 +645,17 @@
if (this.form.orderstepqrcode.length < 1) {
return this.$message.info('鎵弿鏉＄爜涓嶈兘涓虹┖锛�')
}
+ if (this.form.wo_code.toString().length === 0) {
+ return this.$message.info('鏈幏寰楀伐鍗曠紪鐮侊紒')
+ }
if (this.checkStandard.length < 1) {
return this.$message.info('妫�楠屾爣鍑嗕笉鑳戒负绌猴紒')
}
if (this.checkUser.length < 1) {
return this.$message.info('妫�楠屼汉鍛樹笉鑳戒负绌猴紒')
+ }
+ if (parseFloat(this.checkqty) <= 0) {
+ return this.$message.info('妫�楠屾暟閲忓繀椤昏澶т簬闆讹紒')
}
if (this.JYTableData.length < 1) {
return this.$message.info('妫�楠岄」淇℃伅涓嶈兘涓虹┖锛�')
@@ -548,6 +671,7 @@
type: 'warning'
}).then(() => {
const arr = []
+ this.JYTableData = this.JYTableData.filter(item => item.code !== '')
this.JYTableData.forEach((item, index) => {
arr.push({
code: item.code,
@@ -563,6 +687,7 @@
'stepcode': this.form.stepcode, // 宸ュ簭缂栫爜
'checkstanedcode': this.checkStandard, // 妫�楠屾爣鍑嗙紪鐮�
'checkusercode': this.checkUser, // 妫�楠屼汉鍛樼紪鐮�
+ 'checkqty': this.checkqty, // 妫�楠屾暟閲�
'checktypecode': val, // 妫�楠岀被鍨嬬紪鐮�
'checkresult': this.checkResult, // 妫�楠岀粨鏋�(OK(鍚堟牸) NG(涓嶈壇))
'checkdescr': this.checkdescr, // 妫�楠屾弿杩�
@@ -573,6 +698,7 @@
this.$message.success(text + '鎴愬姛锛�')
this.clearContent()
this.getFocus()
+ this.getJYSelectArr()
}
})
}).catch(() => {
@@ -581,15 +707,16 @@
} else {
this.clearContent()
this.getFocus()
+ this.getJYSelectArr()
}
},
// 娓呯┖椤甸潰鍐呭
clearContent() {
this.JYTableData = []
this.multipleSelection = []
- this.JYSelectedArr = []
this.checkdescr = ''
- this.checkUser = ''
+ this.checkUser = getCookie('navTabId')
+ this.checkqty = 0
this.checkResult = ''
this.checkStandard = ''
this.form.orderstepqrcode = ''
@@ -600,6 +727,8 @@
this.form.stepcode = ''
this.form.stepname = ''
+ this.judgeIsScanningArr = []
+
this.isCancel = true
},
--
Gitblit v1.9.3