diff --git a/src/views/wpm/mlog_dept6.vue b/src/views/wpm/mlog_dept6.vue
index 6a48b75c..524b308a 100644
--- a/src/views/wpm/mlog_dept6.vue
+++ b/src/views/wpm/mlog_dept6.vue
@@ -259,6 +259,7 @@ export default {
       this.$API.wpm.handover.submit.req(row.id).then(res => {
         this.$message.success('操作成功')
         this.$refs.table_handover.refresh();
+        this.$refs.table_wm.refresh();
       }).catch(err => { })
     },
   }
diff --git a/src/views/wpm/mlog_hun.vue b/src/views/wpm/mlog_hun.vue
index c481e0ef..1ff3c036 100644
--- a/src/views/wpm/mlog_hun.vue
+++ b/src/views/wpm/mlog_hun.vue
@@ -14,20 +14,22 @@
                         </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_.full_name
-                            }}</span>
+                            scope.row.material_out_.full_name
+                        }}</span>
                             </template>
                         </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">
+
                             <template #default="scope">
                                 <span v-if="scope.row.count_real_eweight"> {{ scope.row.count_real_eweight.toFixed(2)
-                                }}</span>
+                                    }}</span>
                             </template>
                         </el-table-column>
                         <el-table-column label="配料人" prop="handle_user_name">
+
                             <template #default="scope">
                                 <span v-for="item in scope.row.handle_users_" v-bind:key="item.id">
                                     {{ item.name }}/
@@ -35,16 +37,24 @@
                             </template>
                         </el-table-column>
                         <el-table-column label="操作" fixed="right" align="center" width="180">
+
                             <template #default="scope">
-                                <el-button link type="primary" @click="table_edit(scope.row)" v-auth="'mlog.update'">
+                                <el-button link type="primary" v-if="scope.row.submit_time == null"
+                                    @click="table_edit(scope.row)" v-auth="'mlog.update'">
                                     编辑
                                 </el-button>
-                                <el-button link type="primary" @click="addHandover(scope.row)" v-auth="'handover.create'">
-                                    转交接单
-                                </el-button>
-                                <el-button link type="danger" @click="table_del(scope.row)" v-auth="'mlog.delete'">
+                                <el-button link type="danger" @click="table_del(scope.row)" v-auth="'mlog.delete'"
+                                    v-if="scope.row.submit_time == null">
                                     删除
                                 </el-button>
+                                <el-button link type="success" v-if="scope.row.submit_user == null"
+                                    @click="table_submit(scope.row)" v-auth="'mlog.submit'">
+                                    提交
+                                </el-button>
+                                <el-button link type="warning" v-if="scope.row.submit_time != null"
+                                    @click="table_revert(scope.row)" v-auth="'mlog.submit'">
+                                    撤回
+                                </el-button>
                             </template>
                         </el-table-column>
                     </scTable>
@@ -54,53 +64,88 @@
         </el-header>
         <el-main class="nopadding">
             <el-container>
-                <el-header>
-                    <div class="left-panel">
-                        <span style="font-size: 14px">交接记录</span>
-                    </div>
-                </el-header>
-                <el-main>
-                    <scTable ref="table2" :apiObj="apiObjHandover" row-key="id" stripe :params="paramsHandover">
-                        <el-table-column type="index" width="50" />
-                        <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_">{{
-                                scope.row.material_.full_name
-                            }}</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="批次" prop="batch"> </el-table-column>
-                        <el-table-column label="数量/桶数" prop="count">
-                        </el-table-column>
-                        <el-table-column label="每桶重量/kg" prop="count_eweight">
-                            <template #default="scope">
-                                <span v-if="scope.row.count_eweight"> {{ scope.row.count_eweight.toFixed(2) }}</span>
-                            </template>
-                        </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="submit_time">
-                            <template #default="scope">
-                                <span v-if="scope.row.submit_time">是</span>
-                                <span v-else>否</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="操作" fixed="right" align="left" width="100">
-                            <template #default="scope">
-                                <el-button link type="primary" @click="handover_edit(scope.row)" v-auth="'handover.update'"
-                                    v-if="scope.row.submit_time == null">
-                                    编辑
+                <el-aside style="width: 60%">
+                    <el-container>
+                        <el-header>
+                            <div class="left-panel">
+                                <span style="font-size: 14px">交接记录</span>
+                            </div>
+                            <div class="right-panel">
+                                <el-button type="primary" @click="addHandover" v-auth="'handover.create'">
+                                    新增
                                 </el-button>
