From d4ba2560771adb34e3ba48bdb5a8aa4163de7841 Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Mon, 2 Feb 2026 10:21:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E7=BA=A7=E5=87=BA=E5=BA=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/approvalProcessDialog.vue      | 76 +++++++++++++------
 src/views/firstOrder/components/inDialog.vue  | 39 +++++-----
 src/views/firstOrder/inbound.vue              | 30 ++++----
 3 files changed, 82 insertions(+), 63 deletions(-)

diff --git a/src/views/firstOrder/components/approvalProcessDialog.vue b/src/views/firstOrder/components/approvalProcessDialog.vue
index 6555a49..d70702c 100644
--- a/src/views/firstOrder/components/approvalProcessDialog.vue
+++ b/src/views/firstOrder/components/approvalProcessDialog.vue
@@ -1,13 +1,21 @@
 <template>
   <div>
-    <el-dialog :close-on-click-modal="false" :title="inDialogTiltle" :visible.sync="inDialogVisible"
-      :append-to-body="true" width="20%" @close="handleCloseDetail">
-      <el-steps class="teps-con" direction="vertical" :active="1">
-        <el-step v-for="(item, index) in processedApproveList" 
+    <el-dialog
+      :close-on-click-modal="false"
+      :title="inDialogTiltle"
+      :visible.sync="inDialogVisible"
+      :append-to-body="true"
+      width="20%"
+      @close="handleCloseDetail"
+    >
+      <el-steps class="teps-con" direction="vertical" :active="-1">
+        <el-step
+          v-for="(item, index) in processedApproveList"
           :key="item.id"
           :title="item.userName"
           :description="`状态:${item.statusText}\n${item.formattedTime}`"
-          ></el-step>
+           :status="item.stepStatus"
+        ></el-step>
       </el-steps>
     </el-dialog>
   </div>
@@ -33,51 +41,70 @@ export default {
   computed: {
     // 处理审批列表数据
     processedApproveList() {
-      return this.approveList.map(item => {
-        // 1. 处理时间格式化
-        let formattedTime = ''
+      return this.approveList.map((item) => {
+        let formattedTime = "";
         if (item.optTime) {
           const date = new Date(item.optTime);
-          const pad = (num) => num.toString().padStart(2, '0');
-          formattedTime = `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`;
+          const pad = (num) => num.toString().padStart(2, "0");
+          formattedTime = `${date.getFullYear()}-${pad(
+            date.getMonth() + 1
+          )}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(
+            date.getMinutes()
+          )}:${pad(date.getSeconds())}`;
         }
-        let statusText = '待审核'
-        if (item.status !== '' && item.status !== undefined) {
+
+        let statusText = "待审核";
+        let stepStatus = "wait"; // 默认状态
+
+        if (item.status !== "" && item.status !== undefined) {
           const statusMap = {
-            0: '审批中',
-            1: '已完成',
-            2: '已驳回',
+            0: "审批中",
+            1: "已完成",
+            2: "已驳回",
           };
-          statusText = statusMap[item.status] || '';
+          statusText = statusMap[item.status] || "未知";
+
+          // 映射到 el-step 的 status
+          if (item.status === '0') {
+            stepStatus = "process";
+          } else if (item.status === '1') {
+            stepStatus = "finish";
+          } else if (item.status === '2') {
+            stepStatus = "error";
+          }
         }
+
         return {
           ...item,
           formattedTime,
           statusText,
+          stepStatus, // 👈 新增字段
         };
       });
     },
     activeStep() {
-      return this.processedApproveList.findIndex((item, index, array) => {
-        return index === array.length - 1 && item.statusText !== '审批中';
-      }) || 0;
-    }
+      return (
+        this.processedApproveList.findIndex((item, index, array) => {
+          return index === array.length - 1 && item.statusText !== "审批中";
+        }) || 0
+      );
+    },
   },
   methods: {
     handleCloseDetail() {
       this.inDialogVisible = false;
       this.$emit("closeDialog");
-    }
+    },
   },
   data() {
     return {
       inDialogVisible: false,
-      inDialogTiltle: "审批流程"
+      inDialogTiltle: "审批流程",
     };
   },
   mounted() {
     this.inDialogVisible = this.showDialog;
-  }
+  },
 };
 </script>
 
