diff --git a/public/index.html b/public/index.html
index 0c7252ba..8cb78170 100644
--- a/public/index.html
+++ b/public/index.html
@@ -35,9 +35,9 @@
 					<!-- 曲阳 -->
 					<!-- <img src="img/bbmg_jy.jpg"/> -->
 					<!-- 托克逊 -->
-					<img src="img/bbmg.jpg"/>
+					<!-- <img src="img/bbmg.jpg"/> -->
 					<!-- 光子 -->
-					<!-- <img src="img/gz_logo.png"/> -->
+					<img src="img/gz_logo.png"/>
 				</div>
 				<div class="app-loading__loader"></div>
 				<div class="app-loading__title"><%= VUE_APP_TITLE %></div>
diff --git a/src/api/model/qm.js b/src/api/model/qm.js
index 5a7ec2f3..a2d1dad1 100644
--- a/src/api/model/qm.js
+++ b/src/api/model/qm.js
@@ -37,5 +37,47 @@ export default {
 			return await http.get(this.url, data);
 		}
 	},
+	ftest: {
+		list: {
+			name: "首件检验列表",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/qm/ftest/`,
+					data
+				);
+			}
+		},
+		item: {
+			name: "首件检验",
+			req: async function(id){
+				return await http.get(
+					`${config.API_URL}/qm/ftest/${id}/`
+				);
+			}
+		},
+		update: {
+			name: "更新首件检验",
+			req: async function(id, data){
+				return await http.put(
+					`${config.API_URL}/qm/ftest/${id}/`,
+					data);
+			}
+		},
+        create: {
+			name: "创建首件检验",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/qm/ftest/`,
+					data);
+			}
+		},
+		delete: {
+			name: "删除首件检验",
+			req: async function(id){
+				return await http.delete(
+					`${config.API_URL}/qm/ftest/${id}/`);
+			}
+		}
+	},
 	
 }
diff --git a/src/api/model/wpm.js b/src/api/model/wpm.js
index 02158cdb..1ed8c73d 100644
--- a/src/api/model/wpm.js
+++ b/src/api/model/wpm.js
@@ -196,6 +196,72 @@ export default {
 			}
 		}
 	},