-                                <el-button link type="danger" @click="handover_delete(scope.row)" v-auth="'handover.delete'"
-                                    v-if="scope.row.submit_time == null">
-                                    删除
-                                </el-button>
-                            </template>
-                        </el-table-column>
-                    </scTable>
+                            </div>
+                        </el-header>
+                        <el-main>
+                            <scTable ref="table2" :apiObj="apiObjHandover" row-key="id" stripe :params="paramsHandover">
+                                <el-table-column type="index" width="50" />
+                                <el-table-column label="送料日期" prop="send_date" width="120">
+                                </el-table-column>
+                                <el-table-column label="产物" prop="material_name" show-overflow-tooltip width="120">
+                                </el-table-column>
+                                <el-table-column label="批次" prop="batch"> </el-table-column>
+                                <el-table-column label="数量/桶数" prop="count">
+                                </el-table-column>
+                                <el-table-column label="每桶/kg" prop="count_eweight">
+
+                                    <template #default="scope">
+                                        <span v-if="scope.row.count_eweight"> {{ scope.row.count_eweight.toFixed(2)
+                                            }}</span>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="交送人" prop="send_user_name">
+                                </el-table-column>
+                                <el-table-column label="接收车间" prop="recive_dept_name">
+                                </el-table-column>
+                                <el-table-column label="接收人" prop="recive_user_name">
+                                </el-table-column>
+                                <el-table-column label="是否确认" prop="submit_time">
+
+                                    <template #default="scope">
+                                        <span v-if="scope.row.submit_time">是</span>
+                                        <span v-else>否</span>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="操作" fixed="right" align="left" width="100">
+
+                                    <template #default="scope">
+                                        <!-- <el-button link type="primary" @click="handover_edit(scope.row)"
+                                            v-auth="'handover.update'" v-if="scope.row.submit_time == null">
+                                            编辑
+                                        </el-button> -->
+                                        <el-button link type="danger" @click="handover_delete(scope.row)"
+                                            v-auth="'handover.delete'" v-if="scope.row.submit_time == null">
+                                            删除
+                                        </el-button>
+                                    </template>
+                                </el-table-column>
+                            </scTable>
+                        </el-main>
+                    </el-container>
+                </el-aside>
+                <el-main class="nopadding">
+                    <el-container>
+                        <el-header>
+                            <div class="left-panel">
+                                <span style="font-size: 14px">车间库存</span>
+                            </div>
+                        </el-header>
+                        <el-main>
+                            <scTable ref="table_wm" :apiObj="apiObjWm" row-key="id" :params="paramsWm" stripe
+                                hidePagination>
+                                <el-table-column label="物料" prop="material">
+
+                                    <template #default="scope">{{
+                            scope.row.material_name
+                        }}</template>
+                                </el-table-column>
+                                <el-table-column label="批次" prop="batch"> </el-table-column>
+                                <el-table-column label="数量/桶数" prop="count">
+                                </el-table-column>
+                                <el-table-column label="每桶/kg" prop="count_eweight"></el-table-column>
+                            </scTable>
+                        </el-main>
+                    </el-container>
                 </el-main>
             </el-container>
         </el-main>
@@ -109,6 +154,22 @@
         @closed="handoverVisible = false">
         <el-form ref="dialogForm" :model="handoverForm" :rules="rules" label-width="120px">
             <el-row>
+                <el-col :md="24" :sm="24">
+                    <el-form-item label="交送物料" prop="wm">
+                        <el-select v-model="selectWm" placeholder="交送物料" clearable style="width: 100%"
+                            :disabled="handoverType == 'edit'" value-key="id" @change="selectWmChange">
+                            <el-option v-for="item in wmaterialList" :key="item.id"
+                                :label="item.material_name + '---' + item.batch" :value="item">
+                                <span style="float: left">{{ item.material_name }}---{{ item.batch }}</span>
+                                <span style="
+                                    float: right;
+                                    color: var(--el-text-color-secondary);
+                                    font-size: 13px;
+                                ">{{ item.count }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
                 <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"
