优化

mes/qd/src/views/wms/basedata/em/equipmentfile/ChangeDialog.vue

@@ -74,7 +74,7 @@
           </el-table-column>
         </el-table>
       </el-tab-pane>
-      <el-tab-pane label="变更情况" name="third">
+      <el-tab-pane label="变更履历" name="third">
         <!--表格渲染-->
         <el-table
           ref="table"

mes/qd/src/views/wms/sb/repair/devicegridcheck/index.vue

@@ -124,8 +124,8 @@
         <el-table-column prop="update_optname" label="维修人" />
         <el-table-column prop="real_start_date" label="开始时间" width="150px" show-overflow-tooltip />
         <el-table-column prop="real_end_date" label="结束时间" width="150px" show-overflow-tooltip />
-        <el-table-column prop="confirm_optname" label="确认人" />
+        <el-table-column prop="confirm_optname" label="验收人" />
-        <el-table-column prop="confirm_time" label="确认时间" width="150px" show-overflow-tooltip />
+        <el-table-column prop="confirm_time" label="验收时间" width="150px" show-overflow-tooltip />
         <el-table-column prop="audit_optname" label="审核人" />
         <el-table-column prop="audit_time" label="审核时间" width="150px" show-overflow-tooltip />
         <el-table-column prop="source_bill_code" label="源单号" show-overflow-tooltip />
@@ -152,6 +152,7 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
 import AddDialog from '@/views/wms/sb/repair/devicerepair/AddDialog'
 import { getDepts } from '@/api/system/dept'
+import { mapGetters } from 'vuex'
 
 export default {
   name: 'Devicegridcheck',
@@ -184,6 +185,11 @@ export default {
       }
     }
   },
+  computed: {
+    ...mapGetters([
+      'user'
+    ])
+  },
   created() {
     const param = {
       'materOpt_code': this.materOpt_code

mes/qd/src/views/wms/sb/repair/devicerepairpa/ReceiveDialog.vue

@@ -55,10 +55,17 @@
 
       <el-row>
         <el-col :span="8">
-          <el-form-item label="设备" prop="device_code">
+          <el-form-item label="设备编码" prop="device_code">
             <el-input v-model="form3.device_code" :disabled="true" style="width: 200px;" />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="设备名称" prop="device_name">
+            <el-input v-model="form3.device_name" :disabled="true" style="width: 200px;" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="16">
           <el-form-item label="备注" prop="remark">
             <el-input v-model="form3.remark" style="width: 580px;" rows="2" type="textarea" disabled />

mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue

@@ -133,28 +133,6 @@
         >
           结束维修
         </el-button>
-<!--        <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          icon="el-icon-position"
-          size="mini"
-          :disabled="confirm_flag"
-          @click="confirmRepair"
-        >
-          班组验收
-        </el-button>-->
-<!--        <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          icon="el-icon-position"
-          size="mini"
-          :disabled="result_flag"
-          @click="resuftRepair"
-        >
-          结果录入
-        </el-button>-->
       </crudOperation>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="mySelectionChange">

mes/qd/src/views/wms/sb/run/devicerunrecord/PaDialog.vue

@@ -29,7 +29,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="准备时间（分钟）:">
+          <el-form-item label="保养时间（分钟）:">
             <el-input-number :controls="false" :min="0" :precision="0" v-model="form1.prepare_times" style="width: 200px;" />
           </el-form-item>
         </el-col>

mes/qd/src/views/wms/sb/run/devicerunrecord/index.vue

@@ -81,7 +81,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="准备时间（分钟）:">
+              <el-form-item label="保养时间（分钟）:">
                 <el-input-number :controls="false" :min="0" :precision="0" v-model="form.prepare_times" style="width: 200px;" />
               </el-form-item>
             </el-col>