From 4e2bb29096ac63837f8d2c5e25766ee094f45d6c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 27 十二月 2023 14:35:49 +0800
Subject: [PATCH] modified: src/page/index/top/index.vue modified: src/views/common/part.vue modified: src/views/equipment/equipment/index.vue modified: src/views/equipment/metering/index.vue modified: src/views/plan/manufacturingorder/auto-operationtask.vue modified: src/views/plan/operationtask/operationtask-form.vue modified: src/views/quality/Packaging_ledger/index.vue modified: src/views/quality/packageinspect/index.vue modified: src/views/quality/processconfiguration/index.vue modified: src/views/quality/teststandard/index.vue modified: vue.config.js
---
src/views/quality/processconfiguration/index.vue | 106 ++++++++++++++++++++++-------------------------------
1 files changed, 44 insertions(+), 62 deletions(-)
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index b4aaf27..b364506 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -43,19 +43,28 @@
<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-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>
+ <el-radio label="闄嶄负浠栫敤">闄嶄负浠栫敤</el-radio>
+ </div>
+ </el-row>
</el-radio-group>
</div>
</el-form>
<span slot="footer" >
- <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ <el-button @click="WayCancel()">鍙� 娑�</el-button>
<el-button type="primary" @click="WaySure()">纭� 瀹�</el-button>
</span>
</el-dialog>
@@ -73,6 +82,7 @@
import TableForm from './table-form'
import { mapGetters } from 'vuex'
// import { remote } from '@/api/admin/dict'
+import { transform } from '@/util/fileTransform'
import ttable from '@/views/common/ztt-table.vue'
export default {
data() {
@@ -253,65 +263,16 @@
// return this.processModeOptions
// }
// },
- //鍙戣捣浜�
- // {
- // minWidth: '200',
- // prop: 'originator',
- // label: '鍙戣捣浜�',
- // sort: true,
- // isTrue: true,
- // isSearch: true,
- // searchInfoType: 'text'
- // },
- // 瀹℃牳浜�
- // {
- // minWidth: '140',
- // prop: 'examiner',
- // label: '瀹℃牳浜�',
- // sort: true,
- // isTrue: true,
- // isSearch: true,
- // searchInfoType: 'text'
- // },
- // 澶勭悊浜�
- // {
- // minWidth: '120',
- // prop: 'handler',
- // label: '澶勭悊浜�',
- // sort: true,
- // isTrue: true,
- // isSearch: true,
- // searchInfoType: 'text'
- // },
],
toolbar: [
- {
- text: '瀵煎嚭',
- type: 'primary',
- fun: this.handleExport
- },
- ],
- operator: [
// {
- // text: '鍒犻櫎',
- // type: 'text',
- // size: 'small',
- // fun: this.deleteHandle
+ // text: '瀵煎嚭',
+ // type: 'primary',
+ // fun: this.handleExport
// },
- {
- text: '鎻愪氦瀹℃牳',
- type: 'text',
- size: 'small',
- fun: this.Submitreview
- },
- {
- text: '瀹℃牳缁撴灉',
- type: 'text',
- size: 'small',
- fun: this.AuditResult
- }
],
+ operator: null,
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
@@ -319,7 +280,7 @@
minWidth: 100
}
},
- materialType: [{label:'鍘熸潗鏂欐楠�',value:'鍘熸潗鏂欐楠�'},{label:'杩囩▼妫�楠�',value:'杩囩▼妫�楠�'},{label:'浜у搧妫�楠�',value:'浜у搧妫�楠�'}],
+ materialType: [{label:'鍘熸潗鏂欐楠�',value:'鍘熸潗鏂欐楠�'},{label:'杩囩▼妫�楠�',value:'杩囩▼妫�楠�'},{label:'浜у搧妫�楠�',value:'浜у搧妫�楠�'},{label:'鍖呰妫�楠�',value:'鍖呰妫�楠�'}],
StateList: [{label:'鍏ㄩ儴',value:''},{label:'宸叉彁浜ゅ鏍�',value:'1'},{label:'寰呭鐞�',value:'0'},{label:'宸插鐞�',value:'2'}],
insStateList: [{label:'鍏朵粬',value:''},{label:'鐟曠柕',value:'1'}],
}
@@ -334,6 +295,24 @@
},
created() {
// this.getType()
+ let arr = []
+ if(this.permissions.quality_processconfiguration_submit){
+ arr.push({
+ text: '鎻愪氦瀹℃牳',
+ type: 'text',
+ size: 'small',
+ fun: this.Submitreview
+ })
+ }
+ if(this.permissions.quality_processconfiguration_result){
+ arr.push({
+ text: '瀹℃牳缁撴灉',
+ type: 'text',
+ size: 'small',
+ fun: this.AuditResult
+ })
+ }
+ this.table.operator = arr.length>0 ? arr : null
},
methods: {
getQueryParam(data){
@@ -341,7 +320,6 @@
},
handleExport(){
exportData(this.queryParam).then(res=>{
- console.log(res)
this.downloadFun(res)
}).catch(error=>{
console.log(error);
@@ -369,6 +347,12 @@
this.UserId = row.id
this.type = row.type
this.dialogVisible = true;
+
+ },
+ WayCancel(){
+ this.dialogVisible = false
+ this.checkList = null
+ this.WayIdea = null
},
WaySure(){
AuditSuggestion({id:this.UserId,way:this.checkList}).then(
@@ -381,9 +365,7 @@
},
//鎻愪氦瀹℃牳
Submitreview(row){
- console.log(row.id);
pullInsUnapi({id:row.id}).then(res =>{
- console.log(res);
this.$refs.processconfiguration.refreshData()
})
},
--
Gitblit v1.9.3