From 357f0350c6e745dc1df685110c6fd6253121563a Mon Sep 17 00:00:00 2001
From: 15856 <15856818120@163.com>
Date: Wed, 19 Jun 2024 09:52:03 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=86=85=E9=83=A8=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E4=BB=A5=E5=90=8E=E7=9F=AD=E4=BF=A1=E9=80=9A=E7=9F=A5=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BA=BA=E5=91=98=E8=BF=9B=E8=A1=8C=E5=87=BA=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/sgzb/app/mapper/TmTaskMapper.java   | 10 ++----
 .../app/service/impl/TmTaskServiceImpl.java   | 32 +++++++++++++++++++
 .../resources/mapper/app/TmTaskMapper.xml     | 16 ++++++++++
 3 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
index 7d2cfedf..a1e663fa 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
@@ -1,20 +1,12 @@
 package com.bonus.sgzb.app.mapper;
 
 import com.bonus.sgzb.app.domain.*;
-import com.bonus.sgzb.base.domain.MaintenanceGang;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
 
-/**
-* Description:
-* @Author 阮世耀
-* @Create 2023/12/13 15:14
-* @Version 1.0
-*/
-
 @Mapper
 public interface TmTaskMapper {
 
@@ -151,4 +143,6 @@ public interface TmTaskMapper {
 
 
     List<LeaseApplyDetails> getleaseDetailsStatus(TmTask task);
+
+    List<TmTask> getUserByParenntId(TmTask tmTask);
 }
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
index 8385f738..62e1f355 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
@@ -17,6 +17,7 @@ import com.bonus.sgzb.common.core.utils.DateUtils;
 import com.bonus.sgzb.common.core.utils.StringUtils;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.common.security.utils.SecurityUtils;
+import com.bonus.sgzb.system.api.RemoteUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -68,6 +69,9 @@ public class TmTaskServiceImpl implements TmTaskService {
     @Resource
     private BmFlowRecordService bmFlowRecordService;
 
+    @Resource
+    private RemoteUserService remoteUserService;
+
     private final static String STRING_ADMIN = "admin";
     private final static String STRING_SGB = "sgb";
     private final static String STRING_AJB = "sgb";
@@ -135,6 +139,12 @@ public class TmTaskServiceImpl implements TmTaskService {
                         }
                     }
                 }
