From 407faaa979e358feed53da24dc1be04b1a543bd0 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Thu, 29 Aug 2024 16:17:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=85=B7=E7=B1=BB=E5=9E=8B=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../claimAndRefund/return/dialogFormExame.vue |  419 +++---
 .../secondStore/inStoreBook.vue               |    6 +-
 .../secondStore/outStoreBook.vue              |    6 +-
 .../secondStore/secondStore.vue               |   16 +-
 .../picking/apply/component/AddPicking1.vue   |    6 +-
 .../picking/apply/component/home1.vue         |    1 +
 .../auditing/component/auditingPage1.vue      |    7 +-
 .../claimAndreturn/picking/outbound/index.vue |    2 +-
 .../return/apply/component/addReturn1.vue     |    6 +-
 .../return/apply/component/home1.vue          |    2 +-
 .../claimAndreturn/return/auditing/index.vue  |    9 +-
 .../return/receive/component/handlePage.vue   |   14 +-
 .../return/receive/component/home.vue         |    4 +-
 .../component/finishAndDetails.vue            |   10 +-
 src/views/repairTest/brokenExamine/index.vue  |    7 +-
 src/views/repairTest/repair/index.vue         |   21 +-
 src/views/repairTest/testExamine/index.vue    |    8 +-
 .../store/warehousing/repairWarehousing.vue   | 1272 ++++++++++-------
 src/views/stquery/backRecord.vue              |    2 +-
 src/views/stquery/deviceFixQuery.vue          |    2 +-
 src/views/stquery/deviceInStoreQuery.vue      |    3 +-
 src/views/stquery/deviceScrapQuery.vue        |    1 +
 src/views/stquery/leaseRecord.vue             |    2 +-
 src/views/stquery/projUsingRecord.vue         |    3 +-
 .../machinery/coding/index.vue                |   35 +-
 .../machinery/keeper/index.vue                |    8 +-
 .../machinery/personnel/index.vue             |    8 +-
 .../partsAcceptance/component/home.vue        |   13 +-
 .../toolsAcceptance/component/addTools.vue    |    6 +-
 .../toolsAcceptance/component/codingTools.vue |    4 +-
 .../toolsAcceptance/component/home.vue        |   15 +-
 .../toolsAcceptance/component/queryTools.vue  |    2 +-
 .../warehouseManage/tagBind/bind/index.vue    |   15 +-
 .../warehouseManage/tagBind/history/index.vue |    8 +-
 .../warehousing/Inventory/config.js           |    2 +-
 .../warehousing/Inventory/index.vue           |    6 +-
 .../warehousing/newTools/index.vue            |    8 +-
 .../warehousing/repair/index.vue              |   41 +-
 .../warehousing/return/index.vue              |   19 +-
 39 files changed, 1169 insertions(+), 850 deletions(-)

diff --git a/src/views/claimAndRefund/return/dialogFormExame.vue b/src/views/claimAndRefund/return/dialogFormExame.vue
index b6b5b40..c3beb2a 100644
--- a/src/views/claimAndRefund/return/dialogFormExame.vue
+++ b/src/views/claimAndRefund/return/dialogFormExame.vue
@@ -1,50 +1,57 @@
 <template>
-  <el-dialog
-    v-dialogDrag
-    v-loading.fullscreen.lock="fullscreenLoading"
-    :before-close="cancel"
-    :title="dialogTitle"
-    :visible.sync="dialogShowFlag"
-    append-to-body
-    width="800px"
-  >
-    <div id="printcontent" style="height: 500px;overflow-y: scroll;padding: 0 20px;">
-      <vue-easy-print tableShow ref="printRef">
-        <div class="order_box">
-          <div class="order_box_one">
-            <div>
-              <span>工程名称：</span>
-              <span>{{ rowObj.lotName }}</span>
-            </div>
-            <div>
-              <span>退料时间：</span>
-              <span>{{ rowObj.backTime }}</span>
-            </div>
-          </div>
-          <div class="order_box_one">
-            <div>
-              <span>退料单位：</span>
-              <span>{{ rowObj.unitName }}</span>
-            </div>
-            <div>
-              <span>编号：</span>
-              <span>{{ rowObj.code }}</span>
-            </div>
-          </div>
-        </div>
-        <el-table :data="tableData" border style="width: 100%;margin-bottom: 10px;padding: 2px;">
-          <el-table-column label="编号" align="center" type="index" />
-          <el-table-column
-            label="类型名称"
-            align="center"
-            prop="typeName"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column type="expand">
+    <el-dialog
+        v-dialogDrag
+        v-loading.fullscreen.lock="fullscreenLoading"
+        :before-close="cancel"
+        :title="dialogTitle"
+        :visible.sync="dialogShowFlag"
+        append-to-body
+        width="800px"
+    >
+        <div
+            id="printcontent"
+            style="height: 500px; overflow-y: scroll; padding: 0 20px"
+        >
+            <vue-easy-print tableShow ref="printRef">
+                <div class="order_box">
+                    <div class="order_box_one">
+                        <div>
+                            <span>工程名称：</span>
+                            <span>{{ rowObj.lotName }}</span>
+                        </div>
+                        <div>
+                            <span>退料时间：</span>
+                            <span>{{ rowObj.backTime }}</span>
+                        </div>
+                    </div>
+                    <div class="order_box_one">
+                        <div>
+                            <span>退料单位：</span>
+                            <span>{{ rowObj.unitName }}</span>
+                        </div>
+                        <div>
+                            <span>编号：</span>
+                            <span>{{ rowObj.code }}</span>
+                        </div>
+                    </div>
+                </div>
+                <el-table
+                    :data="tableData"
+                    border
+                    style="width: 100%; margin-bottom: 10px; padding: 2px"
+                >
+                    <el-table-column label="编号" align="center" type="index" />
+                    <el-table-column
+                        label="机具名称"
+                        align="center"
+                        prop="typeName"
+                        :show-overflow-tooltip="true"
+                    />
+                    <!-- <el-table-column type="expand">
             <template slot-scope="scope">
               <div class="nested-table-container">
                 <el-table :data="scope.row.maTypeDetails" style="width: 100%">
-                  <!-- 子表格的列 -->
+       
                   <el-table-column label="序号" align="center" width="60" type="index"/>
                   <el-table-column
                     label="类型名称"
@@ -73,21 +80,21 @@
                 </el-table>
               </div>
             </template>
-          </el-table-column>
-          <el-table-column
-            label="规格型号"
-            align="center"
-            prop="typeCode"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="退料数量"
-            align="center"
-            class-name="small-padding fixed-width"
-            width="200"
-            prop="num"
-          ></el-table-column>
-          <!-- <el-table-column prop="remarks" label="备注" align="center">
+          </el-table-column> -->
+                    <el-table-column
+                        label="规格型号"
+                        align="center"
+                        prop="typeCode"
+                        :show-overflow-tooltip="true"
+                    />
+                    <el-table-column
+                        label="退料数量"
+                        align="center"
+                        class-name="small-padding fixed-width"
+                        width="200"
+                        prop="num"
+                    ></el-table-column>
+                    <!-- <el-table-column prop="remarks" label="备注" align="center">
             <template slot-scope="scope">
               <span
                 @click="remarksClick"
@@ -96,158 +103,192 @@
               >
             </template>
           </el-table-column>-->
-        </el-table>
-        <div class="order_footer">
-          <div>审核：</div>
-          <div>退料：</div>
-          <div>操作人：</div>
+                </el-table>
+                <div class="order_footer">
+                    <div>审核：</div>
+                    <div>退料：</div>
+                    <div>操作人：</div>
+                </div>
+            </vue-easy-print>
+            <div>
+                <el-button type="primary" @click="print">打印</el-button>
+            </div>
         </div>
-      </vue-easy-print>
-      <div>
-        <el-button type="primary" @click="print">打印</el-button>
-      </div>
-    </div>
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <div style="height: 500px;overflow-y: scroll;padding: 0 20px;">
-        <vue-easy-print tableShow ref="remarksPrintRef">
-          <div class="remarks_box">
-            <div class="remarks_box_title">退料编码明细</div>
-          </div>
-          <el-table :data="tableData" border style="width: 100%;margin-bottom: 10px;padding: 2px;">
-            <el-table-column label="序号" align="center" type="index" />
-            <el-table-column prop="name" label="名称" align="center"></el-table-column>
-            <el-table-column prop="type" label="规格型号" align="center"></el-table-column>
-            <el-table-column prop="unit" label="单位" align="center"></el-table-column>
-            <el-table-column prop="number" label="数量" align="center"></el-table-column>
-          </el-table>
-        </vue-easy-print>
-      </div>
-      <div style="margin-top: 10px">
-        <el-button type="primary" @click="remarksPrint">打印1</el-button>
-      </div>
+        <el-dialog
+            :title="title"
+            :visible.sync="open"
+            width="800px"
+            append-to-body
+        >
+            <div style="height: 500px; overflow-y: scroll; padding: 0 20px">
+                <vue-easy-print tableShow ref="remarksPrintRef">
+                    <div class="remarks_box">
+                        <div class="remarks_box_title">退料编码明细</div>
+                    </div>
+                    <el-table
+                        :data="tableData"
+                        border
+                        style="width: 100%; margin-bottom: 10px; padding: 2px"
+                    >
+                        <el-table-column
+                            label="序号"
+                            align="center"
+                            type="index"
+                        />
+                        <el-table-column
+                            prop="name"
+                            label="名称"
+                            align="center"
+                        ></el-table-column>
+                        <el-table-column
+                            prop="type"
+                            label="规格型号"
+                            align="center"
+                        ></el-table-column>
+                        <el-table-column
+                            prop="unit"
+                            label="单位"
+                            align="center"
+                        ></el-table-column>
+                        <el-table-column
+                            prop="number"
+                            label="数量"
+                            align="center"
+                        ></el-table-column>
+                    </el-table>
+                </vue-easy-print>
+            </div>
+            <div style="margin-top: 10px">
+                <el-button type="primary" @click="remarksPrint"
+                    >打印1</el-button
+                >
+            </div>
+        </el-dialog>
     </el-dialog>
-  </el-dialog>
 </template>
 <script>
 import vueEasyPrint from 'vue-easy-print'
