From d271f2493796a557eac67b95b310df776abaf48b Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 06 五月 2024 16:15:24 +0800
Subject: [PATCH] 修改产品检，不合格处理等页面
---
src/views/quality/processconfiguration/index.vue | 133 ++++++++++++++++++++++++++++++++------------
1 files changed, 96 insertions(+), 37 deletions(-)
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index 2802435..6d53f3e 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -39,12 +39,29 @@
</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>
+ </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">
@@ -52,15 +69,26 @@
<div style="padding: 20px;">
<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>
</div>
<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>
</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" >
@@ -73,11 +101,12 @@
</template>
<script>
-import {
+import {
UnqualifiedList,
pullInsUnapi,
AuditSuggestion,
- exportData
+ exportData,
+ chooseMoRoutingOperation,
} from '@/api/quality/unqualifiedprocess'
import TableForm from './table-form'
import { mapGetters } from 'vuex'
@@ -89,6 +118,7 @@
return {
queryParam: {},
checkList: "",
+ moRoutingOperationId:"",
// WayIdea:'',
UserId:{},
type:'',
@@ -138,6 +168,15 @@
return this.materialType
// render: { fun: this.addOrUpdateHandle }
}
+ },
+ // 妫�楠岀紪鍙�
+ {
+ minWidth: '140',
+ prop: 'inspectNo',
+ label: '妫�楠岀紪鍙�',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
},
// 浜у搧鍚嶇О
{
@@ -263,7 +302,7 @@
// return this.processModeOptions
// }
// },
-
+
],
toolbar: [
// {
@@ -272,26 +311,7 @@
// fun: this.handleExport
// },
],
- operator: [
- // {
- // text: '鍒犻櫎',
- // type: 'text',
- // size: 'small',
- // fun: this.deleteHandle
- // },
- {
- text: '鎻愪氦瀹℃牳',
- type: 'text',
- size: 'small',
- fun: this.Submitreview
- },
- {
- text: '瀹℃牳缁撴灉',
- type: 'text',
- size: 'small',
- fun: this.AuditResult
- }
- ],
+ operator: null,
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
@@ -299,8 +319,9 @@
minWidth: 100
}
},
+ listOptions:[],
materialType: [{label:'鍘熸潗鏂欐楠�',value:'鍘熸潗鏂欐楠�'},{label:'杩囩▼妫�楠�',value:'杩囩▼妫�楠�'},{label:'浜у搧妫�楠�',value:'浜у搧妫�楠�'},{label:'鍖呰妫�楠�',value:'鍖呰妫�楠�'}],
- StateList: [{label:'鍏ㄩ儴',value:''},{label:'宸叉彁浜ゅ鏍�',value:'1'},{label:'寰呭鐞�',value:'0'},{label:'宸插鐞�',value:'2'}],
+ StateList: [{label:'鍏ㄩ儴',value:''},{label:'宸叉彁浜ゅ鏍�',value:'1'},{label:'寰呭鐞�',value:'0'},{label:'宸插畬鎴�',value:'2'}],
insStateList: [{label:'鍏朵粬',value:''},{label:'鐟曠柕',value:'1'}],
}
},
@@ -312,10 +333,45 @@
...mapGetters(['permissions'])
},
+ watch: {
+ checkList(val){
+ if(val!='杩斾慨'){
+ this.moRoutingOperationId = null
+ }
+ }
+ },
created() {
// this.getType()
+ let arr = []
+ if(this.permissions.quality_processconfiguration_submit){
+ arr.push({
+ text: '鎻愪氦瀹℃牳',
+ type: 'text',
+ size: 'small',
+ fun: this.Submitreview,
+ show: {
+ key: 'state',
+ val: [0]
+ }
+ })
+ }
+ if(this.permissions.quality_processconfiguration_result){
+ arr.push({
+ text: '瀹℃牳缁撴灉',
+ type: 'text',
+ size: 'small',
+ 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
},
@@ -348,17 +404,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()
;})
@@ -370,7 +429,7 @@
this.$refs.processconfiguration.refreshData()
})
},
-
+
//鐘舵��
formatInsState(row, column, cellValue){
if(cellValue != undefined || cellValue != null){
@@ -381,7 +440,7 @@
return "<span style='color:#34BD66;'>宸叉彁浜ゅ鏍�</span>"
}
if(cellValue == 2){
- return "<span style='color:#34BD66;'>宸插鐞�</span>"
+ return "<span style='color:#34BD66;'>宸插畬鎴�</span>"
}
}
},
@@ -392,7 +451,7 @@
}
return "<span style='color:#34BD66;'></span>"
}
- },
+ },
// 鑾峰彇鏁版嵁鍒楄〃
getData() {
// this.$refs.processconfiguration.getDataList()
--
Gitblit v1.9.3