+                //短信通知人员进行出库
+                for (LeaseApplyDetails details:leaseApplyDetails) {
+                    //内部审核以后通知机具管理人进行出库
+                    smsNotification(details,record.getCode());
+                }
+
             } else if (record.getTaskStatus() == 32 && companyId != null) {
                 // 再审核领料任务信息表
                 List<LeaseApplyInfo> leaseApplyInfoList = record.getLeaseApplyInfoList();
@@ -212,6 +222,28 @@ public class TmTaskServiceImpl implements TmTaskService {
 
     }
 
+    private void smsNotification(LeaseApplyDetails details,String code) {
+        TmTask tmTask = new TmTask();
+        tmTask.setId(details.getParenntId().toString());
+        //获取机具所属人员
+        List<TmTask> leaseDetailByParent = tmTaskMapper.getUserByParenntId(tmTask);
+        for (TmTask tmTaskNew: leaseDetailByParent) {
+            //对手机号进行处理，因为存在一种类型的机具归属多个人的情况
+            log.info("短信通知人为：{}",tmTaskNew.getUserName());
+            if (tmTaskNew.getPhoneNumber()!=null){
+                String[] phoneNumberList = tmTaskNew.getPhoneNumber().split(",");
+                String message ="尊敬的用户，宁夏智慧仓储管理系统提醒您：您有一个领料单号为:"+code+"的领料申请待处理，请及时查看";
+                for (int i = 0; i < phoneNumberList.length; i++) {
+                    try {
+                        remoteUserService.send(phoneNumberList[i], message);
+                    }catch (Exception e){
+                        log.info("手机号为：{}发送短信失败",phoneNumberList[i]);
+                    }
+                }
+            }
+        }
+    }
+
     @Override
     public int updateLeaseTaskAuditInfoCq(TmTask record) {
         int result = 0;
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
index 89a4678b..b55ee650 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
@@ -1249,4 +1249,20 @@
     WHERE
       lai.id = #{id}
   </select>
+  <select id="getUserByParenntId" resultType="com.bonus.sgzb.app.domain.TmTask">
+    SELECT
+    lad.id as id,
+    lad.parennt_id as parentId,
+    GROUP_CONCAT(su.user_name) as userName,
+    GROUP_CONCAT(su.phonenumber) as phoneNumber,
+    lad.status as status,
+    lad.type_id as typeId
+    FROM
+    lease_apply_details lad
+    LEFT JOIN ma_type_keeper mtk on lad.type_id = mtk.type_id
+    LEFT JOIN sys_user su on mtk.user_id = su.user_id
+    WHERE
+    lad.parennt_id = #{id}
+    GROUP BY lad.type_id
+  </select>
 </mapper>

From 0616cc2bf05c4efa8c2b0b071c58a3144ec7022f Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Wed, 19 Jun 2024 10:12:35 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=8A=A8=E6=80=81=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E8=B7=B3=E8=BD=AC=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/utils/globalUrl.js  |  9 ++++++++-
 sgzb-ui/src/views/dashboard.vue | 15 +++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/sgzb-ui/src/utils/globalUrl.js b/sgzb-ui/src/utils/globalUrl.js
index 114be562..f0887eff 100644
--- a/sgzb-ui/src/utils/globalUrl.js
+++ b/sgzb-ui/src/utils/globalUrl.js
@@ -4,7 +4,14 @@
 // const qrUrl = 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='; //宁夏
 // const qrUrl = 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode='; //南网
 
-const qrUrl = process.env.NODE_ENV === 'production' ? 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode=' : 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='
+// const qrUrl = process.env.NODE_ENV === 'production' ? 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode=' : 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='
+let qrUrl = ''
+const origin = window.location.origin
+if (origin == 'http://112.29.103.165:21624') {
+  qrUrl = 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='
+} else {
+  qrUrl = 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='
+}
 
 export default {
   qrUrl,
diff --git a/sgzb-ui/src/views/dashboard.vue b/sgzb-ui/src/views/dashboard.vue
index 478d9106..f60c4a30 100644
--- a/sgzb-ui/src/views/dashboard.vue
+++ b/sgzb-ui/src/views/dashboard.vue
@@ -12,28 +12,23 @@
             }
         },
         created() {
-            if (process.env.NODE_ENV === 'production') {
-                this.jumpUrl = 'http://112.29.103.165:21624/'
+            const origin = window.location.origin
+            if (origin == 'http://112.29.103.165:21624') {
+                this.jumpUrl = origin
             } else {
-                this.jumpUrl = 'http://192.168.0.14:21624/'
+                this.jumpUrl = 'http://192.168.0.14:21624'
             }
             this.openNewWindow()
             this.$tab.closePage().then(() => {})
         },
         methods: {
             openNewWindow() {
-                // window.open(
-                //     'http://192.168.0.14:21624/index01.html?token=' +
-                //         localStorage.getItem('token'),
-                //     '_blank',
-                // )
                 window.open(
-                    `${this.jumpUrl}index01.html?token=${localStorage.getItem(
+                    `${this.jumpUrl}/index01.html?token=${localStorage.getItem(
                         'token',
                     )}`,
                     '_blank',
                 )
-                // window.open('http://112.29.103.165:21624/index01.html?token='+localStorage.getItem('token'), '_blank'); // 产线
             },
         },
     }

From 5c3c788d71945ffdaa8cb67bc0d87112733c19cc Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Wed, 19 Jun 2024 10:34:22 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=80=81=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=8F=92=E6=A7=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue
index fa1e76da..626921d6 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue
@@ -98,7 +98,7 @@
     <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" width="100" type="index">
-        <template scope="scope">
+        <template slot-scope="scope">
         <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
         </template>
       </el-table-column>

From 8ef3af8059d507813075483ec0c3784353ec60b3 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Wed, 19 Jun 2024 11:17:48 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BA=8F=E5=8F=B7?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/claimAndRefund/receive/receiveManageAdd.vue  |  6 +++---
 .../src/views/claimAndRefund/receive/receiveOut.vue    |  5 +++--
 .../views/claimAndRefund/receiveByCq/receiveApply.vue  |  5 +++--
 .../views/claimAndRefund/receiveByCq/receiveManage.vue |  5 +++--
 .../views/claimAndRefund/return/returnApplyByCq.vue    |  5 +++--
 .../src/views/claimAndRefund/return/returnFinshed.vue  |  5 +++--
 .../src/views/claimAndRefund/return/returnInDetail.vue | 10 ++++++----
 .../claimAndRefund/returnAbnormal/returnAbnormal.vue   |  5 +++--
 .../views/claimAndRefund/secondStore/secondStore.vue   |  5 +++--
 .../views/claimAndreturn/picking/outbound/index.vue    |  5 +++--
 .../return/receive/component/handlePage.vue            | 10 ++++++----
 .../src/views/cost/csotSettlement/costApplyList.vue    |  5 +++--
 sgzb-ui/src/views/cost/csotSettlement/costList.vue     |  5 +++--
 sgzb-ui/src/views/monitor/online/index.vue             |  5 +++--
 sgzb-ui/src/views/repairTest/brokenExamine/index.vue   |  5 +++--
 sgzb-ui/src/views/store/label/labelType.vue            |  5 +++--
 .../newBuy/newDevices/newDevicesServiceCenterList.vue  |  5 +++--
 .../store/newBuy/newDevices/newDevicesWarehousing.vue  |  5 +++--
 .../views/store/newBuy/newTools/newToolsArrival.vue    |  5 +++--
 .../src/views/store/newBuy/newTools/newToolsCode.vue   |  5 +++--
 .../src/views/store/newBuy/newTools/newToolsList.vue   |  5 +++--
 .../store/newBuy/newTools/newToolsWarehousing.vue      | 10 ++++++----
 sgzb-ui/src/views/store/newBuy/plan.vue                |  5 +++--
 sgzb-ui/src/views/store/newBuy/planSecond.vue          | 10 ++++++----
 sgzb-ui/src/views/store/poleConfig/poleConfig.vue      |  5 +++--
 sgzb-ui/src/views/store/tools/safeTools.vue            |  5 +++--
 .../views/store/warehousing/accessoryWarehousing.vue   |  5 +++--
 .../src/views/store/warehousing/devicesWarehousing.vue |  5 +++--
 .../src/views/store/warehousing/repairWarehousing.vue  |  5 +++--
 .../newPurchase/serviceCenter/index.vue                |  5 +++--
 .../warehouseManage/warehousing/newParts/index.vue     |  5 +++--
 .../warehouseManage/warehousing/newTools/index.vue     |  5 +++--
 .../views/warehouseManage/warehousing/repair/index.vue |  5 +++--
 .../views/warehouseManage/warehousing/return/index.vue |  5 +++--
 34 files changed, 114 insertions(+), 77 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue
index 626921d6..caadb2c4 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue
@@ -97,10 +97,10 @@
 
     <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" width="100" type="index">
-        <template slot-scope="scope">
+      <el-table-column label="序号" align="center" width="100" type="index" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)">
+        <!-- <template slot-scope="scope">
         <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
-        </template>
+        </template> -->
       </el-table-column>
       <el-table-column label="类型名称" prop="roleName" :show-overflow-tooltip="true"   />
       <el-table-column label="规格型号" prop="roleKey" :show-overflow-tooltip="true" />
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
index a73416a4..d3341b7f 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
@@ -386,12 +386,13 @@
                     align="center"
                     width="80"
                     type="index"
+                    :index="indexContinuation(outQuery.pageNum, outQuery.pageSize)"
                 >
-                    <template slot-scope="scope">
+                    <!-- <template slot-scope="scope">
                         <span>{{
                             (outQuery.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
-                    </template>
+                    </template> -->
                 </el-table-column>
                 <el-table-column
                     label="类型名称"
diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
index 19fdad02..153f690c 100644
--- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
@@ -131,12 +131,13 @@
                 align="center"
                 width="80"
                 type="index"
+                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             >
-                <template slot-scope="scope">
+                <!-- <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column
                 label="领料单号"
diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
index 5fa7b95c..95e1d34a 100644
--- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
@@ -126,12 +126,13 @@
                 align="center"
                 width="80"
                 type="index"
+                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             >
-                <template slot-scope="scope">
+                <!-- <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column
                 label="领料单号"
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue
index b3d85ffc..52aaa31f 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue
@@ -163,12 +163,13 @@
                 align="center"
                 width="80"
                 type="index"
+                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             >
-                <template slot-scope="scope">
+                <!-- <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column
                 label="退料单号"
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue b/sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue
index 0d8e3826..fa76f4eb 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue
@@ -128,12 +128,13 @@
                 align="center"
                 width="80"
                 type="index"
+                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             >
-                <template slot-scope="scope">
+                <!-- <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column
                 label="退料单号"
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
index 78d6315e..78b7fbaa 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
@@ -87,12 +87,13 @@
                 align="center"
                 width="80"
                 type="index"
+                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             >
-                <template slot-scope="scope">
+                <!-- <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column
                 label="类型名称"
@@ -316,12 +317,13 @@
                     align="center"
                     width="80"
                     type="index"
+                    :index="indexContinuation(codeQuery.pageNum, codeQuery.pageSize)"
                 >
-                    <template slot-scope="scope">
+                    <!-- <template slot-scope="scope">
                         <span>{{
                             (codeQuery.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
-                    </template>
+                    </template> -->
                 </el-table-column>
                 <el-table-column
                     label="设备类型"
diff --git a/sgzb-ui/src/views/claimAndRefund/returnAbnormal/returnAbnormal.vue b/sgzb-ui/src/views/claimAndRefund/returnAbnormal/returnAbnormal.vue
index d78cdd9d..e38eff78 100644
--- a/sgzb-ui/src/views/claimAndRefund/returnAbnormal/returnAbnormal.vue
+++ b/sgzb-ui/src/views/claimAndRefund/returnAbnormal/returnAbnormal.vue
@@ -125,12 +125,13 @@
                 align="center"
                 width="80"
                 type="index"
+                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             >
-                <template slot-scope="scope">
+                <!-- <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column
                 label="退料单号"
diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
index 48637ac7..166cc899 100644
--- a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
+++ b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
@@ -450,12 +450,13 @@
                     align="center"
                     width="80"
                     type="index"
+                    :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)"
                 >
-                    <template slot-scope="scope">
+                    <!-- <template slot-scope="scope">
                         <span>{{
                             (dialogQuery.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
-                    </template>
+                    </template> -->
                 </el-table-column>
                 <el-table-column
                     label="类型名称"
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
index f0706a93..5991742e 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
@@ -396,12 +396,13 @@
                     align="center"
                     width="80"
                     type="index"
+                    :index="indexContinuation(outQuery.pageNum, outQuery.pageSize)"
                 >
-                    <template slot-scope="scope">
+                    <!-- <template slot-scope="scope">
                         <span>{{
                             (outQuery.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
-                    </template>
+                    </template> -->
                 </el-table-column>
                 <el-table-column
                     label="类型名称"
diff --git a/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue b/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue
index 263c4323..8f11797f 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue
@@ -88,12 +88,13 @@
                 align="center"
                 width="80"
                 type="index"
+                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             >
-                <template slot-scope="scope">
+                <!-- <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column
                 label="类型名称"
@@ -317,12 +318,13 @@
                     align="center"
                     width="80"
                     type="index"
+                    :index="indexContinuation(codeQuery.pageNum, codeQuery.pageSize)"
                 >
-                    <template slot-scope="scope">
+                    <!-- <template slot-scope="scope">
                         <span>{{
                             (codeQuery.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
-                    </template>
+                    </template> -->
                 </el-table-column>
                 <el-table-column
                     label="设备类型"
diff --git a/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue b/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
index 64920045..99c10077 100644
--- a/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
+++ b/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
@@ -88,12 +88,13 @@
                 align="center"
                 width="80"
                 type="index"
+                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             >
-                <template slot-scope="scope">
+                <!-- <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column
                 label="协议编号"
diff --git a/sgzb-ui/src/views/cost/csotSettlement/costList.vue b/sgzb-ui/src/views/cost/csotSettlement/costList.vue
index fa731d5e..c6664e62 100644
--- a/sgzb-ui/src/views/cost/csotSettlement/costList.vue
+++ b/sgzb-ui/src/views/cost/csotSettlement/costList.vue
@@ -87,12 +87,13 @@
                 align="center"
                 width="80"
                 type="index"
+                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             >
-                <template slot-scope="scope">
+                <!-- <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column
                 label="结算单编号"
diff --git a/sgzb-ui/src/views/monitor/online/index.vue b/sgzb-ui/src/views/monitor/online/index.vue
index 8372fe19..f2a78176 100644
--- a/sgzb-ui/src/views/monitor/online/index.vue
+++ b/sgzb-ui/src/views/monitor/online/index.vue
@@ -49,10 +49,11 @@
                 align="center"
                 width="80"
                 type="index"
+                :index="indexContinuation(pageNum, pageSize)"
             >
-                <template slot-scope="scope">
+                <!-- <template slot-scope="scope">
                     <span>{{ (pageNum - 1) * 10 + scope.$index + 1 }}</span>
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column
                 label="会话编号"
diff --git a/sgzb-ui/src/views/repairTest/brokenExamine/index.vue b/sgzb-ui/src/views/repairTest/brokenExamine/index.vue
index 283107c8..8b2247da 100644
--- a/sgzb-ui/src/views/repairTest/brokenExamine/index.vue
+++ b/sgzb-ui/src/views/repairTest/brokenExamine/index.vue
@@ -171,12 +171,13 @@
                 align="center"
                 width="80"
                 type="index"
+                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             >
-                <template slot-scope="scope">
+                <!-- <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column
                 label="报废审核单号"
diff --git a/sgzb-ui/src/views/store/label/labelType.vue b/sgzb-ui/src/views/store/label/labelType.vue
index 7ab8c615..deb38f95 100644
--- a/sgzb-ui/src/views/store/label/labelType.vue
+++ b/sgzb-ui/src/views/store/label/labelType.vue
@@ -105,12 +105,13 @@
                 align="center"
                 width="80"
                 type="index"
+                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             >
-                <template slot-scope="scope">
+                <!-- <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column
                 label="标签种类名称"
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue
index 676dfa99..5728538d 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue
@@ -282,12 +282,13 @@
                     align="center"
                     width="80"
                     type="index"
+                    :index="indexContinuation(query.pageNum, query.pageSize)"
                 >
-                    <template slot-scope="scope">
+                    <!-- <template slot-scope="scope">
                         <span>{{
                             (query.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
-                    </template>
+                    </template> -->
                 </el-table-column>
                 <el-table-column
                     label="机具类型"
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
index dfb4be85..49be0d1f 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
@@ -309,12 +309,13 @@
                     align="center"
                     width="80"
                     type="index"
+                    :index="indexContinuation(query.pageNum, query.pageSize)"
                 >
-                    <template slot-scope="scope">
+                    <!-- <template slot-scope="scope">
                         <span>{{
                             (query.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
-                    </template>
+                    </template> -->
                 </el-table-column>
                 <el-table-column
                     label="机具类型"
diff --git a/sgzb-ui/src/views/store/newBuy/newTools/newToolsArrival.vue b/sgzb-ui/src/views/store/newBuy/newTools/newToolsArrival.vue
index 910c4d34..3925515c 100644
--- a/sgzb-ui/src/views/store/newBuy/newTools/newToolsArrival.vue
+++ b/sgzb-ui/src/views/store/newBuy/newTools/newToolsArrival.vue
@@ -176,12 +176,13 @@
                 align="center"
                 width="80"
                 type="index"
+                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             >
-                <template slot-scope="scope">
+                <!-- <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column
                 label="工器具类型名称"
diff --git a/sgzb-ui/src/views/store/newBuy/newTools/newToolsCode.vue b/sgzb-ui/src/views/store/newBuy/newTools/newToolsCode.vue
index 0a3970b0..26577336 100644
--- a/sgzb-ui/src/views/store/newBuy/newTools/newToolsCode.vue
+++ b/sgzb-ui/src/views/store/newBuy/newTools/newToolsCode.vue
@@ -108,12 +108,13 @@
                 align="center"
                 width="80"
                 type="index"
+                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             >
-                <template slot-scope="scope">
+                <!-- <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column
                 label="工器具名称"
diff --git a/sgzb-ui/src/views/store/newBuy/newTools/newToolsList.vue b/sgzb-ui/src/views/store/newBuy/newTools/newToolsList.vue
index f4daf407..29d9c039 100644
--- a/sgzb-ui/src/views/store/newBuy/newTools/newToolsList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newTools/newToolsList.vue
@@ -119,12 +119,13 @@
                 align="center"
                 width="80"
                 type="index"
+                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             >
-                <template slot-scope="scope">
+                <!-- <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column
                 label="采购单号"
diff --git a/sgzb-ui/src/views/store/newBuy/newTools/newToolsWarehousing.vue b/sgzb-ui/src/views/store/newBuy/newTools/newToolsWarehousing.vue
index a9e3214a..38096b28 100644
--- a/sgzb-ui/src/views/store/newBuy/newTools/newToolsWarehousing.vue
+++ b/sgzb-ui/src/views/store/newBuy/newTools/newToolsWarehousing.vue
@@ -75,12 +75,13 @@
                 align="center"
                 width="80"
                 type="index"
+                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             >
-                <template slot-scope="scope">
+                <!-- <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column label="采购单号" align="center" prop="dictId" />
             <el-table-column
@@ -265,12 +266,13 @@
                     align="center"
                     width="80"
                     type="index"
+                    :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
                 >
-                    <template slot-scope="scope">
+                    <!-- <template slot-scope="scope">
                         <span>{{
                             (queryParams.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
-                    </template>
+                    </template> -->
                 </el-table-column>
                 <el-table-column
                     label="工器具类型"
diff --git a/sgzb-ui/src/views/store/newBuy/plan.vue b/sgzb-ui/src/views/store/newBuy/plan.vue
index 56b93207..a24d6b67 100644
--- a/sgzb-ui/src/views/store/newBuy/plan.vue
+++ b/sgzb-ui/src/views/store/newBuy/plan.vue
@@ -71,12 +71,13 @@
                 align="center"
                 width="80"
                 type="index"
+                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             >
-                <template slot-scope="scope">
+                <!-- <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column
                 label="基层单位"
diff --git a/sgzb-ui/src/views/store/newBuy/planSecond.vue b/sgzb-ui/src/views/store/newBuy/planSecond.vue
index 5b550c63..d9371d20 100644
--- a/sgzb-ui/src/views/store/newBuy/planSecond.vue
+++ b/sgzb-ui/src/views/store/newBuy/planSecond.vue
@@ -73,12 +73,13 @@
                 align="center"
                 width="80"
                 type="index"
+                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             >
-                <template slot-scope="scope">
+                <!-- <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column
                 label="物资名称"
@@ -272,12 +273,13 @@
                     align="center"
                     width="80"
                     type="index"
+                    :index="indexContinuation(dialogParams.pageNum, dialogParams.pageSize)"
                 >
-                    <template slot-scope="scope">
+                    <!-- <template slot-scope="scope">
                         <span>{{
                             (dialogParams.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
-                    </template>
+                    </template> -->
                 </el-table-column>
                 <el-table-column
                     label="物资名称"
diff --git a/sgzb-ui/src/views/store/poleConfig/poleConfig.vue b/sgzb-ui/src/views/store/poleConfig/poleConfig.vue
index 28beafa7..cba38b2d 100644
--- a/sgzb-ui/src/views/store/poleConfig/poleConfig.vue
+++ b/sgzb-ui/src/views/store/poleConfig/poleConfig.vue
@@ -62,12 +62,13 @@
                 align="center"
                 width="80"
                 type="index"
+                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             >
-                <template slot-scope="scope">
+                <!-- <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column
                 prop="typeName"
diff --git a/sgzb-ui/src/views/store/tools/safeTools.vue b/sgzb-ui/src/views/store/tools/safeTools.vue
index 63a21ece..70695780 100644
--- a/sgzb-ui/src/views/store/tools/safeTools.vue
+++ b/sgzb-ui/src/views/store/tools/safeTools.vue
@@ -106,12 +106,13 @@
                 align="center"
                 width="80"
                 type="index"
+                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             >
-                <template slot-scope="scope">
+                <!-- <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column
                 label="工器具类型"
diff --git a/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue b/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
index 96603e92..b7fa8eaa 100644
--- a/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
+++ b/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
@@ -374,12 +374,13 @@
                     align="center"
                     width="80"
                     type="index"
+                    :index="indexContinuation(query.pageNum, query.pageSize)"
                 >
-                    <template slot-scope="scope">
+                    <!-- <template slot-scope="scope">
                         <span>{{
                             (query.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
-                    </template>
+                    </template> -->
                 </el-table-column>
                 <el-table-column
                     label="配件类型"
diff --git a/sgzb-ui/src/views/store/warehousing/devicesWarehousing.vue b/sgzb-ui/src/views/store/warehousing/devicesWarehousing.vue
index 6a5017f8..cbc86a12 100644
--- a/sgzb-ui/src/views/store/warehousing/devicesWarehousing.vue
+++ b/sgzb-ui/src/views/store/warehousing/devicesWarehousing.vue
@@ -336,12 +336,13 @@
                     align="center"
                     width="80"
                     type="index"
+                    :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
                 >
-                    <template slot-scope="scope">
+                    <!-- <template slot-scope="scope">
                         <span>{{
                             (queryParams.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
-                    </template>
+                    </template> -->
                 </el-table-column>
                 <el-table-column
                     label="设备类型"
diff --git a/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue b/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
index 2f66b3c5..413e9a20 100644
--- a/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
+++ b/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
@@ -343,12 +343,13 @@
                     align="center"
                     width="80"
                     type="index"
+                    :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
                 >
-                    <template slot-scope="scope">
+                    <!-- <template slot-scope="scope">
                         <span>{{
                             (queryParams.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
-                    </template>
+                    </template> -->
                 </el-table-column>
                 <el-table-column
                     label="设备类型"
diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue
index f07687dc..31ec87a7 100644
--- a/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue
@@ -286,12 +286,13 @@
                     align="center"
                     width="80"
                     type="index"
+                    :index="indexContinuation(query.pageNum, query.pageSize)"
                 >
-                    <template slot-scope="scope">
+                    <!-- <template slot-scope="scope">
                         <span>{{
                             (query.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
-                    </template>
+                    </template> -->
                 </el-table-column>
                 <el-table-column
                     label="机具类型"
diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue
index 1913526a..c1e51094 100644
--- a/sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue
@@ -379,12 +379,13 @@
                     align="center"
                     width="80"
                     type="index"
+                    :index="indexContinuation(query.pageNum, query.pageSize)"
                 >
-                    <template slot-scope="scope">
+                    <!-- <template slot-scope="scope">
                         <span>{{
                             (query.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
-                    </template>
+                    </template> -->
                 </el-table-column>
                 <el-table-column
                     label="配件类型"
diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
index 51f12083..2e93d7d8 100644
--- a/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
@@ -312,12 +312,13 @@
                     align="center"
                     width="80"
                     type="index"
+                    :index="indexContinuation(query.pageNum, query.pageSize)"
                 >
-                    <template slot-scope="scope">
+                    <!-- <template slot-scope="scope">
                         <span>{{
                             (query.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
-                    </template>
+                    </template> -->
                 </el-table-column>
                 <el-table-column
                     label="机具类型"
diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue
index c54d7dea..48f6cd72 100644
--- a/sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue
@@ -346,12 +346,13 @@
                     align="center"
                     width="80"
                     type="index"
+                    :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
                 >
-                    <template slot-scope="scope">
+                    <!-- <template slot-scope="scope">
                         <span>{{
                             (queryParams.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
-                    </template>
+                    </template> -->
                 </el-table-column>
                 <el-table-column
                     label="设备类型"
diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/return/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/return/index.vue
index 459474f2..bfabdeba 100644
--- a/sgzb-ui/src/views/warehouseManage/warehousing/return/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/warehousing/return/index.vue
@@ -338,12 +338,13 @@
                     align="center"
                     width="80"
                     type="index"
+                    :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
                 >
-                    <template slot-scope="scope">
+                    <!-- <template slot-scope="scope">
                         <span>{{
                             (queryParams.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
-                    </template>
+                    </template> -->
                 </el-table-column>
                 <el-table-column
                     label="设备类型"

From eab8f94c0ef6eb5842528d3ce5ec21eb14501c7b Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 19 Jun 2024 11:20:54 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=B0=E8=B4=AD?=
 =?UTF-8?q?=E9=85=8D=E4=BB=B6=E9=A1=B5=E9=9D=A2=E5=9B=9E=E6=98=BE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partsAcceptance/component/addParts.vue    |  43 ++++----
 .../partsAcceptance/component/home.vue        |  14 ++-
 .../newPurchase/partsAcceptance/index.vue     | 102 ++++++++++++------
 3 files changed, 103 insertions(+), 56 deletions(-)

diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/addParts.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/addParts.vue
index 2d296a4f..af13397d 100644
--- a/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/addParts.vue
+++ b/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/addParts.vue
@@ -7,6 +7,7 @@
             size="small"
             :inline="true"
             label-width="80px"
+            :disabled="isView || isAccept"
         >
             <el-form-item label="采购日期" prop="purchaseTime">
                 <el-date-picker
@@ -14,7 +15,6 @@
                     style="width: 240px"
                     value-format="yyyy-MM-dd"
                     type="date"
-                    :disabled="isDisabled"
                     placeholder="请选择采购日期"
                 ></el-date-picker>
             </el-form-item>
@@ -24,7 +24,6 @@
                     style="width: 240px"
                     value-format="yyyy-MM-dd"
                     type="date"
-                    :disabled="isDisabled"
                     :picker-options="pickerOptions"
                     placeholder="请选择到货日期"
                 ></el-date-picker>
@@ -35,7 +34,6 @@
                     filterable
                     placeholder="请选择采购员"
                     style="width: 240px"
-                    :disabled="isDisabled"
                 >
                     <el-option label="请选择" :value="0"></el-option>
                     <el-option
@@ -51,7 +49,6 @@
                     v-model="maForm.remark"
                     placeholder="请输入备注"
                     clearable
-                    :disabled="isDisabled"
                     type="textarea"
                     maxlength="150"
                     rows="1"
@@ -67,6 +64,7 @@
             :inline="true"
             v-show="showSearch"
             label-width="80px"
+            :disabled="isView || isAccept"
         >
             <el-form-item label="配件类型" prop="equipmentId">
                 <treeselect
@@ -76,7 +74,7 @@
                     :disable-branch-nodes="true"
                     placeholder="请选择机具类型"
                     @select="select"
-                    :disabled="isDisabled"
+                    :disabled="isView || isAccept"
                     style="width: 240px"
                 />
             </el-form-item>
@@ -86,7 +84,6 @@
                     placeholder="配件厂家"
                     clearable
                     filterable
-                    :disabled="isDisabled"
                     style="width: 240px"
                     @change="changeSupplier"
                 >
@@ -117,7 +114,7 @@
                     plain
                     icon="el-icon-plus"
                     size="mini"
-                    v-if="!isDisabled"
+                    v-if="isAdd || isEdit"
                     @click="handleSave"
                     >保存</el-button
                 >
@@ -128,7 +125,7 @@
                     plain
                     icon="el-icon-plus"
                     size="mini"
-                    v-if="isCheck"
+                    v-if="isAccept"
                     :disabled="multiple"
                     @click="handleListCheck"
                     v-hasPermi="['newPurchase:parts:notice:accept:batch']"
@@ -195,7 +192,7 @@
                     <el-input-number
                         v-model="scope.row.purchasePrice"
                         controls-position="right"
-                        :disabled="isCheck || isView"
+                        :disabled="isView || isAccept"
                         style="width: 100%"
                         :min="0"
                     ></el-input-number>
@@ -207,7 +204,7 @@
                     <el-input-number
                         v-model="scope.row.purchaseNum"
                         controls-position="right"
-                        :disabled="isCheck || isView"
+                        :disabled="isView || isAccept"
                         style="width: 100%"
                         :min="1"
                     ></el-input-number>
@@ -227,7 +224,7 @@
                         placeholder="厂家"
                         clearable
                         style="width: 180px"
-                        :disabled="isCheck || isView"
+                        :disabled="isView || isAccept"
                     >
                         <el-option
                             v-for="item in supplierList"
@@ -247,14 +244,14 @@
                 label="操作"
                 align="center"
                 class-name="small-padding fixed-width"
-                v-if="!isView"
+                v-if="!isView || isAccept"
             >
                 <template slot-scope="scope" v-if="scope.row.roleId !== 1">
                     <el-button
                         size="mini"
                         type="text"
                         icon="el-icon-edit"
-                        v-if="isCheck && scope.row.status == 0"
+                        v-if="isAccept && scope.row.status == 0"
                         @click="handleCheck(scope.row)"
                         v-hasPermi="['newPurchase:parts:notice:accept']"
                         >验收</el-button
@@ -263,7 +260,7 @@
                         size="mini"
                         type="text"
                         icon="el-icon-delete"
-                        v-if="!isCheck && scope.row.status == 0"
+                        v-if="isEdit && scope.row.status == 0"
                         @click="handleDelete(scope.row)"
                         >删除</el-button
                     >
@@ -271,7 +268,7 @@
                         size="mini"
                         type="text"
                         icon="el-icon-delete"
-                        v-if="isShow"
+                        v-if="isAdd"
                         @click="handleDelete(scope.row)"
                         >删除</el-button
                     >
@@ -414,13 +411,13 @@ export default {
                 return false
             },
         },
-        isCheck: {
+        isAdd: {
             type: Boolean,
             default: () => {
                 return false
             },
         },
-        isDisabled: {
+        isAccept: {
             type: Boolean,
             default: () => {
                 return false
@@ -428,6 +425,7 @@ export default {
         },
         partsTaskId: {
             type: [String, Number],
+            default: () => null,
         },
     },
     data() {
@@ -587,15 +585,20 @@ export default {
         // }
 
         this.taskId = this.partsTaskId
+
+        // 如果传入了 taskId 则需要查询详情
+        if (this.partsTaskId) {
+            this.getTaskInfo()
+        }
     },
     mounted() {
         this.getUserList()
         this.supplierInfoList()
         this.getAccessoryTree()
 
-        if (this.isView) {
-            this.getTaskInfo()
-        }
+        // if (this.isView) {
+        //     this.getTaskInfo()
+        // }
     },
     methods: {
         /** 查询用户列表--采购员 */
diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue
index 5410f9e8..9edecaff 100644
--- a/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue
+++ b/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue
@@ -534,7 +534,9 @@ export default {
             //     path: '/store/newBuy/newAccessoryAccept',
             //     query,
             // })
-            this.$emit('editParts', row.taskId)
+            // this.$emit('editParts', row.taskId)
+
+            this.$emit('handleParts', 2, row.taskId)
         },
         /** 查看按钮操作 */
         handleView(row) {
@@ -544,7 +546,8 @@ export default {
             //     query,
             // })
 
-            this.$emit('queryParts', row.taskId)
+            // this.$emit('queryParts', row.taskId)
+            this.$emit('handleParts', 3, row.taskId)
         },
         /** 验收按钮操作 */
         handleCheck(row) {
@@ -553,7 +556,8 @@ export default {
             //     path: '/store/newBuy/newAccessoryAccept',
             //     query,
             // })
-            this.$emit('acceptParts', row.taskId)
+            // this.$emit('acceptParts', row.taskId)
+            this.$emit('handleParts', 4, row.taskId)
         },
         /** 提交按钮 */
         submitForm: function () {
@@ -600,7 +604,9 @@ export default {
             //     path: '/store/newBuy/newAccessoryAccept',
             //     query,
             // })
-            this.$emit('addParts')
+            // this.$emit('addParts')
+
+            this.$emit('handleParts', 1)
         },
         /** 删除按钮操作 */
         handleDelete(row) {
diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/index.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/index.vue
index b3a6db78..33928bae 100644
--- a/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/index.vue
@@ -11,13 +11,10 @@
             :partsTaskId="partsTaskId"
             :isView="isView"
             :isEdit="isEdit"
-            :isCheck="isCheck"
-            :isDisabled="isDisabled"
-            @addParts="addParts"
-            @queryParts="queryParts"
-            @editParts="editParts"
-            @acceptParts="acceptParts"
+            :isAdd="isAdd"
+            :isAccept="isAccept"
             @partsSaveSuccess="partsSaveSuccess"
+            @handleParts="handleParts"
         />
     </div>
 </template>
@@ -39,40 +36,81 @@ export default {
             partsTaskId: '',
             isView: false,
             isEdit: false,
-            isCheck: false,
-            isDisabled: false,
+            isAdd: false,
+            isAccept: false,
+            // isCheck: false,
+            // isDisabled: false,
         }
     },
     methods: {
         /* 新增配件 */
-        addParts() {
-            this.pageContent = '新增配件'
-            this.isShowComponent = 'AddParts'
-        },
-        /* 查询配件 */
-        queryParts(taskId) {
-            this.partsTaskId = taskId
-            this.isView = true
-            this.isDisabled = true
-            this.isShowComponent = 'AddParts'
-        },
+        // addParts() {
+        //     this.pageContent = '新增配件'
+        //     this.isShowComponent = 'AddParts'
+        // },
+        // /* 查询配件 */
+        // queryParts(taskId) {
+        //     this.partsTaskId = taskId
+        //     this.isView = true
+        //     this.isDisabled = true
+        //     this.isShowComponent = 'AddParts'
+        // },
         /* 新增 修改保存成功 */
         partsSaveSuccess() {
             this.isShowComponent = 'Home'
         },
-        /* 编辑配件 */
-        editParts(taskId) {
-            this.partsTaskId = taskId
-            this.isView = true
-            this.isEdit = true
-            this.isShowComponent = 'AddParts'
-        },
-        /* 验收配件 */
-        acceptParts(taskId) {
-            this.partsTaskId = taskId
-            this.isView = true
-            this.isDisabled = true
-            this.isCheck = true
+        // /* 编辑配件 */
+        // editParts(taskId) {
+        //     this.partsTaskId = taskId
+        //     this.isView = true
+        //     this.isEdit = true
+        //     this.isShowComponent = 'AddParts'
+        // },
+        // /* 验收配件 */
+        // acceptParts(taskId) {
+        //     this.partsTaskId = taskId
+        //     this.isView = true
+        //     this.isDisabled = true
+        //     this.isCheck = true
+        //     this.isShowComponent = 'AddParts'
+        // },
+
+        // 新增 编辑 查看 验收事件
+        handleParts(type, taskId) {
+            switch (type) {
+                case 1:
+                    this.pageContent = '新增配件'
+                    this.partsTaskId = null
+                    this.isAdd = true
+                    this.isEdit = false
+                    this.isView = false
+                    this.isAccept = false
+                    break
+                case 2:
+                    this.pageContent = '编辑配件'
+                    this.partsTaskId = taskId
+                    this.isEdit = true
+                    this.isAdd = false
+                    this.isView = false
+                    this.isAccept = false
+                    break
+                case 3:
+                    this.pageContent = '配件详情'
+                    this.partsTaskId = taskId
+                    this.isEdit = false
+                    this.isAdd = false
+                    this.isView = true
+                    this.isAccept = false
+                    break
+                case 4:
+                    this.pageContent = '配件验收'
+                    this.partsTaskId = taskId
+                    this.isEdit = false
+                    this.isAdd = false
+                    this.isAccept = true
+                    break
+            }
+
             this.isShowComponent = 'AddParts'
         },
         /* 返回按钮 */