新购内部导出

src/views/material/purchase/goodsAccept/index.vue

@@ -78,23 +78,8 @@
         <el-table-column label="操作时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
         <el-table-column label="状态" align="center" prop="taskStatus" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-                <span v-if="scope.row.taskStatus==0">待提交</span>
+                <dict-tag :options="dict.type.purchase_task_status" :value="scope.row.taskStatus"/>
-                <span v-if="scope.row.taskStatus==1">待通知</span>
-                <span v-if="scope.row.taskStatus==2">待验收</span>
-                <span v-if="scope.row.taskStatus==3">待绑定</span>
-                <span v-if="scope.row.taskStatus==4">待入库</span>
-                <span v-if="scope.row.taskStatus==5">已完成</span>
-                <span v-if="scope.row.taskStatus==6">驳回待验收</span>
-                <span v-if="scope.row.taskStatus==7">驳回待绑定</span>
-                <span v-if="scope.row.taskStatus==8">驳回待入库</span>
-                <span v-if="scope.row.taskStatus==9">入库进行中</span>
-                <span v-if="scope.row.taskStatus==10">未完成</span>
-                <!-- <span v-else>/</span> -->
-
-
-
             </template>
-            
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="操作" align="center" width="250">
@@ -306,6 +291,7 @@
   import { getToken } from '@/utils/auth'
   export default {
     name: "GoodsAcceptList",
+    dicts: ['purchase_task_status'],
     data() {
       return {
         // 遮罩层

src/views/material/purchase/goodsArrived/component/addTools.vue

@@ -92,6 +92,9 @@
             <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleSave" >保存</el-button>
             </el-col>
+            <!-- <el-col :span="1.5">
+                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-if="isEdit">导出</el-button>
+            </el-col> -->
         </el-row>
 
         <el-table
@@ -787,6 +790,10 @@ export default {
                 })
                 .catch(() => {})
         },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download('/material/purchase_check_info/exportDetails',{taskId:this.taskId},`新购到货详情_${new Date().getTime()}.xlsx`)
+        },
     },
 }
 </script>

src/views/material/purchase/goodsArrived/component/home.vue

@@ -172,6 +172,24 @@
                 prop="createTime"
                 :show-overflow-tooltip="true"
             />
+            <el-table-column label="状态" align="center" prop="taskStatus" :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.purchase_task_status" :value="scope.row.taskStatus"/>
+                </template>
+                <!-- <template slot-scope="scope">
+                    <span v-if="scope.row.taskStatus==0">待提交</span>
+                    <span v-if="scope.row.taskStatus==1">待通知</span>
+                    <span v-if="scope.row.taskStatus==2">待验收</span>
+                    <span v-if="scope.row.taskStatus==3">待绑定</span>
+                    <span v-if="scope.row.taskStatus==4">待入库</span>
+                    <span v-if="scope.row.taskStatus==5">已完成</span>
+                    <span v-if="scope.row.taskStatus==6">驳回待验收</span>
+                    <span v-if="scope.row.taskStatus==7">驳回待绑定</span>
+                    <span v-if="scope.row.taskStatus==8">驳回待入库</span>
+                    <span v-if="scope.row.taskStatus==9">入库进行中</span>
+                    <span v-if="scope.row.taskStatus==10">未完成</span>
+                </template> -->
+            </el-table-column>
 
             <el-table-column label="操作" align="center" width="250">
                 <template slot-scope="scope">
@@ -529,7 +547,7 @@ import {
 
 export default {
     name: 'Home',
-    dicts: ['sys_normal_disable'],
+    dicts: ['purchase_task_status'],
     // components: { vueEasyPrint },
     data() {
         return {
@@ -844,13 +862,7 @@ export default {
 
         /** 导出按钮操作 */
         handleExport() {
-            this.download(
+            this.download('/material/purchase_check_info/export',{...this.queryParams},`新购到货_${new Date().getTime()}.xlsx`)
-                '/material/purchase_check_info/export',
-                {
-                    ...this.queryParams,
-                },
-                `新购工机具验收_${new Date().getTime()}.xlsx`)
-            
         },
 
 

src/views/material/purchase/goodsArrived/component/queryTools.vue

@@ -1,7 +1,11 @@
 <template>
     <div>
       
-
+        <el-row :gutter="10" class="mb8"> 
+            <el-col :span="1.5">
+                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+            </el-col>
+        </el-row>
         <el-table
             v-loading="loading"
             :data="equipmentList"
@@ -297,6 +301,10 @@ export default {
             this.dialogVisible = true
           }
         },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download('/material/purchase_check_info/exportDetails',{taskId:this.taskId},`新购到货详情_${new Date().getTime()}.xlsx`)
+        },
     },
 }
 </script>