From c398a0de6b268c4e05ac8bc254c98b6dcb9b8f87 Mon Sep 17 00:00:00 2001
From: syruan <15555146157@163.com>
Date: Mon, 23 Dec 2024 16:23:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E5=A2=9E=E5=8A=A0=E9=98=B6?=
 =?UTF-8?q?=E6=AE=B5stage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/purchase/goodsAccept/index.vue   | 56 +++++++++----------
 .../purchase/goodsArrived/component/home.vue  | 17 +++---
 .../purchase/goodsBind/component/home.vue     | 17 +++---
 .../material/purchase/goodsEntry/index.vue    | 13 +++--
 4 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/src/views/material/purchase/goodsAccept/index.vue b/src/views/material/purchase/goodsAccept/index.vue
index 76d46f61..276c3abf 100644
--- a/src/views/material/purchase/goodsAccept/index.vue
+++ b/src/views/material/purchase/goodsAccept/index.vue
@@ -4,9 +4,9 @@
         <el-form-item  prop="dateRange">
             <el-date-picker
                 v-model="dateRange"
-                type="datetimerange" 
+                type="datetimerange"
                 value-format="yyyy-MM-dd HH:mm:ss"
-                range-separator="至" 
+                range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期">
             </el-date-picker>
@@ -18,7 +18,7 @@
                 clearable
                 @keyup.enter.native="handleQuery"
                 maxlength="20"
-            />   
+            />
         </el-form-item>
         <!-- <el-form-item  prop="status">
             <el-select
@@ -49,7 +49,7 @@
                     size="mini"
                     :disabled="multiple"
                     @click="acceptancePurchase"
-                >   
+                >
                     验收合格
                 </el-button>
             </el-col>
@@ -58,13 +58,13 @@
                 <el-button
                     type="warning" plain
                     icon="el-icon-download"
-                    size="mini" 
+                    size="mini"
                     @click="handleExport"
                 >导出</el-button>
             </el-col>
         </el-row>
 
-        
+
       <el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="taskId" @selection-change="handleSelectionChange" border>
         <el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
         <el-table-column label="序号" align="center" width="80" type="index">
@@ -82,24 +82,24 @@
         <el-table-column label="物资厂家" align="center" prop="supplier" :show-overflow-tooltip="true"/>
         <el-table-column label="操作人" align="center" prop="createBy" :show-overflow-tooltip="true"/>
         <el-table-column label="操作时间" align="center" prop="createTime" width="150" :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>
+        <el-table-column label="状态" align="center" prop="taskStatusName" :show-overflow-tooltip="true">
+<!--            <template slot-scope="scope">-->
+<!--                <dict-tag :options="dict.type.purchase_task_status" :value="scope.row.taskStatus"/>-->
+<!--            </template>-->
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
         <el-table-column label="操作" align="center" width="250">
                         <template slot-scope="scope">
                             <el-button
                                 size="mini"
-                                @click="handleView(scope.row)" 
+                                @click="handleView(scope.row)"
                             >
                                 查看
                             </el-button>
                             <el-button
                                 size="mini"
                                 type="primary"
-                                @click="handleUpdate(scope.row)" 
+                                @click="handleUpdate(scope.row)"
                             >
                                 验收
                             </el-button>
@@ -110,11 +110,11 @@
                             >
                                 验收单
                             </el-button>
-                             
+
                         </template>
                     </el-table-column>
       </el-table>
-  
+
       <pagination
         v-show="total>0"
         :total="total"
@@ -289,9 +289,9 @@
 
 
     </div>
-  </template> 
-  
-  <script> 
+  </template>
+
+  <script>
   import { getPurchaseList,acceptOuterVerify,getPurchaseCheckFormByTaskId } from "@/api/purchase/goodsAccept";
   import { downloadFile } from '@/utils/download'
   import { getToken } from '@/utils/auth'
@@ -301,21 +301,21 @@
     data() {
       return {
         // 遮罩层
-        loading: false,     
+        loading: false,
         // 非单个禁用
         single: true,
         // 非多个禁用
-        multiple: true, 
+        multiple: true,
         // 显示搜索条件
         showSearch: true,
-        showHouse: false, 
+        showHouse: false,
         dateRange:[],
         taskStatusList:[{id:'1',name:'待验收'},{id:'2',name:'验收合格'},{id:'3',name:'验收未通过'}],
         ids:[],
         // 总条数
-        total: 0, 
+        total: 0,
         //表格数据
-        tableList: [], 
+        tableList: [],
         // 弹出层标题
         title: "",
         // 是否显示弹出层
@@ -332,7 +332,7 @@
         printTableData: [],
       };
     },
-    created() { 
+    created() {
       this.getList();
     },
     methods: {
@@ -346,7 +346,7 @@
                 this.queryParams.startTime=undefined
                 this.queryParams.endTime=undefined
             }
-            // this.queryParams.taskStatus="2"
+            this.queryParams.taskStage= 2
             this.queryParams.statusList=[2,12]
             getPurchaseList(this.queryParams).then(response => {
                 this.tableList = response.data.rows;
@@ -388,7 +388,7 @@
                 path: '/purchase/goodsAcceptDetail',
                 query,
             })
-        }, 
+        },
         //批量合格
         acceptancePurchase(){
             let param={
@@ -437,11 +437,11 @@
         handleExport() {
             this.download(
                 "/material/purchase_check_info/export",
-                { ...this.queryParams,statusList:[2,12] },
+                { ...this.queryParams,statusList:[2,12],taskStage: 2 },
                 `新购到货验收_${new Date().getTime()}.xlsx`
             );
         },
-        
+
 
     }
   };
