From 173a44055fcb5808cb4d64baaa6fdfcb82c0fb94 Mon Sep 17 00:00:00 2001
From: bns_han <1604366271@qq.com>
Date: Mon, 29 Jan 2024 16:01:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/app/BackReceiveMapper.xml        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
index 0f58cbba..32673809 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
@@ -658,7 +658,8 @@
       bcd.back_num as backNum,
       bcd.parent_id as parentId,
       bcd.create_by as createBy,
-      bcd.ma_id as maId
+      bcd.ma_id as maId,
+      bai.company_id as companyId
     FROM
       back_check_details bcd
         LEFT JOIN back_apply_info bai on bai.id=bcd.parent_id

From 9e133cacc419b946bd92998d79e24c88df75c5af Mon Sep 17 00:00:00 2001
From: bns_han <1604366271@qq.com>
Date: Mon, 29 Jan 2024 16:51:39 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/app/BackReceiveMapper.xml     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
index 32673809..8761488c 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
@@ -638,7 +638,8 @@
       bcd.back_num as backNum,
       bcd.parent_id as parentId,
       bcd.create_by as createBy,
-      bcd.ma_id as maId
+      bcd.ma_id as maId,
+      bai.company_id as companyId
     FROM
       back_check_details bcd
         LEFT JOIN back_apply_info bai on bai.id=bcd.parent_id
@@ -678,7 +679,8 @@
       bcd.back_num as backNum,
       bcd.parent_id as parentId,
       bcd.create_by as createBy,
-      bcd.ma_id as maId
+      bcd.ma_id as maId,
+      bai.company_id as companyId
     FROM
       back_check_details bcd
         LEFT JOIN back_apply_info bai on bai.id=bcd.parent_id

From 9352a18f75d44994bbe0a3033bf5564dcf6e1bd3 Mon Sep 17 00:00:00 2001
From: zhouzy062 <zhouzy062@tydic.com>
Date: Mon, 29 Jan 2024 17:08:39 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B91.29?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/claimAndRefund/return/returnExamine.vue    | 12 +++++++++++-
 sgzb-ui/src/views/repairTest/repair/index.vue        |  4 ++--
 .../newBuy/newDevices/newDevicesWarehousing.vue      |  2 +-
 sgzb-ui/vue.config.js                                |  2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
index 77ceb972..e7f1dcac 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
@@ -236,10 +236,20 @@
           <el-button
             type="text"
             style="color: #67c23a"
-            v-else-if="scope.row.taskStatus == '38'"
+            v-if="scope.row.taskStatus == '38'"
           >
             已审核
           </el-button>
+          <el-button type="text" v-if="scope.row.taskStatus == '39'">
+            退料核查
+          </el-button>
+          <el-button
+            type="text"
+            style="color: #67c23a"
+            v-if="scope.row.taskStatus == '40'"
+          >
+            退料完成
+          </el-button>
         </template>
       </el-table-column>
       <el-table-column
diff --git a/sgzb-ui/src/views/repairTest/repair/index.vue b/sgzb-ui/src/views/repairTest/repair/index.vue
index 9f00acf9..e8303422 100644
--- a/sgzb-ui/src/views/repairTest/repair/index.vue
+++ b/sgzb-ui/src/views/repairTest/repair/index.vue
@@ -229,7 +229,7 @@
             size="mini"
             type="warning"
             icon="el-icon-edit"
-            :disabled="scope.row.repairStatusCode !== '43'"
+            :disabled="scope.row.repairStatusCode == '44'"
             @click="handleUpdate(scope.row, 'update')"  
             >维修</el-button
           >
@@ -256,7 +256,7 @@
     <!-- 维修对话框 -->
     <el-dialog
       :visible.sync="open"
-      width="1600px"
+      width="1650px"
       append-to-body
       :before-close="onClose"
     >
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
index 47572d4c..00ed316f 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
@@ -124,7 +124,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
         <template slot-scope="scope">
           <el-button
             size="mini"
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index cf7148c7..861c5d1d 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -40,7 +40,7 @@ module.exports = {
         // target: `http://192.168.0.14:21624`,//线上环境
         // target: `http://10.40.92.21:8080`,
         // target: `http://10.40.92.13:8080`,
-        target: `http://10.40.92.219:8080`,
+        target: `http://10.40.92.220:8080`,
 
         changeOrigin: true,
         pathRewrite: {