From b98bb5a14531d68e3ee1a483a79899de0de47704 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 06 五月 2024 17:26:06 +0800
Subject: [PATCH] 优化质量模块
---
src/views/quality/processconfiguration/index.vue | 77 +++++++++++++++++++++++++++++++-------
1 files changed, 63 insertions(+), 14 deletions(-)
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index 74e8b89..6fff645 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -39,12 +39,30 @@
</div>
<div v-if="type === '浜у搧妫�楠�' ">
<el-radio-group v-model="checkList">
- <el-radio label="杩斾慨">杩斾慨</el-radio>
- <el-radio label="鎺ユ敹">鎺ユ敹</el-radio>
- <el-radio label="闄嶇骇浣跨敤">闄嶇骇浣跨敤</el-radio>
- <el-radio label="鎶ュ簾">鎶ュ簾</el-radio>
- <el-radio label="闄嶄负浠栫敤">闄嶄负浠栫敤</el-radio>
+ <el-row>
+ <div style="padding: 20px;">
+ <el-radio label="杩斾慨">杩斾慨</el-radio>
+ <el-radio label="鎺ユ敹">鎺ユ敹</el-radio>
+ <el-radio label="闄嶇骇浣跨敤">闄嶇骇浣跨敤</el-radio>
+ <el-radio label="鎶ュ簾">鎶ュ簾</el-radio>
+ </div>
+ <div style="padding: 20px;">
+ <el-radio label="杩斿伐">杩斿伐</el-radio>
+ <el-radio label="闄嶄负浠栫敤">闄嶄负浠栫敤</el-radio>
+ </div>
+ </el-row>
</el-radio-group>
+ <div class="search" style="margin-left: 20px;" v-if="checkList=='杩斾慨'">
+ <label style="margin-right: 10px;">宸ュ簭</label>
+ <el-select v-model="moRoutingOperationId" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in listOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </div>
</div>
<div v-if="type === '杩囩▼妫�楠�'">
<el-radio-group v-model="checkList">
@@ -61,6 +79,17 @@
</div>
</el-row>
</el-radio-group>
+ <div class="search" style="margin-left: 20px;" v-if="checkList=='杩斾慨'">
+ <label style="margin-right: 10px;">宸ュ簭</label>
+ <el-select v-model="moRoutingOperationId" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in listOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </div>
</div>
</el-form>
<span slot="footer" >
@@ -77,7 +106,8 @@
UnqualifiedList,
pullInsUnapi,
AuditSuggestion,
- exportData
+ exportData,
+ chooseMoRoutingOperation,
} from '@/api/quality/unqualifiedprocess'
import TableForm from './table-form'
import { mapGetters } from 'vuex'
@@ -89,6 +119,7 @@
return {
queryParam: {},
checkList: "",
+ moRoutingOperationId:"",
// WayIdea:'',
UserId:{},
type:'',
@@ -289,8 +320,9 @@
minWidth: 100
}
},
+ listOptions:[],
materialType: [{label:'鍘熸潗鏂欐楠�',value:'鍘熸潗鏂欐楠�'},{label:'杩囩▼妫�楠�',value:'杩囩▼妫�楠�'},{label:'浜у搧妫�楠�',value:'浜у搧妫�楠�'},{label:'鍖呰妫�楠�',value:'鍖呰妫�楠�'}],
- StateList: [{label:'鍏ㄩ儴',value:''},{label:'宸叉彁浜ゅ鏍�',value:'1'},{label:'寰呭鐞�',value:'0'}],
+ StateList: [{label:'鍏ㄩ儴',value:''},{label:'宸叉彁浜ゅ鏍�',value:'1'},{label:'寰呭鐞�',value:'0'},{label:'宸插畬鎴�',value:'2'}],
insStateList: [{label:'鍏朵粬',value:''},{label:'鐟曠柕',value:'1'}],
}
},
@@ -302,6 +334,13 @@
...mapGetters(['permissions'])
},
+ watch: {
+ checkList(val){
+ if(val!='杩斾慨'){
+ this.moRoutingOperationId = null
+ }
+ }
+ },
created() {
// this.getType()
let arr = []
@@ -311,10 +350,11 @@
type: 'text',
size: 'small',
fun: this.Submitreview,
- show: {
- key: 'state',
- val: [0]
- }
+ // show: {
+ // key: 'state',
+ // val: [0]
+ // },
+ showFun: (row)=>{return row.type == '鍘熸潗鏂欐楠�'&&row.state==0}
})
}
if(this.permissions.quality_processconfiguration_result){
@@ -322,12 +362,18 @@
text: '瀹℃牳缁撴灉',
type: 'text',
size: 'small',
- fun: this.AuditResult
+ fun: this.AuditResult,
+ showFun: (row)=>{return row.type != '鍘熸潗鏂欐楠�'}
})
}
this.table.operator = arr.length>0 ? arr : null
},
methods: {
+ chooseMoRoutingOperation(id){
+ chooseMoRoutingOperation({id}).then(res =>{
+ this.listOptions = res.data.data
+ })
+ },
getQueryParam(data){
this.queryParam = data
},
@@ -360,17 +406,20 @@
this.UserId = row.id
this.type = row.type
this.dialogVisible = true;
+ this.chooseMoRoutingOperation(row.id)
},
WayCancel(){
this.dialogVisible = false
this.checkList = null
+ this.moRoutingOperationId = null
this.WayIdea = null
},
WaySure(){
- AuditSuggestion({id:this.UserId,way:this.checkList}).then(
+ AuditSuggestion({id:this.UserId,way:this.checkList,moRoutingOperationId:Number(this.moRoutingOperationId)*1}).then(
res =>{
this.checkList = null
+ this.moRoutingOperationId = null
this.WayIdea = null
this.$refs.processconfiguration.refreshData()
;})
@@ -393,7 +442,7 @@
return "<span style='color:#34BD66;'>宸叉彁浜ゅ鏍�</span>"
}
if(cellValue == 2){
- return "<span style='color:#34BD66;'>宸插鐞�</span>"
+ return "<span style='color:#34BD66;'>宸插畬鎴�</span>"
}
}
},
--
Gitblit v1.9.3