@@ -468,4 +468,4 @@
           display: none;
       }
   }
-  </style>
\ No newline at end of file
+  </style>
diff --git a/src/views/material/purchase/goodsArrived/component/home.vue b/src/views/material/purchase/goodsArrived/component/home.vue
index 841557d8..fbf5c3bd 100644
--- a/src/views/material/purchase/goodsArrived/component/home.vue
+++ b/src/views/material/purchase/goodsArrived/component/home.vue
@@ -164,15 +164,15 @@
       <el-table-column
         label="状态"
         align="center"
-        prop="taskStatus"
+        prop="taskStatusName"
         :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">-->
+<!--          <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>
@@ -651,6 +651,7 @@ export default {
         pageSize: this.queryParams.pageSize,
         pageNum: this.queryParams.pageNum,
         statusList: [1],
+        taskStage: 1,
       };
       getListNewBuy(this.addDateRange(params)).then((response) => {
         this.typeList = response.data.rows;
@@ -889,7 +890,7 @@ export default {
     handleExport() {
       this.download(
         "/material/purchase_check_info/export",
-        { ...this.queryParams,statusList: [1] },
+        { ...this.queryParams,statusList: [1],taskStage: 1 },
         `新购到货_${new Date().getTime()}.xlsx`
       );
     },
diff --git a/src/views/material/purchase/goodsBind/component/home.vue b/src/views/material/purchase/goodsBind/component/home.vue
index 937d2cdf..6ecc7651 100644
--- a/src/views/material/purchase/goodsBind/component/home.vue
+++ b/src/views/material/purchase/goodsBind/component/home.vue
@@ -128,13 +128,13 @@
                 prop="createTime" width="150"
                 show-overflow-tooltip
             />
-            <el-table-column label="状态" align="center" show-overflow-tooltip>
-                <template slot-scope="{ row }">
-                    <dict-tag
-                        :value="row.taskStatus"
-                        :options="dict.type.purchase_task_status"
-                    />
-                </template>
+            <el-table-column label="状态" align="center" prop="taskStatusName" show-overflow-tooltip>
+<!--                <template slot-scope="{ row }">-->
+<!--                    <dict-tag-->
+<!--                        :value="row.taskStatus"-->
+<!--                        :options="dict.type.purchase_task_status"-->
+<!--                    />-->
+<!--                </template>-->
             </el-table-column>
 
             <el-table-column
@@ -230,6 +230,7 @@ export default {
         async getList() {
             this.loading = true
             this.queryParams.statusList=[3,13]
+            this.queryParams.taskStage = 3
             const res = await getNewBuyBindListApi(this.queryParams)
             this.bindList = res.data.rows
             this.total = res.data.total
@@ -277,7 +278,7 @@ export default {
             console.log('数据导出')
             this.download(
                 "/material/purchase_check_info/export",
-                { ...this.queryParams,statusList:[3,13] },
+                { ...this.queryParams,statusList:[3,13],taskStage:3 },
                 `新购到货入库_${new Date().getTime()}.xlsx`
             );
         },
diff --git a/src/views/material/purchase/goodsEntry/index.vue b/src/views/material/purchase/goodsEntry/index.vue
index 157b37fe..a7be6299 100644
--- a/src/views/material/purchase/goodsEntry/index.vue
+++ b/src/views/material/purchase/goodsEntry/index.vue
@@ -28,7 +28,7 @@
                     maxlength="20"
                 />
             </el-form-item>
-            <el-form-item prop="taskStatus"> 
+            <el-form-item prop="taskStatus">
                 <el-select
                     v-model="queryParams.taskStatus"
                     placeholder="请选择任务状态"
@@ -177,12 +177,12 @@
             <el-table-column
                 label="状态"
                 align="center"
-                prop="taskStatus"
+                prop="taskStatusName"
                 :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">-->
+<!--                <dict-tag :options="dict.type.purchase_task_status" :value="scope.row.taskStatus"/>-->
+<!--            </template>-->
             </el-table-column>
             <el-table-column label="备注" align="center" prop="remark" />
             <el-table-column label="操作" align="center" width="250">
@@ -390,6 +390,7 @@ export default {
                 this.queryParams.endTime = undefined
             }
             this.queryParams.statusList=[3,13,4,14,19]
+            this.queryParams.taskStage = 4
             //   this.queryParams.modelName="新购验收"
             getPurchaseList(this.queryParams).then((response) => {
                 this.tableList = response.data.rows
@@ -473,7 +474,7 @@ export default {
         handleExport() {
             this.download(
                 "/material/purchase_check_info/export",
-                { ...this.queryParams,statusList:[3,13,4,14,19] },
+                { ...this.queryParams,statusList:[3,13,4,14,19],taskStage: 4 },
                 `新购到货验收_${new Date().getTime()}.xlsx`
             );
         },