@@ -159,10 +220,12 @@
             <el-button type="primary" @click="submitHandover">提交</el-button>
         </el-footer>
     </el-dialog>
-    <save-dialog v-if="dialogSave" ref="saveDialog" :mgroup="currentMgroup.id" :mgroupShiftRule="currentMgroup.shift_rule"
-        :activeType="activeName" @success="handleSaveSuccess" @closed="dialogSave = false">
+    <save-dialog v-if="dialogSave" ref="saveDialog" :mgroup="currentMgroup.id"
+        :mgroupShiftRule="currentMgroup.shift_rule" :activeType="activeName" @success="handleSaveSuccess"
+        @closed="dialogSave = false">
     </save-dialog>
 </template>
+
 <script>
 import saveDialog from "./worktask_form.vue";
 export default {
@@ -177,12 +240,16 @@ export default {
             params: {},
             apiObjHandover: null,
             paramsHandover: {},
+            apiObjWm: null,
+            paramsWm: {},
             handoverForm: {},
             handoverVisible: false,
             dialogSave: false,
             deptOptions: [],
             userList: [],
-            userList2: []
+            userList2: [],
+            wmaterialList: [],
+            selectWm: null
         }
     },
     mounted() {
@@ -190,6 +257,20 @@ export default {
         this.getDepts()
     },
     methods: {
+        table_revert(row) {
+            this.$API.wpm.mlog.revert.req(row.id).then(res => {
+                this.$message.success("撤回成功");
+                this.$refs.table.refresh();
+                this.$refs.table_wm.refresh();
+            }).catch(e => { })
+        },
+        table_submit(row) {
+            this.$API.wpm.mlog.submit.req(row.id).then(res => {
+                this.$message.success("提交成功");
+                this.$refs.table.refresh();
+                this.$refs.table_wm.refresh();
+            })
+        },
         add() {
             this.dialogSave = true;
             this.$nextTick(() => {
@@ -238,6 +319,12 @@ export default {
 
                     this.paramsHandover.send_mgroup = this.currentMgroup.id
                     this.apiObjHandover = this.$API.wpm.handover.list
+
+                    this.paramsWm.belong_dept = this.currentMgroup.belong_dept
+                    this.paramsWm.material__name__contains = '混料'
+                    this.paramsWm.count__gte = 1
+                    this.apiObjWm = this.$API.wpm.wmaterial.list
+
                     this.$API.system.user.list.req({ page: 0, belong_dept: this.currentMgroup.belong_dept }).then(res => {
                         this.userList = res
                     })
@@ -247,19 +334,37 @@ export default {
             })
         },
         //从生产日志生成交接记录
-        addHandover(row) {
+        addHandover() {
+            this.getWmaterial();
+            this.handoverForm.wm = '';
             this.handoverForm.send_date = "";
-            this.handoverForm.mlog = row.id;
-            this.handoverForm.batch = row.batch;
-            this.handoverForm.count = row.count_real;
-            this.handoverForm.material = row.material_out;
-            this.handoverForm.count_eweight = row.count_real_eweight;
-            this.handoverForm.send_dept = row.belong_dept;
-            this.handoverForm.recive_dept = "";
             this.handoverForm.send_user = "";
-            this.handoverForm.recive_user = "";
+            this.handoverForm.recive_user = '';//接收人
+            this.handoverForm.recive_dept = '';//接收车间
+            this.handoverForm.send_dept = this.currentMgroup.belong_dept;
+            this.handoverForm.send_mgroup = this.currentMgroup.id;
+            this.handoverType = 'add';
             this.handoverVisible = true;
         },
+        getWmaterial() {
+            let obj = {};
+            obj.belong_dept = this.currentMgroup.belong_dept;
+            obj.material__name__contains = '混料';
+            obj.page = 0;
+            obj.count__gte = 1;
+            this.$API.wpm.wmaterial.list.req(obj).then(res => {
+                this.wmaterialList = res;
+            })
+        },
+        selectWmChange(item) {
+            this.handoverForm.count = item.count
+            this.handoverForm.count_eweight = item.count_eweight
+            this.handoverForm.wm = item.id
+            this.handoverForm.send_dept = this.currentMgroup.belong_dept;
+            this.handoverForm.send_mgroup = this.currentMgroup.id;
+            this.handoverForm.material = item.material;
+            this.handoverForm.batch = item.batch;
+        },
         submitHandover() {
             this.$API.wpm.handover.create.req(this.handoverForm).then((res) => {
                 this.$message.success("创建成功");
diff --git a/src/views/wpm/mlog_tui.vue b/src/views/wpm/mlog_tui.vue
index 60a8b99e..6a7b4589 100644
--- a/src/views/wpm/mlog_tui.vue
+++ b/src/views/wpm/mlog_tui.vue
@@ -57,7 +57,7 @@
         </el-header>
         <el-main class="nopadding">
             <el-container>
-                <el-aside style="width:50%">
+                <el-aside style="width:60%">
                     <el-container>
                         <el-header>
                             <div class="left-panel">
@@ -70,21 +70,17 @@
                         <el-main>
                             <scTable ref="table2" :apiObj="apiObjHandover" row-key="id" stripe :params="paramsHandover">
                                 <el-table-column type="index" width="50" />
-                                <el-table-column label="送料日期" prop="send_date">
+                                <el-table-column label="送料日期" prop="send_date" width="120">
                                 </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_.full_name }}
-                                        </span>
-                                    </template>
+                                <el-table-column label="产物" prop="material_name" show-overflow-tooltip width="120">
                                 </el-table-column>
                                 <el-table-column label="批次" prop="batch"> </el-table-column>
                                 <el-table-column label="数量" prop="count">
                                 </el-table-column>
                                 <el-table-column label="交送人" prop="send_user_name">
                                 </el-table-column>
+                                <el-table-column label="接收部门" prop="recive_dept_name">
+                                </el-table-column>
                                 <el-table-column label="接收人" prop="recive_user_name">
                                 </el-table-column>
                                 <el-table-column label="是否确认" prop="submit_time">
@@ -97,10 +93,10 @@
                                 <el-table-column label="操作" fixed="right" align="left" width="100">
 
                                     <template #default="scope">
-                                        <el-button link type="primary" @click="handover_edit(scope.row)"
+                                        <!-- <el-button link type="primary" @click="handover_edit(scope.row)"
                                             v-auth="'handover.update'" v-if="scope.row.submit_time == null">
                                             编辑
-                                        </el-button>
+                                        </el-button> -->
                                         <el-button link type="danger" @click="handover_delete(scope.row)"
                                             v-auth="'handover.delete'" v-if="scope.row.submit_time == null">
                                             删除
@@ -125,29 +121,7 @@
                         <el-main>
                             <scTable ref="table_wm" :apiObj="apiObjWm" row-key="id" :params="paramsWm" stripe
                                 hidePagination>
-                                <el-table-column label="物料名" prop="material">
-
-                                    <template #default="scope">{{
-                            scope.row.material_.name
-                        }}</template>
-                                </el-table-column>
-                                <el-table-column label="规格" prop="material">
-
-                                    <template #default="scope">{{
-                            scope.row.material_.specification
-                        }}</template>
-                                </el-table-column>
-                                <el-table-column label="型号" prop="material">
-
-                                    <template #default="scope">{{
-                            scope.row.material_.model
-                        }}</template>
-                                </el-table-column>
-                                <el-table-column label="已到工序" prop="material">
-
-                                    <template #default="scope">{{
-                            scope.row.material_.process_name
-                        }}</template>
+                                <el-table-column label="物料" prop="material_name">
                                 </el-table-column>
                                 <el-table-column label="批次" prop="batch"> </el-table-column>
                                 <el-table-column label="数量" prop="count" width="80">
