From 5fa75e4daaa9bf549b8d8591b020643ae92813bd Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 12 一月 2024 09:19:55 +0800
Subject: [PATCH] 包装检验模板管理-修改2
---
src/views/quality/packageinspect/packageInspect-form.vue | 77 ++++++++++++++++++++++++++++++--------
1 files changed, 60 insertions(+), 17 deletions(-)
diff --git a/src/views/quality/packageinspect/packageInspect-form.vue b/src/views/quality/packageinspect/packageInspect-form.vue
index 636c5bf..873dc2b 100644
--- a/src/views/quality/packageinspect/packageInspect-form.vue
+++ b/src/views/quality/packageinspect/packageInspect-form.vue
@@ -66,13 +66,12 @@
<el-row :gutter="10" style="width:100%;z-index: 10;height:30px;">
<el-col :span="12">妫�楠岄」鐩�</el-col>
<el-col :span="12" style="text-align: right;">
- <el-dropdown @command="handleCommand" v-if="!isShow">
+ <el-dropdown @command="handleCommand" v-if="isShow">
<el-button size="mini" style="margin-right: 10px;" type="primary" >
- 鍒囨崲榛樿妫�楠岄」<i class="el-icon-arrow-down el-icon--right"></i>
+ 鍒囨崲妫�楠岄」妯℃澘<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
- <el-dropdown-item command="1">妫�楠岄」鐩�1</el-dropdown-item>
- <el-dropdown-item divided command="2">妫�楠岄」鐩�2</el-dropdown-item>
+ <el-dropdown-item :key="index" v-for="(item,index) in inspectMoulds" :command="item.father">{{item.father}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button v-if="resultVal=='' || resultVal==null" size="mini" @click="clickAddLine()">娣诲姞妫�楠岄」鐩�</el-button>
@@ -124,6 +123,7 @@
<el-select style="width:100%" :disabled="resultVal!=null" @change="changeResult" v-model="scope.row.result" v-if="!scope.row.children">
<el-option label="鍚堟牸" value="鍚堟牸"></el-option>
<el-option label="涓嶅悎鏍�" value="涓嶅悎鏍�"></el-option>
+ <el-option label="涓嶉�傜敤" value="涓嶉�傜敤"></el-option>
</el-select>
</template>
</el-table-column>
@@ -194,7 +194,7 @@
updatePackageInspectById,
getCustomer,
} from '@/api/quality/packageInspect'
-import {inspect1,inspect2} from '@/const/defaultPackageInspect'
+import {getAllTemplateByEnable} from '@/api/quality/packageInspectTemp'
export default {
computed:{
},
@@ -202,6 +202,7 @@
},
data(){
return{
+ inspectMoulds: [],
isShow: true,
submitData: {
id:null,
@@ -253,7 +254,10 @@
this.resultVal=val
}
}
+ this.getAllInspect()
this.init()
+ this.checkShowState()
+
},
watch:{
dialogVisible(newVal){
@@ -263,15 +267,34 @@
}
},
methods:{
+ checkShowState(){
+ let num = 0
+ this.list.forEach(ele=>{
+ if(ele.children){
+ ele.children.forEach(c=>{
+ if(c.pid){
+ num++
+ }
+ })
+ }
+ })
+ this.isShow = num==0
+ },
+ getAllInspect(){
+ getAllTemplateByEnable().then(res=>{
+ if(res.status===200){
+ this.inspectMoulds = res.data.data
+ }
+ }).catch(error=>{
+ console.error(error)
+ })
+ },
handleCommand(command) {
- switch(command){
- case "1":
- this.init(inspect1)
- break;
- case "2":
- this.init(inspect2)
- break;
- }
+ this.inspectMoulds.forEach(ele=>{
+ if(ele.father==command){
+ this.init(ele.children)
+ }
+ })
},
changeResult(){
let result = ''
@@ -433,7 +456,27 @@
_than.list = []
let userNameList = []
if(dataList){
- _than.list = JSON.parse(JSON.stringify(dataList))
+ let tempList = []
+ dataList.forEach(ele=>{
+ let obj = {
+ randomId: Math.random(),
+ name: ele.inspectName,
+ children: []
+ }
+ if(ele.children){
+ ele.children.forEach(e=>{
+ obj.children.push({
+ required: e.inspectRequired,
+ randomId: Math.random(),
+ isEdit: false,
+ note: '',
+ result: ''
+ })
+ })
+ }
+ tempList.push(obj)
+ })
+ _than.list = tempList
}
data.packageInsProductS.forEach(item => {
if (item.children) {
@@ -462,9 +505,9 @@
_than.list.push(ele)
}
})
- let find1 = _than.list.find(ele=>ele.name===inspect1[0].name) !=undefined;
- let find2 = _than.list.find(ele=>ele.name===inspect2[0].name) !=undefined;
- _than.isShow = find1||find2
+ // let find1 = this.list.find(ele=>ele.name===inspect1[0].name&&ele.isEdit) !=undefined;
+ // let find2 = this.list.find(ele=>ele.name===inspect2[0].name&&ele.isEdit) !=undefined;
+ // this.isShow = find1||find2
_than.conclusionTable = [{
packageNo: data.packageNo,
userName: Array.from(new Set(userNameList)).join(','),
--
Gitblit v1.9.3