+	handover:{
+		list: {
+			name: "值班记录列表",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/wpm/handover/`,
+					data
+				);
+			}
+		},
+		item: {
+			name: "获取详情",
+			req: async function(id){
+				return await http.get(
+					`${config.API_URL}/wpm/handover/${id}/`
+				);
+			}
+		},
+		cquery: {
+			name: "复杂查询",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/wpm/handover/cquery/`,
+					data);
+			}
+		},
+		update: {
+			name: "更新",
+			req: async function(id, data){
+				return await http.put(
+					`${config.API_URL}/wpm/handover/${id}/`,
+					data);
+			}
+		},
+        create: {
+			name: "创建",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/wpm/handover/`,
+					data);
+			}
+		},
+		delete: {
+			name: "删除",
+			req: async function(id){
+				return await http.delete(
+					`${config.API_URL}/wpm/handover/${id}/`);
+			}
+		},
+		genByMlogs:{
+			name: "从生产日志生成交接记录",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/wpm/handover/gen_by_mlogs/`,
+					data);
+			}
+		},
+		genByWm:{
+			name: "从车间库存生成交接记录",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/wpm/handover/gen_by_wm/`,
+					data);
+			}
+		}
+	},
 	//车间库存
 	wmaterial: {
 		list: {
diff --git a/src/config/route.js b/src/config/route.js
index 5362a43a..22754003 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -643,7 +643,7 @@ const routes = [
           "name": "em",
           "path": "/em",
           "meta": {
-            "title": "设备",
+            "title": "设备管理",
             "icon": "el-icon-grid",
             "type": "menu",
             "perms": ["em"]
diff --git a/src/views/inm/mioitem.vue b/src/views/inm/mioitem.vue
index d22afa38..d44558fd 100644
--- a/src/views/inm/mioitem.vue
+++ b/src/views/inm/mioitem.vue
@@ -42,6 +42,9 @@
                     </el-table-column>
                     <el-table-column label="操作" fixed="right" align="center" width="100px">
                         <template #default="scope">
+                            <el-link type="primary" @click="table_check(scope.row)" >
+                                检验
+                            </el-link>
                             <el-link type="danger" @click="table_del(scope.row)" v-if="mioObj.state == 10">
                                 删除
                             </el-link>
@@ -52,18 +55,25 @@
         </div>
     </div>
     <save-dialog v-if="dialog.save" ref="saveDialog" :mioId="mioId" :belongDeptId="belongDeptId" :mioObj="mioObj"
-        @success="handleSaveSuccess" @closed="dialog.save = false"></save-dialog>
+        @success="handleSaveSuccess" @closed="dialog.save = false">
+    </save-dialog>
+
+    <check-dialog v-if="dialog.check" ref="checkDialog" 
+        @success="handleCheckSuccess" @closed="dialog.check = false">
+    </check-dialog>
 </template>
 <script>
 import saveDialog from "./mioitem_form.vue";
+import checkDialog from "./mioitem_check.vue";
 export default {
     name: "mioitem",
     components: {
-        saveDialog,
+        saveDialog,checkDialog
     },
     data() {
         return {
             dialog: {
+                check:false,
                 save: false,
             },
             apiObj: null,
@@ -133,6 +143,12 @@ export default {
                 });
             }).catch(() => { });
         },
+        table_check(row){
+            this.dialog.check = true;
+            this.$nextTick(() => {
+                this.$refs.checkDialog.open("add");
+            });
+        },
         //本地更新数据
         handleSaveSuccess(data, mode) {
             if (mode == "add") {
@@ -141,6 +157,9 @@ export default {
                 this.$refs.table.refresh();
             }
         },
+        handleCheckSuccess(){
+            this.$refs.table.refresh();
+        },
         handleQuery() {
             this.$refs.table.queryData(this.query)
         },
diff --git a/src/views/inm/mioitem_check.vue b/src/views/inm/mioitem_check.vue
new file mode 100644
index 00000000..89e62ca0
--- /dev/null
+++ b/src/views/inm/mioitem_check.vue
@@ -0,0 +1,254 @@
+<template>
+  <el-dialog
+    title="首件检验"
+    v-model="visible"
+    :size="1000"
+    destroy-on-close
+    @closed="$emit('closed')"
+  >
+    <el-container v-loading="loading">
+      <el-main style="padding: 0 20px 20px 20px">
+        <el-form
+          ref="dialogForm"
+          :model="form"
+          :rules="rules"
+          label-width="100px"
+        >
+          <el-row>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="所属部门" prop="belong_dept">
+                <el-select 
+                v-model="form.belong_dept" 
+                placeholder="所属部门" 
+                clearable style="width:100%" 
+                >
+                  <el-option 
+                    v-for="item in deptOptions" 
+                    :key="item.id" 
+                    :label="item.name" 
+                    :value="item.id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="检验日期" prop="test_date">
+                <el-date-picker
+                  v-model="form.test_date"
+                  type="date"
+                  value-format="YYYY-MM-DD"
+                  style="width:100%"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="操作人" prop="test_user">
+                <el-select 
+                  v-model="form.test_user"
+                  placeholder="操作人"
+                  clearable
+                  style="width:100%"
+                >
+                  <el-option
+                  v-for="item in userList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="专检人" prop="check_user">
+                <el-select 
+                  v-model="form.check_user"
+                  placeholder="专检人"
+                  clearable
+                  style="width:100%"
+                >
+                  <el-option
+                  v-for="item in userList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-table :data="form.ftestitems" border placeholder="暂无数据">
+            <el-table-column prop="testitem" label="测量项" min-width="100" align="center">
+              <template #default="scope">
+                <span>{{ scope.row.testitem }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="test_val" label="操作人测量值" min-width="120" align="center">
+              <template #default="scope">
+                <el-input-number v-model="scope.row.test_val" :min="0" style="width:100%" controls-position="right">
+                </el-input-number>
+              </template>
+            </el-table-column>
+            <el-table-column prop="check_val" label="专检人测量值" min-width="120" align="center">
+              <template #default="scope">
+                <el-input-number v-model="scope.row.check_val" :min="0" style="width:100%" controls-position="right">
+                </el-input-number>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row style="margin-top:14px">
+            <el-col :md="12" :sm="24">
+              <el-form-item label="检验工序集" prop="test_group">
+                <el-select 
+                  v-model="form.test_group" 
+                  placeholder="检验工序集" 
+                  multiple
+                  clearable style="width:100%" 
+                >
+                  <el-option 
+                    v-for="item in processOptions" 
+                    :key="item.id" 
+                    :label="item.name" 
+                    :value="item.id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            
+            <el-col :md="12" :sm="24" prop="is_ok">
+              <el-form-item label="是否合格" prop="is_ok">
+                <el-select 
+                  v-model="form.is_ok"
+                  placeholder="是否合格"
+                  clearable
+                  style="width:100%"
+                >
+                  <el-option label="是" value="true"/>
+                  <el-option label="否" value="false"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="备注">
+                <el-input v-model="form.note" placeholder="备注"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-main>
+      <el-footer>
+        <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
+        <el-button @click="visible = false">取消</el-button>
+      </el-footer>
+    </el-container>
+  </el-dialog>
+</template>
+<script>
+export default {
+  emits: ["success", "closed"],
+  data() {
+    return {
+      loading: false,
+      form: {
+        ftestitems:[
+          {testitem:'椭圆度(≤0.02mm)',test_val:'',check_val:''},
+          {testitem:'锥度(≤0.05mm)',test_val:'',check_val:''},
+          {testitem:'直径(≥29.0)',test_val:'',check_val:''},
+          {testitem:'长度(≥455mm)',test_val:'',check_val:''},
+        ],
+      },
+      rules: {
+          belong_dept: [{required: true, message: "请选择所属部门", trigger: "blur"}],
+          test_date: [{required: true, message: "请选择检验日期", trigger: "blur"}],
+          test_user: [{required: true, message: "请选择操作人", trigger: "blur"}],
+          check_user: [{required: true, message: "请选择专检人", trigger: "blur"}],
+          test_group:[{required: true, message: "请选择检测工序集", trigger: "blur"}],
+          is_ok: [{required: true, message: "请选择是否合格", trigger: "blur"}],
+        },
+      visible: false,
+      isSaveing: false,
+      userList:[],
+      processOptions: [],
+      deptOptions: [],
+      selectionFilters: [],
+      setFiltersVisible: false,
+      belong_dept_options: [],
+      group: [],
+    };
+  },
+  mounted() {
+    this.getProcess();
+    this.getUserList();
+    this.getDeptOptions();
+  },
+  methods: {
+    //显示
+    open(mode = "add",type) {
+      this.mode = mode;
+      this.visible = true;
+      return this;
+    },
+    //获取部门列表
+    getDeptOptions() {
+        this.$API.system.dept.list.req({ page: 0, type__in: 'dept' }).then((res) => {
+            this.deptOptions = [];
+            res.forEach(item=>{
+                if(item.parent=='3423856735881117696'){
+                    this.deptOptions.push(item)
+                }
+            })
+        });
+    },
+    //获取员工
+    getUserList(){
+      let that = this;
+      this.$API.system.user.list.req({page_size:20,page:1}).then(res=>{
+        that.userList = res.results;
+      });
+    },
+    getProcess(){
+      let that = this;
+      this.$API.mtm.process.list.req({page:0}).then(res=>{
+        that.processOptions = res;
+      })
+    },
+    //提交
+    submit() {
+      this.$refs.dialogForm.validate(async (valid) => {
+        if (valid) {
+          this.isSaveing = true;
+          try {
+            var res;
+            this.form.test_group = this.form.test_group.join(',')
+            if (this.mode == "add") {
+              res = await this.$API.qm.ftest.create.req(this.form);
+            } else if (this.mode == "edit") {
+              res = await this.$API.qm.ftest.update.req(this.form.id,this.form);
+            }
+            this.isSaveing = false;
+            this.$emit("success", this.form, this.mode);
+            this.visible = false;
+            this.$message.success("操作成功");
+          } catch (err) {
+            //可以处理校验错误
+            this.isSaveing = false;
+            return err;
+          }
+        }
+      });
+    },
+    //表单注入数据
+    setData(data) {
+      Object.assign(this.form, data);
+      this.form.test_group = this.form.split(',')
+    },
+    //设置过滤项
+    setFilters(filters) {
+      this.selectionFilters = filters;
+      this.setFiltersVisible = true;
+    },
+  },
+};
+</script>
+
+<style>
+</style>
diff --git a/src/views/mtm/materials.vue b/src/views/mtm/materials.vue
index a55e9f25..d8887f58 100644
--- a/src/views/mtm/materials.vue
+++ b/src/views/mtm/materials.vue
@@ -31,6 +31,13 @@
             </el-table-column>
             <el-table-column label="规格型号" prop="specification">
             </el-table-column>
+            <el-table-column label="关联物料" prop="brothers">
+              <template #default="scope">
+                <el-icon v-if="scope.row.brothers.length>0" color="green">
+                    <CircleCheckFilled />
+                </el-icon>
+              </template>
+            </el-table-column>
             <el-table-column label="计量单位" prop="unit">
             </el-table-column>
             <el-table-column label="操作" fixed="right" align="center" width="100">
@@ -136,6 +143,7 @@ export default {
       }).then(() => {
         this.$API.mtm.material.delete.req(row.id).then((res) => {
           this.$message.success("删除成功");
+          this.$refs.table.refresh();
           return res;
         }).catch((err) => {
           return err;
diff --git a/src/views/mtm/materials_form.vue b/src/views/mtm/materials_form.vue
index 35ae71a7..afa5ded2 100644
--- a/src/views/mtm/materials_form.vue
+++ b/src/views/mtm/materials_form.vue
@@ -21,11 +21,29 @@
             </el-col>
             <el-col :md="12" :sm="24">
               <el-form-item label="物料类别" prop="type">
-                <el-select v-model="form.type" placeholder="物料类别" clearable style="width:100%">
+                <el-select v-model="form.type" placeholder="物料类别" clearable style="width:100%" @change="typeChange">
                   <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="关联物料" prop="type">
+                <el-select 
+                  v-model="brothers"
+                  placeholder="关联物料"
+                  clearable
+                  multiple
+                  style="width:100%"
+                >
+                  <el-option
+                  v-for="item in materialOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :md="12" :sm="24">
               <el-form-item label="工艺路线" prop="need_route">
                 <el-switch v-model="form.need_route" />
@@ -70,6 +88,7 @@ export default {
         edit: "编辑物料",
         show: "查看物料",
       },
+      brothers:[],
       form: {},
       rules: {
         name: [{ required: true, message: "请输入物料名称", trigger: "blur" }],
@@ -87,11 +106,14 @@ export default {
         { id: 60, name: '辅助工装' },
         { id: 70, name: '办公用品' },
       ],
+      handle_user:[],
       selectionFilters: [],
+      materialOptions:[],
       setFiltersVisible: false,
     };
   },
   mounted() {
+    
   },
   methods: {
     //显示
@@ -100,26 +122,44 @@ export default {
       this.visible = true;
       return this;
     },
+    getMaterial(val){
+      let that = this;
+      let query = {};
+      query.type = val;
+      query.page = 0;
+      query.is_hidden = false;
+      this.$API.mtm.material.list.req(query).then(res=>{
+        that.materialOptions = res;
+      })
+    },
+    typeChange(val){
+      this.getMaterial(val);
+    },
     //提交
     submit() {
       this.$refs.dialogForm.validate(async (valid) => {
         if (valid) {
           this.isSaveing = true;
-          try {
-            var res;
-            if (this.mode == "add") {
-              res = await this.$API.mtm.material.create.req(this.form);
-            } else if (this.mode == "edit") {
-              res = await this.$API.mtm.material.update.req(this.form.id, this.form);
-            }
-            this.isSaveing = false;
-            this.$emit("success", this.form, this.mode);
-            this.visible = false;
-            this.$message.success("操作成功");
-          } catch (err) {
-            //可以处理校验错误
-            this.isSaveing = false;
-            return err;
+          this.form.brothers = this.brothers;
+          if (this.mode == "add") {
+            this.$API.mtm.material.create.req(this.form).then(res=>{
+              this.isSaveing = false;
+              this.$emit("success", this.form, this.mode);
+              this.visible = false;
+              this.$message.success("操作成功");
+            }).catch(()=>{
+              this.isSaveing = false;
+              this.visible = false;
+            })
+          } else if (this.mode == "edit") {
+            this.$API.mtm.material.update.req(this.form.id, this.form).then(res=>{
+              this.isSaveing = false;
+              this.$emit("success", this.form, this.mode);
+              this.visible = false;
+              this.$message.success("操作成功");
+            }).catch(()=>{
+              this.isSaveing = false;
+            })
           }
         }
       });
@@ -127,6 +167,8 @@ export default {
     //表单注入数据
     setData(data) {
       Object.assign(this.form, data);
+      this.brothers = data.brothers;
+      this.getMaterial(data.type)
     },
     //设置过滤项
     setFilters(filters) {
diff --git a/src/views/mtm/mgroup.vue b/src/views/mtm/mgroup.vue
index 7e8a7f4c..d2dda791 100644
--- a/src/views/mtm/mgroup.vue
+++ b/src/views/mtm/mgroup.vue
@@ -21,7 +21,7 @@
 				<el-table-column label="所属部门" prop="belong_dept_name" min-width="150"></el-table-column>
 				<el-table-column label="排序" prop="sort" min-width="80"></el-table-column>
 				<el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column>
-				<el-table-column label="操作" fixed="right" align="center" width="140">
+				<el-table-column label="操作" fixed="right" align="center" width="180">
 					<template #default="scope">
 						<el-button link size="small" @click="table_edit(scope.row)" v-auth="'mgroup.update'"
 							type="primary">编辑</el-button>
@@ -36,8 +36,12 @@
 			</scTable>
 		</el-main>
 	</el-container>
-	<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
-		@closed="dialog.save = false"></save-dialog>
+	<save-dialog 
+		v-if="dialog.save" 
+		ref="saveDialog" 
+		@success="handleSaveSuccess"
+		@closed="dialog.save = false">
+	</save-dialog>
 </template>
 <script>
 import saveDialog from "./mgroup_form.vue";
diff --git a/src/views/mtm/mgroup_form.vue b/src/views/mtm/mgroup_form.vue
index eb958236..be1b60a5 100644
--- a/src/views/mtm/mgroup_form.vue
+++ b/src/views/mtm/mgroup_form.vue
@@ -21,6 +21,29 @@
             <el-input-number v-model="form.sort" :min="1" />
           </el-form-item>
         </el-form>
+        <sc-form-table ref="table" v-model="materialList" :addTemplate="addTemplate"  placeholder="暂无数据">
+          <el-table-column prop="type" label="输入物料" min-width="120" align="center">
+            <template #default="scope">
+              <el-select v-model="scope.row.material_in" style="width: 100%">
+                <el-option v-for="item in materials" :key="item.id" :label="item.name" :value="item.id"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column prop="type" label="输出物料" min-width="120" align="center">
+            <template #default="scope">
+              <el-select v-model="scope.row.material_out" filterable style="width: 100%" >
+                <el-option v-for="item in materials" :key="item.id" :label="item.name" :value="item.id"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column prop="type" label="操作" min-width="80" align="center">
+            <template #default="scope">
+              <el-button type="primary" v-if="scope.row.isedit" @click="submitForm(scope.row,scope.$index)">确定</el-button>
+              <el-button type="warning" v-else @click="editForm(scope.row,scope.$index)">编辑</el-button>
+              <el-button type="danger"  @click="delForm(scope.row,scope.$index)">删除</el-button>
+            </template>
+          </el-table-column>
+      </sc-form-table>
       </el-main>
       <el-footer>
         <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
@@ -47,7 +70,7 @@ export default {
       titleMap: {
         add: '新增',
         edit: '编辑',
-        show: '查看'
+        show: '查看',
       },
       //表单数据
       form: {
@@ -62,13 +85,17 @@ export default {
       isSaveing: false,
       options: [],
       group: [],
+      routes:[],
       materials: [],
       setFiltersVisible: false,
+      materialList:[{material_in:'',material_out:'',mgroup:'',isedit:true}],
+      addTemplate:{material_in:'',material_out:'',mgroup:'',isedit:true}
     };
   },
   mounted() {
     this.getGroup();//获取部门
-    this.getProcess();//获取产品
+    this.getProcess();//获取工序
+    this.getMaterial();//获取物料
   },
   methods: {
     //部门数据
@@ -79,10 +106,31 @@ export default {
     },
     //获取工序列表
     getProcess() {
-      var res = this.$API.mtm.process.list.req({ page: 0 }).then(res => {
+      this.$API.mtm.process.list.req({ page: 0 }).then(res => {
         this.options = res;
       });
     },
+    getMaterial(){
+      this.$API.mtm.material.list.req({ page: 0,is_hidden:false,type__in:'10,20' }).then(res => {
+        this.materials = res;
+      });
+    },
+    getRoute(id){
+      let that = this;
+      that.$API.mtm.route.list.req({ mgroup: id,page:0 }).then(res => {
+        that.routes = res;
+        if(res.length>0){
+          res.forEach(item=>{
+            let obj = {};
+            obj.material_in=item.material_in;
+            obj.material_out=item.material_out;
+            obj.mgroup = id;
+            obj.isedit=false;
+          })
+          that.materialList.push(obj);
+        }else{}
+      });
+    },
     //显示
     open(mode = "add") {
       this.mode = mode;
@@ -92,6 +140,10 @@ export default {
     //表单注入数据
     setData(data) {
       Object.assign(this.form, data);
+      this.getRoute(data.id);
+    },
+    setMgroup(id){
+      this.form.mgroup = id;
     },
     getReceptionist(data) {
       this.form.leader = data.id;
@@ -99,31 +151,63 @@ export default {
     },
     //表单提交方法
     submit() {
+      console.log(this.mode)
+      console.log(this.form)
       let that = this;
       that.$refs.dialogForm.validate(async (valid) => {
         if (valid) {
-          that.form.cate = 'photon';
-          that.form.need_enm = false;
-          that.isSaveing = true;
-          if (that.mode === 'add') {
-            that.$API.mtm.mgroup.create.req(that.form).then(res => {
-              that.isSaveing = false;
-              that.$emit("success", that.form, that.mode);
-              that.visible = false;
-              that.$message.success("操作成功");
-            })
-          } else {
-            that.$API.mtm.mgroup.update.req(that.form.id, that.form).then(res => {
-              that.isSaveing = false;
-              that.$emit("success", that.form, that.mode);
-              that.visible = false;
-              that.$message.success("操作成功");
-            })
-          }
+          if(this.mode){
+
+          }else{
+            that.form.cate = 'photon';
+            that.form.need_enm = false;
+            that.isSaveing = true;
+            if (that.mode === 'add') {
+              that.$API.mtm.mgroup.create.req(that.form).then(res => {
+                that.isSaveing = false;
+                that.$emit("success", that.form, that.mode);
+                that.visible = false;
+                that.$message.success("操作成功");
+              })
+            } else {
+              that.$API.mtm.mgroup.update.req(that.form.id, that.form).then(res => {
+                that.isSaveing = false;
+                that.$emit("success", that.form, that.mode);
+                that.visible = false;
+                that.$message.success("操作成功");
+              })
+            }
+          } 
         }
       });
     },
-
+    submitForm(row,index){
+      let that = this;
+      let obj = {};
+      obj.material_in = row.material_in;
+      obj.material_out = row.material_out;
+      if (row.id) {
+        obj.mgroup = row.mgroup;
+        this.$API.mtm.route.update.req(row.id, obj).then(res => {
+          that.materialList[index].isedit = false;
+        })
+      } else{
+        obj.mgroup = that.form.id;
+        this.$API.mtm.route.create.req(obj).then(res => {
+          that.materialList[index].isedit = false;
+        })
+      }
+    },
+    editForm(row,index){
+      let that = this;
+      that.materialList[index].isedit = true;
+    },
+    delForm(row,index){
+      let that = this;
+      this.$API.mtm.route.delete.req(row.id).then(res => {
+        that.getRoute(that.form.id);
+      })
+    },
     //设置过滤项
     setFilters(filters) {
       this.selectionFilters = filters;
diff --git a/src/views/wpm/handover_form.vue b/src/views/wpm/handover_form.vue
new file mode 100644
index 00000000..b25761c6
--- /dev/null
+++ b/src/views/wpm/handover_form.vue
@@ -0,0 +1,275 @@
+<template>
+    <el-dialog
+        :title="titleMap[mode]"
+        v-model="visible"
+        width="1000px"
+        :size="1000"
+        destroy-on-close
+        @closed="$emit('closed')"
+    >
+        <el-form ref="dialogForm" :model="form" :rules="rules" label-width="80px">
+            <el-row>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="交接物料" prop="material">
+                        <el-select
+                            v-model="form.wm"
+                            placeholder="交接物料"
+                            clearable
+                            style="width:100%"
+                            @change="materialChange"
+                        >
+                            <el-option
+                                v-for="item in materialOptions"
+                                :key="item.id"
+                                :label="item.batch"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="交接数量" width="100">
+                        <el-input-number 
+                        v-model="form.count" 
+                        controls-position="right" 
+                        :min="0" step="1" 
+                        :step-strictly="true" 
+                        style="width:100%"
+                        placeholder="交接数量">
+                        </el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="送料部门" prop="send_dept">
+                        <el-select
+                            v-model="form.send_dept"
+                            placeholder="送料部门"
+                            clearable
+                            style="width:100%"
+                        >
+                            <el-option
+                                v-for="item in deptOptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="交送人" prop="send_user">
+                        <el-select 
+                            v-model="form.send_user"
+                            placeholder="交送人"
+                            clearable
+                            style="width:100%"
+                        >
+                            <el-option
+                            v-for="item in userList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="接收部门" prop="recive_dept">
+                        <el-select
+                            v-model="form.recive_dept"
+                            placeholder="接收部门"
+                            clearable
+                            style="width:100%"
+                        >
+                            <el-option
+                                v-for="item in deptOptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="接收人" prop="recive_user">
+                        <el-select 
+                            v-model="form.recive_user"
+                            placeholder="接收人"
+                            clearable
+                            style="width:100%"
+                        >
+                            <el-option
+                            v-for="item in userList2"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="交送日期">
+                        <el-date-picker
+                            v-model="form.send_date"
+                            type="date"
+                            placeholder="选择时间"
+                            format="YYYY-MM-DD"
+                            value-format="YYYY-MM-DD"
+                            style="width:100%"
+                        />
+                    </el-form-item>
+                </el-col>
+            </el-row>
+        </el-form>
+        <el-footer>
+            <el-button type="primary" v-loading="isSaveing" @click="submit">确定</el-button>
+            <el-button @click="resetForm">取消</el-button>
+        </el-footer>
+    </el-dialog>
+</template>
+<script>
+    export default {
+        emits: ["success", "closed"],
+        data() {
+            return {
+                yseorno:['是','否'],
+                loading: false,
+                mode: "add",
+                titleMap: {
+                    add: "新增交接记录",
+                    edit: "编辑交接记录",
+                    show: "查看交接记录",
+                },
+                handle_user:[],
+                form:{
+                    batch:'',
+                    count:0,//送料数
+                    wm:'',
+                    send_user:'',
+                    send_dept:'',
+                    send_date:'',
+                    recive_dept:'',
+                    recive_user:'',
+                },
+                userList:[],
+                userList2:[],
+                deptOptions:[],
+                materialOptions:[],
+                visible: false,
+                isSaveing: false,
+                setFiltersVisible: false,
+            };
+        },
+        mounted() {
+            let materialObj = this.$TOOL.data.get('MATERIAL_OBJECT');
+            this.materialObj = materialObj;
+            this.getDeptOptions();
+            this.getMaterial();
+            this.getUserList();
+            let date = new Date();
+            let year = date.getFullYear();
+            let month = date.getMonth()+1;
+            let day = date.getDate();
+            this.form.handle_date =  year+'-'+month+'-'+day;
+            
+        },
+        methods: {
+            //获取6车间和8车间 的人员
+            getUserList(){
+                let that = this;
+                this.$API.system.user.list.req({belong_dept__name:'6车间',page:0}).then(res=>{
+					that.userList2 = res;
+				});
+                this.$API.system.user.list.req({belong_dept__name:'8车间',page:0}).then(res=>{
+                    that.userList = res;
+                });
+            },
+            //获取部门列表
+            getDeptOptions() {
+                this.$API.system.dept.list.req({ page: 0, type__in: 'dept' }).then((res) => {
+                    this.deptOptions = [];
+                    res.forEach(item=>{
+                        if(item.parent=='3423856735881117696'){
+                            this.deptOptions.push(item)
+                        }
+                    })
+                });
+            },
+            //获取车间物料
+            getMaterial(){
+                let that = this;
+				this.$API.wpm.wmaterial.list.req({belong_dept_name:'8车间',page:0}).then(res=>{
+					that.materialOptions = res;
+				});
+			},
+            //获取集合列表
+            getMgroupList(){
+                let that = this;
+                this.$API.mtm.mgroup.list.req({page:0,cate:'photon'}).then(res=>{
+                    let data = res.filter(item=>{
+                        return item.process_cate=='成型'
+                    })
+                    that.mgroupOptions = res;
+                })
+            },
+            //显示
+            open(mode = "add") {
+                this.mode = mode;
+                this.visible = true;
+                return this;
+            },
+            materialChange(val){
+                let data = this.materialOptions.filter(item=>{
+                    return item.id==val;
+                })
+                this.form.batch = data[0].batch;
+            },
+            //提交
+            submit() {
+                this.$refs.dialogForm.validate(async (valid) => {
+                    if (valid) {
+                        if (this.mode == "add") {
+                            this.$API.wpm.handover.create.req(this.form).then(res=>{
+                                this.isSaveing = false;
+                                this.$emit("success", this.form, this.mode);
+                                this.visible = false;
+                                this.$message.success("操作成功");
+                            }).catch( (err) =>{
+                                //可以处理校验错误
+                                this.isSaveing = false;
+                                return err;
+                            })
+                        } else if (this.mode == "edit") {
+                            this.$API.wpm.handover.update.req(this.form.id,this.form).then(res=>{
+                                this.isSaveing = false;
+                                this.$emit("success", this.form, this.mode);
+                                this.visible = false;
+                                this.$message.success("操作成功");
+                            }).catch( (err) =>{
+                                //可以处理校验错误
+                                this.isSaveing = false;
+                                return err;
+                            })
+                        }
+                    }
+                });
+            },
+            //表单注入数据
+            setData(data) {
+                Object.assign(this.form, data);
+            },
+            //设置过滤项
+            setFilters(filters) {
+                this.selectionFilters = filters;
+                this.setFiltersVisible = true;
+            },
+        },
+    };
+</script>
+<style scoped>
+.formTitle{
+    margin-bottom:10px;
+    font-weight:600
+}
+</style>
+  
\ No newline at end of file
diff --git a/src/views/wpm/task2flog_form.vue b/src/views/wpm/task2flog_form.vue
deleted file mode 100644
index c8b094b3..00000000
--- a/src/views/wpm/task2flog_form.vue
+++ /dev/null
@@ -1,545 +0,0 @@
-<template>
-    <el-dialog
-        :title="titleMap[mode]"
-        v-model="visible"
-        width="1000px"
-        :size="1000"
-        destroy-on-close
-        @closed="$emit('closed')"
-    >
-        <!-- 混料工序 -->
-        <el-form v-if="activeType=='8车间'" ref="dialogForm" :model="form" :rules="rules" label-width="80px">
-            <el-row>
-                <el-col :md="12" :sm="24">
-                    <el-form-item label="工段" prop="material">
-                        <el-select
-                            v-model="form.mgroup"
-                            placeholder="工段"
-                            clearable
-                            style="width:100%"
-                        >
-                            <el-option
-                                v-for="item in mgroupOptions"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :md="12" :sm="24">
-                    <el-form-item label="产物" prop="material">
-                        <el-select
-                            v-model="form.material_out"
-                            placeholder="产物"
-                            clearable
-                            style="width:100%"
-                        >
-                            <el-option
-                                v-for="item in materialOptions"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :md="12" :sm="24">
-                    <el-form-item label="设备" prop="material">
-                        <el-select
-                            v-model="form.equipment"
-                            placeholder="设备"
-                            clearable
-                            style="width:100%"
-                        >
-                            <el-option
-                                v-for="item in equipmentOptions"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :md="12" :sm="24">
-                    <el-form-item label="批次" width="100">
-                        <el-input v-model="form.batch"  tyle="width:100%" placeholder="请输入批次"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :md="12" :sm="24">
-                    <el-form-item label="数量" width="100">
-                        <el-input-number 
-                        v-model="form.count_real" 
-                        controls-position="right" 
-                        :min="0" step="1" 
-                        :step-strictly="true" 
-                        style="width:100%"
-                        placeholder="请输入数量">
-                        </el-input-number>
-                    </el-form-item>
-                </el-col>
-                <el-col :md="12" :sm="24">
-                    <el-form-item label="重量" width="100">
-                        <el-input-number 
-                        v-model="form.count_real_eweight" 
-                        controls-position="right" 
-                        :min="0" step="1" 
-                        :step-strictly="true" 
-                        style="width:100%"
-                        placeholder="请输入重量">
-                        </el-input-number>
-                    </el-form-item>
-                </el-col>
-                <el-col :md="12" :sm="24">
-                    <el-form-item label="配料人" prop="material">
-                        <el-select 
-                            v-model="handle_user"
-                            placeholder="配料人"
-                            clearable
-                            multiple
-                            style="width:100%"
-                        >
-                            <el-option
-                            v-for="item in userList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                            />
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-        </el-form>
-        <!-- 七车间 -->
-        <el-form v-if="activeType=='7车间'" ref="ruleForm" :model="form" :rules="rules" label-width="120px">
-            <el-row>
-                <el-col :md="12" :sm="24">
-                    <el-form-item label="锅号">
-                        <el-select
-                            v-model="form.equipment"
-                            placeholder="锅号"
-                            clearable
-                            style="width:100%"
-                        >
-                            <el-option
-                                v-for="item in equipmentOptions"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :md="12" :sm="24">
-                    <el-form-item label="第几锅">
-                        <el-select
-                            v-model="form.index"
-                            placeholder="第几锅"
-                            clearable
-                            style="width:100%"
-                        >
-                            <el-option
-                                v-for="item in 8"
-                                :key="item"
-                                :label="item"
-                                :value="item"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :md="12" :sm="24">
-                    <el-form-item label="产品名称" prop="material">
-                        <el-select
-                            v-model="form.material_out"
-                            placeholder="产品名称"
-                            clearable
-                            style="width:100%"
-                        >
-                            <el-option
-                                v-for="item in materialOptions"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :md="12" :sm="24">
-                    <el-form-item label="产品规格" prop="material">
-                        <el-select
-                            v-model="form.cate"
-                            placeholder="产品规格"
-                            clearable
-                            style="width:100%"
-                        >
-                            <el-option
-                                v-for="item in cateOptions"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :md="12" :sm="24">
-                    <el-form-item label="产品编号">
-                        <el-input-number 
-                        v-model="form.count_real" 
-                        controls-position="right" 
-                        :min="0" step="1" 
-                        :step-strictly="true" 
-                        style="width:100%"
-                        placeholder="请输入批次号">
-                        </el-input-number>
-                    </el-form-item>
-                </el-col>
-                <el-col :md="12" :sm="24">
-                    <el-form-item label="配粉料数(kg)">
-                        <el-input-number 
-                        v-model="form.count_real_eweight" 
-                        controls-position="right" 
-                        :min="0" 
-                        step="1"  
-                        :precision="2"
-                        style="width:100%"
-                        placeholder="请输入配粉料数（kg）">
-                        </el-input-number>
-                    </el-form-item>
-                </el-col>
-                <el-col :md="12" :sm="24">
-                    <el-form-item label="生产量">
-                        <el-input-number 
-                        v-model="form.count_real" 
-                        controls-position="right" 
-                        :min="0" step="1" 
-                        :step-strictly="true" 
-                        style="width:100%"
-                        placeholder="生产量">
-                        </el-input-number>
-                    </el-form-item>
-                </el-col>
-                <el-col :md="12" :sm="24">
-                    <el-form-item label="合格量">
-                        <el-input-number 
-                        v-model="form.count_ok" 
-                        controls-position="right" 
-                        :min="0" step="1" 
-                        :step-strictly="true" 
-                        style="width:100%"
-                        placeholder="合格量">
-                        </el-input-number>
-                    </el-form-item>
-                </el-col>
-                <el-col :md="12" :sm="24">
-                    <el-form-item label="合格率">
-                        <el-input-number 
-                        v-model="form.count_ok" 
-                        controls-position="right" 
-                        :min="0" step="1" 
-                        :step-strictly="true" 
-                        style="width:100%"
-                        placeholder="合格率">
-                        </el-input-number>
-                    </el-form-item>
-                </el-col>
-                <el-col :md="12" :sm="24">
-                    <el-form-item label="退火炉号">
-                        <el-select
-                            v-model="form.cate"
-                            placeholder="退火炉号"
-                            clearable
-                            style="width:100%"
-                        >
-                            <el-option
-                                v-for="item in 8"
-                                :key="item"
-                                :label="item"
-                                :value="item"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                
-                <el-col :md="12" :sm="24">
-                    <el-form-item label="是否加氧">
-                        <el-select
-                            v-model="form.o2"
-                            placeholder="是否加氧"
-                            clearable
-                            style="width:100%"
-                        >
-                            <el-option
-                                v-for="item in yseorno"
-                                :key="item"
-                                :label="item"
-                                :value="item"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :md="12" :sm="24">
-                    <el-form-item prop="type" label="成型人">
-                        <el-select
-                            v-model="form.handle_user"
-                            placeholder="成型人"
-                            clearable
-                            style="width:100%"
-                        >
-                            <el-option
-                                v-for="item in userList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            />
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :md="12" :sm="24">
-                    <el-form-item prop="type" label="切料人">
-                        <el-select
-                            v-model="form.handle_user"
-                            placeholder="切料人"
-                            clearable
-                            style="width:100%"
-                        >
-                            <el-option
-                                v-for="item in userList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            />
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-        </el-form>
-        <!-- 十车间 -->
-        <el-form v-if="activeType=='10车间'" ref="ruleForm" :model="form" :rules="rules" label-width="80px">
-            <el-row>
-                <el-col :md="12" :sm="24">
-                    <el-form-item label="产品规格" prop="material">
-                        <el-select
-                            v-model="form.cate"
-                            placeholder="产品规格"
-                            clearable
-                            style="width:100%"
-                        >
-                            <el-option
-                                v-for="item in cateOptions"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :md="12" :sm="24">
-                    <el-form-item label="班次" prop="material">
-                        <el-select
-                            v-model="form.shift"
-                            placeholder="班次"
-                            clearable
-                            style="width:100%"
-                        >
-                            <el-option
-                                v-for="item in shiftOptions"
-                                :key="item"
-                                :label="item"
-                                :value="item"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :md="12" :sm="24">
-                    <el-form-item label="合格数量" width="100">
-                        <el-input-number 
-                        v-model="form.count_ok" 
-                        controls-position="right" 
-                        :min="0" step="1" 
-                        :step-strictly="true" 
-                        style="width:100%"
-                        placeholder="请输入合格数量">
-                        </el-input-number>
-                    </el-form-item>
-                </el-col>
-                <el-col :md="12" :sm="24">
-                    <el-form-item prop="type" label="成型人">
-                        <el-select
-                            v-model="form.handle_user"
-                            placeholder="成型人"
-                            clearable
-                            style="width:100%"
-                        >
-                            <el-option
-                                v-for="item in userList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            />
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :md="12" :sm="24">
-                    <el-form-item prop="type" label="带班人">
-                        <el-select
-                            v-model="form.handle_leader"
-                            placeholder="带班人"
-                            clearable
-                            style="width:100%"
-                        >
-                            <el-option
-                                v-for="item in userList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            />
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-        </el-form>
-        <el-footer>
-            <el-button type="primary" v-loading="isSaveing" @click="submit">提交</el-button>
-            <el-button @click="resetForm">取消</el-button>
-            
-        </el-footer>
-    </el-dialog>
-</template>
-<script>
-    export default {
-        emits: ["success", "closed"],
-        props:{
-            mtask: { type: String, default: '' },
-            activeType:{ type: String, default: '' },
-        },
-        data() {
-            return {
-                yseorno:['是','否'],
-                loading: false,
-                mode: "add",
-                titleMap: {
-                    add: "新增记录",
-                    edit: "编辑记录",
-                    show: "查看记录",
-                },
-                handle_user:[],
-                form:{},
-                userList:[],
-                cateOptions:[],
-                mgroupOptions:[],
-                materialOptions:[],
-                equipmentOptions:[],
-                shiftOptions:['白班','夜班'],
-                visible: false,
-                isSaveing: false,
-                setFiltersVisible: false,
-                handle_name:'',
-                leader_name:'',
-            };
-        },
-        mounted() {
-            this.getMaterial();
-            this.getUserList();
-            this.getEquipment();
-            this.getMgroupList();
-            let date = new Date();
-            let year = date.getFullYear();
-            let month = date.getMonth()+1;
-            let day = date.getDate();
-            this.form.handle_date =  year+'-'+month+'-'+day;
-        },
-        methods: {
-            getUserList(){
-                let that = this;
-                this.$API.system.user.list.req({belong_dept__name:this.activeType,page:0}).then(res=>{
-					that.userList = res;
-				});
-            },
-            //获取集合列表
-            getMgroupList(){
-                let that = this;
-                this.$API.mtm.mgroup.list.req({page:0,cate:'photon'}).then(res=>{
-                    let data = res.filter(item=>{
-                        return item.process_cate=='成型'
-                    })
-                    that.mgroupOptions = data;
-                })
-            },
-            //获取设备列表
-            getEquipment(){
-            this.$API.em.equipment.list.req({page:0,type:10}).then(res=>{
-                this.equipmentOptions = res;
-            })
-            },
-            getMaterial(){
-                let obj ={};
-                obj.page = 0;
-                obj.type = 20;
-                obj.is_hidden = false;
-                this.$API.mtm.material.list.req(obj).then(res=>{
-                    this.materialOptions = res;
-                })
-            },
-            //显示
-            open(mode = "add") {
-                this.mode = mode;
-                this.visible = true;
-                return this;
-            },
-            //提交
-            submit() {
-                this.$refs.dialogForm.validate(async (valid) => {
-                    if (valid) {
-                        this.isSaveing = true;
-                        if(this.mtask!==''){
-                            this.form.mtask = this.mtask;
-                        }else{
-                            this.form.handle_user = this.handle_user.join(',');
-                        }
-                        if (this.mode == "add") {
-                            this.$API.wpm.mlog.create.req(this.form).then(res=>{
-                                this.isSaveing = false;
-                                this.$emit("success", this.form, this.mode);
-                                this.visible = false;
-                                this.$message.success("操作成功");
-                            }).catch( (err) =>{
-                                //可以处理校验错误
-                                this.isSaveing = false;
-                                return err;
-                            })
-                        } else if (this.mode == "edit") {
-                            this.$API.wpm.mlog.update.req(this.form.id,this.form).then(res=>{
-                                this.isSaveing = false;
-                                this.$emit("success", this.form, this.mode);
-                                this.visible = false;
-                                this.$message.success("操作成功");
-                            }).catch( (err) =>{
-                                //可以处理校验错误
-                                this.isSaveing = false;
-                                return err;
-                            })
-                        }
-                    }
-                });
-            },
-            //表单注入数据
-            setData(data) {
-                Object.assign(this.form, data);
-                if(this.activeType=='8车间'){
-                    if(this.form.handle_user.indexOf(',')>-1){
-                        this.handle_user = this.form.handle_user.split(',')
-                    }else{
-                        this.handle_user = [this.form.handle_user];
-                    }
-                    
-                }
-            },
-            //设置过滤项
-            setFilters(filters) {
-                this.selectionFilters = filters;
-                this.setFiltersVisible = true;
-            },
-        },
-    };
-</script>
-  
\ No newline at end of file
diff --git a/src/views/wpm/worktask.vue b/src/views/wpm/worktask.vue
index 9c1e2677..e702836e 100644
--- a/src/views/wpm/worktask.vue
+++ b/src/views/wpm/worktask.vue
@@ -3,41 +3,148 @@
     <el-main id="topContainer" class="nopadding" style="position: relative;height: 50%;margin-bottom: 10px;">
       <el-row :gutter="10">
         <el-col :span="activeSpan" style="border-right: 1px solid #eeeeee;position: relative;">
-          <div class="right-panel"  v-if="activeName=='8车间'" style="display: inline-block;position:absolute;right:20px;margin-top:4px;z-index:100">
+          <div class="right-panel btnWrap"  v-if="activeName=='8车间'||activeName=='退火'">
             <el-button type="primary" icon="el-icon-plus" @click="add">新增</el-button>
           </div>
           <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
             <el-tab-pane label="混料工序" name="8车间">
               <scTable
                 ref="table8"
-                :apiObj="apiObj8"
+                :apiObj="apiObjMlog"
                 row-key="id"
                 stripe
-                :height="tableHeight"
+                :height="tableHeightHalf"
                 :params="params8"
                 hidePagination
                 hideDo
               >
                 <el-table-column type="index" width="50"/>
-                <el-table-column label="送料日期" prop="handle_date">
+                <el-table-column label="配料日期" prop="handle_date">
                 </el-table-column>
                 <el-table-column label="产物" prop="material" show-overflow-tooltip>
                   <template #default="scope"><span v-if="scope.row.material_out_">{{ scope.row.material_out_.name }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="工段" prop="material" show-overflow-tooltip>
+                <el-table-column label="设备" prop="equipment_name">
                 </el-table-column>
-                <el-table-column label="设备" prop="count">
-                </el-table-column>
-                <el-table-column label="批次" prop="end_date">
+                <el-table-column label="批次" prop="batch">
                 </el-table-column>
                 <el-table-column label="数量/桶数" prop="count_real">
                 </el-table-column>
                 <el-table-column label="每桶重量/kg" prop="count_real_eweight">
                 </el-table-column>
-                <el-table-column label="配料人" prop="count">
+                <el-table-column label="配料人" prop="handle_user_name">
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" align="center" width="180">
+                  <template #default="scope">
+                    <el-link
+                      type="primary"
+                      @click="table_edit(scope.row)"
+                      v-auth="'equipment'"
+                    >
+                      编辑
+                    </el-link>
+                    <el-divider direction="vertical"></el-divider>
+                    <el-link
+                      type="primary"
+                      @click="addHandover(scope.row)"
+                      v-auth="'equipment'"
+                    >
+                      转交接单
+                    </el-link>
+                    <el-divider direction="vertical"></el-divider>
+                    <el-link
+                      type="danger"
+                      @click="table_del(scope.row,'8车间')"
+                      v-auth="'equipment'"
+                    >
+                      删除
+                    </el-link>
+                  </template>
+                </el-table-column>
+              </scTable>
+              <div class="tableTitle">交接记录</div>
+              <scTable
+                ref="table8"
+                :apiObj="apiObjHandover"
+                row-key="id"
+                stripe
+                :height="tableHeightHalf"
+                :params="params82"
+                hidePagination
+                hideDo
+                @selection-change="handleSelectionChange"
+              >
+                <el-table-column type="index" width="50"/>
+                <el-table-column type="selection" width="40" />
+                <el-table-column label="送料日期" prop="send_date">
+                </el-table-column>
+                <el-table-column label="产物" prop="material" show-overflow-tooltip>
+                  <template #default="scope"><span v-if="scope.row.material_out_">{{ scope.row.material_out_.name }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="设备" prop="equipment_name">
+                </el-table-column>
+                <el-table-column label="批次" prop="batch">
+                </el-table-column>
+                <el-table-column label="数量/桶数" prop="count_real">
+                </el-table-column>
+                <el-table-column label="每桶重量/kg" prop="count_real_eweight">
+                </el-table-column>
+                <el-table-column label="交送人" prop="send_user_name">
+                </el-table-column>
+                <el-table-column label="接收人" prop="send_user_name">
                 </el-table-column>
                 <el-table-column label="操作" fixed="right" align="left">
+                  <template #default="scope">
+                    <el-link
+                      type="primary"
+                      @click="handover_edit(scope.row)"
+                      v-auth="'equipment'"
+                    >
+                      编辑
+                    </el-link>
+                    <el-divider direction="vertical"></el-divider>
+                    <el-link
+                      type="danger"
+                      @click="table_del(scope.row,'8车间')"
+                      v-auth="'equipment'"
+                    >
+                      删除
+                    </el-link>
+                  </template>
+                </el-table-column>
+              </scTable>
+            </el-tab-pane>
+            <el-tab-pane label="退火" name="退火">
+              <scTable
+                ref="table8"
+                :apiObj="apiObjMlog"
+                row-key="id"
+                stripe
+                :height="tableHeightHalf"
+                :params="paramsth"
+                hidePagination
+                hideDo
+              >
+                <el-table-column type="index" width="50"/>
+                <el-table-column label="配料日期" prop="handle_date">
+                </el-table-column>
+                <el-table-column label="产物" prop="material" show-overflow-tooltip>
+                  <template #default="scope"><span v-if="scope.row.material_out_">{{ scope.row.material_out_.name }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="设备" prop="equipment_name">
+                </el-table-column>
+                <el-table-column label="批次" prop="batch">
+                </el-table-column>
+                <el-table-column label="数量/桶数" prop="count_real">
+                </el-table-column>
+                <el-table-column label="每桶重量/kg" prop="count_real_eweight">
+                </el-table-column>
+                <el-table-column label="配料人" prop="handle_user_name">
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" align="center" width="180">
                   <template #default="scope">
                     <el-link
                       type="primary"
@@ -57,11 +164,121 @@
                   </template>
                 </el-table-column>
               </scTable>
+              <el-row :gutter="10">
+                <el-col :span="12" style="position: relative;">
+                  <div class="tableTitle">
+                    交接记录
+                    <div class="right-panel btnWrap">
+                      <el-button type="primary" icon="el-icon-plus" @click="addHandover2">新增</el-button>
+                    </div>
+                  </div>
+                  <scTable
+                    ref="table8"
+                    :apiObj="apiObjHandover"
+                    row-key="id"
+                    stripe
+                    :height="tableHeightHalf"
+                    :params="params82"
+                    hidePagination
+                    hideDo
+                  >
+                    <el-table-column type="index" width="50"/>
+                    <el-table-column label="交接日期" prop="send_date">
+                    </el-table-column>
+                    <el-table-column label="批次号" prop="batch" show-overflow-tooltip>
+                    </el-table-column>
+                    <el-table-column label="交送人" prop="send_user_name">
+                    </el-table-column>
+                    <el-table-column label="接收人" prop="recive_user_name">
+                    </el-table-column>
+                    <el-table-column label="数量" prop="count">
+                    </el-table-column>
+                    <el-table-column label="操作" fixed="right" align="center" width="180">
+                      <template #default="scope">
+                        <el-link
+                          type="primary"
+                          @click="editHandover2(scope.row)"
+                          v-auth="'equipment'"
+                        >
+                          编辑
+                        </el-link>
+                        <el-divider direction="vertical"></el-divider>
+                        <el-link
+                          type="danger"
+                          @click="delHandover2(scope.row,'8车间')"
+                          v-auth="'equipment'"
+                        >
+                          删除
+                        </el-link>
+                      </template>
+                    </el-table-column>
+                  </scTable>
+                </el-col>
+                <el-col :span="12" style="position: relative;">
+                  <div class="tableTitle">
+                    车间物料
+                    <div class="right-panel btnWrap">
+                      <el-button type="primary" @click="getMaterial">领料</el-button>
+                    </div>
+                  </div>
+                  <scTable
+                    ref="table8"
+                    :apiObj="apiObjMetarial"
+                    row-key="id"
+                    stripe
+                    :height="tableHeightHalf"
+                    :params="paramsMaterial"
+                    hidePagination
+                    hideDo
+                    @selection-change="handleSelectionChange"
+                  >
+                    <el-table-column type="index" width="50"/>
+                    <el-table-column type="selection" width="40" />
+                    <el-table-column label="送料日期" prop="send_date">
+                    </el-table-column>
+                    <el-table-column label="产物" prop="material" show-overflow-tooltip>
+                      <template #default="scope"><span v-if="scope.row.material_out_">{{ scope.row.material_out_.name }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="设备" prop="equipment_name">
+                    </el-table-column>
+                    <el-table-column label="批次" prop="batch">
+                    </el-table-column>
+                    <el-table-column label="数量/桶数" prop="count_real">
+                    </el-table-column>
+                    <el-table-column label="每桶重量/kg" prop="count_real_eweight">
+                    </el-table-column>
+                    <el-table-column label="交送人" prop="send_user_name">
+                    </el-table-column>
+                    <el-table-column label="接收人" prop="send_user_name">
+                    </el-table-column>
+                    <!-- <el-table-column label="操作" fixed="right" align="left">
+                      <template #default="scope">
+                        <el-link
+                          type="primary"
+                          @click="handover_edit(scope.row)"
+                          v-auth="'equipment'"
+                        >
+                          编辑
+                        </el-link>
+                        <el-divider direction="vertical"></el-divider>
+                        <el-link
+                          type="danger"
+                          @click="table_del(scope.row,'8车间')"
+                          v-auth="'equipment'"
+                        >
+                          删除
+                        </el-link>
+                      </template>
+                    </el-table-column> -->
+                  </scTable>
+                </el-col>
+              </el-row> 
             </el-tab-pane>
             <el-tab-pane label="7车间" name="7车间">
               <scTable
                 ref="table7"
-                :apiObj="apiObj"
+                :apiObj="apiObjMtask"
                 row-key="id"
                 stripe
                 :height="tableHeight"
@@ -103,12 +320,23 @@
                     </el-tag>
                   </template>
                 </el-table-column>
+                <el-table-column label="操作" fixed="right" width="60">
+                  <template #default="scope">
+                    <el-link
+                      type="primary"
+                      @click="table_submit(scope.row)"
+                      v-auth="'equipment'"
+                      :disabled="scope.row.state==40"
+                    >提交
+                    </el-link>
+                  </template>
+                </el-table-column>
               </scTable>
             </el-tab-pane>
             <el-tab-pane label="10车间" name="10车间">
               <scTable
                 ref="table10"
-                :apiObj="apiObj"
+                :apiObj="apiObjMtask"
                 row-key="id"
                 stripe
                 :height="tableHeight"
@@ -137,32 +365,69 @@
                 </el-table-column>
                 <el-table-column label="完成量" prop="count">
                 </el-table-column>
+                <el-table-column label="状态" prop="state">
+                  <template #default="scope">
+                    <el-tag v-if="scope.row.state!==40" type="primary">
+                      {{ state_[scope.row.state] }}
+                    </el-tag>
+                    <el-tag v-else type="success">
+                      {{ state_[scope.row.state] }}
+                    </el-tag>
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="60">
+                  <template #default="scope">
+                    <el-link
+                      type="primary"
+                      @click="table_submit(scope.row)"
+                      v-auth="'equipment'"
+                      :disabled="scope.row.state==40"
+                    >提交
+                    </el-link>
+                  </template>
+                </el-table-column>
               </scTable>
             </el-tab-pane>
           </el-tabs>
         </el-col>
-        <el-col :span="12" v-if="activeName!=='8车间'">
-          <el-form label-width="100px" style="border-bottom: 1px solid #eeeeee;padding: 4px 0;">
+        <el-col :span="12" v-if="activeName!=='8车间'&&activeName!=='退火'">
+          <div v-if="activeName=='退火'" style="font-size:16px;padding:10px 0;border-bottom:1px solid #eeeeee">退火日志</div>
+          <el-form v-else label-width="100px" style="border-bottom: 1px solid #eeeeee;padding: 4px 0;">
             <el-row>
               <el-col :md="8" :sm="12" :xs="24">
                 <el-form-item class="infoForm" label="产品名称：">
-                  <span v-if="choseData.material_out_">{{ choseData.material_out_.name }}</span>
+                  <span v-if="choseData&&choseData.material_out_">{{ choseData.material_out_.name }}</span>
                 </el-form-item>
               </el-col>
               <el-col :md="8" :sm="12" :xs="24">
                 <el-form-item class="infoForm" label="产品型号：">
-                  <span v-if="choseData.material_out_">{{ choseData.material_out_.number }}</span>
+                  <span v-if="choseData&&choseData.material_out_">{{ choseData.material_out_.number }}</span>
                 </el-form-item>
               </el-col>
               <el-col :md="8" :sm="12" :xs="24">
-                <el-form-item class="infoForm" label="计划数量：">{{ choseData.count }}</el-form-item>
+                <el-form-item class="infoForm" label="配粉料数：">
+                  <span>{{ peifen_kg }}</span>
+                </el-form-item>
               </el-col>
+              <!-- <el-col :md="8" :sm="12" :xs="24">
+                <el-form-item label="配粉料数：">
+                  <el-input-number 
+                    v-model="materialCount" 
+                    controls-position="right" 
+                    :min="0" step="1" 
+                    :step-strictly="true" 
+                    style="width:100%"
+                    placeholder="配粉料数"
+                  >
+                  </el-input-number>
+                </el-form-item>
+              </el-col> -->
             </el-row>
           </el-form>
           <div style="margin-top: 10px;">
-            <el-button type="primary" icon="el-icon-plus" @click="add">新增</el-button>
-            <el-button type="primary" @click="sum" v-if="activeName=='10车间'">合计</el-button>
+            <el-button type="primary" icon="el-icon-plus" @click="add" :disabled="choseData&&choseData.state==40">新增</el-button>
           </div>
+          <!-- 7车间 -->
           <scTable
             ref="table"
             :data="flogs"
@@ -170,46 +435,72 @@
             stripe
             :height="rightHeight"
             :params="query"
+            v-if="activeName=='7车间'"
           >
             <el-table-column type="index" width="40"/>
-            <el-table-column type="selection" width="40"/>
-            <el-table-column v-if="activeName=='7车间'" label="锅号" prop="material">
+            <el-table-column label="锅号" prop="equipment_name">
             </el-table-column>
-            <el-table-column label="产品编号" prop="material">
+            <el-table-column label="产品名称" prop="material_out_">
+              <template #default="scope">
+                <span v-if="scope.row.material_out_">{{ scope.row.material_out_.name }}</span>
+              </template>
             </el-table-column>
-            <el-table-column label="产品名称" prop="number">
+            <el-table-column label="规格" prop="material_out_">
+              <template #default="scope">
+                <span v-if="scope.row.material_out_">{{ scope.row.material_out_.specification }}</span>
+              </template>
             </el-table-column>
-            <el-table-column label="型号" prop="number">
+            <el-table-column label="生产量" prop="count_real">
             </el-table-column>
-            <el-table-column label="规格" prop="number">
+            <el-table-column label="合格量" prop="count_ok">
             </el-table-column>
-            <el-table-column label="领料数量" prop="count">
+            <el-table-column label="合格率" prop="count">
+              <template #default="scope">
+                <span>{{ scope.row.count_ok/scope.row.count_real }}</span>
+              </template>
             </el-table-column>
-            <el-table-column label="操作" fixed="right" width="100">
+            <el-table-column label="不合格原因及数量" align="center">
+              <el-table-column label="炸纹" prop="count_n_zw">
+              </el-table-column>
+              <el-table-column label="条纹" prop="count_n_tw">
+              </el-table-column>
+              <el-table-column label="气泡" prop="count_n_qp">
+              </el-table-column>
+              <el-table-column label="弯曲" prop="count_n_wq">
+              </el-table-column>
+              <el-table-column label="其他" prop="count_n_qt">
+              </el-table-column>
+              <el-table-column label="合计" prop="count_n_qt">
+              </el-table-column>
+            </el-table-column>
+            <el-table-column label="退火炉号" prop="equipment_2_name">
+            </el-table-column>
+            <el-table-column label="第几锅" prop="index">
+            </el-table-column>
+            <el-table-column label="成型人" prop="handle_user_name">
+            </el-table-column>
+            <el-table-column label="切料人" prop="handle_user_2_name">
+            </el-table-column>
+            <el-table-column label="操作" fixed="right" width="100" align="center">
               <template #default="scope">
                 <el-link
                   type="primary"
                   @click="table_edit(scope.row)"
-                  v-if="scope.row.status==10"
                   v-auth="'equipment'"
+                  :disabled="choseData.state==40"
                 >编辑
                 </el-link>
-                <!-- 提交后变查看 -->
-                <el-link
-                  v-else
-                  type="primary"
-                  @click="table_edit(scope.row)"
-                  v-auth="'equipment'"
-                >查看
-                </el-link>
+                <el-divider direction="vertical"></el-divider>
                 <el-link
                   type="primary"
-                  @click="table_edit(scope.row)"
+                  @click="table_del(scope.row)"
+                  :disabled="choseData.state==40"
                 >删除
                 </el-link>
               </template>
             </el-table-column>
           </scTable>
+          <!-- 10车间 -->
           <scTable
             ref="table"
             :data="flogs"
@@ -220,38 +511,61 @@
             v-if="activeName=='10车间'"
           >
             <el-table-column type="index" width="40"/>
-            <el-table-column label="班组" prop="material">
+            <el-table-column label="班次" prop="shift_name">
             </el-table-column>
-            <el-table-column label="产品编号" prop="material">
+            <el-table-column label="出管总数" prop="count_real">
             </el-table-column>
-            <el-table-column label="产品名称" prop="number">
+            <el-table-column label="规格" prop="mlogb" width="100">
+              <template #default="scope">
+                <div v-for="item in scope.row.mlogb" :key="item" class="cateItem" style="">
+                  <span>{{ item.material_out_.name }}</span>
+                  <span>{{ item.count_ok }}</span>
+                </div>
+              </template>
             </el-table-column>
-            <el-table-column label="型号" prop="number">
+            <el-table-column label="合格总数" prop="count_ok">
             </el-table-column>
-            <el-table-column label="规格" prop="number">
+            <el-table-column label="合格率" prop="count">
+              <template #default="scope">
+                <span>{{ scope.row.count_ok/scope.row.count_real }}</span>
+              </template>
             </el-table-column>
-            <el-table-column label="领料数量" prop="count">
+            <el-table-column label="不合格原因及数量" align="center">
+              <el-table-column label="椭圆/弯曲" prop="count_n_wq">
+              </el-table-column>
+              <el-table-column label="条纹" prop="count_n_tw">
+              </el-table-column>
+              <el-table-column label="断裂" prop="count_n_dl">
+              </el-table-column>
+              <el-table-column label="偏壁" prop="count_n_pb">
+              </el-table-column>
+              <el-table-column label="大小头" prop="count_n_dxt">
+              </el-table-column>
+              <el-table-column label="结石气绒" prop="count_n_jsqx">
+              </el-table-column>
+              <el-table-column label="合计" prop="count_n_qt">
+              </el-table-column>
             </el-table-column>
-            <el-table-column label="操作" fixed="right" align="left" width="120">
+            <el-table-column label="成型人" prop="handle_user_name">
+            </el-table-column>
+            <el-table-column label="带班长" prop="handle_leader_name">
+            </el-table-column>
+            <el-table-column label="碎料" prop="count">
+            </el-table-column>
+            <el-table-column label="操作" fixed="right" width="100" align="center">
               <template #default="scope">
                 <el-link
                   type="primary"
                   @click="table_edit(scope.row)"
-                  v-if="scope.row.status==10"
                   v-auth="'equipment'"
+                  :disabled="choseData.state==40"
                 >编辑
                 </el-link>
-                <!-- 提交后变查看 -->
-                <el-link
-                  v-else
-                  type="primary"
-                  @click="table_edit(scope.row)"
-                  v-auth="'equipment.update'"
-                >查看
-                </el-link>
+                <el-divider direction="vertical"></el-divider>
                 <el-link
                   type="primary"
-                  @click="table_edit(scope.row)"
+                  :disabled="choseData.state==40"
+                  @click="table_del(scope.row)"
                 >删除
                 </el-link>
               </template>
@@ -264,66 +578,104 @@
       v-if="dialog.save"
       ref="saveDialog"
       :mtask = "mtask"
+      :brothersList="brothersList"
       :activeType = "activeName"
       @success="handleSaveSuccess"
       @closed="dialog.save = false"
     ></save-dialog>
+    
+    <handover-dialog
+      v-if="dialog.handover"
+      ref="handoverDialog2"
+      @success="handleSuccess"
+      @closed="dialog.handover = false"
+    ></handover-dialog>
     <el-dialog
-        title="合计"
-        ref="sumDialog"
-        v-model="sumLog"
+        title="交接单"
+        ref="handoverDialog"
+        v-model="handoverVisible"
         :size="1000"
         destroy-on-close
-        @success="handleSuccess"
-        @closed="sumLog = false"
+        @closed="handoverVisible = false"
       >
-      <sc-form-table hideAdd="false" ref="sumLogtable" v-model="formList" placeholder="暂无数据">
-            <el-table-column prop="count1" label="生产总数" min-width="100"></el-table-column>
-            <el-table-column prop="count2" label="合格总数" min-width="100"></el-table-column>
-            <el-table-column prop="rate" label="合格率" min-width="100"></el-table-column>
-            <el-table-column label="不合格原因及数量" align="center">
-                <el-table-column prop="val" label="原因1" min-width="100">
-                    <template #default="scope">
-                        <el-input v-model="scope.row.count_no1" placeholder="不合格数量1"></el-input>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="val" label="原因2" min-width="100">
-                    <template #default="scope">
-                        <el-input v-model="scope.row.count_no2" placeholder="不合格数量2"></el-input>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="val" label="原因3" min-width="100">
-                    <template #default="scope">
-                        <el-input v-model="scope.row.count_no3" placeholder="不合格数量3"></el-input>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="val" label="总计" min-width="100">
-                    <template #default="scope">
-                        <el-input v-model="scope.row.count_noall" placeholder="不合格数量3"></el-input>
-                    </template>
-                </el-table-column>
-            </el-table-column>
-            <el-table-column prop="val" label="碎料" min-width="100">
-                <template #default="scope">
-                    <el-input v-model="scope.row.material" placeholder="请输入内容"></el-input>
-                </template>
-            </el-table-column>
-        </sc-form-table>
+      <el-form ref="dialogForm" :model="handoverForm" :rules="rules" label-width="120px">
+          <el-row>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="送料日期" prop="send_date">
+                <el-date-picker
+                  v-model="handoverForm.send_date"
+                  type="date"
+                  value-format="YYYY-MM-DD"
+                  style="width:100%"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="接收部门" prop="recive_dept">
+                <el-select v-model="handoverForm.recive_dept" placeholder="接收部门" clearable style="width:100%" @change="getUserList2">
+                  <el-option v-for="item in group" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="送料部门" prop="send_dept">
+                <el-select v-model="handoverForm.send_dept" placeholder="送料部门" clearable style="width:100%">
+                  <el-option v-for="item in group" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="接收人" prop="recive_user">
+                <el-select 
+                  v-model="handoverForm.recive_user"
+                  placeholder="接收人"
+                  clearable
+                  style="width:100%"
+                >
+                  <el-option
+                  v-for="item in userList2"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="交送人" prop="send_user">
+                <el-select 
+                  v-model="handoverForm.send_user"
+                  placeholder="交送人"
+                  clearable
+                  style="width:100%"
+                >
+                  <el-option
+                  v-for="item in userList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <el-footer>
             <el-button @click="resetForm">取消</el-button>
-            <el-button type="primary" @click="submitForm">提交</el-button>
+            <el-button type="primary" @click="submitHandover">提交</el-button>
         </el-footer>
     </el-dialog>
   </el-container>
 </template>
 <script>
 import {generateExcel} from "@/utils/exportExcel.js";
-import saveDialog from "./task2flog_form.vue";
+import saveDialog from "./worktask_form.vue";
+import handoverDialog from "./handover_form.vue";
 import GanttComponent from '@/components/GanttComponent.vue';
 export default {
   name: "rparty",
   components: {
-    GanttComponent,saveDialog
+    GanttComponent,saveDialog,handoverDialog
   },
   data() {
     return {
@@ -336,36 +688,43 @@ export default {
           {number:'GZ20231013',model:'GB2',cate:'100*50*2',count:300,text: "一天任务",start_date: "2023-10-13",id:'2023101801',duration: 1,progress: 1},
           {number:'GZ20231014',model:'GB2',cate:'100*50*2',count:200, text: "一天任务",start_date: "2023-10-14",id:'2023101802',duration: 1,progress: 0.8},
           {number:'GZ20231015',model:'ZB2',cate:'100*50*2',count:100, text: "一天任务", start_date: "2023-10-15",id:'2023101803',duration: 1,progress: 0.6},
-          {number:'GZ20231016',model:'GB2',cate:'100*50*2',count:50, text: "一天任务", start_date: "2023-10-16",id:'2023101804',duration: 1,progress: 0.4},
-          {number:'GZ20231017',model:'GB2',cate:'100*50*2',count:0, text: "一天任务", start_date: "2023-10-17",id:'2023101805',duration: 1,progress: 0.2},
-          {number:'GZ20231018',model:'GB2',cate:'100*50*2',count:300,text: "一天任务",start_date: "2023-10-18",id:'2023101806',duration: 1,progress: 1},
-          {number:'GZ20231018',model:'GB2',cate:'100*50*2',count:200, text: "一天任务",start_date: "2023-10-19",id:'2023101807',duration: 1,progress: 0.8},
-          {number:'GZ20231020',model:'ZB2',cate:'100*50*2',count:100, text: "一天任务", start_date: "2023-10-20",id:'2023101808',duration: 1,progress: 0.6},
-          {number:'GZ20231021',model:'GB2',cate:'100*50*2',count:50, text: "一天任务", start_date: "2023-10-21",id:'2023101809',duration: 1,progress: 0.4},
-          {number:'GZ20231022',model:'GB2',cate:'100*50*2',count:0, text: "一天任务", start_date: "2023-10-22",id:'20231018010',duration: 1,progress: 0.2},
         ]
       },
       dialog: {
         save: false,
+        handover:false
       },
-      sumLog:false,
+      handoverVisible:false,
       // apiObj: this.$API.pm.mtask.list,
       params7:{
         belong_dept_name:'7车间',
         date:'2023-10-24'
       },
-      params8:{
-        belong_dept_name:'8车间',
-        date:'2023-10-24'
-      },
-      apiObj: null,
-      apiObj8:null,
       params10: {
         belong_dept_name:'10车间',
         date:'2023-10-20'
       },
-      
+      params8:{
+        mgroup__belong_dept__name:'8车间',
+      },
+      params82:{
+        send_dept__name:'8车间',
+      },
+      paramsth:{
+        belong_dept_name:'8车间',
+      },
+      apiObjMlog: null,
+      apiObjHandover: null,
+      apiObjWMaterial: this.$API.wpm.wmaterial.list,
+      apiObjMtask: null,
+
+      apiObj: null,
+      apiObjMetarial:this.$API.wpm.wmaterial.list,
+      paramsMaterial:{belong_dept__name:'8车间',page:0},
+      form:{},
+      handoverForm:{},
       flogs:[],
+      selectedIds:[],
       flogsData: [{id: 1, name: 'John Doe', dob: new Date(1970,1,1)}],
       columns : [
          { header: 'Id', key: 'id', wpx: 40 },
@@ -385,6 +744,7 @@ export default {
       activeSpan:24,
       rightHeight:null,
       tableHeight:null,
+      tableHeightHalf:null,
       formList:[
         {
           count1:0,
@@ -396,7 +756,11 @@ export default {
           count_noall:0,
           material:0,
         }
-      ]
+      ],
+      peifen_kg:0,
+      userList:[],
+      userList2:[],
+      brothersList:[]
     };
   },
   created() {
@@ -407,26 +771,56 @@ export default {
     let heights = document.getElementById('topContainer').clientHeight;
     console.log('heights',heights)
     this.tableHeight = (heights-50)+'px';
+    this.tableHeightHalf = (heights-100)/2+'px';
     let rightHeight = heights-100;
     this.rightHeight = rightHeight/2+'px';
     let NowDate = new Date();
     let month = NowDate.getMonth()>8?NowDate.getMonth()+1:'0'+(NowDate.getMonth()+1)
     this.params7.date  = NowDate.getFullYear()+'-'+(NowDate.getMonth()+1)+'-'+NowDate.getDate();
-    this.params8.date  = NowDate.getFullYear()+'-'+(NowDate.getMonth()+1)+'-'+NowDate.getDate();
     this.params10.date  = NowDate.getFullYear()+'-'+(NowDate.getMonth()+1)+'-'+NowDate.getDate();
-    this.apiObj = this.$API.pm.mtask.daylist;
-    this.apiObj8 =  this.$API.wpm.mlog.list;
+    this.apiObjMtask = this.$API.pm.mtask.daylist;
+    this.apiObjMlog =  this.$API.wpm.mlog.list;
+    this.apiObjHandover =  this.$API.wpm.handover.list;
+    this.getGroup();
+    this.getUserList();
   },
   methods: {
+    //部门数据
+    getGroup() {
+      this.$API.system.dept.list.req({ page: 0, type: 'dept' }).then(res => {
+        this.group = res;
+      });
+    },
+    getUserList(){
+      let that = this;
+      this.$API.system.user.list.req({belong_dept__name:this.activeName,page:0}).then(res=>{
+        that.userList = res;
+      });
+    },
+    getUserList2(){
+      let that = this;
+      this.$API.system.user.list.req({belong_dept:this.handoverForm.recive_dept,page:0}).then(res=>{
+        that.userList2 = res;
+      });
+    },
     handleClick(val){
       console.log(val.index);
-      if(val.index==0){
+      if(val.index==0||val.index==1){
         this.activeSpan = 24
       }else{
         this.activeSpan = 12
       }
+      this.choseData = null;
+      this.flogs = [];
+    },
+    table_submit(row){
+      let obj = {};
+      obj.ids = [];
+      obj.ids.push(row.id);
+      this.$API.pm.mtask.submit.req(obj).then(res=>{
+        debugger;
+      })
     },
-
     //自定义新增任务
     addTask(taskId) {
       var $this = this;
@@ -440,10 +834,21 @@ export default {
     },
     //添加
     add() {
-      this.dialog.save = true;
-      this.$nextTick(() => {
-        this.$refs.saveDialog.open("add");
-      });
+      if(this.activeName=='8车间'||this.activeName=='退火'){
+        this.dialog.save = true;
+        this.$nextTick(() => {
+          this.$refs.saveDialog.open("add");
+        });
+      }else{
+        if(this.choseData&&this.choseData.id){
+          this.dialog.save = true;
+          this.$nextTick(() => {
+            this.$refs.saveDialog.open("add");
+          });
+        }else{
+          this.$message.warning("请选择任务");
+        }
+      }
     },
     //编辑
     table_edit(row) {
@@ -461,40 +866,37 @@ export default {
     },
     //删除
     async table_del(row,type) {
-      
       this.$confirm(`确定删除吗？`, "提示", {
       type: "warning",
       }).then(() => {
-        if(type=='8车间'){
-          this.$API.wpm.mlog.delete.req(row.id).then((res) => {
+        this.$API.wpm.mlog.delete.req(row.id).then((res) => {
               this.$message.success("删除成功");
               return res;
           }).catch((err) => {
               return err;
           });
-        }else{
-          this.$API.pm.mtask.delete.req(row.id).then((res) => {
-              this.$message.success("删除成功");
-              return res;
-          }).catch((err) => {
-              return err;
-          });
-        }
-          
       }).catch(() => {});
     },
-    //合计
-    sum(){
-      this.sumLog = true;
-    },
     rowClick(row){
-      this.choseData = row
+      this.choseData = row;
+      this.mtask = row.id;
+      this.$API.wpm.mlog.list.req({mtask:row.id,page:0}).then(res=>{
+        this.flogs = res;
+      })
+      this.$TOOL.data.set("MATERIAL_OBJECT", row.material_out_);
+      if(this.activeName == '10车间'){
+        this.brothersList = [];
+        this.brothersList = row.material_out_.brothers;
+      }
     },
     //本地更新数据
     handleSaveSuccess(data, mode) {
       this.$refs.table7.refresh();
       this.$refs.table8.refresh();
       this.$refs.table10.refresh();
+    },
+    handleSuccess(){
+
     },
     handleQuery() {
       // this.$refs.table.queryData(this.query)
@@ -504,19 +906,105 @@ export default {
     resetQuery() {
       this.query = {};
     },
+    //从生产日志生成交接记录
+    addHandover(row){
+      this.handoverForm.send_date = '';
+      this.handoverForm.mlog = row.id;
+      this.handoverForm.batch = row.batch;
+      this.handoverForm.count = row.count_real;
+      this.handoverForm.count_eweight = row.count_real_eweight;
+      this.handoverForm.send_dept = '';
+      this.handoverForm.recive_dept = '';
+      this.handoverForm.send_user = '';
+      this.handoverForm.recive_user = '';
+      this.handoverVisible = true;
+    },
+    addHandover2(){
+      let that = this;
+      that.dialog.handover = true;
+      that.$nextTick(() => {
+        that.$refs.handoverDialog2.open("add");
+      });
+    },
+    //编辑
+    editHandover2(row) {
+      this.dialog.handover = true;
+      this.$nextTick(() => {
+        this.$refs.handoverDialog2.open("edit").setData(row);
+      });
+    },
+    delHandover2(row){
+      this.$confirm(`确定删除吗？`, "提示", {
+      type: "warning",
+      }).then(() => {
+        this.$API.wpm.handover.delete.req(row.id).then((res) => {
+              this.$message.success("删除成功");
+              return res;
+          }).catch((err) => {
+              return err;
+          });
+      }).catch(() => {});
+    },
+    handover_edit(row){
+      Object.assign(this.handoverForm, row);
+      this.getUserList2();
+      console.log('this.handoverVisible:',this.handoverForm)
+      this.handoverVisible = true;
+    },
+    submitHandover(){
+      this.$API.wpm.handover.create.req(this.handoverForm).then(res=>{
+
+      })
+    },
+    handleSelectionChange(selection){
+      this.selectedIds = [];
+      selection.forEach(item => {
+        this.selectedIds.push(item.id)
+      });
+    },
+    submitMaterialCount(){
+      let obj = {};
+      obj = this.choseData;
+      obj.peifen_kg = this.peifen_kg;
+      this.$API.pm.mtask.update.req(this.mtask,obj).then(res=>{
+        console.log('配粉料数');
+      })
+    },
+    getMaterial(){
+      this.$router.push({ name: "mio" })
+    },
   },
 };
 </script>
 <style scoped>
-    .el-main.nopadding{
-      padding:0 20px 0 20px
-    }
-    .gantt-container {
-  height: 30%;
-}
-.ganntClass {
-  background-color: #fff;
-  padding: 10px;
-  border-radius: 4px;
-}
+  .btnWrap{
+    display: inline-block;
+    position:absolute;
+    right:20px;
+    margin-top:4px;
+    z-index:100
+  }
+  .el-main.nopadding{
+    padding:0 20px 0 20px
+  }
+  .gantt-container {
+    height: 30%;
+  }
+  .ganntClass {
+    background-color: #fff;
+    padding: 10px;
+    border-radius: 4px;
+  }
+  .cateItem{
+    justify-content: space-between;
+    display:flex;
+    border-bottom:1px solid #eeeeee;
+  }
+  .tableTitle{
+    height:40px;
+    font-size: 16px;
+    padding-top: 5px;
+    margin-top: 10px;
+    border-top: 1px solid rgb(238, 238, 238);
+  }
 </style>
\ No newline at end of file
diff --git a/src/views/wpm/worktask_form.vue b/src/views/wpm/worktask_form.vue
new file mode 100644
index 00000000..04da8973
--- /dev/null
+++ b/src/views/wpm/worktask_form.vue
@@ -0,0 +1,1027 @@
+<template>
+    <el-dialog
+        :title="titleMap[mode]"
+        v-model="visible"
+        width="1000px"
+        :size="1000"
+        destroy-on-close
+        @closed="$emit('closed')"
+    >
+        <!-- 混料工序 -->
+        <el-form v-if="activeType=='8车间'" ref="dialogForm" :model="form" :rules="rules" label-width="80px">
+            <el-row>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="工段" prop="material">
+                        <el-select
+                            v-model="form.mgroup"
+                            placeholder="工段"
+                            clearable
+                            style="width:100%"
+                        >
+                            <el-option
+                                v-for="item in mgroupOptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="产物" prop="material">
+                        <el-select
+                            v-model="form.material_out"
+                            placeholder="产物"
+                            clearable
+                            style="width:100%"
+                        >
+                            <el-option
+                                v-for="item in materialOptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="设备" prop="material">
+                        <el-select
+                            v-model="form.equipment"
+                            placeholder="设备"
+                            clearable
+                            style="width:100%"
+                        >
+                            <el-option
+                                v-for="item in equipmentOptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="批次" width="100">
+                        <el-input v-model="form.batch"  tyle="width:100%" placeholder="请输入批次"></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="数量" width="100">
+                        <el-input-number 
+                        v-model="form.count_real" 
+                        controls-position="right" 
+                        :min="0" step="1" 
+                        :step-strictly="true" 
+                        style="width:100%"
+                        placeholder="请输入数量">
+                        </el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="重量" width="100">
+                        <el-input-number 
+                        v-model="form.count_real_eweight" 
+                        controls-position="right" 
+                        :min="0" step="1" 
+                        :step-strictly="true" 
+                        style="width:100%"
+                        placeholder="请输入重量">
+                        </el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="配料人" prop="material">
+                        <el-select 
+                            v-model="form.handle_users"
+                            placeholder="配料人"
+                            clearable
+                            multiple
+                            style="width:100%"
+                        >
+                            <el-option
+                            v-for="item in userList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+        </el-form>
+        <!-- 退火 -->
+        <el-form v-if="activeType=='退火'" ref="dialogForm" :model="form" :rules="rules" label-width="80px">
+            <el-row>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="工段" prop="material">
+                        <el-select
+                            v-model="form.mgroup"
+                            placeholder="工段"
+                            clearable
+                            style="width:100%"
+                        >
+                            <el-option
+                                v-for="item in mgroupOptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="消耗物" prop="material_in">
+                        <el-select
+                            v-model="form.material_in"
+                            placeholder="消耗物"
+                            clearable
+                            style="width:100%"
+                            @change="wmaterialInChange"
+                        >
+                            <el-option
+                                v-for="item in wMaterialOptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="产物" prop="material_out">
+                        <el-select
+                            v-model="form.material_out"
+                            placeholder="产物"
+                            clearable
+                            style="width:100%"
+                        >
+                            <el-option
+                                v-for="item in materialOptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <!-- <el-col :md="12" :sm="24">
+                    <el-form-item label="设备" prop="material">
+                        <el-select
+                            v-model="form.equipment"
+                            placeholder="设备"
+                            clearable
+                            style="width:100%"
+                        >
+                            <el-option
+                                v-for="item in equipmentOptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col> -->
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="批次" width="100">
+                        <el-input v-model="form.batch" disabled tyle="width:100%" placeholder="请输入批次"></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="数量" width="100">
+                        <el-input-number 
+                        v-model="form.count" 
+                        controls-position="right" 
+                        :min="0" step="1" 
+                        :step-strictly="true" 
+                        style="width:100%"
+                        placeholder="请输入数量">
+                        </el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="操作人" prop="material">
+                        <el-select 
+                            v-model="form.handle_users"
+                            placeholder="操作人"
+                            clearable
+                            multiple
+                            style="width:100%"
+                        >
+                            <el-option
+                            v-for="item in userList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="退火时间" prop="material">
+                        <el-date-picker
+                            v-model="form.handle_date"
+                            type="date"
+                            placeholder="退火时间"
+                            format="YYYY-MM-DD"
+                            value-format="YYYY-MM-DD"
+                            style="width:100%"
+                        />
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="备注">
+                        <el-input v-model="form.note"  tyle="width:100%" placeholder="备注"></el-input>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+        </el-form>
+        <!-- 七车间 -->
+        <el-form v-if="activeType=='7车间'" ref="dialogForm" :model="form" :rules="rules" label-width="120px">
+            <el-row>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="产品名称" prop="material">
+                        <el-select
+                            v-model="form.material_out"
+                            placeholder="产品名称"
+                            disabled
+                            style="width:100%"
+                        >
+                            <el-option
+                                v-for="item in materialOptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="批次号">
+                        <el-input v-model="form.batch" placeholder="请输入请输入批次号"></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="锅号">
+                        <el-select
+                            v-model="form.equipment"
+                            placeholder="锅号"
+                            clearable
+                            style="width:100%"
+                        >
+                            <el-option
+                                v-for="item in equipmentOptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="第几锅">
+                        <el-select
+                            v-model="form.index"
+                            placeholder="第几锅"
+                            clearable
+                            style="width:100%"
+                        >
+                            <el-option
+                                v-for="item in 8"
+                                :key="item"
+                                :label="item"
+                                :value="item"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="生产量">
+                        <el-input-number 
+                        v-model="form.count_real" 
+                        controls-position="right" 
+                        :min="0" step="1" 
+                        :step-strictly="true" 
+                        style="width:100%"
+                        placeholder="生产量"
+                        @change="countChange"
+                        >
+                        </el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="合格量">
+                        <el-input-number 
+                        v-model="form.count_ok" 
+                        controls-position="right" 
+                        :min="0" step="1" 
+                        :step-strictly="true" 
+                        style="width:100%"
+                        placeholder="合格量"
+                        @change="countChange"
+                        >
+                        </el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="合格率">
+                        <!-- <span>{{ form.count_ok/form.count_real }}</span> -->
+                        <el-input 
+                        v-model="form.rate"  
+                        style="width:100%"
+                        disabled
+                        placeholder="合格率">
+                        </el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="退火炉号">
+                        <el-select
+                            v-model="form.equipment_2"
+                            placeholder="退火炉号"
+                            clearable
+                            style="width:100%"
+                        >
+                            <el-option
+                                v-for="item in equipmentOptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <!-- <el-col :md="12" :sm="24">
+                    <el-form-item label="是否加氧">
+                        <el-select
+                            v-model="form.o2"
+                            placeholder="是否加氧"
+                            clearable
+                            style="width:100%"
+                        >
+                            <el-option
+                                v-for="item in yseorno"
+                                :key="item"
+                                :label="item"
+                                :value="item"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col> -->
+                <el-col :md="12" :sm="24">
+                    <el-form-item prop="type" label="成型人">
+                        <el-select
+                            v-model="form.handle_user"
+                            placeholder="成型人"
+                            clearable
+                            style="width:100%"
+                        >
+                            <el-option
+                                v-for="item in userList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item prop="type" label="切料人">
+                        <el-select
+                            v-model="form.handle_user_2"
+                            placeholder="切料人"
+                            clearable
+                            style="width:100%"
+                        >
+                            <el-option
+                                v-for="item in userList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <div class="formTitle">不合格原因及数量:</div>
+            <el-row>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="炸纹">
+                        <el-input-number 
+                        v-model="form.count_n_zw" 
+                        controls-position="right" 
+                        :min="0" step="1" 
+                        :step-strictly="true" 
+                        style="width:100%"
+                        placeholder="炸纹"
+                        @change="countNotOkSun"
+                        >
+                        </el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="条纹">
+                        <el-input-number 
+                        v-model="form.count_n_tw" 
+                        controls-position="right" 
+                        :min="0" step="1" 
+                        :step-strictly="true" 
+                        style="width:100%"
+                        placeholder="条纹"
+                        @change="countNotOkSun"
+                        >
+                        </el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="气泡">
+                        <el-input-number 
+                        v-model="form.count_n_qp" 
+                        controls-position="right" 
+                        :min="0" step="1" 
+                        :step-strictly="true" 
+                        style="width:100%"
+                        placeholder="气泡"
+                        @change="countNotOkSun"
+                        >
+                        </el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="弯曲">
+                        <el-input-number 
+                        v-model="form.count_n_wq" 
+                        controls-position="right" 
+                        :min="0" step="1" 
+                        :step-strictly="true" 
+                        style="width:100%"
+                        placeholder="弯曲"
+                        @change="countNotOkSun"
+                        >
+                        </el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="其他">
+                        <el-input-number 
+                        v-model="form.count_n_qt" 
+                        controls-position="right" 
+                        :min="0" step="1" 
+                        :step-strictly="true" 
+                        style="width:100%"
+                        placeholder="其他"
+                        @change="countNotOkSun"
+                        >
+                        </el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="合计">
+                        <el-input-number 
+                        v-model="form.count_notok" 
+                        controls-position="right" 
+                        style="width:100%"
+                        placeholder="合计"
+                        disabled
+                        >
+                        </el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="备注">
+                        <el-input v-model="form.note" placeholder="备注"></el-input>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+        </el-form>
+        <!-- 十车间 -->
+        <el-form v-if="activeType=='10车间'" ref="dialogForm" :model="form" :rules="rules" label-width="80px">
+            <el-row>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="产品名称" prop="material">
+                        <el-select
+                            v-model="form.material_out"
+                            placeholder="产品名称"
+                            disabled
+                            style="width:100%"
+                        >
+                            <el-option
+                                v-for="item in materialOptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="班次" prop="material">
+                        <el-select
+                            v-model="form.shift"
+                            placeholder="班次"
+                            clearable
+                            style="width:100%"
+                        >
+                            <el-option
+                                v-for="item in shiftOptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="出管总数">
+                        <el-input-number 
+                        v-model="form.count_real" 
+                        controls-position="right" 
+                        :min="0" step="1" 
+                        :step-strictly="true" 
+                        style="width:100%"
+                        placeholder="出管总数"
+                        @change="countChange"
+                        >
+                        </el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="合格总数">
+                        <el-input-number
+                        v-model="form.count_ok" 
+                        controls-position="right" 
+                        style="width:100%"
+                        placeholder="合计"
+                        disabled
+                        @change="countChange"
+                        ></el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="合格率">
+                        <el-input 
+                        v-model="form.rate"  
+                        style="width:100%"
+                        disabled
+                        placeholder="合格率">
+                        </el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item prop="type" label="成型人">
+                        <el-select
+                            v-model="form.handle_user"
+                            placeholder="成型人"
+                            clearable
+                            style="width:100%"
+                        >
+                            <el-option
+                                v-for="item in userList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item prop="type" label="带班人">
+                        <el-select
+                            v-model="form.handle_leader"
+                            placeholder="带班人"
+                            clearable
+                            style="width:100%"
+                        >
+                            <el-option
+                                v-for="item in userList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="碎料">
+                        <el-input-number 
+                        v-model="form.count_break" 
+                        controls-position="right" 
+                        :min="0" step="1" 
+                        :step-strictly="true" 
+                        style="width:100%"
+                        placeholder="碎料"
+                        >
+                        </el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="批次号">
+                        <el-input v-model="form.batch" placeholder="请输入请输入批次号"></el-input>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <div class="formTitle">关联产品计数:</div>
+            <el-row v-for="item in form.mlogb" :key="item">
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="产品名称" prop="material">
+                        <el-select
+                            v-model="item.material_out"
+                            placeholder="产品名称"
+                            disabled
+                            style="width:100%"
+                        >
+                            <el-option
+                                v-for="item in materialOptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="合格数">
+                        <el-input-number 
+                        v-model="item.count_ok" 
+                        controls-position="right" 
+                        :min="0" step="1" 
+                        :step-strictly="true" 
+                        style="width:100%"
+                        placeholder="合格数"
+                        @change="countOkSun"
+                        >
+                        </el-input-number>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <div class="formTitle">不合格原因及数量:</div>
+            <el-row>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="椭圆/弯曲">
+                        <el-input-number 
+                        v-model="form.count_n_wq" 
+                        controls-position="right" 
+                        :min="0" step="1" 
+                        :step-strictly="true" 
+                        style="width:100%"
+                        placeholder="椭圆/弯曲"
+                        @change="countNotOkSun"
+                        >
+                        </el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="条纹">
+                        <el-input-number 
+                        v-model="form.count_n_tw" 
+                        controls-position="right" 
+                        :min="0" step="1" 
+                        :step-strictly="true" 
+                        style="width:100%"
+                        placeholder="条纹"
+                        @change="countNotOkSun"
+                        >
+                        </el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="断裂">
+                        <el-input-number 
+                        v-model="form.count_n_dl" 
+                        controls-position="right" 
+                        :min="0" step="1" 
+                        :step-strictly="true" 
+                        style="width:100%"
+                        placeholder="断裂"
+                        @change="countNotOkSun"
+                        >
+                        </el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="偏壁">
+                        <el-input-number 
+                        v-model="form.count_n_pb" 
+                        controls-position="right" 
+                        :min="0" step="1" 
+                        :step-strictly="true" 
+                        style="width:100%"
+                        placeholder="偏壁"
+                        @change="countNotOkSun"
+                        >
+                        </el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="大小头">
+                        <el-input-number 
+                        v-model="form.count_n_dxt" 
+                        controls-position="right" 
+                        :min="0" step="1" 
+                        :step-strictly="true" 
+                        style="width:100%"
+                        placeholder="大小头"
+                        @change="countNotOkSun"
+                        >
+                        </el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="结石气绒">
+                        <el-input-number 
+                        v-model="form.count_n_jsqx" 
+                        controls-position="right" 
+                        :min="0" step="1" 
+                        :step-strictly="true" 
+                        style="width:100%"
+                        placeholder="结石气绒"
+                        @change="countNotOkSun"
+                        >
+                        </el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="合计">
+                        <el-input-number
+                        v-model="form.count_notok" 
+                        controls-position="right" 
+                        style="width:100%"
+                        placeholder="合计"
+                        disabled
+                        >
+                        </el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="备注">
+                        <el-input v-model="form.note" placeholder="备注"></el-input>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+        </el-form>
+        <el-footer>
+            <el-button type="primary" v-loading="isSaveing" @click="submit">确定</el-button>
+            <el-button @click="resetForm">取消</el-button>
+        </el-footer>
+    </el-dialog>
+</template>
+<script>
+    export default {
+        emits: ["success", "closed"],
+        props:{
+            mtask: { type: String, default: '' },
+            activeType:{ type: String, default: '' },
+            brothersList:{ type: Array },
+        },
+        data() {
+            return {
+                yseorno:['是','否'],
+                loading: false,
+                mode: "add",
+                titleMap: {
+                    add: "新增记录",
+                    edit: "编辑记录",
+                    show: "查看记录",
+                },
+                handle_user:[],
+                form:{
+                    count_ok:0,
+                    count_real:0,
+                    count_n_zw:0,
+                    count_n_tw:0,
+                    count_n_qp:0,
+                    count_n_wq:0,
+                    count_n_dl:0,
+                    count_n_pb:0,
+                    count_n_dxt:0,
+                    count_n_jsqx:0,
+                    count_n_qt:0,
+                    mlogb:[]
+                },
+                userList:[],
+                cateOptions:[],
+                mgroupOptions:[],
+                materialOptions:[],
+                equipmentOptions:[],
+                wMaterialOptions:[],
+                shiftOptions:['白班','夜班'],
+                visible: false,
+                isSaveing: false,
+                setFiltersVisible: false,
+                handle_name:'',
+                leader_name:'',
+                count_n_all:null,
+            };
+        },
+        mounted() {
+            let materialObj = this.$TOOL.data.get('MATERIAL_OBJECT');
+            this.materialObj = materialObj;
+            this.form.material_out = materialObj.id;
+            this.getMaterial();
+            this.getUserList();
+            this.getEquipment();
+            this.getMgroupList();
+            let date = new Date();
+            let year = date.getFullYear();
+            let month = date.getMonth()+1;
+            let day = date.getDate();
+            this.form.handle_date =  year+'-'+month+'-'+day;
+            if(this.activeType=='10车间'){
+                this.$API.mtm.shift.req({page:0}).then(res=>{
+                    this.shiftOptions = res;
+                })
+               if(this.mode=='add'){
+                let mlogb = [];
+                this.brothersList.forEach(item=>{
+                    let obj = {};
+                    obj.material_out = item;
+                    obj.count_ok = 0;
+                    mlogb.push(obj)
+                })
+                this.form.mlogb = mlogb;
+               }
+            }
+            this.getWorkShopMaterial();
+        },
+        methods: {
+            getUserList(){
+                let that = this;
+                let deptName = '';
+                if(this.activeType=='退火'){
+                    deptName =  '8车间';
+                }else{
+                    deptName =  this.activeType;
+                }
+                this.$API.system.user.list.req({belong_dept__name:deptName,page:0}).then(res=>{
+					that.userList = res;
+				});
+            },
+             //获取车间物料批次号
+			getBatchs(){
+                let that = this;
+				this.$API.wpm.wmaterial.batchs.req({belong_dept_name:'6车间'}).then(res=>{
+					that.batchOptions = res;
+				});
+			},
+            //获取集合列表
+            getMgroupList(){
+                let that = this;
+                this.$API.mtm.mgroup.list.req({page:0,cate:'photon'}).then(res=>{
+                    let data = res.filter(item=>{
+                        return item.process_cate=='成型'
+                    })
+                    that.mgroupOptions = res;
+                })
+            },
+            //获取设备列表
+            getEquipment(){
+            this.$API.em.equipment.list.req({page:0,type:10}).then(res=>{
+                this.equipmentOptions = res;
+            })
+            },
+            getMaterial(){
+                let obj ={};
+                obj.page = 0;
+                obj.is_hidden = false;
+                this.$API.mtm.material.list.req(obj).then(res=>{
+                    this.materialOptions = res;
+                })
+            },
+             //获取车间物料
+            //  getMaterial(){
+            //     let that = this;
+			// 	this.$API.wpm.wmaterial.list.req({belong_dept_name:'8车间',page:0}).then(res=>{
+			// 		that.materialOptions = res;
+			// 	});
+			// },
+            getWorkShopMaterial(){
+                this.$API.wpm.wmaterial.list.req({belong_dept__name:'8车间',page:0}).then(res=>{
+                    this.wMaterialOptions = res;
+                })
+            },
+            //显示
+            open(mode = "add") {
+                this.mode = mode;
+                this.visible = true;
+                return this;
+            },
+            countNotOkSun(){
+                if(this.activeType=='7车间'){
+                    this.form.count_notok = this.form.count_n_zw+this.form.count_n_tw+this.form.count_n_qp+this.form.count_n_wq+this.form.count_n_qt;
+                }else if(this.activeType=='10车间'){
+                    this.form.count_notok =  this.form.count_n_wq+this.form.count_n_tw+this.form.count_n_dl+this.form.count_n_pb+this.form.count_n_dxt+this.form.count_n_jsqx;
+                 }
+            },
+            countOkSun(){
+                let ok_number = 0;
+                this.form.mlogb.forEach(item=>{
+                    ok_number+=item.count_ok;
+                })
+                this.form.count_ok = ok_number;
+                this.countChange();
+            },
+            //提交
+            submit() {
+                console.log(this.form);
+                debugger;
+                this.$refs.dialogForm.validate(async (valid) => {
+                    if (valid) {
+                        this.isSaveing = true;
+                        if(this.activeType=='7车间'){
+                            this.form.mtask = this.mtask;
+                            this.form.count_notok = this.form.count_n_zw+this.form.count_n_tw+this.form.count_n_qp+this.form.count_n_wq+this.form.count_n_qt;
+                        }else if(this.activeType=='10车间'){
+                            this.form.mtask = this.mtask;
+                            this.form.count_notok =  this.form.count_n_wq+this.form.count_n_tw+this.form.count_n_dl+this.form.count_n_pb+this.form.count_n_dxt+this.form.count_n_jsqx;
+                            let ok_number = 0;
+                            this.form.mlogb.forEach(item=>{
+                                ok_number+=item.count_ok;
+                            })
+                            this.form.count_ok = ok_number;
+                        }
+                        let sun = this.form.count_ok+this.form.count_notok;
+                        if(sun==this.form.count_real){
+                            if (this.mode == "add") {
+                                this.$API.wpm.mlog.create.req(this.form).then(res=>{
+                                    this.isSaveing = false;
+                                    this.$emit("success", this.form, this.mode);
+                                    this.visible = false;
+                                    this.$message.success("操作成功");
+                                }).catch( (err) =>{
+                                    //可以处理校验错误
+                                    this.isSaveing = false;
+                                    return err;
+                                })
+                            } else if (this.mode == "edit") {
+                                this.$API.wpm.mlog.update.req(this.form.id,this.form).then(res=>{
+                                    this.isSaveing = false;
+                                    this.$emit("success", this.form, this.mode);
+                                    this.visible = false;
+                                    this.$message.success("操作成功");
+                                }).catch( (err) =>{
+                                    //可以处理校验错误
+                                    this.isSaveing = false;
+                                    return err;
+                                })
+                            }
+                        }else{
+                            this.isSaveing = false;
+                            this.$message.error("合格总数与不合格总数与出管总数不对等");
+                        }
+                    }
+                });
+            },
+            //表单注入数据
+            setData(data) {
+                Object.assign(this.form, data);
+                if(this.activeType=='8车间'){
+                    if(this.form.handle_user.indexOf(',')>-1){
+                        this.handle_user = this.form.handle_user.split(',')
+                    }else{
+                        this.handle_user = [this.form.handle_user];
+                    }
+                }else{
+                    this.form.rate = this.form.count_ok/this.form.count_real*100+'%';
+                }
+            },
+            //设置过滤项
+            setFilters(filters) {
+                this.selectionFilters = filters;
+                this.setFiltersVisible = true;
+            },
+            //
+            countChange(){
+                if(this.form.count_real!==null&&this.form.count_real!==''&&this.form.count_real!==0){
+                    if(this.form.count_ok!==null&&this.form.count_ok!==''&&this.form.count_ok!==0){
+                        this.form.rate = this.form.count_ok/this.form.count_real*100+'%'
+                    }else{
+                        this.form.rate =null;
+                    }
+                }else{
+                        this.form.rate =null;
+                    }
+            },
+            //选择
+            materialInChange(val){
+                let data = this.materialOptions.filter(item=>{
+                    return item.id==val;
+                })
+                this.form.batch = data[0].batch;
+            },
+            //选择
+            wmaterialInChange(val){
+                let data = this.wmaterialOptions.filter(item=>{
+                    return item.id==val;
+                })
+                this.form.batch = data[0].batch;
+            },
+        },
+    };
+</script>
+<style scoped>
+.formTitle{
+    margin-bottom:10px;
+    font-weight:600
+}
+</style>
+  
\ No newline at end of file