@@ -165,11 +139,11 @@
             <el-row>
                 <el-col :md="24" :sm="24">
                     <el-form-item label="交送物料" prop="wm">
-                        <el-select v-model="handoverForm.wm" placeholder="交送物料" clearable style="width: 100%"
-                            :disabled="handoverType == 'edit'">
-                            <el-option v-for="item in wmaterialList" :key="item.id" :label="item.material_name"
-                                :value="item.id">
-                                <span style="float: left">{{ item.material_name }} {{ item.batch }}</span>
+                        <el-select v-model="selectWm" placeholder="交送物料" clearable style="width: 100%"
+                            :disabled="handoverType == 'edit'" value-key="id" @change="selectWmChange">
+                            <el-option v-for="item in wmaterialList" :key="item.id"
+                                :label="item.material_name + '---' + item.batch" :value="item">
+                                <span style="float: left">{{ item.material_name }}---{{ item.batch }}</span>
                                 <span style="
                                     float: right;
                                     color: var(--el-text-color-secondary);
@@ -257,7 +231,8 @@ export default {
             deptOptions: [],
             userList: [],
             userList2: [],
-            wmaterialList: []
+            wmaterialList: [],
+            selectWm: null,
         }
     },
     mounted() {
@@ -334,6 +309,7 @@ export default {
                     this.apiObjHandover = this.$API.wpm.handover.list
 
                     this.paramsWm.belong_dept = this.currentMgroup.belong_dept
+                    this.paramsWm.material__process__name__contains = '管料'
                     this.paramsWm.count__gte = 1
                     this.apiObjWm = this.$API.wpm.wmaterial.list
 
@@ -351,7 +327,6 @@ export default {
             this.handoverForm.wm = '';
             this.handoverForm.send_date = "";
             this.handoverForm.send_user = "";
-            this.handoverForm.count = 1;
 
             this.handoverForm.recive_user = '';//接收人
             this.handoverForm.recive_dept = '';//接收车间
@@ -359,6 +334,15 @@ export default {
             this.handoverType = 'add';
             this.handoverVisible = true;
         },
+        selectWmChange(item) {
+            this.handoverForm.count = item.count
+            this.handoverForm.count_eweight = item.count_eweight
+            this.handoverForm.wm = item.id
+            this.handoverForm.send_dept = this.currentMgroup.belong_dept;
+            this.handoverForm.send_mgroup = this.currentMgroup.id;
+            this.handoverForm.material = item.material;
+            this.handoverForm.batch = item.batch;
+        },
         getWmaterial() {
             let obj = {};
             obj.belong_dept = this.currentMgroup.belong_dept;
@@ -370,7 +354,7 @@ export default {
             })
         },
         submitHandover() {
-            this.$API.wpm.handover.genByWm.req(this.handoverForm).then((res) => {
+            this.$API.wpm.handover.create.req(this.handoverForm).then((res) => {
                 this.$message.success("创建成功");
                 this.handoverVisible = false;
                 this.$refs.table2.refresh();
diff --git a/src/views/wpm/worktask_form.vue b/src/views/wpm/worktask_form.vue
index 688a6d1e..e286223b 100644
--- a/src/views/wpm/worktask_form.vue
+++ b/src/views/wpm/worktask_form.vue
@@ -615,7 +615,7 @@ export default {
         count_n_js: 0,
         count_n_qx: 0,
         count_n_qt: 0,
-        count_n_xzp:0,
+        count_n_xzp: 0,
         count_break: 0,
         count_notok: 0,
         mlogb: [],
@@ -720,7 +720,7 @@ export default {
         let list = res.filter(item =>
           item.rule == '长白班'
         );
-        if (that.activeType !== '10车间') {
+        if (that.activeType !== '10车间' && list.length > 0) {
           that.form.shift = list[0].id;
         }
       });
@@ -870,6 +870,9 @@ export default {
       this.$refs.dialogForm.validate(async (valid) => {
         if (valid) {
           this.isSaveing = true;
+          if (this.activeType == '8车间') {
+            this.form.count_ok = this.form.count_real;
+          }
           if (this.activeType == "7车间") {
             this.form.mtask = this.mtask;
             this.form.count_notok =
@@ -962,16 +965,16 @@ export default {
     //表单注入数据
     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 + "%";
-      }
+      // 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) {