diff --git a/sgzb-ui/src/views/repairTest/brokenExamine/index.vue b/sgzb-ui/src/views/repairTest/brokenExamine/index.vue
index 882c29b5..4c7f18d9 100644
--- a/sgzb-ui/src/views/repairTest/brokenExamine/index.vue
+++ b/sgzb-ui/src/views/repairTest/brokenExamine/index.vue
@@ -59,7 +59,7 @@
         <!--          nodeKey="id"-->
         <!--          :defaultSelect="true"-->
         <!--          :defaultData="defaultData"-->
-        <!--          :clearable="false"-->
+        <!--          :clearable="true"-->
         <!--          :placeholder="'请选择'"-->
         <!--          @handleNodeClick="selectDrop"-->
         <!--        ></selectTree>-->
@@ -79,10 +79,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="维修状态" prop="repairStatus">
+      <el-form-item label="报废状态" prop="repairStatus">
         <el-select
           v-model="queryParams.repairStatus"
-          placeholder="请选择维修状态"
+          placeholder="请选择报废状态"
           clearable
           style="width: 240px"
         >
@@ -126,7 +126,7 @@
           plain
           icon="el-icon-plus"
           size="mini"
-          :disabled="multiple"
+          :disabled="!checkResultOne"
           v-hasPermi="['store:labelType:add']"
           @click="checkClick"
           >批量审核</el-button
@@ -199,12 +199,13 @@
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        label="报废单号"
+        label="维修单号"
         align="center"
         sortable
         prop="repairNum"
         :show-overflow-tooltip="true"
       />
+
       <el-table-column
         label="审核状态"
         align="center"
@@ -234,10 +235,12 @@
             v-hasPermi="['store:labelType:edit']"
             >查看</el-button
           >
+          <!--  -->
           <el-button
             size="mini"
             type="warning"
             icon="el-icon-circle-check"
+            :disabled="scope.row.taskStatus !== 58"
             @click="handleUpdate(scope.row, 'update')"
             v-hasPermi="['store:labelType:edit']"
             >审核</el-button
@@ -275,7 +278,7 @@
             <el-input
               v-model="dialogQueryParams.keyword"
               placeholder="请输入关键字"
-              clearable
+              :clearable="false"
               style="width: 240px"
             />
           </el-form-item>
@@ -304,13 +307,6 @@
             ></selectTree>
           </el-form-item>
           <el-form-item label="规格型号" prop="type">
-            <!-- <treeselect
-              style="width: 250px"
-              v-model="dialogQueryParams.type"
-              :options="deptTypeList"
-              :normalizer="normalizerType"
-              placeholder="请选择类型名称"
-            /> -->
             <selectTree
               ref="mychildDialogTwo"
               style="width: 240px"
@@ -345,12 +341,7 @@
         </el-row>
       </el-form>
 
-      <el-table
-        v-loading="loading"
-        :data="dialogList"
-        height="500px"
-        @selection-change="handleSelectionChange"
-      >
+      <el-table v-loading="loading" :data="dialogList" height="500px">
         <el-table-column label="序号" sortable align="center" type="index" />
         <el-table-column
           label="类型名称"
@@ -389,7 +380,6 @@
           :show-overflow-tooltip="true"
         />
       </el-table>
-
       <pagination
         v-show="dialogTotal > 0"
         :total="dialogTotal"
@@ -438,6 +428,7 @@
       :visible.sync="openTwo"
       append-to-body
       width="400px"
+      :before-close="openTextThreeClose"
     >
       <div class="submit_box_two">
         <div>
