#72

src/views/wpm/mlog_hun.vue

@@ -154,6 +154,7 @@
     </el-dialog>
     <save-dialog v-if="dialogSave" 
         ref="saveDialog"
+        :mgroup="currentMgroup.id"
         :activeType="activeName"
         @success="handleSaveSuccess" 
         @closed="dialogSave = false">

src/views/wpm/mlog_tui.vue

@@ -196,6 +196,7 @@
     </el-dialog>
     <save-dialog v-if="dialogSave" 
         ref="saveDialog"
+        :mgroup="currentMgroup.id"
         :activeType="activeName"
         @success="handleSaveSuccess" 
         @closed="dialogSave = false">
@@ -250,7 +251,7 @@ export default {
             });
         },
         tomio() {
-            this.$router.push({ name: "mio" });
+            this.$router.push({ name: "halfgood_mio" });
         },
         async table_del(row) {
             this.$confirm(`确定删除吗？`, "提示", {

src/views/wpm/worktask_form.vue

@@ -16,7 +16,7 @@
       label-width="80px"
     >
       <el-row>
-        <el-col :md="12" :sm="24">
+        <!-- <el-col :md="12" :sm="24">
           <el-form-item label="工段" prop="material">
             <el-select
               v-model="form.mgroup"
@@ -33,7 +33,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :md="12" :sm="24">
           <el-form-item label="生产路线" prop="material_out">
             <el-select
@@ -51,7 +51,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :md="12" :sm="24">
+        <!-- <el-col :md="12" :sm="24">
           <el-form-item label="班次" prop="material">
             <el-select
               v-model="form.shift"
@@ -67,7 +67,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :md="12" :sm="24">
           <el-form-item label="物料批次" width="100">
             <el-input
@@ -146,7 +146,7 @@
       label-width="120px"
     >
       <el-row>
-        <el-col :md="12" :sm="24">
+        <!-- <el-col :md="12" :sm="24">
           <el-form-item label="工段" prop="material">
             <el-select
               v-model="form.mgroup"
@@ -163,7 +163,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :md="12" :sm="24">
           <el-form-item label="生产路线" prop="material_out">
             <el-select
@@ -224,7 +224,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :md="12" :sm="24">
+        <!-- <el-col :md="12" :sm="24">
           <el-form-item label="班次" prop="material">
             <el-select
               v-model="form.shift"
@@ -240,7 +240,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :md="12" :sm="24">
           <el-form-item label="退火时间" prop="material">
             <el-date-picker
@@ -460,7 +460,7 @@
             <el-input v-model="form.batch" placeholder="批次号"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :md="12" :sm="24">
+        <!-- <el-col :md="12" :sm="24">
           <el-form-item label="班次" prop="material">
             <el-select
               v-model="form.shift"
@@ -476,9 +476,9 @@
               ></el-option>
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :md="12" :sm="24">
-          <el-form-item label="锅号">
+          <el-form-item label="炉号">
             <el-select
               v-model="form.equipment"
               placeholder="锅号"
@@ -512,7 +512,7 @@
           </el-form-item>
         </el-col>
         <el-col :md="12" :sm="24">
-          <el-form-item label="生产量">
+          <el-form-item label="应出量">
             <el-input-number
               v-model="form.count_real"
               controls-position="right"
@@ -1096,6 +1096,7 @@ export default {
     this.getUserList();
     this.getEquipment();
     this.getShiftOptions();
+    this.getRouteOptions();
     this.getWorkShopMaterial();
     let date = new Date();
     let year = date.getFullYear();
@@ -1143,7 +1144,20 @@ export default {
     },
     getShiftOptions() {
       this.$API.mtm.shift.list.req({ page: 0}).then((res) => {
-        this.shiftOptions = res;
+        this.shiftOptions = [];
+        if(this.activeType == "10车间"){
+          res.forEach(item=>{
+            if(item.rule=='两倒'){
+              this.shiftOptions.push(item);
+            }
+          })
+        }else{
+          res.forEach(item=>{
+            if(item.rule=='默认'){
+              this.form.shift = item.id;
+            }
+          })
+        }
       });
     },
     getUserList() {
@@ -1364,7 +1378,6 @@ export default {
     //表单注入数据
     setData(data) {
       Object.assign(this.form, data);
-      this.getRouteOptions();
       if (this.activeType == "8车间") {
         if (this.form.handle_user.indexOf(",") > -1) {
           this.handle_user = this.form.handle_user.split(",");