@@ -91,14 +118,13 @@ export default {
 .teps-con {
   margin: 0 auto 0;
   :deep(.el-step) {
-    margin-bottom: 10px; 
+    margin-bottom: 10px;
     &:last-child {
       margin-bottom: 0;
     }
   }
 }
 
-
 // :deep(.el-dialog__body) {
 //   height: 300px;
 // }
diff --git a/src/views/firstOrder/components/inDialog.vue b/src/views/firstOrder/components/inDialog.vue
index 8ae2baf..044a2dc 100644
--- a/src/views/firstOrder/components/inDialog.vue
+++ b/src/views/firstOrder/components/inDialog.vue
@@ -488,9 +488,7 @@
             <el-table-column prop="date" label="入库后库存">
               <el-table-column label="数量">
                 <template slot-scope="scope">
-                  {{
-                    scope.row.totalQuantity
-                  }}
+                  {{ scope.row.totalQuantity }}
                 </template>
               </el-table-column>
               <el-table-column prop="unitPrice" label="单价">
@@ -609,9 +607,7 @@ export default {
         status: "", //状态
         quarterName: "",
         purchaseEndInfo: "", //采购单信息
-        userInfoVO: {
-
-        },
+        userInfoVO: {},
         ldOnePutStorageDetailVOList: [], //入库明细
       },
       inTableData: [],
@@ -623,7 +619,7 @@ export default {
     };
   },
   computed: {
-      ...mapGetters(["userInfo"]),
+    ...mapGetters(["userInfo"]),
     inDate() {
       const now = new Date();
       const year = now.getFullYear();
@@ -644,7 +640,7 @@ export default {
     }
     this.getBatchOptions();
     this.getMaterialList();
-     this.sizeForm.userInfoVO = this.userInfo;
+    this.sizeForm.userInfoVO = this.userInfo;
   },
   methods: {
     // 批量 更改明细表数据
@@ -653,7 +649,8 @@ export default {
         this.statisticsList = res.data.result;
         this.statisticsList = this.statisticsList.map((stat) => {
           const detail = this.sizeForm.inTableData.find(
-            (item) => item.materialCode === stat.materialCode && item.type === stat.type
+            (item) =>
+              item.materialCode === stat.materialCode && item.type === stat.type
           );
           return {
             ...stat,
@@ -670,7 +667,8 @@ export default {
         this.statisticsList = res.data.result;
         this.statisticsList = this.statisticsList.map((stat) => {
           const detail = this.sizeForm.singleData.find(
-            (item) => item.materialId === stat.materialId&& item.type === stat.type
+            (item) =>
+              item.materialId === stat.materialId && item.type === stat.type
           );
           return {
             ...stat,
@@ -683,19 +681,19 @@ export default {
     },
     //本次入库数量
     syncInboundQuantity(row) {
-      row.theInboundQuantity = Number(row.theInboundQuantity);
-       if(this.sizeForm.option == 1){
+      // row.theInboundQuantity = Number(row.theInboundQuantity);
+      if (this.sizeForm.option == 1) {
         this.getStatistics();
-      }else{
+      } else {
         this.getStatisticsSingle();
       }
     },
     //单价
     syncUnitPrice(row) {
       row.unitPrice = Number(row.unitPrice);
-       if(this.sizeForm.option == 1){
+      if (this.sizeForm.option == 1) {
         this.getStatistics();
-      }else{
+      } else {
         this.getStatisticsSingle();
       }
     },
@@ -818,7 +816,7 @@ export default {
         this.sizeForm.inTableData = res.data.result;
         this.sizeForm.inTableData.forEach((item) => {
           item.theInboundQuantity = 0;
-          if(item.type == 'YH'){
+          if (item.type == "YH") {
             item.unitPrice = 0;
           }
         });
@@ -980,7 +978,6 @@ export default {
         this.sizeForm.option = "";
       }
       try {
-
         const res = await submitData(this.sizeForm);
         if (res.data.success) {
           this.$message({
@@ -1030,9 +1027,9 @@ export default {
         }
       }
 
-      if(this.sizeForm.option == 1){
+      if (this.sizeForm.option == 1) {
         this.getStatistics();
-      }else{
+      } else {
         this.getStatisticsSingle();
       }
     },
@@ -1059,7 +1056,7 @@ export default {
   padding-right: 10px;
 }
 ::v-deep.el-table th.el-table__cell {
-    background: #F5F7FA;
-    font-weight: 500;
+  background: #f5f7fa;
+  font-weight: 500;
 }
 </style>
diff --git a/src/views/firstOrder/inbound.vue b/src/views/firstOrder/inbound.vue
index f75edd9..feb042b 100644
--- a/src/views/firstOrder/inbound.vue
+++ b/src/views/firstOrder/inbound.vue
@@ -17,7 +17,7 @@
       @on-load="onLoad"
     >
       <template slot-scope="scope" slot="menuLeft">
-        <el-button size="small"  type="primary"  @click="handleDesign()"
+        <el-button size="small" type="primary" @click="handleDesign()"
           >新增入库单
         </el-button>
       </template>
@@ -91,7 +91,7 @@ export default {
   },
   data() {
     return {
-      approveList:[],
+      approveList: [],
       form: { inDate: [], inOperatorName: "", inOperator: "" },
       selectionList: [],
       query: {},
@@ -144,13 +144,13 @@ export default {
                 return "无"; // 空值时显示“无”
               }
               return value; // 有值时显示原内容
-            }
+            },
           },
           {
             label: "入库单号",
             prop: "orderNo",
             width: 160,
-            align: "center"
+            align: "center",
           },
           {
             label: "入库日期",
@@ -160,10 +160,10 @@ export default {
             searchRange: true,
             startPlaceholder: "开始时间",
             endPlaceholder: "结束时间",
-            format: 'yyyy-MM-dd HH:mm:ss',
-            valueFormat: 'yyyy-MM-dd HH:mm:ss',
+            format: "yyyy-MM-dd HH:mm:ss",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
             width: 160,
-            align: "center"
+            align: "center",
             // searchParam: 'startTime',
             // searchEndParam: 'endTime'
           },
@@ -171,8 +171,8 @@ export default {
             label: "入库人",
             prop: "inOperatorName",
             search: true,
-            searchParam: 'inOperator',
-            align: "center"
+            searchParam: "inOperator",
+            align: "center",
           },
           {
             label: "来源",
@@ -184,11 +184,11 @@ export default {
             dicData: [
               {
                 label: "采购申请",
-                value: 'cg',
+                value: "cg",
               },
               {
                 label: "其他来源",
-                value: 'qt',
+                value: "qt",
               },
             ],
           },
@@ -259,8 +259,7 @@ export default {
     async approvalProcessFn(row) {
       this.approvalProcessShow = true;
       const res = await editList(row.id);
-      this.approveList = res.data.result.approveList
-      console.log(this.approveList,'1111122')
+      this.approveList = res.data.result.approveList;
     },
     handleDesign() {
       this.inDialogType = "add";
@@ -283,7 +282,6 @@ export default {
     },
     // 采购单
     purchaseFn(row) {
-      console.log(122)
       this.purchaseOpen = true;
       this.purchaseTitle = row.purchaseEndInfo + "采购单详情";
       this.id = row.id;
@@ -370,6 +368,4 @@ export default {
 };
 </script>
 
-<style>
-
-</style>
+<style></style>