-import { getViewByApply, materialReturnNoteByExamine } from '@/api/claimAndRefund/return.js'
+import {
+    getViewByApply,
+    materialReturnNoteByExamine,
+} from '@/api/claimAndRefund/return.js'
 export default {
-  components: { vueEasyPrint },
-  props: {
-    // 弹窗是否显示
-    isShowFlag: {
-      type: Boolean,
-      default: false,
+    components: { vueEasyPrint },
+    props: {
+        // 弹窗是否显示
+        isShowFlag: {
+            type: Boolean,
+            default: false,
+        },
+        // 对应操作数据键值
+        priKey: {
+            type: [String, Number],
+            default: '',
+        },
+        //弹窗标题
+        dialogTitle: {
+            type: String,
+            default: '',
+        },
+        rowObj: {
+            type: Object,
+            default: {},
+        },
     },
-    // 对应操作数据键值
-    priKey: {
-      type: [String, Number],
-      default: '',
+    watch: {
+        isShowFlag(val) {
+            if (val) {
+                this.init()
+            }
+        },
     },
-    //弹窗标题
-    dialogTitle: {
-      type: String,
-      default: '',
+    computed: {
+        dialogShowFlag: {
+            get() {
+                return this.isShowFlag
+            },
+            set(v) {
+                this.$emit('update:isShowFlag', v)
+            },
+        },
     },
-    rowObj: {
-      type: Object,
-      default: {},
-    },
-  },
-  watch: {
-    isShowFlag(val) {
-      if (val) {
-        this.init()
-      }
-    },
-  },
-  computed: {
-    dialogShowFlag: {
-      get() {
-        return this.isShowFlag
-      },
-      set(v) {
-        this.$emit('update:isShowFlag', v)
-      },
-    },
-  },
-  data() {
-    return {
-      fullscreenLoading: false,
-      tableData: [],
-      open: false,
-      title: '',
-    }
-  },
-  methods: {
-    init() {
-      let params = {
-        taskId: this.rowObj.taskId,
-        agreementId: this.rowObj.agreementId,
-        badId: this.rowObj.badId,
-      }
-      materialReturnNoteByExamine(params).then(res => {
-        this.tableData = res.data
-      })
-    },
-    // 取消按钮
-    cancel() {
-      this.dialogShowFlag = false
-    },
-    print() {
-      this.$refs.printRef.print()
-    },
-    remarksClick() {
-      this.title = '查看'
-      this.open = true
-    },
-    remarksPrint() {
-      this.$refs.remarksPrintRef.print()
+    data() {
+        return {
+            fullscreenLoading: false,
+            tableData: [],
+            open: false,
+            title: '',
+        }
     },
+    methods: {
+        init() {
+            let params = {
+                taskId: this.rowObj.taskId,
+                agreementId: this.rowObj.agreementId,
+                badId: this.rowObj.badId,
+            }
+            materialReturnNoteByExamine(params).then((res) => {
+                this.tableData = res.data
+            })
+        },
+        // 取消按钮
+        cancel() {
+            this.dialogShowFlag = false
+        },
+        print() {
+            this.$refs.printRef.print()
+        },
+        remarksClick() {
+            this.title = '查看'
+            this.open = true
+        },
+        remarksPrint() {
+            this.$refs.remarksPrintRef.print()
+        },
 
-    // submit() {
-    //   this.$refs["dynamicValidateForm"].validate(valid => {
-    //     console.log("valid", valid);
-    //     if (valid) {
-    //       console.log("11111");
-    //       this.cancel();
-    //     } else {
-    //       return false;
-    //     }
-    //   });
-    // }
-  },
+        // submit() {
+        //   this.$refs["dynamicValidateForm"].validate(valid => {
+        //     console.log("valid", valid);
+        //     if (valid) {
+        //       console.log("11111");
+        //       this.cancel();
+        //     } else {
+        //       return false;
+        //     }
+        //   });
+        // }
+    },
 }
 </script>
 <style lang="scss" scoped>
 .order_box {
-  display: flex;
-  flex-direction: column;
-  .order_box_one {
-    width: 100%;
     display: flex;
-    align-content: center;
-    justify-content: space-between;
-    margin-bottom: 10px;
-    :last-child {
-      margin-right: 20px;
+    flex-direction: column;
+    .order_box_one {
+        width: 100%;
+        display: flex;
+        align-content: center;
+        justify-content: space-between;
+        margin-bottom: 10px;
+        :last-child {
+            margin-right: 20px;
+        }
     }
-  }
 }
 .order_footer {
-  margin-top: 10px;
-  display: flex;
-  justify-content: space-around;
-  align-items: center;
+    margin-top: 10px;
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
 }
 .remarks_box {
-  display: flex;
-  // align-items: center;
-  justify-content: center;
-  .remarks_box_title {
-    margin-bottom: 10px;
+    display: flex;
+    // align-items: center;
+    justify-content: center;
+    .remarks_box_title {
+        margin-bottom: 10px;
 
-    font-size: 18px;
-  }
+        font-size: 18px;
+    }
 }
 </style>
diff --git a/src/views/claimAndRefund/secondStore/inStoreBook.vue b/src/views/claimAndRefund/secondStore/inStoreBook.vue
index 75efa4d..54d68c2 100644
--- a/src/views/claimAndRefund/secondStore/inStoreBook.vue
+++ b/src/views/claimAndRefund/secondStore/inStoreBook.vue
@@ -48,10 +48,10 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="类型名称" prop="typeId">
+            <el-form-item label="机具名称" prop="typeId">
                 <el-select
                     v-model="queryParams.typeId"
-                    placeholder="请选择类型名称"
+                    placeholder="请选择机具名称"
                     clearable
                     filterable
                     style="width: 240px"
@@ -152,7 +152,7 @@
                 :show-overflow-tooltip="true"
             />
             <el-table-column
-                label="类型名称"
+                label="机具名称"
                 align="center"
                 prop="typeName"
                 :show-overflow-tooltip="true"
diff --git a/src/views/claimAndRefund/secondStore/outStoreBook.vue b/src/views/claimAndRefund/secondStore/outStoreBook.vue
index 48e3f9c..d1aab16 100644
--- a/src/views/claimAndRefund/secondStore/outStoreBook.vue
+++ b/src/views/claimAndRefund/secondStore/outStoreBook.vue
@@ -48,10 +48,10 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="类型名称" prop="typeId">
+            <el-form-item label="机具名称" prop="typeId">
                 <el-select
                     v-model="queryParams.typeId"
-                    placeholder="请选择类型名称"
+                    placeholder="请选择机具名称"
                     clearable
                     filterable
                     style="width: 240px"
@@ -152,7 +152,7 @@
                 :show-overflow-tooltip="true"
             />
             <el-table-column
-                label="类型名称"
+                label="机具名称"
                 align="center"
                 prop="typeName"
                 :show-overflow-tooltip="true"
diff --git a/src/views/claimAndRefund/secondStore/secondStore.vue b/src/views/claimAndRefund/secondStore/secondStore.vue
index bb33e29..71e2bce 100644
--- a/src/views/claimAndRefund/secondStore/secondStore.vue
+++ b/src/views/claimAndRefund/secondStore/secondStore.vue
@@ -55,10 +55,10 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="类型名称" prop="typeId">
+            <el-form-item label="机具名称" prop="typeId">
                 <el-select
                     v-model="queryParams.typeId"
-                    placeholder="请选择类型名称"
+                    placeholder="请选择机具名称"
                     clearable
                     filterable
                     style="width: 240px"
@@ -162,7 +162,7 @@
                 v-if="leaseType == 0"
             />
             <el-table-column
-                label="类型名称"
+                label="机具名称"
                 align="center"
                 key="4"
                 prop="typeName"
@@ -275,10 +275,10 @@
                 :rules="rules"
                 label-width="120px"
             >
-                <el-form-item label="类型名称:" prop="typeName">
+                <el-form-item label="机具名称:" prop="typeName">
                     <el-input
                         v-model="form.typeName"
-                        placeholder="请输入类型名称"
+                        placeholder="请输入机具名称"
                         disabled
                     />
                 </el-form-item>
@@ -349,10 +349,10 @@
                 :rules="nrules"
                 label-width="120px"
             >
-                <el-form-item label="类型名称:" prop="typeName">
+                <el-form-item label="机具名称:" prop="typeName">
                     <el-input
                         v-model="nform.typeName"
-                        placeholder="请输入类型名称"
+                        placeholder="请输入机具名称"
                         disabled
                     />
                 </el-form-item>
@@ -474,7 +474,7 @@
                     </template> -->
                 </el-table-column>
                 <el-table-column
-                    label="类型名称"
+                    label="机具名称"
                     align="center"
                     prop="typeName"
                     :show-overflow-tooltip="true"
diff --git a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
index 2db75c6..7b440bb 100644
--- a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
+++ b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
@@ -72,9 +72,9 @@
                     style="width: 240px"
                 ></el-input>
             </el-form-item>
-            <el-form-item label="物品类型" prop="status">
+            <el-form-item label="规格型号" prop="status">
                 <el-cascader
-                    placeholder="请输入物品类型"
+                    placeholder="请输入规格型号"
                     :options="deviceTypeTree"
                     :props="deviceTypeTreeProps"
                     v-model="deviceType"
@@ -180,7 +180,7 @@
             <!-- <el-table-column type="selection" width="55" align="center" /> -->
             <el-table-column label="序号" type="index" width="80" />
             <el-table-column
-                label="类型名称"
+                label="机具名称"
                 prop="typeCn"
                 :show-overflow-tooltip="true"
             />
diff --git a/src/views/claimAndreturn/picking/apply/component/home1.vue b/src/views/claimAndreturn/picking/apply/component/home1.vue
index c986b5e..19a9c61 100644
--- a/src/views/claimAndreturn/picking/apply/component/home1.vue
+++ b/src/views/claimAndreturn/picking/apply/component/home1.vue
@@ -16,6 +16,7 @@
                     range-separator="至"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
+                    style="width: 240px"
                 >
                 </el-date-picker>
             </el-form-item>
diff --git a/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue b/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue
index fc8ebcc..27b2e50 100644
--- a/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue
+++ b/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue
@@ -88,19 +88,18 @@
                     <!--          <el-table-column type="selection" width="55" align="center" />-->
                     <el-table-column label="序号" align="center" type="index" />
                     <el-table-column
-                        label="类型名称"
+                        label="机具名称"
                         align="center"
                         prop="typeName"
                         :show-overflow-tooltip="true"
                     />
-                    <el-table-column type="expand">
+                    <!-- <el-table-column type="expand">
                         <template slot-scope="scope">
                             <div class="nested-table-container">
                                 <el-table
                                     :data="scope.row.maTypeDetails"
                                     style="width: 100%"
                                 >
-                                    <!-- 子表格的列 -->
                                     <el-table-column
                                         label="序号"
                                         align="center"
@@ -133,7 +132,7 @@
                                 </el-table>
                             </div>
                         </template>
-                    </el-table-column>
+                    </el-table-column> -->
                     <el-table-column
                         label="规格型号"
                         align="center"
diff --git a/src/views/claimAndreturn/picking/outbound/index.vue b/src/views/claimAndreturn/picking/outbound/index.vue
index 0e604f7..1436135 100644
--- a/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/src/views/claimAndreturn/picking/outbound/index.vue
@@ -245,7 +245,7 @@
                     "
                 />
                 <el-table-column
-                    label="类型名称"
+                    label="机具名称"
                     align="center"
                     prop="typeName"
                     :show-overflow-tooltip="true"
diff --git a/src/views/claimAndreturn/return/apply/component/addReturn1.vue b/src/views/claimAndreturn/return/apply/component/addReturn1.vue
index 0083374..07ecd98 100644
--- a/src/views/claimAndreturn/return/apply/component/addReturn1.vue
+++ b/src/views/claimAndreturn/return/apply/component/addReturn1.vue
@@ -55,9 +55,9 @@
                         style="width: 240px"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="物品类型" prop="status">
+                <el-form-item label="规格型号" prop="status">
                     <el-cascader
-                        placeholder="请输入物品类型"
+                        placeholder="规格型号"
                         :options="deviceTypeTree"
                         :props="deviceTypeTreeProps"
                         v-model="deviceType"
@@ -156,7 +156,7 @@
             />
             <el-table-column label="序号" type="index" min-width="120" />
             <el-table-column
-                label="类型名称"
+                label="机具名称"
                 prop="typeName"
                 min-width="200"
                 :show-overflow-tooltip="true"
diff --git a/src/views/claimAndreturn/return/apply/component/home1.vue b/src/views/claimAndreturn/return/apply/component/home1.vue
index d6106c5..cfc3616 100644
--- a/src/views/claimAndreturn/return/apply/component/home1.vue
+++ b/src/views/claimAndreturn/return/apply/component/home1.vue
@@ -466,7 +466,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column
-                    label="类型名称"
+                    label="机具名称"
                     align="center"
                     prop="typeName"
                     :show-overflow-tooltip="true"
diff --git a/src/views/claimAndreturn/return/auditing/index.vue b/src/views/claimAndreturn/return/auditing/index.vue
index 9df9e25..1208c28 100644
--- a/src/views/claimAndreturn/return/auditing/index.vue
+++ b/src/views/claimAndreturn/return/auditing/index.vue
@@ -440,26 +440,25 @@
                     </template>
                 </el-table-column>
                 <el-table-column
-                    label="类型名称"
+                    label="机具名称"
                     align="center"
                     prop="typeName"
                     :show-overflow-tooltip="true"
                 />
-                <el-table-column type="expand">
+                <!-- <el-table-column type="expand">
                     <template slot-scope="scope">
                         <div class="nested-table-container">
                             <el-table
                                 :data="scope.row.maTypeDetails"
                                 style="width: 100%"
                             >
-                                <!-- 子表格的列 -->
                                 <el-table-column
                                     label="序号"
                                     align="center"
                                     type="index"
                                 />
                                 <el-table-column
-                                    label="类型名称"
+                                    label="机具名称"
                                     align="center"
                                     prop="typeName"
                                     :show-overflow-tooltip="true"
@@ -485,7 +484,7 @@
                             </el-table>
                         </div>
                     </template>
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column
                     label="规格型号"
                     align="center"
diff --git a/src/views/claimAndreturn/return/receive/component/handlePage.vue b/src/views/claimAndreturn/return/receive/component/handlePage.vue
index 03b43b9..31f4874 100644
--- a/src/views/claimAndreturn/return/receive/component/handlePage.vue
+++ b/src/views/claimAndreturn/return/receive/component/handlePage.vue
@@ -19,10 +19,10 @@
           />
       </el-form-item>-->
 
-            <el-form-item label="类型名称" prop="typeId">
+            <el-form-item label="机具名称" prop="typeId">
                 <el-select
                     v-model="queryParams.typeId"
-                    placeholder="请选择类型名称"
+                    placeholder="请选择机具名称"
                     clearable
                     filterable
                     style="width: 240px"
@@ -99,19 +99,19 @@
                 </template> -->
             </el-table-column>
             <el-table-column
-                label="类型名称"
+                label="机具名称"
                 align="center"
                 prop="typeName"
                 :show-overflow-tooltip="true"
             />
-            <el-table-column type="expand" v-if="isPlural">
+            <!-- <el-table-column type="expand" v-if="isPlural">
                 <template slot-scope="scope">
                     <div class="nested-table-container">
                         <el-table
                             :data="scope.row.maTypeDetails"
                             style="width: 100%"
                         >
-                            <!-- 子表格的列 -->
+     
                             <el-table-column
                                 label="序号"
                                 align="center"
@@ -144,7 +144,7 @@
                         </el-table>
                     </div>
                 </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
                 label="规格型号"
                 align="center"
@@ -536,7 +536,7 @@
                 <el-table v-loading="loading" :data="numList" height="500">
                     <el-table-column label="序号" align="center" type="index" />
                     <el-table-column
-                        label="类型名称"
+                        label="机具名称"
                         align="center"
                         prop="typeName"
                         :show-overflow-tooltip="true"
diff --git a/src/views/claimAndreturn/return/receive/component/home.vue b/src/views/claimAndreturn/return/receive/component/home.vue
index cea5db1..0305bb0 100644
--- a/src/views/claimAndreturn/return/receive/component/home.vue
+++ b/src/views/claimAndreturn/return/receive/component/home.vue
@@ -172,7 +172,7 @@
                 show-overflow-tooltip
             />
             <el-table-column
-                label="退料机具"
+                label="退料规格型号"
                 align="center"
                 prop="typeName"
                 show-overflow-tooltip
@@ -258,7 +258,7 @@
     </div>
 </template>
 
-  <script>
+<script>
 import {
     getBackAuditList,
     getViewByExamine,
diff --git a/src/views/cost/csotSettlement/component/finishAndDetails.vue b/src/views/cost/csotSettlement/component/finishAndDetails.vue
index a90ad2b..589ae9f 100644
--- a/src/views/cost/csotSettlement/component/finishAndDetails.vue
+++ b/src/views/cost/csotSettlement/component/finishAndDetails.vue
@@ -129,7 +129,7 @@ export default {
         return {
             // 结算清单配置项
             settleTableColumns: [
-                { t_prop: 'typeName', t_label: '设备名称' },
+                { t_prop: 'typeName', t_label: '机具名称' },
                 { t_prop: 'modelName', t_label: '规格型号' },
                 { t_prop: 'nuitName', t_label: '计量单位' },
                 { t_prop: 'num', t_label: '数量' },
@@ -146,7 +146,7 @@ export default {
             ],
             // 维修清单配置项
             repairTableColumns: [
-                { t_prop: 'typeName', t_label: '设备名称' },
+                { t_prop: 'typeName', t_label: '机具名称' },
                 { t_prop: 'modelName', t_label: '规格型号' },
                 { t_prop: 'nuitName', t_label: '计量单位' },
                 { t_prop: 'partName', t_label: '维修配件名称' },
@@ -159,7 +159,7 @@ export default {
             ],
             // 未还赔偿清单配置项
             noReturnTableColumns: [
-                { t_prop: 'typeName', t_label: '设备名称' },
+                { t_prop: 'typeName', t_label: '机具名称' },
                 { t_prop: 'modelName', t_label: '规格型号' },
                 { t_prop: 'nuitName', t_label: '计量单位' },
                 { t_prop: 'maCode', t_label: '设备编码' },
@@ -169,7 +169,7 @@ export default {
             ],
             // 报废清单单配置项
             scrapTableColumns: [
-                { t_prop: 'typeName', t_label: '设备名称' },
+                { t_prop: 'typeName', t_label: '机具名称' },
                 { t_prop: 'modelName', t_label: '规格型号' },
                 { t_prop: 'nuitName', t_label: '计量单位' },
                 { t_prop: 'maCode', t_label: '设备编码' },
@@ -179,7 +179,7 @@ export default {
             ],
             // 待报废清单配置项
             stayScrapTableColumns: [
-                { t_prop: 'typeName', t_label: '设备名称' },
+                { t_prop: 'typeName', t_label: '机具名称' },
                 { t_prop: 'modelName', t_label: '规格型号' },
                 { t_prop: 'nuitName', t_label: '计量单位' },
                 { t_prop: 'maCode', t_label: '设备编码' },
diff --git a/src/views/repairTest/brokenExamine/index.vue b/src/views/repairTest/brokenExamine/index.vue
index 5c1d4ed..9c6c046 100644
--- a/src/views/repairTest/brokenExamine/index.vue
+++ b/src/views/repairTest/brokenExamine/index.vue
@@ -291,7 +291,7 @@
                             style="width: 240px"
                         />
                     </el-form-item>
-                    <el-form-item label="类型名称" prop="typeName">
+                    <el-form-item label="机具名称" prop="typeName">
                         <!-- <treeselect
               style="width: 250px"
               v-model="dialogQueryParams.typeName"
@@ -377,7 +377,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column
-                    label="类型名称"
+                    label="机具名称"
                     align="center"
                     prop="machineTypeName"
                     :show-overflow-tooltip="true"
@@ -500,7 +500,8 @@
                 >
                     <template slot-scope="scope">
                         <span>{{
-                            (scrapRecordParams.pageNum - 1) * scrapRecordParams.pageSize +
+                            (scrapRecordParams.pageNum - 1) *
+                                scrapRecordParams.pageSize +
                             scope.$index +
                             1
                         }}</span>
diff --git a/src/views/repairTest/repair/index.vue b/src/views/repairTest/repair/index.vue
index e30185c..a5a2dcc 100644
--- a/src/views/repairTest/repair/index.vue
+++ b/src/views/repairTest/repair/index.vue
@@ -160,7 +160,12 @@
             @selection-change="handleSelectionChange"
             border
         >
-            <el-table-column type="selection" width="55" align="center" :selectable="disabledSelection"/>
+            <el-table-column
+                type="selection"
+                width="55"
+                align="center"
+                :selectable="disabledSelection"
+            />
             <!-- <el-table-column
                 label="序号"
                 align="center"
@@ -288,7 +293,7 @@
                             style="width: 240px"
                         />
                     </el-form-item>
-                    <el-form-item label="类型名称" prop="typeName">
+                    <el-form-item label="机具名称" prop="typeName">
                         <selectTree
                             ref="mychildDialog"
                             style="width: 240px"
@@ -301,7 +306,7 @@
                             :defaultSelect="true"
                             :defaultData="defaultData"
                             :clearable="true"
-                            :placeholder="'请选择类型名称'"
+                            :placeholder="'请选择机具名称'"
                             @handleNodeClick="selectDropDialog"
                         ></selectTree>
                     </el-form-item>
@@ -378,14 +383,15 @@
                 >
                     <template slot-scope="scope">
                         <span>{{
-                            (dialogQueryParams.pageNum - 1) * dialogQueryParams.pageSize +
+                            (dialogQueryParams.pageNum - 1) *
+                                dialogQueryParams.pageSize +
                             scope.$index +
                             1
                         }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column
-                    label="类型名称"
+                    label="机具名称"
                     align="center"
                     prop="typeName"
                     :show-overflow-tooltip="true"
@@ -451,7 +457,10 @@
                     width="300px"
                     v-if="type == 'update'"
                 >
-                    <template slot-scope="scope" v-if="scope.row.status !== '1'">
+                    <template
+                        slot-scope="scope"
+                        v-if="scope.row.status !== '1'"
+                    >
                         <el-button
                             size="mini"
                             type="primary"
diff --git a/src/views/repairTest/testExamine/index.vue b/src/views/repairTest/testExamine/index.vue
index fe921c4..a8c16f8 100644
--- a/src/views/repairTest/testExamine/index.vue
+++ b/src/views/repairTest/testExamine/index.vue
@@ -172,7 +172,9 @@
                 align="center"
                 width="80"
                 type="index"
-                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
+                :index="
+                    indexContinuation(queryParams.pageNum, queryParams.pageSize)
+                "
             >
                 <!-- <template slot-scope="scope">
                     <span>{{
@@ -291,7 +293,7 @@
                             style="width: 240px"
                         />
                     </el-form-item>
-                    <el-form-item label="类型名称" prop="typeName">
+                    <el-form-item label="机具名称" prop="typeName">
                         <!-- <treeselect
               style="width: 250px"
               v-model="dialogQueryParams.typeName"
@@ -388,7 +390,7 @@
                     "
                 />
                 <el-table-column
-                    label="类型名称"
+                    label="机具名称"
                     align="center"
                     prop="machineTypeName"
                     :show-overflow-tooltip="true"
diff --git a/src/views/store/warehousing/repairWarehousing.vue b/src/views/store/warehousing/repairWarehousing.vue
index bf769af..db67412 100644
--- a/src/views/store/warehousing/repairWarehousing.vue
+++ b/src/views/store/warehousing/repairWarehousing.vue
@@ -1,21 +1,50 @@
 <template>
-  <div class="app-container" id="repairWarehousing">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="关键字" prop="keyWord">
-        <el-input v-model="queryParams.keyWord" placeholder="请输入关键字" clearable maxlength="50" style="width: 240px"
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="维修时间">
-        <el-date-picker v-model="queryParams.wxTime" style="width: 240px" value-format="yyyy-MM-dd" type="date"
-          range-separator="-" placeholder="维修时间"></el-date-picker>
-      </el-form-item>
-      <el-form-item label="设备类型" prop="deviceTypeId">
-        <el-select v-model="queryParams.deviceTypeId" placeholder="请选择设备类型" clearable filterable style="width: 240px">
-          <el-option v-for="typeItem in typeList" :key="typeItem.typeId" :label="typeItem.typeName"
-            :value="typeItem.typeId" />
-        </el-select>
-      </el-form-item>
-      <!-- <el-form-item label="规格型号" prop="modelId">
+    <div class="app-container" id="repairWarehousing">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="100px"
+        >
+            <el-form-item label="关键字" prop="keyWord">
+                <el-input
+                    v-model="queryParams.keyWord"
+                    placeholder="请输入关键字"
+                    clearable
+                    maxlength="50"
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="维修时间">
+                <el-date-picker
+                    v-model="queryParams.wxTime"
+                    style="width: 240px"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    range-separator="-"
+                    placeholder="维修时间"
+                ></el-date-picker>
+            </el-form-item>
+            <el-form-item label="机具名称" prop="deviceTypeId">
+                <el-select
+                    v-model="queryParams.deviceTypeId"
+                    placeholder="请选择机具名称"
+                    clearable
+                    filterable
+                    style="width: 240px"
+                >
+                    <el-option
+                        v-for="typeItem in typeList"
+                        :key="typeItem.typeId"
+                        :label="typeItem.typeName"
+                        :value="typeItem.typeId"
+                    />
+                </el-select>
+            </el-form-item>
+            <!-- <el-form-item label="规格型号" prop="modelId">
         <el-select
           v-model="queryParams.modelId"
           placeholder="请选择规格型号"
@@ -31,14 +60,25 @@
         </el-select>
       </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-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-row :gutter="10" class="mb8">
+            <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -49,550 +89,730 @@
           v-hasPermi="['system:dict:add']"
         >入库审核</el-button>
       </el-col>-->
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="success"-->
-      <!--          plain-->
-      <!--          icon="el-icon-edit"-->
-      <!--          size="mini"-->
-      <!--          :disabled="single"-->
-      <!--          @click="handleUpdate"-->
-      <!--          v-hasPermi="['system:dict:edit']"-->
-      <!--        >修改</el-button>-->
-      <!--      </el-col>-->
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="danger"-->
-      <!--          plain-->
-      <!--          icon="el-icon-delete"-->
-      <!--          size="mini"-->
-      <!--          :disabled="multiple"-->
-      <!--          @click="handleDelete"-->
-      <!--          v-hasPermi="['system:dict:remove']"-->
-      <!--        >删除</el-button>-->
-      <!--      </el-col>-->
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+            <!--      <el-col :span="1.5">-->
+            <!--        <el-button-->
+            <!--          type="success"-->
+            <!--          plain-->
+            <!--          icon="el-icon-edit"-->
+            <!--          size="mini"-->
+            <!--          :disabled="single"-->
+            <!--          @click="handleUpdate"-->
+            <!--          v-hasPermi="['system:dict:edit']"-->
+            <!--        >修改</el-button>-->
+            <!--      </el-col>-->
+            <!--      <el-col :span="1.5">-->
+            <!--        <el-button-->
+            <!--          type="danger"-->
+            <!--          plain-->
+            <!--          icon="el-icon-delete"-->
+            <!--          size="mini"-->
+            <!--          :disabled="multiple"-->
+            <!--          @click="handleDelete"-->
+            <!--          v-hasPermi="['system:dict:remove']"-->
+            <!--        >删除</el-button>-->
+            <!--      </el-col>-->
+            <el-col :span="1.5">
+                <el-button
+                    type="warning"
+                    plain
+                    icon="el-icon-download"
+                    size="mini"
+                    @click="handleExport"
+                    >导出</el-button
+                >
+            </el-col>
+            <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+            ></right-toolbar>
+        </el-row>
 
-    <el-table v-loading="loading" :data="tableList">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="维修单号" align="center" prop="repairCode" />
-      <el-table-column label="工机具类型" align="center" prop="maTypeName" :show-overflow-tooltip="true" />
-      <el-table-column label="维修人员" align="center" prop="wxName" :show-overflow-tooltip="true" />
-      <el-table-column label="维修时间" align="center" prop="wxTime" :show-overflow-tooltip="true"></el-table-column>
-      <!-- <el-table-column label="退料单号" align="center" prop="dictName" :show-overflow-tooltip="true" />
+        <el-table v-loading="loading" :data="tableList">
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column
+                label="维修单号"
+                align="center"
+                prop="repairCode"
+            />
+            <el-table-column
+                label="机具名称"
+                align="center"
+                prop="maTypeName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="维修人员"
+                align="center"
+                prop="wxName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="维修时间"
+                align="center"
+                prop="wxTime"
+                :show-overflow-tooltip="true"
+            ></el-table-column>
+            <!-- <el-table-column label="退料单号" align="center" prop="dictName" :show-overflow-tooltip="true" />
 
       <el-table-column label="提交入库人员" align="center" prop="updateBy" :show-overflow-tooltip="true" />
       <el-table-column label="提交入库时间" align="center" prop="updateTime" width="180"></el-table-column>
       <el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" />-->
-      <el-table-column label="状态" align="center" prop="taskStatus">
-        <!-- <template slot-scope="scope">
+            <el-table-column label="状态" align="center" prop="taskStatus">
+                <!-- <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
         </template>-->
-      </el-table-column>
+            </el-table-column>
 
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button size="mini" icon="el-icon-zoom-in" @click="handleView(scope.row)">查看</el-button>
-          <el-button size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-if="scope.row.taskStatus == '入库进行中'">审核</el-button>
-          <!--          <el-button-->
-          <!--            size="mini"-->
-          <!--            type="text"-->
-          <!--            icon="el-icon-delete"-->
-          <!--            @click="handleDelete(scope.row)"-->
-          <!--            v-hasPermi="['system:dict:remove']"-->
-          <!--          >删除</el-button>-->
-        </template>
-      </el-table-column>
-    </el-table>
+            <el-table-column
+                label="操作"
+                align="center"
+                class-name="small-padding fixed-width"
+            >
+                <template slot-scope="scope">
+                    <el-button
+                        size="mini"
+                        icon="el-icon-zoom-in"
+                        @click="handleView(scope.row)"
+                        >查看</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        icon="el-icon-edit"
+                        @click="handleUpdate(scope.row)"
+                        v-if="scope.row.taskStatus == '入库进行中'"
+                        >审核</el-button
+                    >
+                    <!--          <el-button-->
+                    <!--            size="mini"-->
+                    <!--            type="text"-->
+                    <!--            icon="el-icon-delete"-->
+                    <!--            @click="handleDelete(scope.row)"-->
+                    <!--            v-hasPermi="['system:dict:remove']"-->
+                    <!--          >删除</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" />
+        <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="query" ref="query" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="关键字" prop="keyWord">
-          <el-input v-model="query.keyWord" placeholder="请输入关键字" clearable maxlength="50" style="width: 240px"
-            @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <!--        <el-form-item label="状态" prop="status"> -->
-        <!--        <el-select -->
-        <!--        v-model="query.status" -->
-        <!--        placeholder="审核状态" -->
-        <!--        clearable -->
-        <!--        filterable -->
-        <!--        style="width: 240px" -->
-        <!--        > -->
-        <!--        <el-option label="未审核" value="0" /> -->
-        <!--        <el-option label="已入库" value="1" /> -->
-        <!--        <el-option label="驳回" value="2" /> -->
-        <!--        </el-select> -->
-        <!--        </el-form-item> -->
+        <!-- 添加或修改参数配置对话框 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="open"
+            width="1000px"
+            append-to-body
+        >
+            <el-form
+                :model="query"
+                ref="query"
+                size="small"
+                :inline="true"
+                v-show="showSearch"
+                label-width="68px"
+            >
+                <el-form-item label="关键字" prop="keyWord">
+                    <el-input
+                        v-model="query.keyWord"
+                        placeholder="请输入关键字"
+                        clearable
+                        maxlength="50"
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </el-form-item>
+                <!--        <el-form-item label="状态" prop="status"> -->
+                <!--        <el-select -->
+                <!--        v-model="query.status" -->
+                <!--        placeholder="审核状态" -->
+                <!--        clearable -->
+                <!--        filterable -->
+                <!--        style="width: 240px" -->
+                <!--        > -->
+                <!--        <el-option label="未审核" value="0" /> -->
+                <!--        <el-option label="已入库" value="1" /> -->
+                <!--        <el-option label="驳回" value="2" /> -->
+                <!--        </el-select> -->
+                <!--        </el-form-item> -->
 
-        <el-form-item label="机具类型" prop="typeId">
-          <treeselect v-model="query.typeId" default-expand-all :options="equipmentTypeList" placeholder="请选择规格型号"
-            :disable-branch-nodes="true" style="width: 240px" noChildrenText="没有数据了" noOptionsText="没有数据"
-            noResultsText="没有搜索结果" />
-        </el-form-item>
+                <el-form-item label="机具类型" prop="typeId">
+                    <treeselect
+                        v-model="query.typeId"
+                        default-expand-all
+                        :options="equipmentTypeList"
+                        placeholder="请选择规格型号"
+                        :disable-branch-nodes="true"
+                        style="width: 240px"
+                        noChildrenText="没有数据了"
+                        noOptionsText="没有数据"
+                        noResultsText="没有搜索结果"
+                    />
+                </el-form-item>
 
-        <!--        <el-form-item label="设备类型" prop="deviceTypeId"> -->
-        <!--        <el-select -->
-        <!--        v-model="query.deviceTypeId" -->
-        <!--        placeholder="请选择设备类型" -->
-        <!--        clearable -->
-        <!--        filterable -->
-        <!--        style="width: 240px" -->
-        <!--        > -->
-        <!--        <el-option -->
-        <!--        v-for="typeItem in typeList" -->
-        <!--        :key="typeItem.typeId" -->
-        <!--        :label="typeItem.typeName" -->
-        <!--        :value="typeItem.typeId" -->
-        <!--        /> -->
-        <!--        </el-select> -->
-        <!--        </el-form-item> -->
-        <!--        <el-form-item label="规格型号" prop="typeId"> -->
-        <!--        <el-select -->
-        <!--        v-model="query.typeId" -->
-        <!--        placeholder="请选择规格型号" -->
-        <!--        clearable -->
-        <!--        filterable -->
-        <!--        style="width: 240px" -->
-        <!--        > -->
-        <!--        <el-option -->
-        <!--        v-for="model in modelList" -->
-        <!--        :key="model.typeId" -->
-        <!--        :label="model.typeName" -->
-        <!--        :value="model.typeId" -->
-        <!--        /> -->
-        <!--        </el-select> -->
-        <!--        </el-form-item> -->
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleDialogQuery">查询</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 size="mini" :disabled="multiple" @click="passAll">批量通过</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="danger" plain size="mini" @click="refusedAll" :disabled="multiple">批量不通过</el-button>
-        </el-col>
-        <!--        <el-col :span="1.5">-->
-        <!--          <el-button-->
-        <!--            type="warning"-->
-        <!--            plain-->
-        <!--            icon="el-icon-download"-->
-        <!--            size="mini"-->
-        <!--            @click="handleExport"-->
-        <!--            v-hasPermi="['system:dict:export']"-->
-        <!--          >导出</el-button>-->
-        <!--        </el-col>-->
-      </el-row>
-      <el-table v-loading="loading" :data="detailTableList" @selection-change="handleSelectionChange" height="400">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" align="center" width="80" type="index" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)">
-          <!-- <template scope="scope">
+                <!--        <el-form-item label="设备类型" prop="deviceTypeId"> -->
+                <!--        <el-select -->
+                <!--        v-model="query.deviceTypeId" -->
+                <!--        placeholder="请选择设备类型" -->
+                <!--        clearable -->
+                <!--        filterable -->
+                <!--        style="width: 240px" -->
+                <!--        > -->
+                <!--        <el-option -->
+                <!--        v-for="typeItem in typeList" -->
+                <!--        :key="typeItem.typeId" -->
+                <!--        :label="typeItem.typeName" -->
+                <!--        :value="typeItem.typeId" -->
+                <!--        /> -->
+                <!--        </el-select> -->
+                <!--        </el-form-item> -->
+                <!--        <el-form-item label="规格型号" prop="typeId"> -->
+                <!--        <el-select -->
+                <!--        v-model="query.typeId" -->
+                <!--        placeholder="请选择规格型号" -->
+                <!--        clearable -->
+                <!--        filterable -->
+                <!--        style="width: 240px" -->
+                <!--        > -->
+                <!--        <el-option -->
+                <!--        v-for="model in modelList" -->
+                <!--        :key="model.typeId" -->
+                <!--        :label="model.typeName" -->
+                <!--        :value="model.typeId" -->
+                <!--        /> -->
+                <!--        </el-select> -->
+                <!--        </el-form-item> -->
+                <el-form-item>
+                    <el-button
+                        type="primary"
+                        icon="el-icon-search"
+                        size="mini"
+                        @click="handleDialogQuery"
+                        >查询</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
+                        size="mini"
+                        :disabled="multiple"
+                        @click="passAll"
+                        >批量通过</el-button
+                    >
+                </el-col>
+                <el-col :span="1.5">
+                    <el-button
+                        type="danger"
+                        plain
+                        size="mini"
+                        @click="refusedAll"
+                        :disabled="multiple"
+                        >批量不通过</el-button
+                    >
+                </el-col>
+                <!--        <el-col :span="1.5">-->
+                <!--          <el-button-->
+                <!--            type="warning"-->
+                <!--            plain-->
+                <!--            icon="el-icon-download"-->
+                <!--            size="mini"-->
+                <!--            @click="handleExport"-->
+                <!--            v-hasPermi="['system:dict:export']"-->
+                <!--          >导出</el-button>-->
+                <!--        </el-col>-->
+            </el-row>
+            <el-table
+                v-loading="loading"
+                :data="detailTableList"
+                @selection-change="handleSelectionChange"
+                height="400"
+            >
+                <el-table-column type="selection" width="55" align="center" />
+                <el-table-column
+                    label="序号"
+                    align="center"
+                    width="80"
+                    type="index"
+                    :index="
+                        indexContinuation(
+                            queryParams.pageNum,
+                            queryParams.pageSize,
+                        )
+                    "
+                >
+                    <!-- <template scope="scope">
             <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
           </template> -->
-        </el-table-column>
-        <el-table-column label="设备类型" align="center" prop="typeName2" :show-overflow-tooltip="true" />
-        <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />
-        <el-table-column label="数量" align="center" prop="repairNum" :show-overflow-tooltip="true" />
-        <el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" />
-        <el-table-column label="提交入库人员" align="center" prop="updateBy" :show-overflow-tooltip="true" width="100" />
-        <el-table-column label="提交入库时间" align="center" prop="updateTime" width="100"></el-table-column>
+                </el-table-column>
+                <el-table-column
+                    label="设备类型"
+                    align="center"
+                    prop="typeName2"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="规格型号"
+                    align="center"
+                    prop="typeName"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="数量"
+                    align="center"
+                    prop="repairNum"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="编号"
+                    align="center"
+                    prop="maCode"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="提交入库人员"
+                    align="center"
+                    prop="updateBy"
+                    :show-overflow-tooltip="true"
+                    width="100"
+                />
+                <el-table-column
+                    label="提交入库时间"
+                    align="center"
+                    prop="updateTime"
+                    width="100"
+                ></el-table-column>
 
-        <el-table-column label="状态" align="center" prop="status">
-          <!-- <template slot-scope="scope">
+                <el-table-column label="状态" align="center" prop="status">
+                    <!-- <template slot-scope="scope">
             <span v-if="scope.row.status=='0'">未审核</span>
             <span v-if="scope.row.status=='1'">已入库</span>
             <span v-if="scope.row.status=='2'">驳回 </span>
           </template>-->
-        </el-table-column>
+                </el-table-column>
 
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="showHandle">
-          <template slot-scope="scope">
-            <el-button size="mini" type="text" @click="pass(scope.row)" v-if="scope.row.status == '进行中'">通过</el-button>
-            <el-button size="mini" type="text" v-if="scope.row.status == '进行中'"
-              @click="refused(scope.row)">不通过</el-button>
-            <!--          <el-button-->
-            <!--            size="mini"-->
-            <!--            type="text"-->
-            <!--            icon="el-icon-delete"-->
-            <!--            @click="handleDelete(scope.row)"-->
-            <!--            v-hasPermi="['system:dict:remove']"-->
-            <!--          >删除</el-button>-->
-          </template>
-        </el-table-column>
-      </el-table>
+                <el-table-column
+                    label="操作"
+                    align="center"
+                    class-name="small-padding fixed-width"
+                    v-if="showHandle"
+                >
+                    <template slot-scope="scope">
+                        <el-button
+                            size="mini"
+                            type="text"
+                            @click="pass(scope.row)"
+                            v-if="scope.row.status == '进行中'"
+                            >通过</el-button
+                        >
+                        <el-button
+                            size="mini"
+                            type="text"
+                            v-if="scope.row.status == '进行中'"
+                            @click="refused(scope.row)"
+                            >不通过</el-button
+                        >
+                        <!--          <el-button-->
+                        <!--            size="mini"-->
+                        <!--            type="text"-->
+                        <!--            icon="el-icon-delete"-->
+                        <!--            @click="handleDelete(scope.row)"-->
+                        <!--            v-hasPermi="['system:dict:remove']"-->
+                        <!--          >删除</el-button>-->
+                    </template>
+                </el-table-column>
+            </el-table>
 
-      <pagination v-show="dialogTotal > 0" :total="dialogTotal" :page.sync="query.pageNum" :limit.sync="query.pageSize"
-        @pagination="getDialogTable" />
-    </el-dialog>
-  </div>
+            <pagination
+                v-show="dialogTotal > 0"
+                :total="dialogTotal"
+                :page.sync="query.pageNum"
+                :limit.sync="query.pageSize"
+                @pagination="getDialogTable"
+            />
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-import { listType, getType, delType, addType, updateType, refreshCache } from '@/api/system/dict/type'
-import { getRepairedList, getRepairedDetailList, inputByType, getTypeList } from '@/api/store/warehousing'
+import {
+    listType,
+    getType,
+    delType,
+    addType,
+    updateType,
+    refreshCache,
+} from '@/api/system/dict/type'
+import {
+    getRepairedList,
+    getRepairedDetailList,
+    inputByType,
+    getTypeList,
+} from '@/api/store/warehousing'
 import { equipmentTypeTree } from '@/api/store/tools'
 
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 export default {
-  name: 'RepairWarehousing',
-  dicts: ['sys_normal_disable'],
-  components: {
-    Treeselect,
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 总条数
-      dialogTotal: 0,
-      //搜索下拉数据
-      typeList: [],
-      modelList: [],
-      // 表格数据
-      tableList: [],
-      detailTableList: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      showHandle: true,
-      // 日期范围
-      dateRange: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        dictName: undefined,
-        dictType: undefined,
-        status: undefined,
-        keyWord: '',
-        wxTime: '',
-        deviceTypeId: '',
-      },
-      query: {
-        pageNum: 1,
-        pageSize: 10,
-        keyWord: '',
-        typeId: ''
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        dictName: [
-          {
-            required: true,
-            message: '字典名称不能为空',
-            trigger: 'blur',
-          },
-        ],
-        dictType: [
-          {
-            required: true,
-            message: '字典类型不能为空',
-            trigger: 'blur',
-          },
-        ],
-      },
-      equipmentTypeList: [],
-    }
-  },
-  created() {
-    this.getList()
-    this.getTypeList()
-    this.equipmentType()
-  },
-  methods: {
-    getTypeList() {
-      getTypeList({ level: '3' }).then(response => {
-        this.typeList = response.data
-      })
-      getTypeList({ level: '4' }).then(response => {
-        this.modelList = response.data
-      })
+    name: 'RepairWarehousing',
+    dicts: ['sys_normal_disable'],
+    components: {
+        Treeselect,
     },
-    /** 查询字典类型列表 */
-    getList() {
-      this.loading = true
-      getRepairedList(this.queryParams).then(response => {
-        this.tableList = response.rows
-        this.total = response.total
-        this.loading = false
-      })
-    },
-
-    getDialogTable() {
-      this.loading = true
-      getRepairedDetailList(this.query).then(response => {
-        this.detailTableList = response.rows
-        this.dialogTotal = 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()
-    },
-    /** 搜索按钮操作 */
-    handleDialogQuery() {
-      this.query.pageNum = 1
-      this.getDialogTable()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm('queryForm')
-      this.handleQuery()
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      // this.reset();
-      this.open = true
-      this.title = '添加字典类型'
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item)
-      this.single = selection.length != 1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      // this.reset();
-      this.query.keyWord = ''
-      this.query.taskId = row.id
-      this.getDialogTable()
-      this.open = true
-      this.showHandle = true
-      this.title = '审核'
-    },
-    //查看
-    handleView(row) {
-      this.query.keyWord = ''
-      this.query.taskId = row.id
-      this.getDialogTable()
-      this.open = true
-      this.showHandle = false
-      this.title = '查看'
-    },
-    pass(row) {
-      console.log(row)
-      console.log(this.query.taskId)
-      row.taskId = this.query.taskId
-      let obj = {
-        taskId: this.query.taskId,
-        id: row.id,
-        checkType: '1', //1 审核通过 2 驳回 -必填
-        type: row.manageType, //0.编号 1.计数
-        maId: row.maId,
-        typeId: row.typeId,
-        remark: row.remark,
-        repairNum: row.repairNum,
-      }
-
-      let param = {
-        params: JSON.stringify([obj]),
-      }
-      console.log(param)
-      inputByType(param).then(response => {
-        if (response.code == 200) {
-          this.$modal.msgSuccess('审批成功')
-          this.getDialogTable()
-          this.getList()
-        } else {
-          this.$modal.msgSuccess('审批失败')
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 总条数
+            dialogTotal: 0,
+            //搜索下拉数据
+            typeList: [],
+            modelList: [],
+            // 表格数据
+            tableList: [],
+            detailTableList: [],
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            showHandle: true,
+            // 日期范围
+            dateRange: [],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                dictName: undefined,
+                dictType: undefined,
+                status: undefined,
+                keyWord: '',
+                wxTime: '',
+                deviceTypeId: '',
+            },
+            query: {
+                pageNum: 1,
+                pageSize: 10,
+                keyWord: '',
+                typeId: '',
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+                dictName: [
+                    {
+                        required: true,
+                        message: '字典名称不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                dictType: [
+                    {
+                        required: true,
+                        message: '字典类型不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+            },
+            equipmentTypeList: [],
         }
-      })
     },
-    passAll() {
-      console.log(this.query.taskId)
-      console.log(this.ids)
-      this.ids.forEach(item => {
-        item.taskId = this.query.taskId
-        item.checkType = '1'
-        item.type = item.manageType //0.编号 1.计数
-      })
-      let param = {
-        params: JSON.stringify(this.ids),
-      }
-      inputByType(param).then(response => {
-        if (response.code == 200) {
-          this.$modal.msgSuccess('审批成功')
-          this.getDialogTable()
-          this.getList()
-        } else {
-          this.$modal.msgSuccess('审批失败')
-        }
-      })
+    created() {
+        this.getList()
+        this.getTypeList()
+        this.equipmentType()
     },
-
-    refused(row) {
-      console.log(row)
-      console.log(this.query.taskId)
-      row.taskId = this.query.taskId
-      let obj = {
-        taskId: this.query.taskId,
-        id: row.id,
-        checkType: '2', //1 审核通过 2 驳回 -必填
-        type: row.manageType, //0.编号 1.计数
-        maId: row.maId,
-        typeId: row.typeId,
-        remark: row.remark,
-        repairNum: row.repairNum,
-      }
-      let param = {
-        params: JSON.stringify([obj]),
-      }
-      inputByType(param).then(response => {
-        if (response.code == 200) {
-          this.$modal.msgSuccess('审批成功')
-          this.getDialogTable()
-          this.getList()
-        } else {
-          this.$modal.msgSuccess('审批失败')
-        }
-      })
-    },
-    refusedAll() {
-      console.log(this.query.taskId)
-      console.log(this.ids)
-      this.ids.forEach(item => {
-        item.taskId = this.query.taskId
-        item.checkType = '2'
-        item.type = item.manageType
-      })
-      let param = {
-        params: JSON.stringify(this.ids),
-      }
-      inputByType(param).then(response => {
-        if (response.code == 200) {
-          this.$modal.msgSuccess('审批成功')
-          this.getDialogTable()
-          this.getList()
-        } else {
-          this.$modal.msgSuccess('审批失败')
-        }
-      })
-    },
-
-    /** 提交按钮 */
-    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()
+    methods: {
+        getTypeList() {
+            getTypeList({ level: '3' }).then((response) => {
+                this.typeList = response.data
             })
-          } else {
-            addType(this.form).then(response => {
-              this.$modal.msgSuccess('新增成功')
-              this.open = false
-              this.getList()
+            getTypeList({ level: '4' }).then((response) => {
+                this.modelList = response.data
             })
-          }
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      // const dictIds = row.dictId || this.ids;
-      // this.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？').then(function() {
-      //   return delType(dictIds);
-      // }).then(() => {
-      //   this.getList();
-      //   this.$modal.msgSuccess("删除成功");
-      // }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download(
-        'material/RepairTestInput/export',
-        {
-          ...this.queryParams,
         },
-        `修试入库_${new Date().getTime()}.xlsx`
-      )
-    },
-    /** 刷新缓存按钮操作 */
-    handleRefreshCache() {
-      refreshCache().then(() => {
-        this.$modal.msgSuccess('刷新成功')
-        this.$store.dispatch('dict/cleanDict')
-      })
-    },
-    //规格型号
-    equipmentType() {
-      equipmentTypeTree().then(response => {
-        this.equipmentTypeList = response.data
-        this.equipmentTypeList.forEach((item, index) => {
-          if (item.children && item.children.length > 0) {
-            item.children.forEach((item2, index2) => {
-              if (item2.children && item2.children.length > 0) {
-                item2.children.forEach(item3 => {
-                  if (item3.children && item3.children.length > 0) {
-                    item3.children.forEach(item4 => {
-                      item4.machineTypeName = item3.typeName
-                      item4.specificationType = item4.typeName
-                      // this.$set(item4, 'purchasePrice', 0);
-                      // this.$set(item4, 'purchaseNum', 1);
-                    })
-                  }
-                })
-              }
+        /** 查询字典类型列表 */
+        getList() {
+            this.loading = true
+            getRepairedList(this.queryParams).then((response) => {
+                this.tableList = response.rows
+                this.total = response.total
+                this.loading = false
             })
-          }
-        })
-      })
+        },
+
+        getDialogTable() {
+            this.loading = true
+            getRepairedDetailList(this.query).then((response) => {
+                this.detailTableList = response.rows
+                this.dialogTotal = 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()
+        },
+        /** 搜索按钮操作 */
+        handleDialogQuery() {
+            this.query.pageNum = 1
+            this.getDialogTable()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            // this.reset();
+            this.open = true
+            this.title = '添加字典类型'
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item)
+            this.single = selection.length != 1
+            this.multiple = !selection.length
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            // this.reset();
+            this.query.keyWord = ''
+            this.query.taskId = row.id
+            this.getDialogTable()
+            this.open = true
+            this.showHandle = true
+            this.title = '审核'
+        },
+        //查看
+        handleView(row) {
+            this.query.keyWord = ''
+            this.query.taskId = row.id
+            this.getDialogTable()
+            this.open = true
+            this.showHandle = false
+            this.title = '查看'
+        },
+        pass(row) {
+            console.log(row)
+            console.log(this.query.taskId)
+            row.taskId = this.query.taskId
+            let obj = {
+                taskId: this.query.taskId,
+                id: row.id,
+                checkType: '1', //1 审核通过 2 驳回 -必填
+                type: row.manageType, //0.编号 1.计数
+                maId: row.maId,
+                typeId: row.typeId,
+                remark: row.remark,
+                repairNum: row.repairNum,
+            }
+
+            let param = {
+                params: JSON.stringify([obj]),
+            }
+            console.log(param)
+            inputByType(param).then((response) => {
+                if (response.code == 200) {
+                    this.$modal.msgSuccess('审批成功')
+                    this.getDialogTable()
+                    this.getList()
+                } else {
+                    this.$modal.msgSuccess('审批失败')
+                }
+            })
+        },
+        passAll() {
+            console.log(this.query.taskId)
+            console.log(this.ids)
+            this.ids.forEach((item) => {
+                item.taskId = this.query.taskId
+                item.checkType = '1'
+                item.type = item.manageType //0.编号 1.计数
+            })
+            let param = {
+                params: JSON.stringify(this.ids),
+            }
+            inputByType(param).then((response) => {
+                if (response.code == 200) {
+                    this.$modal.msgSuccess('审批成功')
+                    this.getDialogTable()
+                    this.getList()
+                } else {
+                    this.$modal.msgSuccess('审批失败')
+                }
+            })
+        },
+
+        refused(row) {
+            console.log(row)
+            console.log(this.query.taskId)
+            row.taskId = this.query.taskId
+            let obj = {
+                taskId: this.query.taskId,
+                id: row.id,
+                checkType: '2', //1 审核通过 2 驳回 -必填
+                type: row.manageType, //0.编号 1.计数
+                maId: row.maId,
+                typeId: row.typeId,
+                remark: row.remark,
+                repairNum: row.repairNum,
+            }
+            let param = {
+                params: JSON.stringify([obj]),
+            }
+            inputByType(param).then((response) => {
+                if (response.code == 200) {
+                    this.$modal.msgSuccess('审批成功')
+                    this.getDialogTable()
+                    this.getList()
+                } else {
+                    this.$modal.msgSuccess('审批失败')
+                }
+            })
+        },
+        refusedAll() {
+            console.log(this.query.taskId)
+            console.log(this.ids)
+            this.ids.forEach((item) => {
+                item.taskId = this.query.taskId
+                item.checkType = '2'
+                item.type = item.manageType
+            })
+            let param = {
+                params: JSON.stringify(this.ids),
+            }
+            inputByType(param).then((response) => {
+                if (response.code == 200) {
+                    this.$modal.msgSuccess('审批成功')
+                    this.getDialogTable()
+                    this.getList()
+                } else {
+                    this.$modal.msgSuccess('审批失败')
+                }
+            })
+        },
+
+        /** 提交按钮 */
+        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('是否确认删除字典编号为"' + dictIds + '"的数据项？').then(function() {
+            //   return delType(dictIds);
+            // }).then(() => {
+            //   this.getList();
+            //   this.$modal.msgSuccess("删除成功");
+            // }).catch(() => {});
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download(
+                'material/RepairTestInput/export',
+                {
+                    ...this.queryParams,
+                },
+                `修试入库_${new Date().getTime()}.xlsx`,
+            )
+        },
+        /** 刷新缓存按钮操作 */
+        handleRefreshCache() {
+            refreshCache().then(() => {
+                this.$modal.msgSuccess('刷新成功')
+                this.$store.dispatch('dict/cleanDict')
+            })
+        },
+        //规格型号
+        equipmentType() {
+            equipmentTypeTree().then((response) => {
+                this.equipmentTypeList = response.data
+                this.equipmentTypeList.forEach((item, index) => {
+                    if (item.children && item.children.length > 0) {
+                        item.children.forEach((item2, index2) => {
+                            if (item2.children && item2.children.length > 0) {
+                                item2.children.forEach((item3) => {
+                                    if (
+                                        item3.children &&
+                                        item3.children.length > 0
+                                    ) {
+                                        item3.children.forEach((item4) => {
+                                            item4.machineTypeName =
+                                                item3.typeName
+                                            item4.specificationType =
+                                                item4.typeName
+                                            // this.$set(item4, 'purchasePrice', 0);
+                                            // this.$set(item4, 'purchaseNum', 1);
+                                        })
+                                    }
+                                })
+                            }
+                        })
+                    }
+                })
+            })
+        },
     },
-  },
 }
 </script>
 <style lang="scss" scoped>
 ::v-deep.el-table .fixed-width .el-button--mini {
-  width: 60px !important;
-  margin-bottom: 10px;
+    width: 60px !important;
+    margin-bottom: 10px;
 }
 </style>
diff --git a/src/views/stquery/backRecord.vue b/src/views/stquery/backRecord.vue
index 44c02f6..cba5813 100644
--- a/src/views/stquery/backRecord.vue
+++ b/src/views/stquery/backRecord.vue
@@ -154,7 +154,7 @@
                 :show-overflow-tooltip="true"
             />
             <el-table-column
-                label="机具规格"
+                label="规格型号"
                 align="center"
                 prop="typeModelName"
                 :show-overflow-tooltip="true"
diff --git a/src/views/stquery/deviceFixQuery.vue b/src/views/stquery/deviceFixQuery.vue
index 7e82914..ad2cf1b 100644
--- a/src/views/stquery/deviceFixQuery.vue
+++ b/src/views/stquery/deviceFixQuery.vue
@@ -115,7 +115,7 @@
                 :show-overflow-tooltip="true"
             />
             <el-table-column
-                label="类型名称"
+                label="机具名称"
                 align="center"
                 prop="typeName"
                 :show-overflow-tooltip="true"
diff --git a/src/views/stquery/deviceInStoreQuery.vue b/src/views/stquery/deviceInStoreQuery.vue
index 381fcab..d8d4c55 100644
--- a/src/views/stquery/deviceInStoreQuery.vue
+++ b/src/views/stquery/deviceInStoreQuery.vue
@@ -16,6 +16,7 @@
                     range-separator="至"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
+                    style="width: 240px"
                 >
                 </el-date-picker>
             </el-form-item>
@@ -106,7 +107,7 @@
                 "
             />
             <el-table-column
-                label="机具类型"
+                label="机具名称"
                 align="center"
                 prop="typeName"
                 :show-overflow-tooltip="true"
diff --git a/src/views/stquery/deviceScrapQuery.vue b/src/views/stquery/deviceScrapQuery.vue
index 8a16c71..cd27f9a 100644
--- a/src/views/stquery/deviceScrapQuery.vue
+++ b/src/views/stquery/deviceScrapQuery.vue
@@ -16,6 +16,7 @@
                     range-separator="至"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
+                    style="width: 240px"
                 >
                 </el-date-picker>
             </el-form-item>
diff --git a/src/views/stquery/leaseRecord.vue b/src/views/stquery/leaseRecord.vue
index 4abe492..21604ba 100644
--- a/src/views/stquery/leaseRecord.vue
+++ b/src/views/stquery/leaseRecord.vue
@@ -144,7 +144,7 @@
                 :show-overflow-tooltip="true"
             />
             <el-table-column
-                label="机具规格"
+                label="规格型号"
                 align="center"
                 prop="typeModelName"
                 :show-overflow-tooltip="true"
diff --git a/src/views/stquery/projUsingRecord.vue b/src/views/stquery/projUsingRecord.vue
index 9ad073d..74b299b 100644
--- a/src/views/stquery/projUsingRecord.vue
+++ b/src/views/stquery/projUsingRecord.vue
@@ -16,6 +16,7 @@
                     range-separator="至"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
+                    style="width: 240px"
                 >
                 </el-date-picker>
             </el-form-item>
@@ -170,7 +171,7 @@
                 :show-overflow-tooltip="true"
             />
             <el-table-column
-                label="规格名称"
+                label="规格型号"
                 align="center"
                 prop="typeModelName"
                 :show-overflow-tooltip="true"
diff --git a/src/views/warehouseManage/machinery/coding/index.vue b/src/views/warehouseManage/machinery/coding/index.vue
index 9f7b8dd..52e0f54 100644
--- a/src/views/warehouseManage/machinery/coding/index.vue
+++ b/src/views/warehouseManage/machinery/coding/index.vue
@@ -19,10 +19,10 @@
                     @keyup.enter.native="handleQuery"
                 />
             </el-form-item>
-            <el-form-item label="物品种类" prop="itemId">
+            <el-form-item label="类型名称" prop="itemId">
                 <el-select
                     v-model="queryParams.itemId"
-                    placeholder="请选择物品种类"
+                    placeholder="请选择类型名称"
                     clearable
                     filterable
                     style="width: 240px"
@@ -37,10 +37,10 @@
                 </el-select>
             </el-form-item>
 
-            <el-form-item label="设备类型" prop="deviceId">
+            <el-form-item label="机具名称" prop="deviceId">
                 <el-select
                     v-model="queryParams.deviceId"
-                    placeholder="请选择设备类型"
+                    placeholder="请选择机具名称"
                     clearable
                     filterable
                     style="width: 240px"
@@ -144,9 +144,9 @@
                     indexContinuation(queryParams.pageNum, queryParams.pageSize)
                 "
             />
-            <el-table-column label="物品种类" align="center" prop="itemType" />
+            <el-table-column label="类型名称" align="center" prop="itemType" />
             <el-table-column
-                label="设备类型"
+                label="机具名称"
                 align="center"
                 prop="deviceType"
                 :show-overflow-tooltip="true"
@@ -265,19 +265,19 @@
             >
                 <el-row>
                     <el-col :span="8">
-                        <el-form-item label="物品种类" prop="itemType">
+                        <el-form-item label="类型名称" prop="itemType">
                             <el-input
                                 v-model="form.itemType"
-                                placeholder="请输入物品种类"
+                                placeholder="请输入类型名称"
                                 disabled
                             />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="设备类型" prop="deviceType">
+                        <el-form-item label="机具名称" prop="deviceType">
                             <el-input
                                 v-model="form.deviceType"
-                                placeholder="请输入设备类型"
+                                placeholder="请输入机具名称"
                                 disabled
                             />
                         </el-form-item>
@@ -736,7 +736,8 @@ export default {
             const maId = row.maId || this.ids
             getMachine(maId).then((response) => {
                 this.form = response.data
-                if (this.form.maVender) this.form.maVender = parseInt(this.form.maVender)
+                if (this.form.maVender)
+                    this.form.maVender = parseInt(this.form.maVender)
                 if (this.form.propId == 0) this.form.propId = ''
                 this.open = true
                 this.title = '编辑'
@@ -778,10 +779,14 @@ export default {
         },
         /** 导出按钮操作 */
         handleExport() {
-            this.download('material/base/machine/export', {
-              ...this.queryParams,
-              dataCondition: this.ids
-            }, `编码设备管理_${new Date().getTime()}.xlsx`)
+            this.download(
+                'material/base/machine/export',
+                {
+                    ...this.queryParams,
+                    dataCondition: this.ids,
+                },
+                `编码设备管理_${new Date().getTime()}.xlsx`,
+            )
         },
     },
 }
diff --git a/src/views/warehouseManage/machinery/keeper/index.vue b/src/views/warehouseManage/machinery/keeper/index.vue
index b485ab6..93ea241 100644
--- a/src/views/warehouseManage/machinery/keeper/index.vue
+++ b/src/views/warehouseManage/machinery/keeper/index.vue
@@ -44,10 +44,10 @@
                     v-show="showSearch"
                     label-width="68px"
                 >
-                    <el-form-item label="类型名称" prop="typeName">
+                    <el-form-item label="机具名称" prop="typeName">
                         <el-input
                             v-model="queryParams.typeName"
-                            placeholder="请输入类型名称"
+                            placeholder="请输入机具名称"
                             clearable
                             maxlength="50"
                             style="width: 240px"
@@ -157,7 +157,7 @@
                         "
                     />
                     <el-table-column
-                        label="种类名称"
+                        label="机具种类"
                         align="center"
                         key="kindName"
                         prop="kindName"
@@ -165,7 +165,7 @@
                         show-overflow-tooltip
                     />
                     <el-table-column
-                        label="类型名称"
+                        label="机具名称"
                         align="center"
                         key="typeName"
                         prop="typeName"
diff --git a/src/views/warehouseManage/machinery/personnel/index.vue b/src/views/warehouseManage/machinery/personnel/index.vue
index 30e45d8..b9c3535 100644
--- a/src/views/warehouseManage/machinery/personnel/index.vue
+++ b/src/views/warehouseManage/machinery/personnel/index.vue
@@ -44,10 +44,10 @@
                     v-show="showSearch"
                     label-width="68px"
                 >
-                    <el-form-item label="类型名称" prop="typeName">
+                    <el-form-item label="机具名称" prop="typeName">
                         <el-input
                             v-model="queryParams.typeName"
-                            placeholder="请输入类型名称"
+                            placeholder="请输入机具名称"
                             clearable
                             maxlength="50"
                             style="width: 240px"
@@ -169,7 +169,7 @@
                         "
                     />
                     <el-table-column
-                        label="种类名称"
+                        label="机具种类"
                         align="center"
                         key="kindName"
                         prop="kindName"
@@ -177,7 +177,7 @@
                         :show-overflow-tooltip="true"
                     />
                     <el-table-column
-                        label="类型名称"
+                        label="机具名称"
                         align="center"
                         key="typeName"
                         prop="typeName"
diff --git a/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue b/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue
index 5410f9e..e990765 100644
--- a/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue
+++ b/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue
@@ -275,7 +275,7 @@
                         >
                             <span>供应商：</span>
                             <span v-if="printTableData.length > 0">{{
-                                printTableData[0].supplier
+                                supplierStr
                             }}</span>
                         </div>
                     </div>
@@ -471,6 +471,7 @@ export default {
                     },
                 ],
             },
+            supplierStr: '',
         }
     },
     created() {
@@ -580,6 +581,16 @@ export default {
             getAccessoryAcceptanceForm({ taskId: taskId }).then((response) => {
                 this.printData = response.data
                 this.printTableData = response.data.partDetailsList
+
+                let supplierList = []
+                this.printTableData.forEach((e) => {
+                    if (e.supplier) {
+                        supplierList.push(e.supplier)
+                    }
+                })
+                supplierList = [...new Set(supplierList)]
+
+                this.supplierStr = supplierList.join(',')
             })
         },
         //查看验收单
diff --git a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue
index feb27b1..a08dd92 100644
--- a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue
+++ b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue
@@ -8,12 +8,12 @@
             :inline="true"
             label-width="100px"
         >
-            <el-form-item label="机具类型" prop="equipmentId">
+            <el-form-item label="规格型号" prop="equipmentId">
                 <treeselect
                     v-model="queryParams.equipmentId"
                     default-expand-all
                     :options="equipmentTypeList"
-                    placeholder="请选择机具类型"
+                    placeholder="请选择规格型号"
                     @select="select"
                     :disable-branch-nodes="true"
                     style="width: 240px"
@@ -126,7 +126,7 @@
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column label="序号" type="index" width="55" />
             <el-table-column
-                label="机具类型"
+                label="机具名称"
                 prop="machineTypeName"
                 :show-overflow-tooltip="true"
                 width="200"
diff --git a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue
index 0426424..e67874f 100644
--- a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue
+++ b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue
@@ -51,7 +51,7 @@
             <!-- <el-table-column type="selection" width="55" align="center" /> -->
             <el-table-column label="序号" align="center" type="index" />
             <el-table-column
-                label="机具类型名称"
+                label="机具名称"
                 align="center"
                 prop="typeName"
                 :show-overflow-tooltip="true"
@@ -238,7 +238,7 @@
                 <!-- <el-table-column type="selection" width="50" align="center" /> -->
                 <el-table-column label="序号" align="center" type="index" />
                 <el-table-column
-                    label="机具种类"
+                    label="机具名称"
                     align="center"
                     prop="typeName"
                     :show-overflow-tooltip="true"
diff --git a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
index f3af36c..2cbca7e 100644
--- a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
+++ b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
@@ -344,7 +344,7 @@
                             type="index"
                         />
                         <el-table-column
-                            label="类型名称"
+                            label="机具名称"
                             align="center"
                             prop="machineTypeName"
                         />
@@ -608,15 +608,14 @@ export default {
                 this.printTableData = response.data.checkDetailsList
 
                 let supplierList = []
-                supplierList = this.printTableData.map((e) => {
-                    if (e.supplier) return e.supplier
+                this.printTableData.forEach((e) => {
+                    if (e.supplier) {
+                        supplierList.push(e.supplier)
+                    }
                 })
+                supplierList = [...new Set(supplierList)]
 
-                supplierList = new Set(supplierList)
-
-                this.supplierStr = supplierList
-                    .join(',')
-                    .substring(0, supplierList.length - 1)
+                this.supplierStr = supplierList.join(',')
             })
         },
         //查看验收单
diff --git a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
index a79649d..d9d45e8 100644
--- a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
+++ b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
@@ -95,7 +95,7 @@
             />
             <el-table-column label="序号" align="center" type="index" />
             <el-table-column
-                label="机具类型名称"
+                label="机具名称"
                 align="center"
                 prop="machineTypeName"
                 :show-overflow-tooltip="true"
diff --git a/src/views/warehouseManage/tagBind/bind/index.vue b/src/views/warehouseManage/tagBind/bind/index.vue
index f8537cb..40bccb5 100644
--- a/src/views/warehouseManage/tagBind/bind/index.vue
+++ b/src/views/warehouseManage/tagBind/bind/index.vue
@@ -22,10 +22,10 @@
                             @keyup.enter.native="handleQuery"
                         />
                     </el-form-item>
-                    <el-form-item label="设备类型" prop="typeId">
+                    <el-form-item label="机具名称" prop="typeId">
                         <el-select
                             v-model="queryParams.typeId"
-                            placeholder="请选择设备类型"
+                            placeholder="请选择机具名称"
                             clearable
                             filterable
                             style="width: 240px"
@@ -182,7 +182,12 @@
                 :data="labelList"
                 @selection-change="handleSelectionChange"
             >
-                <el-table-column type="selection" width="55" align="center" :selectable="(row, index) => row.status != '1'" />
+                <el-table-column
+                    type="selection"
+                    width="55"
+                    align="center"
+                    :selectable="(row, index) => row.status != '1'"
+                />
                 <el-table-column
                     align="center"
                     label="序号"
@@ -215,13 +220,13 @@
                     </template>
                 </el-table-column>
                 <el-table-column
-                    label="物品种类"
+                    label="类型名称"
                     align="center"
                     prop="kindName"
                     :show-overflow-tooltip="true"
                 />
                 <el-table-column
-                    label="物品名称"
+                    label="机具名称"
                     align="center"
                     prop="modelName"
                 />
diff --git a/src/views/warehouseManage/tagBind/history/index.vue b/src/views/warehouseManage/tagBind/history/index.vue
index 6a97c18..6f40910 100644
--- a/src/views/warehouseManage/tagBind/history/index.vue
+++ b/src/views/warehouseManage/tagBind/history/index.vue
@@ -19,10 +19,10 @@
                     @keyup.enter.native="handleQuery"
                 />
             </el-form-item>
-            <el-form-item label="设备类型" prop="typeId">
+            <el-form-item label="机具名称" prop="typeId">
                 <el-select
                     v-model="queryParams.typeId"
-                    placeholder="请选择设备类型"
+                    placeholder="请选择机具名称"
                     clearable
                     filterable
                     style="width: 240px"
@@ -109,12 +109,12 @@
                 </template>
             </el-table-column>
             <el-table-column
-                label="物品种类"
+                label="机具种类"
                 align="center"
                 prop="kindName"
                 :show-overflow-tooltip="true"
             />
-            <el-table-column label="物品名称" align="center" prop="modelName" />
+            <el-table-column label="机具名称" align="center" prop="modelName" />
             <el-table-column
                 label="规格型号"
                 align="center"
diff --git a/src/views/warehouseManage/warehousing/Inventory/config.js b/src/views/warehouseManage/warehousing/Inventory/config.js
index fe6181a..64c3858 100644
--- a/src/views/warehouseManage/warehousing/Inventory/config.js
+++ b/src/views/warehouseManage/warehousing/Inventory/config.js
@@ -13,7 +13,7 @@ export const dialogConfig = {
 
     columnsList: [
         { t_width: '', t_props: 'putInType', t_label: '入库来源' },
-        { t_width: '', t_props: 'typeName', t_label: '设备类型' },
+        { t_width: '', t_props: 'typeName', t_label: '机具名称' },
         { t_width: '', t_props: 'typeModelName', t_label: '规格型号' },
         { t_width: '', t_props: 'maCode', t_label: '设备编码' },
         { t_width: '', t_props: 'num', t_label: '入库数量' },
diff --git a/src/views/warehouseManage/warehousing/Inventory/index.vue b/src/views/warehouseManage/warehousing/Inventory/index.vue
index d538271..2553327 100644
--- a/src/views/warehouseManage/warehousing/Inventory/index.vue
+++ b/src/views/warehouseManage/warehousing/Inventory/index.vue
@@ -87,7 +87,7 @@
                 :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-                label="设备/物资名称"
+                label="机具名称"
                 align="center"
                 prop="typeName"
                 :show-overflow-tooltip="true"
@@ -173,7 +173,7 @@
                     </el-col>
                     <el-col :span="10">
                         <el-form-item
-                            label="设备/物资类型"
+                            label="规格型号"
                             label-width="130px"
                             prop="typeId"
                         >
@@ -995,7 +995,7 @@ export default {
                 typeId: [
                     {
                         required: true,
-                        message: '设备/物资类型不能为空',
+                        message: '规格型号不能为空',
                         trigger: 'change',
                     },
                 ],
diff --git a/src/views/warehouseManage/warehousing/newTools/index.vue b/src/views/warehouseManage/warehousing/newTools/index.vue
index 81dee83..d3bca95 100644
--- a/src/views/warehouseManage/warehousing/newTools/index.vue
+++ b/src/views/warehouseManage/warehousing/newTools/index.vue
@@ -19,10 +19,10 @@
                     @keyup.enter.native="handleQuery"
                 />
             </el-form-item>
-            <el-form-item label="设备类型" prop="typeId">
+            <el-form-item label="机具名称" prop="typeId">
                 <el-select
                     v-model="queryParams.typeId"
-                    placeholder="请选择设备类型"
+                    placeholder="请选择机具名称"
                     clearable
                     filterable
                     style="width: 240px"
@@ -99,7 +99,7 @@
                 show-overflow-tooltip
             />
             <el-table-column
-                label="采购机具设备"
+                label="规格型号"
                 align="center"
                 prop="purchasingTypeName"
                 show-overflow-tooltip
@@ -302,7 +302,7 @@
                     </template> -->
                 </el-table-column>
                 <el-table-column
-                    label="机具类型"
+                    label="机具名称"
                     align="center"
                     prop="typeName"
                     show-overflow-tooltip
diff --git a/src/views/warehouseManage/warehousing/repair/index.vue b/src/views/warehouseManage/warehousing/repair/index.vue
index 82ad000..7818ff8 100644
--- a/src/views/warehouseManage/warehousing/repair/index.vue
+++ b/src/views/warehouseManage/warehousing/repair/index.vue
@@ -29,10 +29,10 @@
                     placeholder="维修时间"
                 ></el-date-picker>
             </el-form-item>
-            <el-form-item label="设备类型" prop="deviceTypeId">
+            <el-form-item label="机具名称" prop="deviceTypeId">
                 <el-select
                     v-model="queryParams.deviceTypeId"
-                    placeholder="请选择设备类型"
+                    placeholder="请选择机具名称"
                     clearable
                     filterable
                     style="width: 240px"
@@ -137,7 +137,7 @@
                 prop="repairCode"
             />
             <el-table-column
-                label="工机具类型"
+                label="机具名称"
                 align="center"
                 prop="maTypeName"
                 :show-overflow-tooltip="true"
@@ -245,12 +245,12 @@
                 <!--        </el-select> -->
                 <!--        </el-form-item> -->
 
-                <el-form-item label="机具类型" prop="typeId">
+                <el-form-item label="机具名称" prop="typeId">
                     <treeselect
                         v-model="query.typeId"
                         default-expand-all
                         :options="equipmentTypeList"
-                        placeholder="请选择规格型号"
+                        placeholder="请选择规机具名称"
                         :disable-branch-nodes="true"
                         style="width: 240px"
                         noChildrenText="没有数据了"
@@ -342,14 +342,27 @@
                 @selection-change="handleSelectionChange"
                 height="400"
             >
-                <el-table-column type="selection" width="55" align="center" :selectable="
-                    (row, index) => row.status == '进行中' && row.userIds.includes(userId)" />
+                <el-table-column
+                    type="selection"
+                    width="55"
+                    align="center"
+                    :selectable="
+                        (row, index) =>
+                            row.status == '进行中' &&
+                            row.userIds.includes(userId)
+                    "
+                />
                 <el-table-column
                     label="序号"
                     align="center"
                     width="80"
                     type="index"
-                    :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
+                    :index="
+                        indexContinuation(
+                            queryParams.pageNum,
+                            queryParams.pageSize,
+                        )
+                    "
                 >
                     <!-- <template slot-scope="scope">
                         <span>{{
@@ -358,7 +371,7 @@
                     </template> -->
                 </el-table-column>
                 <el-table-column
-                    label="设备类型"
+                    label="机具名称"
                     align="center"
                     prop="typeName2"
                     :show-overflow-tooltip="true"
@@ -414,13 +427,19 @@
                             size="mini"
                             type="text"
                             @click="pass(scope.row)"
-                            v-if="scope.row.status == '进行中' && scope.row.userIds.includes(userId)"
+                            v-if="
+                                scope.row.status == '进行中' &&
+                                scope.row.userIds.includes(userId)
+                            "
                             >通过</el-button
                         >
                         <el-button
                             size="mini"
                             type="text"
-                            v-if="scope.row.status == '进行中' && scope.row.userIds.includes(userId)"
+                            v-if="
+                                scope.row.status == '进行中' &&
+                                scope.row.userIds.includes(userId)
+                            "
                             @click="refused(scope.row)"
                             >不通过</el-button
                         >
diff --git a/src/views/warehouseManage/warehousing/return/index.vue b/src/views/warehouseManage/warehousing/return/index.vue
index bfabdeb..5977dd9 100644
--- a/src/views/warehouseManage/warehousing/return/index.vue
+++ b/src/views/warehouseManage/warehousing/return/index.vue
@@ -29,10 +29,10 @@
                     placeholder="提交入库时间"
                 ></el-date-picker>
             </el-form-item>
-            <el-form-item label="设备类型" prop="typeId">
+            <el-form-item label="机具名称" prop="typeId">
                 <el-select
                     v-model="queryParams.typeId"
-                    placeholder="请选择设备类型"
+                    placeholder="请选择机具名称"
                     clearable
                     filterable
                     style="width: 240px"
@@ -150,15 +150,15 @@
                 :show-overflow-tooltip="true"
             />
             <el-table-column
-                label="退料机具类型"
+                label="退料类型名称"
                 align="center"
-                prop="kindName"
+                prop="typeName"
                 :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-                label="退料设备类型"
+                label="退料机具名称"
                 align="center"
-                prop="typeName"
+                prop="kindName"
                 :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
@@ -338,7 +338,12 @@
                     align="center"
                     width="80"
                     type="index"
-                    :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
+                    :index="
+                        indexContinuation(
+                            queryParams.pageNum,
+                            queryParams.pageSize,
+                        )
+                    "
                 >
                     <!-- <template slot-scope="scope">
                         <span>{{