From e96df584e9770d4ec4c626ec1c2b06cf4454e1ee Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 02 十一月 2023 10:38:07 +0800
Subject: [PATCH] s
---
src/views/quality/processconfiguration/index.vue | 48 ++++++++++++++----------
src/error.js | 18 ++++----
src/views/common/ztt-table.vue | 2
3 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/src/error.js b/src/error.js
index 35e8d64..a9b4ab0 100644
--- a/src/error.js
+++ b/src/error.js
@@ -10,15 +10,15 @@
info
})
if (process.env.NODE_ENV === 'development') {
- console.group('>>>>>> 閿欒淇℃伅 >>>>>>')
- console.log(info)
- console.groupEnd()
- console.group('>>>>>> Vue 瀹炰緥 >>>>>>')
- console.log(vm)
- console.groupEnd()
- console.group('>>>>>> Error >>>>>>')
- console.log(err)
- console.groupEnd()
+ // console.group('>>>>>> 閿欒淇℃伅 >>>>>>')
+ // console.log(info)
+ // console.groupEnd()
+ // console.group('>>>>>> Vue 瀹炰緥 >>>>>>')
+ // console.log(vm)
+ // console.groupEnd()
+ // console.group('>>>>>> Error >>>>>>')
+ // console.log(err)
+ // console.groupEnd()
}
})
}
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index 724a966..f0f12a8 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -959,7 +959,7 @@
arr.push(this.paramArr[i])
}
}
-
+ this.dataListLoading = false
return this.doCallback(this.ajaxFun, arr, selectedId)
},
doCallback(fn, args, selectedId) {
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index 11e2ab4..336e90a 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -22,27 +22,27 @@
<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>
</el-form>
@@ -66,8 +66,9 @@
data() {
return {
checkList: "",
- WayIdea:'',
+ // WayIdea:'',
UserId:{},
+ type:'',
ajaxFun: UnqualifiedList,
addOrUpdateVisible: false,
multipleSelection: [],
@@ -90,6 +91,7 @@
multiSelect: true, //
seqNo: true,
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
+ isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
defaultOrderBy: { column: 'createTime', direction: 'desc' }
},
@@ -135,7 +137,7 @@
{
minWidth: '140',
prop: 'materialCode',
- label: '浜у搧缂栧彿',
+ label: '闆朵欢鍙�',
isTrue: true,
isSearch: true,
searchInfoType: 'text',
@@ -322,14 +324,20 @@
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(){
- // 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
--
Gitblit v1.9.3