Merge branch 'dev' into test-sso

# Conflicts:
#	sgzb-ui/vue.config.js

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
@@ -658,7 +659,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
@@ -677,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

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

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"
     >

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"