From 67aa542b63a1bb80f1e553bc2c1aab5b2a11e8ab Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 06 十一月 2023 15:48:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/quality/rawMaterial/index.vue |   64 ++++++++++++++++++++++++++++----
 1 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index ae5e1c2..44a4618 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -19,6 +19,8 @@
         <basic-container>
             <ttable 
             :table="table"
+            :resultData="resultData"
+            @change ="costPlannedAmountChange"
             @handleSelectionChange="handleSelectionChange"
             :prelang="prelang"
             :options="options"
@@ -35,8 +37,8 @@
         ></RawMaterialForm>
     </div>
 </template>
-  
 <script>
+import ExportMaterial from './ExportMaterial.vue'
 import ttable from '@/views/common/ztt-table.vue'
 import { getRawInspectList,delObj } from '@/api/quality/rawMaterial'
 import RawMaterialForm from './rawMaterial-form'
@@ -45,6 +47,7 @@
   export default {
     data() {
         return {
+            resultData:[],
             addOrUpdateVisible: false,
             type: [1],
             prelang: 'rawMaterial',
@@ -68,6 +71,7 @@
                 currentPage: 1,
                 pageSize: 20,
                 data: [],
+                isExport:true,
                 // 鏍囬
                 column: [
                     {
@@ -78,6 +82,14 @@
                         isSearch: true,
                         searchInfoType: 'text',
                         render: { fun: this.addOrUpdateHandle }
+                    },
+                    {
+                        minWidth: '120',
+                        prop: 'projectName',
+                        label: '椤圭洰鍚嶇О',
+                        isTrue: true,
+                        isSearch: true,
+                        searchInfoType: 'text'
                     },
                     {
                         minWidth: '120',
@@ -166,8 +178,11 @@
                         label: '鍚堟牸鐘舵��',
                         isTrue: true,
                         isSearch: true,
-                        searchInfoType: 'text',
+                        searchInfoType: 'select',
                         formatter: this.formatJudgeState,
+                        optList: () => {
+                                return this.StateList
+                            }
                     },
                 ],
                 toolbar: [
@@ -178,13 +193,11 @@
                 },
                 {
                     text: '瀵煎嚭',
+                    type: 'primary',
+                    fun: this.handleExcel
                 }
                 ],
                 operator: [{
-                    text: '鎵撳嵃',
-                    type: 'text',
-                    size: 'small',
-                },{
                     text: '浣滃簾',
                     type: 'text',
                     size: 'small',
@@ -197,19 +210,50 @@
                 minWidth: 100
                 },
             },
-            insStateList: [{label:'鍏ㄩ儴',value:''},{label:'宸叉娴�',value:'1'},{label:'鏈娴�',value:'0'}]
+            insStateList: [{label:'鍏ㄩ儴',value:''},{label:'宸叉娴�',value:'1'},{label:'鏈娴�',value:'0'}],
+            StateList: [{label:'鍏ㄩ儴',value:''},{label:'宸插悎鏍�',value:'1'},{label:'涓嶅悎鏍�',value:'0'}],
         }
     },
     components: {
         ttable,
         RawMaterialForm,
+        ExportMaterial,
     },
     created() {
+
     },
     computed: {
         ...mapGetters(['permissions'])
     },
     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
+        });
+      },
         // 鍒犻櫎
         deleteHandle(row) {
         this.$confirm('鏄惁纭鍒犻櫎璇ユ暟鎹細' + row.code , '鎻愮ず', {
@@ -233,7 +277,10 @@
         addOrUpdateHandle(row) {
             this.$router.push({
                 name: 'rawMaterialForm',
-                query: { id: row == null ? null : row.id }
+                query: { 
+                    id: row == null ? null : row.id,
+                    resultVal: row == null ? null : row.judgeState
+                 }
             })
         },
         formatInsState(row, column, cellValue){
@@ -257,6 +304,7 @@
         },
         getData() {
             this.$refs.rawMaterialTable.getDataList()
+ 
         },
         // table鑷甫浜嬩欢
         handleSelectionChange(val) {

--
Gitblit v1.9.3