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 | 81 +++++++++++++++++++++++++---------------
1 files changed, 51 insertions(+), 30 deletions(-)
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index 0dc0fd2..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"
@@ -42,14 +44,23 @@
<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>
@@ -72,11 +83,12 @@
export default {
data() {
return {
+ resultData:[],
checkList: "",
// WayIdea:'',
UserId:{},
type:'',
- ajaxFun: UnqualifiedList,
+ ajaxFun: UnqualifiedList,pullInsUnapi,AuditSuggestion,
addOrUpdateVisible: false,
multipleSelection: [],
typeOptions: [],
@@ -283,7 +295,7 @@
{
text: '瀵煎嚭',
type: 'primary',
- // fun: this.addOrUpdateHandle
+ fun: this.handleExcel
},
],
operator: [
@@ -324,31 +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){
- 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(){
AuditSuggestion({id:this.UserId,way:this.checkList}).then(
res =>{
this.checkList = null
this.WayIdea = null
+ this.$refs.processconfiguration.refreshData()
;})
this.dialogVisible = false
},
@@ -357,6 +391,7 @@
console.log(row.id);
pullInsUnapi({id:row.id}).then(res =>{
console.log(res);
+ this.$refs.processconfiguration.refreshData()
})
},
@@ -382,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