Explorar o código

修改生产线为区域

wangyani hai 1 ano
pai
achega
63bef0a3c1

+ 5 - 9
src/components/separationPoint/workshop.vue

@@ -48,11 +48,11 @@
           <!--          </el-checkbox-group>-->
           <!--        </el-select>-->
         </el-form-item>
-        <el-form-item label="生产线">
+        <el-form-item label="区域">
           <el-select
             :disabled="this.getSopLook"
             v-model="form.producLine"
-            placeholder="请选择生产线"
+            placeholder="请选择区域"
             @change="handleselectProductLine"
           >
             <el-option
@@ -103,7 +103,6 @@ export default {
       workShopOptions: [],
       producLineOptions: [],
       imgsrc: "",
-
     };
   },
   watch: {
@@ -113,7 +112,6 @@ export default {
           this.imgsrc = localStorage.getItem("img");
         }
       },
-
     },
     // 监听父组件传递的数据
     sopProps: {
@@ -190,7 +188,6 @@ export default {
     },
   },
   mounted() {
-
     this.getworkshopList();
   },
   computed: {
@@ -249,15 +246,14 @@ export default {
             resolve(); // 异步操作成功后 resolve
           })
           .catch((error) => {
-            console.error("获取生产线下拉列表失败", error);
+            console.error("获取区域下拉列表失败", error);
             reject(error); // 异步操作失败后 reject
           });
-
       });
     },
-    // 生产线下拉
+    // 区域下拉
     handleselectProductLine(val) {
-      console.log(val, "生产线下拉");
+      console.log(val, "区域下拉");
 
       // 获取区域map解析数据
       const data = val;

+ 6 - 1
src/views/mes/hw/information/index.vue

@@ -347,12 +347,17 @@
               <el-input
                 v-model="form.availableTimes"
                 placeholder="请输入可用次数"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="11">
             <el-form-item label="已用次数" prop="usedTimes">
-              <el-input v-model="form.usedTimes" placeholder="请输入已用次数" />
+              <el-input
+                v-model="form.usedTimes"
+                placeholder="请输入已用次数"
+                disabled
+              />
             </el-form-item>
           </el-col>
         </el-row>

+ 4 - 4
src/views/mes/job/jobm/NewOperations.vue

@@ -137,10 +137,10 @@
                       disabled
                     />
                   </el-form-item>
-                  <el-form-item label="生产线" prop="workline">
+                  <el-form-item label="区域" prop="workline">
                     <el-input
                       v-model="form.workline"
-                      placeholder="请输入产线"
+                      placeholder="请输入区域"
                       style="width: 100%"
                       disabled
                     />
@@ -463,7 +463,7 @@ export default {
         ticketCode: "",
         ticketContent: "",
         workshopName: "", //车间名称
-        workline: "", //生产线
+        workline: "", //区域
         spoint: [], //已选隔离点
         locker: "", //上锁人
         coLocker: "", //共锁人
@@ -1066,7 +1066,7 @@ export default {
         ticketCode: "",
         ticketContent: "",
         workshopName: "", //车间名称
-        workline: "", //生产线
+        workline: "", //区域
         spoint: [], //已选隔离点
         locker: "", //上锁人
         coLocker: "", //共锁人

+ 3 - 3
src/views/mes/job/jobm/index.vue

@@ -48,8 +48,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="生产线" prop="workareaId">
-        <el-select v-model="queryParams.workareaId" placeholder="请选择生产线">
+      <el-form-item label="区域" prop="workareaId">
+        <el-select v-model="queryParams.workareaId" placeholder="请选择区域">
           <el-option
             v-for="dict in this.workareaList"
             :key="dict.value"
@@ -207,7 +207,7 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="生产线" align="center" prop="workareaName">
+      <el-table-column label="区域" align="center" prop="workareaName">
       </el-table-column>
       <el-table-column label="隔离点总数" align="center" prop="pointCount">
       </el-table-column>

+ 2 - 2
src/views/mes/sop/sopm/NewSop.vue

@@ -119,7 +119,7 @@
                       disabled
                     />
                   </el-form-item>
-                  <el-form-item label="生产线" prop="workline">
+                  <el-form-item label="区域" prop="workline">
                     <el-input
                       v-model="form.workline"
                       style="width: 100%"
@@ -231,7 +231,7 @@ export default {
         sopCode: "",
         SOPType: "",
         workshopName: "", //车间名称
-        workline: "", //生产线
+        workline: "", //区域
         workareaName: "",
         spoint: [], //已选隔离点
       },

+ 3 - 3
src/views/mes/sop/sopm/index.vue

@@ -48,8 +48,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="生产线" prop="workareaId">
-        <el-select v-model="queryParams.workareaId" placeholder="请选择生产线">
+      <el-form-item label="区域" prop="workareaId">
+        <el-select v-model="queryParams.workareaId" placeholder="请选择区域">
           <el-option
             v-for="dict in this.workareaList"
             :key="dict.value"
@@ -183,7 +183,7 @@
           <dict-tag :options="dict.type.sop_type" :value="scope.row.sopType" />
         </template>
       </el-table-column>
-      <el-table-column label="生产线" align="center" prop="workareaName">
+      <el-table-column label="区域" align="center" prop="workareaName">
       </el-table-column>
       <el-table-column label="隔离点数量" align="center" prop="pointCount">
       </el-table-column>