From 7317a7885a3a0d5f7850bf07c33d172b77977e08 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Mon, 10 Nov 2025 22:45:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E5=88=B0=E8=B4=A7=E9=AA=8C?=
 =?UTF-8?q?=E6=94=B6=E9=A1=B5=E9=9D=A2=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=8F=8A=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/purchase/goodsAccept/index.vue   | 51 +++++++++++++------
 1 file changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/views/material/purchase/goodsAccept/index.vue b/src/views/material/purchase/goodsAccept/index.vue
index cce72dd7..5c096a34 100644
--- a/src/views/material/purchase/goodsAccept/index.vue
+++ b/src/views/material/purchase/goodsAccept/index.vue
@@ -29,13 +29,13 @@
                 maxlength="20"
             />
         </el-form-item>
-        <el-form-item  prop="isFinish">
+        <el-form-item  prop="taskStatusText">
             <el-select
                 clearable
                 filterable
                 style="width: 240px"
                 placeholder="状态筛选"
-                v-model="queryParams.isFinish"
+                v-model="queryParams.taskStatusText"
             >
                 <el-option
                     :key="dict.id"
@@ -81,9 +81,9 @@
             <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="到货时间" align="center" prop="arrivalTime" width="110" :show-overflow-tooltip="true"/>
-        <el-table-column label="采购单号" align="center" prop="code" width="150" :show-overflow-tooltip="true"/>
-        <el-table-column label="采购物资" align="center" prop="purchaseMaTypeName" min-width="150" :show-overflow-tooltip="true"/>
+        <el-table-column label="到货时间" align="center" prop="arrivalTime" width="90" :show-overflow-tooltip="true"/>
+        <el-table-column label="采购单号" align="center" prop="code" width="130" :show-overflow-tooltip="true"/>
+        <el-table-column label="采购物资" align="center" prop="purchaseMaTypeName" min-width="140" :show-overflow-tooltip="true"/>
         <el-table-column label="采购数量" align="center" prop="purchaseMaNumber" width="80" :show-overflow-tooltip="true"/>
         <el-table-column label="采购价格(元含税)" align="center" prop="purchaseTaxPrice" width="100" :show-overflow-tooltip="true"/>
         <el-table-column label="采购价格（元不含税）" align="center" prop="purchasePrice" width="100" :show-overflow-tooltip="true"/>
@@ -93,14 +93,32 @@
             </template>
         </el-table-column>
         <el-table-column label="物资厂家" align="center" prop="supplier"  width="120"  :show-overflow-tooltip="true"/>
-        <el-table-column label="操作人" align="center" prop="createBy" width="100" :show-overflow-tooltip="true"/>
+        <el-table-column label="操作人" align="center" prop="createBy" width="90" :show-overflow-tooltip="true"/>
         <el-table-column label="操作时间" align="center" prop="createTime" width="110" :show-overflow-tooltip="true"/>
-        <el-table-column label="状态" align="center" prop="taskStatusName" :show-overflow-tooltip="true" width="80">
-<!--            <template slot-scope="scope">-->
-<!--                <dict-tag :options="dict.type.purchase_task_status" :value="scope.row.taskStatus"/>-->
-<!--            </template>-->
+<!--        <el-table-column label="状态" align="center" prop="taskStatusText" :show-overflow-tooltip="true" width="100">-->
+<!--&lt;!&ndash;            <template slot-scope="scope">&ndash;&gt;-->
+<!--&lt;!&ndash;                <dict-tag :options="dict.type.purchase_task_status" :value="scope.row.taskStatus"/>&ndash;&gt;-->
+<!--&lt;!&ndash;            </template>&ndash;&gt;-->
+<!--        </el-table-column>-->
+        <el-table-column label="状态" align="center" prop="taskStatusText" :show-overflow-tooltip="true" width="160">
+          <template slot-scope="scope">
+        <span v-if="scope.row.taskStatusText == '待验收'">
+            <span v-if="scope.row.signLevel == '2'">
+                待验收（安全/技术科）
+            </span>
+            <span v-else-if="scope.row.signLevel == '3'">
+                待验收（库管班）
+            </span>
+            <span v-else>
+                待验收
+            </span>
+        </span>
+            <span v-else>
+            {{ scope.row.taskStatusText }}
+        </span>
+          </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
+        <el-table-column label="备注" align="center" width="80" prop="remark" :show-overflow-tooltip="true"/>
         <el-table-column label="操作" align="center" min-width="150" fixed="right">
                         <template slot-scope="scope">
                             <el-button
@@ -127,7 +145,7 @@
                             </el-button>
                             <el-button
                                 size="mini"
-                                type="primary" v-if="scope.row.taskStatusName == '未完成' && (signLevelDeptMap[scope.row.signLevel] || []).some(name => deptName.includes(name))"
+                                type="primary" v-if="scope.row.taskStatusText == '待验收' && (signLevelDeptMap[scope.row.signLevel] || []).some(name => deptName.includes(name))"
                                 @click="handleUpdate(scope.row)"
                             >
                                 验收
@@ -224,7 +242,7 @@
                             </tr>
                         </tbody>
                     </table>
-                    
+
                     <div class="fillIn" style="margin-top: 20px;display: flex;justify-content: space-between;" >
                         <div class="item" style="width: 33%;display: flex;align-items: center;">
                             <div style="width: 30%;">供应科：</div>
@@ -265,7 +283,7 @@
             </div>
       </el-dialog>
 
-      
+
     </div>
   </template>
 
@@ -292,7 +310,7 @@
         showSearch: true,
         showHouse: false,
         dateRange:[],
-        taskStatusList:[{id:'0',name:'未完成'},{id:'1',name:'已完成'}],
+        taskStatusList:[{id:'待验收',name:'待验收'},{id:'待绑定',name:'待绑定'},{id:'待入库',name:'待入库'},{id:'入库中',name:'入库中'},{id:'已入库',name:'已入库'}],
         ids:[],
         // 总条数
         total: 0,
@@ -310,6 +328,7 @@
           isFinish:undefined,
           startTime: undefined,
           endTime: undefined,
+          taskStatusText:undefined
         },
         openPrint: false,
         printData: {},
@@ -329,7 +348,7 @@
     created() {
         // 设置默认状态为第一个选项（未完成）
         if (this.taskStatusList.length > 0) {
-            this.queryParams.isFinish = this.taskStatusList[0].id
+            this.queryParams.taskStatusText = this.taskStatusList[0].id
         }
         this.getList()
     },