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 |   50 +++++++++++++++++++++++++++++++++++++++++++++-----
 src/views/quality/rawMaterial/index.vue          |    4 ----
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index 2f21df8..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,6 +83,7 @@
 export default {
   data() {
     return {
+      resultData:[],
       checkList: "",
       // WayIdea:'',
       UserId:{},
@@ -283,7 +295,7 @@
           {
             text: '瀵煎嚭',
             type: 'primary',
-            // fun: this.addOrUpdateHandle
+            fun: this.handleExcel
           },
         ],
         operator: [
@@ -330,6 +342,34 @@
     // 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
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index 3e33e70..44a4618 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -233,8 +233,6 @@
       handleExcel() {
         console.log(this.resultData);
         console.log(this.table.column);
-        // let arr = this.table.column.map(el = el.isTrue == true)
-        // console.log(arr);
         let arr = this.table.column.filter(item => item.isTrue == true).map(item => {
                     return{
                         prop:item.prop,
@@ -255,8 +253,6 @@
           columns: opt.column,
           data: opt.data
         });
-        // console.log(this.table);
-
       },
         // 鍒犻櫎
         deleteHandle(row) {

--
Gitblit v1.9.3