From c5b7788a691f1ac4bc22c26e0203626cfdc3555f Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 06 十一月 2023 10:37:21 +0800
Subject: [PATCH] modified: src/views/quality/processconfiguration/index.vue modified: src/views/quality/rawMaterial/index.vue
---
src/views/quality/processconfiguration/index.vue | 112 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 74 insertions(+), 38 deletions(-)
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index abcf3ce..ab26a76 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -3,6 +3,8 @@
<basic-container>
<ttable
:table="table"
+ :resultData="resultData"
+ @change ="costPlannedAmountChange"
@handleSelectionChange="handleSelectionChange"
:uploadInfo="uploadInfo"
:isShowHide="true"
@@ -22,27 +24,43 @@
<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 label="闄嶄负浠栫敤">闄嶄负浠栫敤</el-radio>
+ </el-radio-group>
+ </div>
+ <div v-if="type === '杩囩▼妫�楠�'">
+ <el-radio-group v-model="checkList">
+ <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>
@@ -65,10 +83,12 @@
export default {
data() {
return {
+ resultData:[],
checkList: "",
- WayIdea:'',
+ // WayIdea:'',
UserId:{},
- ajaxFun: UnqualifiedList,
+ type:'',
+ ajaxFun: UnqualifiedList,pullInsUnapi,AuditSuggestion,
addOrUpdateVisible: false,
multipleSelection: [],
typeOptions: [],
@@ -90,6 +110,7 @@
multiSelect: true, //
seqNo: true,
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
+ isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
defaultOrderBy: { column: 'createTime', direction: 'desc' }
},
@@ -135,7 +156,7 @@
{
minWidth: '140',
prop: 'materialCode',
- label: '浜у搧缂栧彿',
+ label: '闆朵欢鍙�',
isTrue: true,
isSearch: true,
searchInfoType: 'text',
@@ -274,7 +295,7 @@
{
text: '瀵煎嚭',
type: 'primary',
- // fun: this.addOrUpdateHandle
+ fun: this.handleExcel
},
],
operator: [
@@ -304,7 +325,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'}],
}
@@ -315,25 +336,53 @@
},
computed: {
...mapGetters(['permissions'])
+
},
created() {
// this.getType()
},
methods: {
+ async costPlannedAmountChange(value){
+ this.resultData= value
+ },
+
+ handleExcel() {
+ console.log(this.resultData);
+ console.log(this.table.column);
+ let arr = this.table.column.filter(item => item.isTrue == true).map(item => {
+ return{
+ prop:item.prop,
+ label:item.label
+ }
+ })
+ let opt = {
+ title: '鏂囨。鏍囬',
+ column: [{
+ label:'涓嶅悎鏍煎缃�',
+ prop:'header',
+ children:arr
+ }],
+ data: this.resultData
+ }
+ this.$Export.excel({
+ title: opt.title,
+ columns: opt.column,
+ data: opt.data
+ });
+ },
//瀹℃牳缁撴灉
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 +391,7 @@
console.log(row.id);
pullInsUnapi({id:row.id}).then(res =>{
console.log(res);
+ this.$refs.processconfiguration.refreshData()
})
},
@@ -367,23 +417,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