@@ -502,10 +493,11 @@ import selectTree from '../repair/selectTree.vue'
 import Tree from '@/views/repairTest/repair/tree.vue'
 export default {
   name: "Dict",
-  components: { selectTree, Tree },
+  components: { Tree, selectTree, },
   dicts: ['sys_normal_disable'],
   data() {
     return {
+      checkResultOne: false,
       defaultData: null,
       selectionList: [],
       unitInfoSelectList: [],
@@ -573,11 +565,12 @@ export default {
     getProjectSelectApi().then(res => {
       this.projectSelectList = res.data
     })
-    getDicSelectApi({ value: 'wx_task' }).then(res => {
+    getDicSelectApi({ value: 'bf_task' }).then(res => {
       this.dicSelectList = res.data
     })
     this.getTree()
   },
+
   methods: {
     /** 查询字典类型列表 */
     getList() {
@@ -596,10 +589,10 @@ export default {
         pageNum: this.dialogQueryParams.pageNum,
         pageSize: this.dialogQueryParams.pageSize,
       }
-      this.loading = true;
+      // this.loading = true;
       getRepairAuditListApi(params).then(response => {
         if (response.code == 200) {
-          this.loading = false;
+          // this.loading = false;
           this.open = true
           this.dialogList = response.rows
           this.dialogTotal = response.total;
@@ -650,12 +643,12 @@ export default {
     getTree() {
       listPartTypeApi().then(response => {
         this.deptList = response.data
+        // this.deptList = this.handleTree(response.data, "id");
       });
       getMaTypeSelectApi().then(response => {
         this.deptTypeList = response.data
       });
     },
-
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -665,9 +658,8 @@ export default {
     resetQuery() {
       this.dateRange = [];
       this.resetForm("queryForm");
-      // this.$refs.mychild.clearSelect();
-      this.queryParams.type = ''
       this.$refs.mychildSon.inputValue = '';
+      this.queryParams.type = ''
       this.handleQuery();
     },
     /** 新增按钮操作 */
@@ -679,11 +671,11 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.selectionList = selection
+      this.checkResultOne = selection.every(item => item.taskStatus == 58);
       this.ids = selection.map(item => item.dictId)
       this.single = selection.length != 1
       this.multiple = !selection.length
     },
-
     handleSee(row, type) {
       this.dialogTitle = '查看'
       this.rowObj = row
@@ -710,6 +702,7 @@ export default {
     },
     submitOpenOneForm() {
       this.openOne = false
+      this.open = false
       // val 1代表对话框中审核   2代表批量审核
       if (this.checkResult == 1) {
         let taskIdList = []
@@ -719,11 +712,11 @@ export default {
           taskIdList: taskIdList
         }
         addDetailsAuditApi(params).then(res => {
-          if (res.code == 200) {
-            this.openTwo = true
-            this.openTextThree = '审批通过！'
-            this.getdialogList()
-          }
+          this.openTwo = true
+          this.open = false
+          this.openTextThree = '审批通过！'
+          // this.getdialogList()
+          this.getList()
         }).catch(() => { })
       }
       if (this.checkResult == 2) {
@@ -736,14 +729,20 @@ export default {
           taskIdList: taskIdList
         }
         addDetailsAuditApi(params).then(res => {
-          if (res.code == 200) {
-            this.openTwo = true
-            this.openTextThree = '审批通过！'
-            this.getList()
-          }
+          this.openTwo = true
+          this.openTextThree = '审批通过！'
+          this.getList()
         }).catch(() => { })
       }
     },
+    openTextThreeClose() {
+      this.open = false
+      this.openOne = false
+      this.openTwo = false
+      this.openThree = false
+      this.openFour = false
+      this.getList()
+    },
 
     submitOpenOneFeturn() {
       this.openOne = false
@@ -759,7 +758,6 @@ export default {
     },
     formSubmit() {
       this.$refs.form.validate(valid => {
-        console.log('this.checkResult', this.checkResult);
         if (valid) {
           if (this.checkResult == 1) {
             let taskIdList = []
@@ -770,11 +768,12 @@ export default {
               remark: this.form.remark
             }
             addDetailsAuditApi(params).then(res => {
-              if (res.code == 200) {
-                this.$refs.form.resetFields();
-                this.formCancel()
-                this.getdialogList()
-              }
+              this.$refs.form.resetFields();
+              this.formCancel()
+              this.open = false
+              this.openThree = false
+              // this.getdialogList()
+              this.getList()
             }).catch(() => { })
           }
           if (this.checkResult == 2) {
@@ -788,12 +787,12 @@ export default {
               remark: this.form.remark
             }
             addDetailsAuditApi(params).then(res => {
-              if (res.code == 200) {
-                this.$refs.form.resetFields();
-                this.openThree = false
-                this.openFour = false
-                this.getList()
-              }
+              // if (res.code == 200) {
+              this.$refs.form.resetFields();
+              this.openThree = false
+              this.openFour = false
+              this.getList()
+              // }
             }).catch(() => { })
           }
         } else {
diff --git a/sgzb-ui/src/views/repairTest/repair/index.vue b/sgzb-ui/src/views/repairTest/repair/index.vue
index 763b366f..908315ea 100644
--- a/sgzb-ui/src/views/repairTest/repair/index.vue
+++ b/sgzb-ui/src/views/repairTest/repair/index.vue
@@ -143,7 +143,6 @@
           >导出</el-button
         >
       </el-col> -->
-
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -261,7 +260,7 @@
     <!-- 维修对话框 -->
     <el-dialog
       :visible.sync="open"
-      width="1400px"
+      width="1600px"
       append-to-body
       :before-close="onClose"
     >
@@ -788,12 +787,12 @@ export default {
         typeName: this.dialogQueryParams.typeName,
         type: this.dialogQueryParams.type,
       }
-      this.loading = true;
+      // this.loading = true;
       getRepairMaTypeListApi(this.addDateRange(params)).then(res => {
         if (res.code == 200) {
           this.repairList = res.rows;
           this.dialogTotal = res.total;
-          this.loading = false;
+          // this.loading = false;
         }
       })
     },
diff --git a/sgzb-ui/src/views/repairTest/testExamine/index.vue b/sgzb-ui/src/views/repairTest/testExamine/index.vue
index 8beab6cb..16e367cb 100644
--- a/sgzb-ui/src/views/repairTest/testExamine/index.vue
+++ b/sgzb-ui/src/views/repairTest/testExamine/index.vue
@@ -1,4 +1,3 @@
-<script src="../../../../vue.config.js"></script>
 <template>
   <div class="app-container">
     <el-form
@@ -71,19 +70,19 @@
           @changeId="selectDrop"
         ></Tree>
       </el-form-item>
-      <el-form-item label="维修单号" prop="backCode">
+      <el-form-item label="修试审核单号" prop="backCode">
         <el-input
           v-model="queryParams.backCode"
-          placeholder="请选择维修单号"
+          placeholder="请选择修试审核"
           clearable
           style="width: 240px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="维修状态" prop="repairStatus">
+      <el-form-item label="修试审核状态" prop="taskStatus">
         <el-select
-          v-model="queryParams.repairStatus"
-          placeholder="请选择维修状态"
+          v-model="queryParams.taskStatus"
+          placeholder="请选择修试审核"
           clearable
           style="width: 240px"
         >
@@ -127,7 +126,7 @@
           plain
           icon="el-icon-plus"
           size="mini"
-          :disabled="multiple"
+          :disabled="!checkResultOne"
           v-hasPermi="['store:labelType:add']"
           @click="checkClick"
           >批量审核</el-button
@@ -236,10 +235,12 @@
             v-hasPermi="['store:labelType:edit']"
             >查看</el-button
           >
+          <!--  -->
           <el-button
             size="mini"
             type="warning"
             icon="el-icon-circle-check"
+            :disabled="scope.row.taskStatus !== 46"
             @click="handleUpdate(scope.row, 'update')"
             v-hasPermi="['store:labelType:edit']"
             >审核</el-button
@@ -277,7 +278,7 @@
             <el-input
               v-model="dialogQueryParams.keyword"
               placeholder="请输入关键字"
-              clearable
+              :clearable="false"
               style="width: 240px"
             />
           </el-form-item>
@@ -340,12 +341,7 @@
         </el-row>
       </el-form>
 
-      <el-table
-        v-loading="loading"
-        :data="dialogList"
-        height="500px"
-        @selection-change="handleSelectionChange"
-      >
+      <el-table v-loading="loading" :data="dialogList" height="500px">
         <el-table-column label="序号" sortable align="center" type="index" />
         <el-table-column
           label="类型名称"
@@ -384,7 +380,6 @@
           :show-overflow-tooltip="true"
         />
       </el-table>
-
       <pagination
         v-show="dialogTotal > 0"
         :total="dialogTotal"
@@ -433,6 +428,7 @@
       :visible.sync="openTwo"
       append-to-body
       width="400px"
+      :before-close="openTextThreeClose"
     >
       <div class="submit_box_two">
         <div>
@@ -501,6 +497,7 @@ export default {
   dicts: ['sys_normal_disable'],
   data() {
     return {
+      checkResultOne: false,
       defaultData: null,
       selectionList: [],
       unitInfoSelectList: [],
@@ -568,7 +565,7 @@ export default {
     getProjectSelectApi().then(res => {
       this.projectSelectList = res.data
     })
-    getDicSelectApi({ value: 'wx_task' }).then(res => {
+    getDicSelectApi({ value: 'ws_shenhe' }).then(res => {
       this.dicSelectList = res.data
     })
     this.getTree()
@@ -592,10 +589,10 @@ export default {
         pageNum: this.dialogQueryParams.pageNum,
         pageSize: this.dialogQueryParams.pageSize,
       }
-      this.loading = true;
+      // this.loading = true;
       getRepairAuditListApi(params).then(response => {
         if (response.code == 200) {
-          this.loading = false;
+          // this.loading = false;
           this.open = true
           this.dialogList = response.rows
           this.dialogTotal = response.total;
@@ -674,6 +671,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.selectionList = selection
+      this.checkResultOne = selection.every(item => item.taskStatus == 46);
       this.ids = selection.map(item => item.dictId)
       this.single = selection.length != 1
       this.multiple = !selection.length
@@ -704,6 +702,7 @@ export default {
     },
     submitOpenOneForm() {
       this.openOne = false
+      this.open = false
       // val 1代表对话框中审核   2代表批量审核
       if (this.checkResult == 1) {
         let taskIdList = []
@@ -713,11 +712,11 @@ export default {
           taskIdList: taskIdList
         }
         addDetailsAuditApi(params).then(res => {
-          if (res.code == 200) {
-            this.openTwo = true
-            this.openTextThree = '审批通过！'
-            this.getdialogList()
-          }
+          this.openTwo = true
+          this.open = false
+          this.openTextThree = '审批通过！'
+          // this.getdialogList()
+          this.getList()
         }).catch(() => { })
       }
       if (this.checkResult == 2) {
@@ -730,14 +729,20 @@ export default {
           taskIdList: taskIdList
         }
         addDetailsAuditApi(params).then(res => {
-          if (res.code == 200) {
-            this.openTwo = true
-            this.openTextThree = '审批通过！'
-            this.getList()
-          }
+          this.openTwo = true
+          this.openTextThree = '审批通过！'
+          this.getList()
         }).catch(() => { })
       }
     },
+    openTextThreeClose() {
+      this.open = false
+      this.openOne = false
+      this.openTwo = false
+      this.openThree = false
+      this.openFour = false
+      this.getList()
+    },
 
     submitOpenOneFeturn() {
       this.openOne = false
@@ -753,7 +758,6 @@ export default {
     },
     formSubmit() {
       this.$refs.form.validate(valid => {
-        console.log('this.checkResult', this.checkResult);
         if (valid) {
           if (this.checkResult == 1) {
             let taskIdList = []
@@ -764,11 +768,12 @@ export default {
               remark: this.form.remark
             }
             addDetailsAuditApi(params).then(res => {
-              if (res.code == 200) {
-                this.$refs.form.resetFields();
-                this.formCancel()
-                this.getdialogList()
-              }
+              this.$refs.form.resetFields();
+              this.formCancel()
+              this.open = false
+              this.openThree = false
+              // this.getdialogList()
+              this.getList()
             }).catch(() => { })
           }
           if (this.checkResult == 2) {
@@ -782,12 +787,12 @@ export default {
               remark: this.form.remark
             }
             addDetailsAuditApi(params).then(res => {
-              if (res.code == 200) {
-                this.$refs.form.resetFields();
-                this.openThree = false
-                this.openFour = false
-                this.getList()
-              }
+              // if (res.code == 200) {
+              this.$refs.form.resetFields();
+              this.openThree = false
+              this.openFour = false
+              this.getList()
+              // }
             }).catch(() => { })
           }
         } else {
diff --git a/sgzb-ui/src/views/store/label/labelBinding.vue b/sgzb-ui/src/views/store/label/labelBinding.vue
index eb0f64a0..9d635e90 100644
--- a/sgzb-ui/src/views/store/label/labelBinding.vue
+++ b/sgzb-ui/src/views/store/label/labelBinding.vue
@@ -339,23 +339,24 @@
         <el-button type="primary" @click="downloadCode">下 载</el-button>
       </div>
     </el-dialog>
-    <div
-      id="qrCode"
-      v-for="(codeItem, codeIndex) in checkboxModel"
-      :key="codeIndex"
-      class="captureId"
-      v-show="codeId"
-      ref="QrcodePage"
-      style="
-        z-index: -1111111;
-        position: absolute;
-        top: 10px;
-        left: -99999;
-        width: 450px;
-        height: 475px;
-        background-size: cover;
-      "
-    >
+    <div style="background-color;: transparent">
+      <div
+        id="qrCode"
+        v-for="(codeItem, codeIndex) in checkboxModel"
+        :key="codeIndex"
+        class="captureId"
+        v-show="codeId"
+        ref="QrcodePage"
+        style="
+          z-index: -1111111;
+          position: absolute;
+          top: 10px;
+          left: -99999;
+          width: 450px;
+          height: 475px;
+          background-size: cover;
+        "
+      ></div>
       <!-- <center style="text-align: center; font-size: 1.5625rem">
         {{ codeVal }}
       </center> -->
@@ -592,7 +593,7 @@ export default {
             // 索引，数组下标
           }
           let parmas = {
-            uuidList: uuidList,
+            uuidList: uuidList.join(','),
             labelType: this.cform.labelType,
             labelNum: this.cform.labelNum,
           }