From e5a1caa356a38b51f285580b17b4ac7ba06ecb2c Mon Sep 17 00:00:00 2001
From: zhouxian <zhouxian44159095!>
Date: Mon, 18 Dec 2023 17:47:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E8=AF=95=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-screen/package-lock.json                 | 258 ++++----
 .../claimAndRefund/return/returnApply.vue     | 428 ++++++++++---
 .../claimAndRefund/return/returnExamine.vue   | 310 +++++++---
 .../claimAndRefund/return/returnFinshed.vue   | 402 +++++++++---
 .../returnAbnormal/returnAbnormal.vue         | 260 ++++++--
 .../src/views/repairTest/brokenExamine.vue    | 376 ------------
 sgzb-ui/src/views/repairTest/repair.vue       | 581 ------------------
 sgzb-ui/src/views/repairTest/testExamine.vue  | 376 ------------
 8 files changed, 1222 insertions(+), 1769 deletions(-)
 delete mode 100644 sgzb-ui/src/views/repairTest/brokenExamine.vue
 delete mode 100644 sgzb-ui/src/views/repairTest/repair.vue
 delete mode 100644 sgzb-ui/src/views/repairTest/testExamine.vue

diff --git a/sgzb-screen/package-lock.json b/sgzb-screen/package-lock.json
index a538d088..0915ec39 100644
--- a/sgzb-screen/package-lock.json
+++ b/sgzb-screen/package-lock.json
@@ -119,6 +119,27 @@
           "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
           "dev": true
         },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
         "string-width": {
           "version": "5.1.2",
           "resolved": "https://registry.npmmirror.com/string-width/-/string-width-5.1.2.tgz",
@@ -130,6 +151,40 @@
             "strip-ansi": "^7.0.1"
           }
         },
+        "string-width-cjs": {
+          "version": "npm:string-width@4.2.3",
+          "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
+          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.1"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "5.0.1",
+              "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
+              "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+              "dev": true
+            },
+            "emoji-regex": {
+              "version": "8.0.0",
+              "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz",
+              "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+              "dev": true
+            },
+            "strip-ansi": {
+              "version": "6.0.1",
+              "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
+              "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^5.0.1"
+              }
+            }
+          }
+        },
         "strip-ansi": {
           "version": "7.1.0",
           "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-7.1.0.tgz",
@@ -139,6 +194,23 @@
             "ansi-regex": "^6.0.1"
           }
         },
+        "strip-ansi-cjs": {
+          "version": "npm:strip-ansi@6.0.1",
+          "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.1"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "5.0.1",
+              "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
+              "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+              "dev": true
+            }
+          }
+        },
         "wrap-ansi": {
           "version": "8.1.0",
           "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
@@ -149,6 +221,60 @@
             "string-width": "^5.0.1",
             "strip-ansi": "^7.0.1"
           }
+        },
+        "wrap-ansi-cjs": {
+          "version": "npm:wrap-ansi@7.0.0",
+          "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "5.0.1",
+              "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
+              "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+              "dev": true
+            },
+            "ansi-styles": {
+              "version": "4.3.0",
+              "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+              "dev": true,
+              "requires": {
+                "color-convert": "^2.0.1"
+              }
+            },
+            "emoji-regex": {
+              "version": "8.0.0",
+              "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz",
+              "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+              "dev": true
+            },
+            "string-width": {
+              "version": "4.2.3",
+              "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
+              "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+              "dev": true,
+              "requires": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+              }
+            },
+            "strip-ansi": {
+              "version": "6.0.1",
+              "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
+              "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^5.0.1"
+              }
+            }
+          }
         }
       }
     },
@@ -14763,46 +14889,6 @@
         }
       }
     },
-    "string-width-cjs": {
-      "version": "npm:string-width@4.2.3",
-      "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
-          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.1"
-          }
-        }
-      }
-    },
     "string.prototype.trim": {
       "version": "1.2.8",
       "resolved": "https://registry.npmmirror.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
@@ -14859,23 +14945,6 @@
         "ansi-regex": "^2.0.0"
       }
     },
-    "strip-ansi-cjs": {
-      "version": "npm:strip-ansi@6.0.1",
-      "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^5.0.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-          "dev": true
-        }
-      }
-    },
     "strip-bom": {
       "version": "2.0.0",
       "resolved": "https://registry.npmmirror.com/strip-bom/-/strip-bom-2.0.0.tgz",
@@ -17273,81 +17342,6 @@
         }
       }
     },
-    "wrap-ansi-cjs": {
-      "version": "npm:wrap-ansi@7.0.0",
-      "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
-          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.1"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
-          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.1"
-          }
-        }
-      }
-    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz",
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
index 95ad28d0..4acf419f 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
       <el-form-item label="关键字" prop="dictName">
         <el-input
           v-model="queryParams.dictName"
@@ -66,8 +73,16 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >查询</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -76,86 +91,180 @@
         <el-button
           type="primary"
           plain
-          icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
           v-hasPermi="['store:labelType:add']"
-        >退料申请</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          :disabled="multiple"
-          v-hasPermi="['store:labelType:add']"
-        >批量提交</el-button>
+          >退料申请</el-button
+        >
       </el-col>
       <el-col :span="1.5">
+        <!-- :disabled="multiple" -->
         <el-button
           type="warning"
           plain
+          size="mini"
+          @click="handleSubmit()"
+          v-hasPermi="['store:labelType:add']"
+          >批量提交</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
           v-hasPermi="['store:labelType:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
 
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="typeList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="dictId" />
-      <el-table-column label="退料单号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料单位名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料工程名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料工机具类型" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料人员" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料人联系电话" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料申请时间" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="协议号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="是否异常退料" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料状态" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="不通过原因" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="序号" sortable align="center" prop="dictId" />
+      <el-table-column
+        label="退料单号"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料单位名称"
+        align="center"
+        sortable
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料工程名称"
+        sortable
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料工机具类型"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料人员"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料人联系电话"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料申请时间"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="协议号"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="是否异常退料"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料状态"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="不通过原因"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="300"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            type="primary"
+            plain
+            icon="el-icon-zoom-in"
+            @click="handleUpdate(scope.row, 'see')"
             v-hasPermi="['store:labelType:edit']"
