From 778910ce85e301e63a43439b655cc457a96bbb44 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 02 十一月 2023 12:38:01 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/processconfiguration/index.vue | 42 +++++++++++++++---------------------------
1 files changed, 15 insertions(+), 27 deletions(-)
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index 336e90a..2f21df8 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -36,13 +36,20 @@
<el-radio label="鎺ユ敹">鎺ユ敹</el-radio>
</el-radio-group>
</div>
- <div v-if="type === '浜у搧妫�楠�' || '杩囩▼妫�楠�'">
+ <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-group>
+ </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-group>
</div>
</el-form>
@@ -69,7 +76,7 @@
// WayIdea:'',
UserId:{},
type:'',
- ajaxFun: UnqualifiedList,
+ ajaxFun: UnqualifiedList,pullInsUnapi,AuditSuggestion,
addOrUpdateVisible: false,
multipleSelection: [],
typeOptions: [],
@@ -317,6 +324,7 @@
},
computed: {
...mapGetters(['permissions'])
+
},
created() {
// this.getType()
@@ -324,24 +332,17 @@
methods: {
//瀹℃牳缁撴灉
AuditResult(row){
- console.log(row);
this.UserId = row.id
this.type = row.type
this.dialogVisible = true;
- console.log(row.type);
- // setTimeout(() => {
- // if (this.type === 鍘熸潗鏂欐楠�) {
- // return
- // } else
- // if (this.type === 浜у搧妫�楠�) {
- // }
- // }, 100)
+
},
WaySure(){
AuditSuggestion({id:this.UserId,way:this.checkList}).then(
res =>{
this.checkList = null
this.WayIdea = null
+ this.$refs.processconfiguration.refreshData()
;})
this.dialogVisible = false
},
@@ -350,6 +351,7 @@
console.log(row.id);
pullInsUnapi({id:row.id}).then(res =>{
console.log(res);
+ this.$refs.processconfiguration.refreshData()
})
},
@@ -375,23 +377,9 @@
return "<span style='color:#34BD66;'></span>"
}
},
- // materialTypeList(row, column, cellValue){
- // if(cellValue != undefined || cellValue != null){
- // if(cellValue == 鍘熸潗鏂欐楠�){
- // return "<span style='color:#E84738;'>鍘熸潗鏂欐楠�</span>"
- // }
- // if(cellValue == 杩囩▼妫�楠�){
- // return "<span style='color:#34BD66;'>杩囩▼妫�楠�</span>"
- // }
- // if(cellValue == 璐ㄩ噺妫�楠�){
- // return "<span style='color:#34BD66;'>璐ㄩ噺妫�楠�</span>"
- // }
- // }
- // },
-
// 鑾峰彇鏁版嵁鍒楄〃
getData() {
- this.$refs.processconfiguration.getDataList()
+ // this.$refs.processconfiguration.getDataList()
},
handleSelectionChange(val) {
// 澶氳閫変腑
--
Gitblit v1.9.3