Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/views/mes/md/workstation/index.vue

@@ -303,7 +303,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
           <el-form-item label="所属工序" prop="processName">
             <el-select v-model="form.process" placeholder="请选择工序" multiple>
               <el-option
@@ -314,8 +314,14 @@
               ></el-option>
             </el-select>
           </el-form-item>
-        </el-col>
-
+        </el-col> -->
+        <el-col :span="12">
+            <el-form-item label="转间时间" label-width="120px" prop="transferTime">
+              <el-input v-model="form.transferTime" placeholder="请输入转间时间">
+                <i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">MIN</i>
+              </el-input>
+            </el-form-item>
+          </el-col>
 
           <el-col :span="12">
             <el-form-item label="标准工时" prop="stdWorkingTime">
@@ -403,13 +409,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="转间时间" label-width="120px" prop="transferTime">
-              <el-input v-model="form.transferTime" placeholder="请输入转间时间">
-                <i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">MIN</i>
-              </el-input>
-            </el-form-item>
-          </el-col>
+          
       </el-row>
       <el-row>
         <el-col :span="12">
@@ -577,7 +577,6 @@ export default {
       //工序选项
       processOptions: [],
 
-      processList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -658,47 +657,9 @@ export default {
       });
     },
 
-    getProcessList() {
-      listProcess().then((response) => {
-        this.processList = response.rows;
-      });
-    },
     
 
 
-    //获取仓库
-    // getWarehouseList() {
-    //   getTreeList().then((response) => {
-    //     this.warehouseOptions = response.data;
-    //     this.warehouseOptions.map((w) => {
-    //       w.children.map((l) => {
-    //         let lstr = JSON.stringify(l.children)
-    //           .replace(/locationId/g, "lId")
-    //           .replace(/areaId/g, "pId")
-    //           .replace(/areaName/g, "pName");
-    //         l.children = JSON.parse(lstr);
-    //       });
-
-    //       let wstr = JSON.stringify(w.children)
-    //         .replace(/warehouseId/g, "wId")
-    //         .replace(/locationId/g, "pId")
-    //         .replace(/locationName/g, "pName");
-    //       w.children = JSON.parse(wstr);
-    //     });
-    //     let ostr = JSON.stringify(this.warehouseOptions)
-    //       .replace(/warehouseId/g, "pId")
-    //       .replace(/warehouseName/g, "pName");
-    //     this.warehouseOptions = JSON.parse(ostr);
-    //   });
-    // },
-    //选择默认的仓库、库区、库位
-    // handleWarehouseChanged(obj) {
-    //   if (obj != null) {
-    //     this.form.warehouseId = obj[0];
-    //     this.form.locationId = obj[1];
-    //     this.form.areaId = obj[2];
-    //   }
-    // },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -781,7 +742,6 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.getProcessList();
       this.handleAutoGenChange(true);
       this.getWorkshops();
       this.open = true;
@@ -792,7 +752,6 @@ export default {
     handleView(row) {
       this.reset();
       this.getWorkshops();
-      this.getProcessList();
       const workstationId = row.workstationId || this.ids;
       getWorkstation(workstationId).then((response) => {
         this.form = response.data;