-          >编辑</el-button>
+            >查看</el-button
+          >
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            type="primary"
+            icon="el-icon-s-order"
+            @click="handleUpdateOrder(scope.row)"
             v-hasPermi="['store:labelType:edit']"
-          >提交</el-button>
+            >退料单</el-button
+          >
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            type="warning"
+            plain
+            icon="el-icon-edit-outline"
+            @click="handleUpdate(scope.row, 'update')"
             v-hasPermi="['store:labelType:edit']"
-          >退料单</el-button>
+            >编辑</el-button
+          >
           <el-button
             size="mini"
-            type="text"
+            type="warning"
+            icon="el-icon-check"
+            @click="handleSubmit(scope.row)"
+            v-hasPermi="['store:labelType:edit']"
+            >提交</el-button
+          >
+          <el-button
+            size="mini"
+            type="danger"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['store:labelType:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -163,8 +272,20 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px"   append-to-body>
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1000px"
+      append-to-body
+    >
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="100px"
+      >
         <el-row>
           <el-form-item label="退料单位" prop="dictName">
             <el-input
@@ -215,7 +336,6 @@
           </el-form-item>
         </el-row>
 
-
         <el-row>
           <el-form-item label="关键字" prop="dictName">
             <el-input
@@ -227,22 +347,58 @@
             />
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >查询</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
           </el-form-item>
         </el-row>
-
       </el-form>
 
-
-      <el-table v-loading="loading" :data="typeList" height="500px" @selection-change="handleSelectionChange">
+      <el-table
+        v-loading="loading"
+        :data="typeList"
+        height="500px"
+        @selection-change="handleSelectionChange"
+      >
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" align="center" prop="dictId" />
-        <el-table-column label="类型名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="编码" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="当前在用量" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="退料数量" align="center" class-name="small-padding fixed-width" width="200">
+        <el-table-column
+          label="类型名称"
+          align="center"
+          prop="dictName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="规格型号"
+          align="center"
+          prop="dictName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="编码"
+          align="center"
+          prop="dictName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="当前在用量"
+          align="center"
+          prop="dictName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="退料数量"
+          align="center"
+          class-name="small-padding fixed-width"
+          width="200"
+        >
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.dictName"
@@ -254,34 +410,89 @@
       </el-table>
 
       <pagination
-        v-show="total>0"
+        v-show="total > 0"
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
         @pagination="getList"
       />
 
-
-      <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="submitForm">保存</el-button>
-        <el-button @click="cancel">取 消</el-button>
+      <div
+        slot="footer"
+        class="dialog-footer"
+        style="text-align: center"
+        v-if="type == 'update'"
+      >
+        <el-button type="primary" @click="submitForm">确定</el-button>
+        <el-button @click="cancel">取消</el-button>
       </div>
-      <!--      <div slot="footer" class="dialog-footer" style="text-align: center">-->
-      <!--        <el-button type="primary" @click="submitForm">通过</el-button>-->
-      <!--        <el-button type="warning" @click="cancel">不通过</el-button>-->
-      <!--      </div>-->
+    </el-dialog>
+    <!-- 退料单 -->
+    <dialogForm
+      :dialogTitle="title"
+      :isShowFlag.sync="isShowOneFlag"
+      :priKey="priKey"
+    ></dialogForm>
+    <!-- 提交 -->
+    <el-dialog
+      v-loading.fullscreen.lock="fullscreenLoading"
+      :title="title"
+      :visible.sync="openOne"
+      append-to-body
+      width="400px"
+    >
+      <div class="submit_box">
+        <div>
+          <i
+            class="el-icon-circle-check"
+            style="color: #ff9900; font-size: 30px"
+          ></i>
+        </div>
+        <div class="submit_box_title">
+          <div>{{ openTextOne }}</div>
+          <div>{{ openTextTwo }}</div>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">返回</el-button>
+        <el-button type="primary" @click="submitOpenOneForm()">确定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      v-loading.fullscreen.lock="fullscreenLoading"
+      :title="title"
+      :visible.sync="openTwo"
+      append-to-body
+      width="400px"
+    >
+      <div class="submit_box_two">
+        <div>
+          <i
+            class="el-icon-circle-check"
+            style="color: #00c196; font-size: 30px"
+          ></i>
+        </div>
+        <div class="submit_box_title">{{ openTextThree }}</div>
+      </div>
+      <div slot="footer" class="dialog-footer"></div>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
+import dialogForm from "./dialogForm.vue";
 
 export default {
   name: "Dict",
   dicts: ['sys_normal_disable'],
+  components: { dialogForm, },
   data() {
     return {
+      fullscreenLoading: false,
+      type: '',
+      isShowOneFlag: false,
+      priKey: '',
       // 遮罩层
       loading: true,
       // 选中数组
@@ -320,7 +531,12 @@ export default {
         dictType: [
           { required: true, message: "字典类型不能为空", trigger: "blur" }
         ]
-      }
+      },
+      openOne: false,
+      openTwo: false,
+      openTextOne: '',
+      openTextTwo: '',
+      openTextThree: '',
     };
   },
   created() {
@@ -331,10 +547,10 @@ export default {
     getList() {
       this.loading = true;
       listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.typeList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
+        this.typeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      }
       );
     },
     // 取消按钮
@@ -373,11 +589,12 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.dictId)
-      this.single = selection.length!=1
+      this.single = selection.length != 1
       this.multiple = !selection.length
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleUpdate(row, type) {
+      this.type = type
       this.reset();
       const dictId = row.dictId || this.ids
       getType(dictId).then(response => {
@@ -386,8 +603,24 @@ export default {
         this.title = "修改";
       });
     },
+    // 退料单
+    handleUpdateOrder() {
+      this.title = "查看";
+      this.isShowOneFlag = true
+    },
+    // 提交
+    handleSubmit() {
+      this.title = "确认操作";
+      this.openTextOne = "确认提交申请么?";
+      this.openTextTwo = "确认提交申请么?";
+      this.openOne = true
+    },
+    submitOpenOneForm() {
+      this.openTextThree = "提交成功！";
+      this.openTwo = true
+    },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.dictId != undefined) {
@@ -409,12 +642,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const dictIds = row.dictId || this.ids;
-      this.$modal.confirm('是否确认删除该数据项？').then(function() {
+      this.$modal.confirm('是否确认删除该数据项？').then(function () {
         return delType(dictIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -432,3 +665,42 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+.submit_box {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+
+  .submit_box_title {
+    display: flex;
+    flex-direction: column;
+    margin-left: 15px;
+
+    :first-child {
+      font-size: 14px;
+      font-weight: 600;
+    }
+
+    :last-child {
+      margin-top: 6px;
+      font-size: 12px;
+    }
+  }
+}
+
+.submit_box_two {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+  margin-left: 30%;
+
+  .submit_box_title {
+    display: flex;
+    flex-direction: column;
+    margin-left: 10px;
+    font-size: 18px;
+    font-weight: 600;
+  }
+}
+</style>
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
index 042e4f9d..d4a34e01 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
       <el-form-item label="关键字" prop="dictName">
         <el-input
           v-model="queryParams.dictName"
@@ -66,32 +73,31 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >查询</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+      <!-- :disabled="multiple" -->
       <el-col :span="1.5">
         <el-button
           type="primary"
           plain
-          icon="el-icon-plus"
           size="mini"
-          :disabled="multiple"
           v-hasPermi="['store:labelType:add']"
-        >批量审核</el-button>
+          @click="handleUpdate('111', 'update')"
+          >批量审核</el-button
+        >
       </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="primary"-->
-<!--          plain-->
-<!--          icon="el-icon-plus"-->
-<!--          size="mini"-->
-<!--          :disabled="multiple"-->
-<!--          v-hasPermi="['store:labelType:add']"-->
-<!--        >批量提交</el-button>-->
-<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -100,56 +106,137 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['store:labelType:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
 
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="typeList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="dictId" />
-      <el-table-column label="退料单号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料单位名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料工程名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料工机具类型" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料人员" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料人联系电话" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料申请时间" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="协议号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="是否异常退料" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料状态" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="不通过原因" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="序号" sortable align="center" prop="dictId" />
+      <el-table-column
+        label="退料单号"
+        align="center"
+        sortable
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料单位名称"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料工程名称"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料工机具类型"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料人员"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料人联系电话"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料申请时间"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="协议号"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="是否异常退料"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料状态"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="不通过原因"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="200px"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            type="primary"
+            icon="el-icon-zoom-in"
+            @click="handleUpdate(scope.row, 'see')"
             v-hasPermi="['store:labelType:edit']"
-          >查看</el-button>
+            >查看</el-button
+          >
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            type="warning"
+            icon="el-icon-circle-check"
+            @click="handleUpdate(scope.row, 'update')"
             v-hasPermi="['store:labelType:edit']"
-          >审核</el-button>
+            >审核</el-button
+          >
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            type="primary"
+            icon="el-icon-document"
+            @click="handleUpdateOrder(scope.row)"
             v-hasPermi="['store:labelType:edit']"
-          >退料单</el-button>
-
+            >退料单</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -157,8 +244,20 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px"   append-to-body>
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1000px"
+      append-to-body
+    >
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="100px"
+      >
         <el-row>
           <el-form-item label="退料单位" prop="dictName">
             <el-input
@@ -209,7 +308,6 @@
           </el-form-item>
         </el-row>
 
-
         <el-row>
           <el-form-item label="关键字" prop="dictName">
             <el-input
@@ -221,22 +319,58 @@
             />
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >查询</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
           </el-form-item>
         </el-row>
-
       </el-form>
 
-
-      <el-table v-loading="loading" :data="typeList" height="500px" @selection-change="handleSelectionChange">
+      <el-table
+        v-loading="loading"
+        :data="typeList"
+        height="500px"
+        @selection-change="handleSelectionChange"
+      >
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" align="center" prop="dictId" />
-        <el-table-column label="类型名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="编码" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="当前在用量" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="退料数量" align="center" class-name="small-padding fixed-width" width="200">
+        <el-table-column
+          label="类型名称"
+          align="center"
+          prop="dictName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="规格型号"
+          align="center"
+          prop="dictName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="编码"
+          align="center"
+          prop="dictName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="当前在用量"
+          align="center"
+          prop="dictName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="退料数量"
+          align="center"
+          class-name="small-padding fixed-width"
+          width="200"
+        >
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.dictName"
@@ -248,30 +382,42 @@
       </el-table>
 
       <pagination
-        v-show="total>0"
+        v-show="total > 0"
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
         @pagination="getList"
       />
 
-
-      <div slot="footer" class="dialog-footer" style="text-align: center">
+      <div
+        slot="footer"
+        class="dialog-footer"
+        style="text-align: center"
+        v-if="type == 'update'"
+      >
         <el-button type="primary" @click="submitForm">通过</el-button>
         <el-button @click="cancel">不通过</el-button>
       </div>
     </el-dialog>
+    <dialogForm
+      :dialogTitle="title"
+      :isShowFlag.sync="isShowOneFlag"
+      :priKey="priKey"
+    ></dialogForm>
   </div>
 </template>
 
 <script>
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-
+import dialogForm from "./dialogForm.vue";
 export default {
+  components: { dialogForm, },
   name: "Dict",
   dicts: ['sys_normal_disable'],
   data() {
     return {
+      isShowOneFlag: false,
+      type: '',
       // 遮罩层
       loading: true,
       // 选中数组
@@ -321,10 +467,10 @@ export default {
     getList() {
       this.loading = true;
       listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.typeList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
+        this.typeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      }
       );
     },
     // 取消按钮
@@ -363,21 +509,29 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.dictId)
-      this.single = selection.length!=1
+      this.single = selection.length != 1
       this.multiple = !selection.length
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleUpdate(row, type) {
+      this.type = type
       this.reset();
-      const dictId = row.dictId || this.ids
-      getType(dictId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改";
-      });
+      // const dictId = row.dictId || this.ids
+      // getType(dictId).then(response => {
+      //   this.form = response.data;
+      //   this.open = true;
+      //   this.title = "修改";
+      // });
+      this.open = true;
+      this.title = "修改";
+    },
+    // 退料单
+    handleUpdateOrder() {
+      this.title = "查看";
+      this.isShowOneFlag = true
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.dictId != undefined) {
@@ -399,12 +553,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const dictIds = row.dictId || this.ids;
-      this.$modal.confirm('是否确认删除该数据项？').then(function() {
+      this.$modal.confirm('是否确认删除该数据项？').then(function () {
         return delType(dictIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue b/sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue
index 19d736a8..de35050a 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
       <el-form-item label="关键字" prop="dictName">
         <el-input
           v-model="queryParams.dictName"
@@ -66,89 +73,155 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >查询</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          :disabled="multiple"
-          v-hasPermi="['store:labelType:add']"
-        >完成退料</el-button>
-      </el-col>
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="primary"-->
-      <!--          plain-->
-      <!--          icon="el-icon-plus"-->
-      <!--          size="mini"-->
-      <!--          :disabled="multiple"-->
-      <!--          v-hasPermi="['store:labelType:add']"-->
-      <!--        >批量提交</el-button>-->
-      <!--      </el-col>-->
-      <el-col :span="1.5">
+        <!-- :disabled="multiple" -->
         <el-button
           type="warning"
           plain
+          size="mini"
+          @click="handleFinish"
+          v-hasPermi="['store:labelType:add']"
+          >完成退料</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
           v-hasPermi="['store:labelType:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
 
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="typeList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="dictId" />
-      <el-table-column label="退料单号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料单位名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料工程名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料工机具类型" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料人员" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料人联系电话" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料申请时间" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="协议号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="是否异常退料" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料状态" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="不通过原因" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="序号" sortable align="center" prop="dictId" />
+      <el-table-column
+        sortable
+        label="退料单号"
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        sortable
+        label="退料单位名称"
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        sortable
+        label="退料工程名称"
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        sortable
+        label="退料工机具类型"
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        sortable
+        label="退料人员"
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        sortable
+        label="退料人联系电话"
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        sortable
+        label="退料申请时间"
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="协议号"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        sortable
+        label="退料状态"
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="250"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            type="primary"
+            icon="el-icon-zoom-in"
+            @click="handleUpdate(scope.row, 'see')"
             v-hasPermi="['store:labelType:edit']"
-          >查看</el-button>
+            >查看</el-button
+          >
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
+            type="warning"
+            @click="handleFinish(scope.row, 'see')"
             v-hasPermi="['store:labelType:edit']"
-          >完成退料</el-button>
+            >完成退料</el-button
+          >
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            type="primary"
+            icon="el-icon-document"
+            @click="handleUpdateOrder(scope.row)"
             v-hasPermi="['store:labelType:edit']"
-          >退料单</el-button>
-
+            >退料单</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -156,8 +229,20 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px"   append-to-body>
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1000px"
+      append-to-body
+    >
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="100px"
+      >
         <el-row>
           <el-form-item label="关键字" prop="dictName">
             <el-input
@@ -187,21 +272,58 @@
             />
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >查询</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
           </el-form-item>
         </el-row>
       </el-form>
 
-
-      <el-table v-loading="loading" :data="typeList" height="500px" @selection-change="handleSelectionChange">
+      <el-table
+        v-loading="loading"
+        :data="typeList"
+        height="500px"
+        @selection-change="handleSelectionChange"
+      >
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" align="center" prop="dictId" />
-        <el-table-column label="类型名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="编码" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="退料数量" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="合格入库数" align="center" class-name="small-padding fixed-width" width="200">
+        <el-table-column label="序号" sortable align="center" prop="dictId" />
+        <el-table-column
+          label="类型名称"
+          align="center"
+          prop="dictName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="规格型号"
+          align="center"
+          prop="dictName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="编码"
+          align="center"
+          prop="dictName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="退料数量"
+          align="center"
+          prop="dictName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="合格入库数"
+          align="center"
+          class-name="small-padding fixed-width"
+          width="200"
+        >
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.dictName"
@@ -210,7 +332,12 @@
             />
           </template>
         </el-table-column>
-        <el-table-column label="待修数" align="center" class-name="small-padding fixed-width" width="200">
+        <el-table-column
+          label="待修数"
+          align="center"
+          class-name="small-padding fixed-width"
+          width="200"
+        >
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.dictName"
@@ -219,7 +346,12 @@
             />
           </template>
         </el-table-column>
-        <el-table-column label="报废数" align="center" class-name="small-padding fixed-width" width="200">
+        <el-table-column
+          label="报废数"
+          align="center"
+          class-name="small-padding fixed-width"
+          width="200"
+        >
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.dictName"
@@ -231,29 +363,83 @@
       </el-table>
 
       <pagination
-        v-show="total>0"
+        v-show="total > 0"
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
         @pagination="getList"
       />
-
-      <div slot="footer" class="dialog-footer" style="text-align: center">
-          <el-button type="primary" @click="submitForm">确定</el-button>
-          <el-button @click="cancel">取消</el-button>
+      <!-- <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button type="primary" @click="submitForm">确定</el-button>
+        <el-button @click="cancel">取消</el-button>
+      </div> -->
+    </el-dialog>
+    <dialogForm
+      :dialogTitle="title"
+      :isShowFlag.sync="isShowOneFlag"
+      :priKey="priKey"
+    ></dialogForm>
+    <el-dialog
+      v-loading.fullscreen.lock="fullscreenLoading"
+      :title="title"
+      :visible.sync="openOne"
+      append-to-body
+      width="400px"
+    >
+      <div class="submit_box">
+        <div>
+          <i
+            class="el-icon-circle-check"
+            style="color: #ff9900; font-size: 30px"
+          ></i>
+        </div>
+        <div class="submit_box_title">
+          <div>{{ openTextOne }}</div>
+          <div>{{ openTextTwo }}</div>
+        </div>
       </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">返回</el-button>
+        <el-button type="primary" @click="submitOpenOneForm()">确定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      v-loading.fullscreen.lock="fullscreenLoading"
+      :title="title"
+      :visible.sync="openTwo"
+      append-to-body
+      width="400px"
+    >
+      <div class="submit_box_two">
+        <div>
+          <i
+            class="el-icon-circle-check"
+            style="color: #00c196; font-size: 30px"
+          ></i>
+        </div>
+        <div class="submit_box_title">{{ openTextThree }}！</div>
+      </div>
+      <div slot="footer" class="dialog-footer"></div>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-
+import dialogForm from "./dialogForm.vue";
 export default {
+  components: { dialogForm, },
   name: "Dict",
   dicts: ['sys_normal_disable'],
   data() {
     return {
+      fullscreenLoading: false,
+      openOne: false,
+      openTwo: false,
+      openTextOne: '',
+      openTextTwo: '',
+      openTextThree: '',
+      isShowOneFlag: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -303,10 +489,10 @@ export default {
     getList() {
       this.loading = true;
       listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.typeList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
+        this.typeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      }
       );
     },
     // 取消按钮
@@ -345,7 +531,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.dictId)
-      this.single = selection.length!=1
+      this.single = selection.length != 1
       this.multiple = !selection.length
     },
     /** 修改按钮操作 */
@@ -358,8 +544,24 @@ export default {
         this.title = "修改";
       });
     },
+    // 退料单
+    handleUpdateOrder() {
+      this.title = "查看";
+      this.isShowOneFlag = true
+    },
+    // 完成退料
+    handleFinish() {
+      this.title = "确认操作";
+      this.openTextOne = "确认完成退料么?";
+      this.openTextTwo = "确认完成退料么?";
+      this.openOne = true
+    },
+    submitOpenOneForm() {
+      this.openTextThree = "完成退料成功！";
+      this.openTwo = true
+    },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.dictId != undefined) {
@@ -381,12 +583,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const dictIds = row.dictId || this.ids;
-      this.$modal.confirm('是否确认删除该数据项？').then(function() {
+      this.$modal.confirm('是否确认删除该数据项？').then(function () {
         return delType(dictIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -404,3 +606,43 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+.submit_box {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+
+  .submit_box_title {
+    display: flex;
+    flex-direction: column;
+    margin-left: 15px;
+
+    :first-child {
+      font-size: 14px;
+      font-weight: 600;
+    }
+
+    :last-child {
+      margin-top: 6px;
+      font-size: 12px;
+    }
+  }
+}
+
+.submit_box_two {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+  margin-left: 30%;
+
+  .submit_box_title {
+    display: flex;
+    flex-direction: column;
+    margin-left: 10px;
+    font-size: 18px;
+    font-weight: 600;
+  }
+}
+</style>
+
diff --git a/sgzb-ui/src/views/claimAndRefund/returnAbnormal/returnAbnormal.vue b/sgzb-ui/src/views/claimAndRefund/returnAbnormal/returnAbnormal.vue
index 58e6c30f..e0fb776e 100644
--- a/sgzb-ui/src/views/claimAndRefund/returnAbnormal/returnAbnormal.vue
+++ b/sgzb-ui/src/views/claimAndRefund/returnAbnormal/returnAbnormal.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
       <el-form-item label="关键字" prop="dictName">
         <el-input
           v-model="queryParams.dictName"
@@ -35,16 +42,16 @@
           clearable
           style="width: 240px"
           @keyup.enter.native="handleQuery"
+        /> </el-form-item
+      ><el-form-item label="规格型号" prop="dictName">
+        <el-input
+          v-model="queryParams.dictName"
+          placeholder="请输入规格型号"
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
         />
-      </el-form-item><el-form-item label="规格型号" prop="dictName">
-      <el-input
-        v-model="queryParams.dictName"
-        placeholder="请输入规格型号"
-        clearable
-        style="width: 240px"
-        @keyup.enter.native="handleQuery"
-      />
-    </el-form-item>
+      </el-form-item>
       <el-form-item label="异常原型" prop="dictName">
         <el-input
           v-model="queryParams.dictName"
@@ -73,10 +80,17 @@
         />
       </el-form-item>
 
-
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >查询</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -89,52 +103,127 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['store:labelType:export']"
-        >导出数据</el-button>
+          >导出数据</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="typeList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="dictId" />
-      <el-table-column label="退料单号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料单位名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料工机具类型" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料人员" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料数量" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料超出数量" align="center" prop="dictName" :show-overflow-tooltip="true" >
+      <el-table-column
+        label="退料单号"
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料单位名称"
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料工机具类型"
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="规格型号"
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料人员"
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料数量"
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料超出数量"
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      >
         <template slot-scope="scope">
-          <span style="color: #02A7F0;" @click="openNum(scope.row)">{{scope.row.dictName}}</span>
+          <span style="color: #02a7f0" @click="openNum(scope.row)">{{
+            scope.row.dictName
+          }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="退料时间" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="操作人" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="异常原因 " align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="管理模式" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="状态" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="退料时间"
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="操作人"
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="异常原因 "
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="管理模式"
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="状态"
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
+            type="warning"
+            icon="el-icon-circle-check"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['store:labelType:edit']"
-          >转退</el-button>
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-delete"-->
-<!--            @click="handleDelete(scope.row)"-->
-<!--            v-hasPermi="['store:labelType:remove']"-->
-<!--          >删除</el-button>-->
+            >转退</el-button
+          >
+          <!--          <el-button-->
+          <!--            size="mini"-->
+          <!--            type="text"-->
+          <!--            icon="el-icon-delete"-->
+          <!--            @click="handleDelete(scope.row)"-->
+          <!--            v-hasPermi="['store:labelType:remove']"-->
+          <!--          >删除</el-button>-->
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -154,7 +243,12 @@
           <el-input v-model="form.dictName" placeholder="请输入开始日期" />
         </el-form-item>
         <el-form-item label="转退单位" prop="dictName">
-          <el-input-number v-model="form.dictName" style="width:100%;" controls-position="right" :min="0" />
+          <el-input-number
+            v-model="form.dictName"
+            style="width: 100%"
+            controls-position="right"
+            :min="0"
+          />
         </el-form-item>
         <el-form-item label="转退工程" prop="dictName">
           <el-input v-model="form.dictName" placeholder="请输入授权人" />
@@ -171,7 +265,6 @@
         <el-form-item label="转退人员" prop="dictName">
           <el-input v-model="form.dictName" placeholder="请输入联系方式" />
         </el-form-item>
-
       </el-form>
       <div slot="footer" class="dialog-footer" style="text-align: center">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -179,28 +272,59 @@
       </div>
     </el-dialog>
 
-    <el-dialog :title="title" :visible.sync="opeNum" width="800px" append-to-body>
-      <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+    <el-dialog
+      :title="title"
+      :visible.sync="opeNum"
+      width="800px"
+      append-to-body
+    >
+      <el-table
+        v-loading="loading"
+        :data="typeList"
+        @selection-change="handleSelectionChange"
+      >
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" align="center" prop="dictId" />
-        <el-table-column label="工机具类型" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="编码" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="实际退料单位" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="实际退料工程" align="center" prop="dictName" :show-overflow-tooltip="true" />
+        <el-table-column
+          label="工机具类型"
+          align="center"
+          prop="dictName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="规格型号"
+          align="center"
+          prop="dictName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="编码"
+          align="center"
+          prop="dictName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="实际退料单位"
+          align="center"
+          prop="dictName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="实际退料工程"
+          align="center"
+          prop="dictName"
+          :show-overflow-tooltip="true"
+        />
       </el-table>
 
       <pagination
-        v-show="total>0"
+        v-show="total > 0"
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
         @pagination="getList"
       />
-
-
     </el-dialog>
-
   </div>
 </template>
 
@@ -253,10 +377,10 @@ export default {
           { required: true, message: "字典类型不能为空", trigger: "blur" }
         ]
       },
-      peopleOpen:false,
-      noticeOpen:false,
-      nform:{
-        notice:''
+      peopleOpen: false,
+      noticeOpen: false,
+      nform: {
+        notice: ''
       },
       nrules: {
         notice: [
@@ -274,10 +398,10 @@ export default {
     getList() {
       this.loading = true;
       listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.typeList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
+        this.typeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      }
       );
     },
     // 取消按钮
@@ -307,7 +431,7 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    handleNotice(){
+    handleNotice() {
       this.noticeOpen = true;
     },
     /** 新增按钮操作 */
@@ -319,7 +443,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.dictId)
-      this.single = selection.length!=1
+      this.single = selection.length != 1
       this.multiple = !selection.length
     },
     /** 修改按钮操作 */
@@ -332,12 +456,12 @@ export default {
         this.title = "退转";
       });
     },
-    openNum(row){
+    openNum(row) {
       this.opeNum = true;
       this.title = "";
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.dictId != undefined) {
@@ -359,12 +483,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const dictIds = row.dictId || this.ids;
-      this.$modal.confirm('是否确认删除该数据项？').then(function() {
+      this.$modal.confirm('是否确认删除该数据项？').then(function () {
         return delType(dictIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
diff --git a/sgzb-ui/src/views/repairTest/brokenExamine.vue b/sgzb-ui/src/views/repairTest/brokenExamine.vue
deleted file mode 100644
index bafab467..00000000
--- a/sgzb-ui/src/views/repairTest/brokenExamine.vue
+++ /dev/null
@@ -1,376 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="关键字" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请输入关键字"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单位名称" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请输入单位名称"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工程名称" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请输入工程名称"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工机具类型" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请输入工机具类型"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
-      <el-form-item label="维修单号" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请选择维修单号"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="审批状态" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请选择审批状态"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="任务创建时间" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请输入任务创建时间"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          :disabled="multiple"
-          v-hasPermi="['store:labelType:add']"
-        >批量审核</el-button>
-      </el-col>
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="primary"-->
-      <!--          plain-->
-      <!--          icon="el-icon-plus"-->
-      <!--          size="mini"-->
-      <!--          :disabled="multiple"-->
-      <!--          v-hasPermi="['store:labelType:add']"-->
-      <!--        >批量提交</el-button>-->
-      <!--      </el-col>-->
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['store:labelType:export']"
-        >导出</el-button>
-      </el-col>
-
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="dictId" />
-      <el-table-column label="退料单号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料单位名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料工程名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料工机具类型" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料人员" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料人联系电话" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料申请时间" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="协议号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="是否异常退料" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料状态" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="不通过原因" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['store:labelType:edit']"
-          >查看</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['store:labelType:edit']"
-          >审核</el-button>
-
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px"   append-to-body>
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-        <el-row>
-          <el-form-item label="关键字" prop="dictName">
-            <el-input
-              v-model="queryParams.dictName"
-              placeholder="请输入借出方单位"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="类型名称" prop="dictName">
-            <el-input
-              v-model="queryParams.dictName"
-              placeholder="请输入借入方单位"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="规格型号" prop="dictName">
-            <el-input
-              v-model="queryParams.dictName"
-              placeholder="请输入关键字"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>、
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-row>
-
-      </el-form>
-
-
-      <el-table v-loading="loading" :data="typeList" height="500px" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" align="center" prop="dictId" />
-        <el-table-column label="类型名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="编码" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="报废图片" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="报废数量" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      </el-table>
-
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
-
-      <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="submitForm">通过</el-button>
-        <el-button @click="cancel">不通过</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-
-export default {
-  name: "Dict",
-  dicts: ['sys_normal_disable'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 字典表格数据
-      typeList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 日期范围
-      dateRange: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        dictName: undefined,
-        dictType: undefined,
-        status: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        dictName: [
-          { required: true, message: "字典名称不能为空", trigger: "blur" }
-        ],
-        dictType: [
-          { required: true, message: "字典类型不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询字典类型列表 */
-    getList() {
-      this.loading = true;
-      listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.typeList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        dictId: undefined,
-        dictName: undefined,
-        dictType: undefined,
-        status: "0",
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "计划借调";
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dictId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const dictId = row.dictId || this.ids
-      getType(dictId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.dictId != undefined) {
-            updateType(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addType(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const dictIds = row.dictId || this.ids;
-      this.$modal.confirm('是否确认删除该数据项？').then(function() {
-        return delType(dictIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/dict/type/export', {
-        ...this.queryParams
-      }, `type_${new Date().getTime()}.xlsx`)
-    },
-    /** 刷新缓存按钮操作 */
-    handleRefreshCache() {
-      refreshCache().then(() => {
-        this.$modal.msgSuccess("刷新成功");
-        this.$store.dispatch('dict/cleanDict');
-      });
-    }
-  }
-};
-</script>
diff --git a/sgzb-ui/src/views/repairTest/repair.vue b/sgzb-ui/src/views/repairTest/repair.vue
deleted file mode 100644
index 7cc67d0f..00000000
--- a/sgzb-ui/src/views/repairTest/repair.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="关键字" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请输入关键字"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单位名称" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请输入单位名称"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工程名称" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请输入工程名称"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工机具类型" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请输入工机具类型"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="退料单号" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请选择退料单号"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="维修状态" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请选择维修状态"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
-      <el-form-item label="任务创建时间" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请输入任务创建时间"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          :disabled="multiple"
-          v-hasPermi="['store:labelType:add']"
-        >提交审核</el-button>
-      </el-col>
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="primary"-->
-      <!--          plain-->
-      <!--          icon="el-icon-plus"-->
-      <!--          size="mini"-->
-      <!--          :disabled="multiple"-->
-      <!--          v-hasPermi="['store:labelType:add']"-->
-      <!--        >批量提交</el-button>-->
-      <!--      </el-col>-->
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['store:labelType:export']"
-        >导出</el-button>
-      </el-col>
-
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="dictId" />
-      <el-table-column label="维修单号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料单位名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料工程名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="维修机具类型" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="任务创建人" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="任务创建时间" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料单号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="维修状态" align="center" prop="dictName" :show-overflow-tooltip="true" />
-
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['store:labelType:edit']"
-          >查看</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['store:labelType:edit']"
-          >维修</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['store:labelType:edit']"
-          >退回退料</el-button>
-
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 维修对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px"   append-to-body>
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-        <el-row>
-          <el-form-item label="关键字" prop="dictName">
-            <el-input
-              v-model="queryParams.dictName"
-              placeholder="请输入借出方单位"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="类型名称" prop="dictName">
-            <el-input
-              v-model="queryParams.dictName"
-              placeholder="请输入借入方单位"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="规格型号" prop="dictName">
-            <el-input
-              v-model="queryParams.dictName"
-              placeholder="请输入关键字"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-row>
-      </el-form>
-
-      <el-table v-loading="loading" :data="typeList" height="1000px" max-height="500px" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" align="center" prop="dictId" />
-        <el-table-column label="类型名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="编码" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="待修数量" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="待修状态" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="维修人员" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="维修时间" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="internalRepair(scope.row)"
-            >内部维修</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="backRepair(scope.row)"
-            >返厂维修</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="broken(scope.row)"
-            >待报废</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="complete(scope.row)"
-            >完成维修</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-    </el-dialog>
-
-    <el-dialog :title="title" :visible.sync="interOpen" width="800px"   append-to-body>
-        <div>
-          <div v-for="(form,index) in interList" :key="index" >
-            <div style="border-bottom: 1px solid #000;display: flex;justify-content: space-between;">
-              <span v-if="form.type=='code'">编码管理设备</span>
-              <span v-if="form.type=='num'">数量管理设备</span>
-              <el-button style="float: right;" type="text" @click="deleteForm(index)">删除</el-button>
-            </div>
-            <el-form
-              style="margin-top: 20px;"
-              :ref="'ruleForm'+index"
-              :model="form"
-              label-width="100px"
-            >
-              <el-form-item label="选择配件" prop="name">
-                <el-input
-                  v-model="form.name"
-                  placeholder="请选择配件"
-                  clearable
-                />
-              </el-form-item>
-              <el-form-item label="是否收费" prop="charge">
-                <el-radio v-model="form.charge" label="1">是</el-radio>
-                <el-radio v-model="form.charge" label="2">否</el-radio>
-              </el-form-item>
-              <el-form-item label="配件数量" prop="number">
-                <el-input
-                  v-model="form.number"
-                  placeholder="请输入配件数量"
-                  clearable
-                />
-              </el-form-item>
-              <el-form-item label="维修内容" prop="mark">
-                <el-input
-                  v-model="form.mark"
-                  placeholder="请输入维修内容"
-                  clearable
-                />
-              </el-form-item>
-            </el-form>
-          </div>
-          <el-button >添加配件</el-button>
-        </div>
-        <div slot="footer" class="dialog-footer" style="text-align: center">
-          <el-button type="primary" @click="submitForm">保存</el-button>
-          <el-button @click="cancel">取消</el-button>
-        </div>
-    </el-dialog>
-
-    <el-dialog :title="title" :visible.sync="backOpen" width="800px"   append-to-body>
-      <div>
-        <div v-for="(form,index) in interList" :key="index" >
-          <div style="border-bottom: 1px solid #000;display: flex;justify-content: space-between;">
-            <span v-if="form.type=='code'">编码管理设备</span>
-            <span v-if="form.type=='num'">数量管理设备</span>
-            <el-button style="float: right;" type="text" @click="deleteForm(index)">删除</el-button>
-          </div>
-          <el-form
-            style="margin-top: 20px;"
-            :ref="'ruleForm'+index"
-            :model="form"
-            label-width="100px"
-          >
-            <el-form-item label="选择配件" prop="name">
-              <el-input
-                v-model="form.name"
-                placeholder="请选择配件"
-                clearable
-              />
-            </el-form-item>
-            <el-form-item label="是否收费" prop="charge">
-              <el-radio v-model="form.charge" label="1">是</el-radio>
-              <el-radio v-model="form.charge" label="2">否</el-radio>
-            </el-form-item>
-            <el-form-item label="选择厂家" prop="number">
-              <el-input
-                v-model="form.number"
-                placeholder="请选择厂家"
-                clearable
-              />
-            </el-form-item>
-            <el-form-item label="配件单价" prop="number">
-              <el-input
-                v-model="form.number"
-                placeholder="请输入配件单价"
-                clearable
-              />
-            </el-form-item>
-            <el-form-item label="配件数量" prop="number">
-              <el-input
-                v-model="form.number"
-                placeholder="请输入配件数量"
-                clearable
-              />
-            </el-form-item>
-            <el-form-item label="维修内容" prop="mark">
-              <el-input
-                v-model="form.mark"
-                placeholder="请输入维修内容"
-                clearable
-              />
-            </el-form-item>
-          </el-form>
-        </div>
-        <el-button >添加配件</el-button>
-      </div>
-      <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="submitForm">保存</el-button>
-        <el-button @click="cancel">取消</el-button>
-      </div>
-
-    </el-dialog>
-
-    <el-dialog :title="title" :visible.sync="brokenOpen" width="800px"   append-to-body>
-      <div>
-        <div v-for="(form,index) in interList" :key="index" >
-          <div style="border-bottom: 1px solid #000;display: flex;justify-content: space-between;">
-            <span v-if="form.type=='code'">编码管理设备</span>
-            <span v-if="form.type=='num'">数量管理设备</span>
-            <el-button style="float: right;" type="text" @click="deleteForm(index)">删除</el-button>
-          </div>
-          <el-form
-            style="margin-top: 20px;"
-            :ref="'ruleForm'+index"
-            :model="form"
-            label-width="100px"
-          >
-            <el-form-item label="报废原因" prop="name">
-              <el-input
-                v-model="form.name"
-                placeholder="报废原因"
-                clearable
-              />
-            </el-form-item>
-            <el-form-item label="是否收费" prop="charge">
-              <el-radio v-model="form.charge" label="1">人为</el-radio>
-              <el-radio v-model="form.charge" label="2">自然</el-radio>
-            </el-form-item>
-            <el-form-item label="报废数量" prop="number">
-              <el-input
-                v-model="form.number"
-                placeholder="请输入报废数量"
-                clearable
-              />
-            </el-form-item>
-
-          </el-form>
-        </div>
-        <el-button >添加配件</el-button>
-      </div>
-      <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="submitForm">保存</el-button>
-        <el-button @click="cancel">取消</el-button>
-      </div>
-
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-
-export default {
-  name: "Dict",
-  dicts: ['sys_normal_disable'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 字典表格数据
-      typeList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      interOpen: false,
-      backOpen: false,
-      brokenOpen: false,
-      // 日期范围
-      dateRange: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        dictName: undefined,
-        dictType: undefined,
-        status: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        dictName: [
-          { required: true, message: "字典名称不能为空", trigger: "blur" }
-        ],
-        dictType: [
-          { required: true, message: "字典类型不能为空", trigger: "blur" }
-        ]
-      },
-      interList:[{name:'',number:'',mark:'',charge:'1',type:'code'},{name:'',number:'',mark:'',charge:'1',type:'num'}],
-      backList:[{name:'',number:'',mark:'',charge:'1'}],
-      brokenList:[{name:'',number:'',mark:'',charge:'1'}],
-
-
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询字典类型列表 */
-    getList() {
-      this.loading = true;
-      listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.typeList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        dictId: undefined,
-        dictName: undefined,
-        dictType: undefined,
-        status: "0",
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "计划借调";
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dictId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      // this.reset();
-      // const dictId = row.dictId || this.ids
-      // getType(dictId).then(response => {
-      //   this.form = response.data;
-        this.open = true;
-        this.title = "维修";
-      // });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.dictId != undefined) {
-            updateType(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addType(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const dictIds = row.dictId || this.ids;
-      this.$modal.confirm('是否确认删除该数据项？').then(function() {
-        return delType(dictIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/dict/type/export', {
-        ...this.queryParams
-      }, `type_${new Date().getTime()}.xlsx`)
-    },
-    internalRepair(row) {
-      console.log(row)
-      this.interOpen = true;
-      this.title = "内部维修";
-    },
-    backRepair(row) {
-      console.log(row)
-      this.backOpen = true;
-      this.title = "返厂维修";
-    },
-    broken(row) {
-      console.log(row)
-      this.brokenOpen = true;
-      this.title = "待报废";
-    },
-    complete(row) {
-      console.log(row)
-
-    },
-  }
-};
-</script>
diff --git a/sgzb-ui/src/views/repairTest/testExamine.vue b/sgzb-ui/src/views/repairTest/testExamine.vue
deleted file mode 100644
index d2fa9d06..00000000
--- a/sgzb-ui/src/views/repairTest/testExamine.vue
+++ /dev/null
@@ -1,376 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="关键字" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请输入关键字"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单位名称" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请输入单位名称"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工程名称" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请输入工程名称"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工机具类型" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请输入工机具类型"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
-      <el-form-item label="维修单号" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请选择维修单号"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="审批状态" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请选择审批状态"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="任务创建时间" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请输入任务创建时间"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          :disabled="multiple"
-          v-hasPermi="['store:labelType:add']"
-        >批量审核</el-button>
-      </el-col>
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="primary"-->
-      <!--          plain-->
-      <!--          icon="el-icon-plus"-->
-      <!--          size="mini"-->
-      <!--          :disabled="multiple"-->
-      <!--          v-hasPermi="['store:labelType:add']"-->
-      <!--        >批量提交</el-button>-->
-      <!--      </el-col>-->
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['store:labelType:export']"
-        >导出</el-button>
-      </el-col>
-
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="dictId" />
-      <el-table-column label="退料单号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料单位名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料工程名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料工机具类型" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料人员" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料人联系电话" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料申请时间" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="协议号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="是否异常退料" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料状态" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="不通过原因" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['store:labelType:edit']"
-          >查看</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['store:labelType:edit']"
-          >审核</el-button>
-
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px"   append-to-body>
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-        <el-row>
-          <el-form-item label="关键字" prop="dictName">
-            <el-input
-              v-model="queryParams.dictName"
-              placeholder="请输入借出方单位"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="类型名称" prop="dictName">
-            <el-input
-              v-model="queryParams.dictName"
-              placeholder="请输入借入方单位"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="规格型号" prop="dictName">
-            <el-input
-              v-model="queryParams.dictName"
-              placeholder="请输入关键字"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>、
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-row>
-
-      </el-form>
-
-
-      <el-table v-loading="loading" :data="typeList" height="500px" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" align="center" prop="dictId" />
-        <el-table-column label="类型名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="编码" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="维修合格数量" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="待报废数量" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      </el-table>
-
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
-
-      <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="submitForm">通过</el-button>
-        <el-button @click="cancel">不通过</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-
-export default {
-  name: "Dict",
-  dicts: ['sys_normal_disable'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 字典表格数据
-      typeList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 日期范围
-      dateRange: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        dictName: undefined,
-        dictType: undefined,
-        status: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        dictName: [
-          { required: true, message: "字典名称不能为空", trigger: "blur" }
-        ],
-        dictType: [
-          { required: true, message: "字典类型不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询字典类型列表 */
-    getList() {
-      this.loading = true;
-      listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.typeList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        dictId: undefined,
-        dictName: undefined,
-        dictType: undefined,
-        status: "0",
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新建";
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dictId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const dictId = row.dictId || this.ids
-      getType(dictId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.dictId != undefined) {
-            updateType(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addType(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const dictIds = row.dictId || this.ids;
-      this.$modal.confirm('是否确认删除该数据项？').then(function() {
-        return delType(dictIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/dict/type/export', {
-        ...this.queryParams
-      }, `type_${new Date().getTime()}.xlsx`)
-    },
-    /** 刷新缓存按钮操作 */
-    handleRefreshCache() {
-      refreshCache().then(() => {
-        this.$modal.msgSuccess("刷新成功");
-        this.$store.dispatch('dict/cleanDict');
-      });
-    }
-  }
-};
-</script>