Merge branch 'dev' of https://e.coding.net/g-pheu9517/grt-iscs/ISCS_Ui_Admin_Base into dev

src/views/mes/hw/information/index.vue

@@ -32,21 +32,18 @@
             placeholder="请选择硬件状态"
             clearable
           >
-            <el-option label="在线" value="1"></el-option>
-            <el-option label="离线" value="2"></el-option>
-            <el-option label="异常" value="3"></el-option>
-<!--            <el-option-->
-<!--              v-for="dict in dict.type.mes_order_status"-->
-<!--              :key="dict.value"-->
-<!--              :label="dict.label"-->
-<!--              :value="dict.value"-->
-<!--            />-->
+            <el-option
+              v-for="dict in dict.type.hardware_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
           </el-select>
         </el-form-item>
 
-        <el-form-item label="硬件类型" prop="hardwareTypeName">
+        <el-form-item label="硬件类型" prop="hardwareTypeId">
           <el-select
-            v-model="queryParams.hardwareTypeName"
+            v-model="queryParams.hardwareTypeId"
             placeholder="请选择硬件类型"
             clearable
           >
@@ -54,7 +51,7 @@
               v-for="dict in hardwareTypeOption"
               :key="dict.key"
               :label="dict.label"
-              :value="dict.value"
+              :value="dict.key"
             />
           </el-select>
         </el-form-item>
@@ -173,7 +170,14 @@
       <el-table-column label="硬件类型" align="center" prop="hardwareTypeName" />
       <el-table-column label="规格型号" align="center" prop="hardwareSpec" />
       <el-table-column label="所属车间" align="center" prop="workshopName" />
-      <el-table-column label="硬件状态" align="center" prop="status" />
+      <el-table-column label="硬件状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.hardware_status"
+            :value="scope.row.status"
+          />
+        </template>
+      </el-table-column>
       <el-table-column
         label="创建时间"
         align="center"
@@ -195,8 +199,8 @@
         </template>
       </el-table-column>
       <el-table-column label="可用次数" align="center" prop="availableTimes" />
-      <el-table-column label="可用寿命" align="center" prop="availableLife" />
       <el-table-column label="已用次数" align="center" prop="usedTimes" />
+      <el-table-column label="可用寿命" align="center" prop="availableLife" />
       <el-table-column label="已用寿命" align="center" prop="usedLife" />
       <el-table-column
         label="操作"
@@ -401,7 +405,7 @@ import {
 
 export default {
   name: "hardwareinfo",
-  dicts: ["mes_repair_result", "mes_order_status"],
+  dicts: ["hardware_status"],
   // components: { Repairline, MachinerySelectSingle },
   data() {
     return {
@@ -559,6 +563,8 @@ export default {
         return item.value==val?item.key:null;
       })
       this.form.hardwareTypeId=TypeId.key
+      this.form.hardwareTypeCode=TypeId.value
+      this.form.hardwareTypeName=TypeId.label
       console.log(this.form.hardwareTypeId,'hardwareTypeId')
     },
     // 车间下拉 --新增表单

src/views/mes/sop/sopm/NewSop.vue

@@ -85,15 +85,15 @@
                   <el-form-item label="车间名称" prop="workshopName">
                     <el-input
                       v-model="form.workshopName"
-                      placeholder="请输入车间名称"
                       style="width: 100%"
+                      disabled
                     />
                   </el-form-item>
                   <el-form-item label="产线" prop="workline">
                     <el-input
                       v-model="form.workline"
-                      placeholder="请输入产线"
                       style="width: 100%"
+                      disabled
                     />
                   </el-form-item>
 
@@ -222,12 +222,6 @@ export default {
           },
         ],
       },
-      // sop类型列表
-      sopTypeList: [
-        { label: "维护", value: 1 },
-        { label: "维修", value: 2 },
-        { label: "保养", value: 3 },
-      ],
       // 右侧底部已选隔离点
       tableData: [],
       points: null, //车间逆向传递拿到的隔离点数据

src/views/mes/wa/workarea/index.vue

@@ -103,7 +103,7 @@
       </el-table-column>
       <el-table-column label="工作区域名称" align="center" prop="workareaName"/>
       <el-table-column label="工作区域类型" align="center" prop="workareaType"/>
-      <el-table-column label="所属车间Id" align="center" prop="workshopId"/>
+      <el-table-column label="所属车间" align="center" prop="workshopName"/>
 
 <!--      <el-table-column label="状态" align="center" prop="calendarType">-->
 <!--        <template slot-scope="scope">-->