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 | 68 ++++++++++++++++------------------
1 files changed, 32 insertions(+), 36 deletions(-)
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index 11e2ab4..2f21df8 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -22,27 +22,34 @@
<table></table>
</basic-container>
<div>
- <el-dialog title="鏈�缁堝缃剰瑙�" :visible.sync="dialogVisible" width="38%">
+ <el-dialog title="鏈�缁堝缃剰瑙�" :visible.sync="dialogVisible" width="30%">
<el-form label-width="120px">
- <div>
- <el-form-item label="鏈�缁堝缃剰瑙侊細">
+ <div v-if="type === '鍘熸潗鏂欐楠�'">
+ <!-- <el-form-item label="鏈�缁堝缃剰瑙侊細">
<el-input type="textarea" :rows="3" placeholder="璇疯緭鍏ュ唴瀹�" v-model="WayIdea" />
- </el-form-item>
- <!-- <el-checkbox-group v-model="checkList">
- <el-checkbox label="杩斾慨"></el-checkbox>
- <el-checkbox label="鎹㈣揣"></el-checkbox>
- <el-checkbox label="閫�璐�"></el-checkbox>
- <el-checkbox label="浣滃簾"></el-checkbox>
- <el-checkbox label="璁╂鎺ユ敹"></el-checkbox>
- <el-checkbox label="闄嶇骇浣跨敤"></el-checkbox>
- </el-checkbox-group> -->
+ </el-form-item> -->
<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-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>
+ <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>
@@ -66,9 +73,10 @@
data() {
return {
checkList: "",
- WayIdea:'',
+ // WayIdea:'',
UserId:{},
- ajaxFun: UnqualifiedList,
+ type:'',
+ ajaxFun: UnqualifiedList,pullInsUnapi,AuditSuggestion,
addOrUpdateVisible: false,
multipleSelection: [],
typeOptions: [],
@@ -90,6 +98,7 @@
multiSelect: true, //
seqNo: true,
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
+ isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
defaultOrderBy: { column: 'createTime', direction: 'desc' }
},
@@ -135,7 +144,7 @@
{
minWidth: '140',
prop: 'materialCode',
- label: '浜у搧缂栧彿',
+ label: '闆朵欢鍙�',
isTrue: true,
isSearch: true,
searchInfoType: 'text',
@@ -315,6 +324,7 @@
},
computed: {
...mapGetters(['permissions'])
+
},
created() {
// this.getType()
@@ -323,17 +333,16 @@
//瀹℃牳缁撴灉
AuditResult(row){
this.UserId = row.id
+ this.type = row.type
this.dialogVisible = true;
+
},
WaySure(){
- // console.log(this.checkList);
- // this.aa = this.checkList.join(',')
- // console.log(this.aa);
- // console.log(this.checkList);
AuditSuggestion({id:this.UserId,way:this.checkList}).then(
res =>{
this.checkList = null
this.WayIdea = null
+ this.$refs.processconfiguration.refreshData()
;})
this.dialogVisible = false
},
@@ -342,6 +351,7 @@
console.log(row.id);
pullInsUnapi({id:row.id}).then(res =>{
console.log(res);
+ this.$refs.processconfiguration.refreshData()
})
},
@@ -367,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