From 125b765551a31599e7e6f289ab722c28e98a8bfa Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 01 十一月 2023 20:25:47 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/api/quality/unqualifiedprocess.js | 14 +++++++-------
src/views/quality/processconfiguration/index.vue | 42 +++++++++++++++++++++++++++++-------------
2 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/src/api/quality/unqualifiedprocess.js b/src/api/quality/unqualifiedprocess.js
index a0bda0f..729751c 100644
--- a/src/api/quality/unqualifiedprocess.js
+++ b/src/api/quality/unqualifiedprocess.js
@@ -16,13 +16,13 @@
})
}
-// export function pullInsi(query) {
-// return request({
-// url: '/mes/qualityInspectUnaccepted/getResult',
-// method: 'post',
-// params: query
-// })
-// }
+export function AuditSuggestion(query) {
+ return request({
+ url: '/mes/qualityInspectUnaccepted/getResult',
+ method: 'post',
+ params: query
+ })
+}
export function fetchListUnqualifiedProcess(query) {
return request({
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index d8f82bc..11e2ab4 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -22,25 +22,33 @@
<table></table>
</basic-container>
<div>
- <el-dialog title="鏈�缁堝缃剰瑙�" :visible.sync="dialogVisible" width="30%">
+ <el-dialog title="鏈�缁堝缃剰瑙�" :visible.sync="dialogVisible" width="38%">
<el-form label-width="120px">
<div>
<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-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-checkbox-group> -->
+ <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-group>
</div>
</el-form>
<span slot="footer" >
<el-button @click="dialogVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="WaySure">纭� 瀹�</el-button>
+ <el-button type="primary" @click="WaySure()">纭� 瀹�</el-button>
</span>
</el-dialog>
</div>
@@ -48,7 +56,7 @@
</template>
<script>
-import { UnqualifiedList,pullInsUnapi,
+import { UnqualifiedList,pullInsUnapi,AuditSuggestion
} from '@/api/quality/unqualifiedprocess'
import TableForm from './table-form'
import { mapGetters } from 'vuex'
@@ -57,8 +65,9 @@
export default {
data() {
return {
- checkList: [],
+ checkList: "",
WayIdea:'',
+ UserId:{},
ajaxFun: UnqualifiedList,
addOrUpdateVisible: false,
multipleSelection: [],
@@ -295,7 +304,7 @@
minWidth: 100
}
},
- materialType: [{label:'鍘熸潗鏂欐楠�',value:'鍘熸潗鏂欐楠�'},{label:'杩囩▼妫�楠�',value:'杩囩▼妫�楠�'},{label:'璐ㄩ噺妫�楠�',value:'璐ㄩ噺妫�楠�'}],
+ materialType: [{label:'鍘熸潗鏂欐楠�',value:'鍘熸潗鏂欐楠�'},{label:'杩囩▼妫�楠�',value:'杩囩▼妫�楠�'},{label:'浜у搧妫�楠�',value:'浜у搧妫�楠�'}],
StateList: [{label:'鍏ㄩ儴',value:''},{label:'宸叉彁浜ゅ鏍�',value:'1'},{label:'寰呭鐞�',value:'0'},{label:'宸插鐞�',value:'2'}],
insStateList: [{label:'鍏朵粬',value:''},{label:'鐟曠柕',value:'1'}],
}
@@ -312,13 +321,20 @@
},
methods: {
//瀹℃牳缁撴灉
- AuditResult(){
- this.dialogVisible = true
+ AuditResult(row){
+ this.UserId = row.id
+ this.dialogVisible = true;
},
- WaySure(row){
- let aa = this.checkList
- let bb = this.WayIdea
- console.log(aa,bb);
+ 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.dialogVisible = false
},
//鎻愪氦瀹℃牳
--
Gitblit v1.9.3