diff --git a/src/views/inm/good_mio.vue b/src/views/inm/good_mio.vue
index 3c4d018a..98784cb2 100644
--- a/src/views/inm/good_mio.vue
+++ b/src/views/inm/good_mio.vue
@@ -90,7 +90,8 @@ export default {
         save: false,
       },
       query: {
-        type__in: 'sale_out,do_in'
+        type__in: 'sale_out,do_in',
+        item_mio__material__type: 10
       },
       form: {
 
@@ -118,7 +119,7 @@ export default {
     table_detail(row) {
       this.$router.push({
         name: "mioitem",
-        query: { mio: row.id ,type:row.type,cate:'good'}
+        query: { mio: row.id, type: row.type, cate: 'good' }
       });
     },
     //删除
diff --git a/src/views/inm/halfgood_mio.vue b/src/views/inm/halfgood_mio.vue
index 8c5d01e9..4f71b780 100644
--- a/src/views/inm/halfgood_mio.vue
+++ b/src/views/inm/halfgood_mio.vue
@@ -90,7 +90,8 @@ export default {
         save: false,
       },
       query: {
-        type: 'do_in'
+        type__in: 'do_in,do_out',
+        item_mio__material__type: 20
       },
       form: {
 
@@ -118,7 +119,7 @@ export default {
     table_detail(row) {
       this.$router.push({
         name: "mioitem",
-        query: { mio: row.id ,type:row.type,cate:'halfgood'}
+        query: { mio: row.id, type: row.type, cate: 'halfgood' }
 
       });
     },
diff --git a/src/views/inm/helpso_mio.vue b/src/views/inm/helpso_mio.vue
index 1a29c74f..43a2d443 100644
--- a/src/views/inm/helpso_mio.vue
+++ b/src/views/inm/helpso_mio.vue
@@ -1,144 +1,152 @@
 <template>
-    <el-container>
-      <el-header>
-        <div class="left-panel">
-          <el-button type="primary" @click="add('pur_in')" v-auth="'mio.pur'">采购入库</el-button>
-          <el-select v-model="query.state" clearable style="width: 120px; margin-left: 2px" placeholder="状态"
-            @change="handleQuery">
-            <el-option v-for="item in stateOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
-          </el-select>
-        </div>
-        <div class="right-panel">
-          <el-input v-model="query.search" placeholder="编号" clearable style="margin-right: 5px;"></el-input>
-          <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
-        </div>
-      </el-header>
-      <el-main class="nopadding">
-        <scTable ref="table" :apiObj="apiObj" row-key="id" :params="query" stripe>
-          <el-table-column type="index" width="50" />
-          <el-table-column label="记录编号" prop="number"></el-table-column>
-          <el-table-column label="出/入库类型">
-            <template #default="scope">
-              {{ typeDict[scope.row.type] }}
-            </template>
-          </el-table-column>
-          <el-table-column label="记录状态">
-            <template #default="scope">
-              {{ stateDict[scope.row.state] }}
-            </template>
-          </el-table-column>
-          <el-table-column label="出/入库日期" prop="inout_date">
-          </el-table-column>
-  
-          <el-table-column label="创建人" prop="create_by_name">
-          </el-table-column>
-          <el-table-column label="创建时间" prop="create_time">
-          </el-table-column>
-          <el-table-column label="操作" fixed="right" align="center" width="150px">
-            <template #default="scope">
-              <el-button link type="primary" @click="table_detail(scope.row)">
-                查看
-              </el-button>
-              <el-button link type="primary" @click="table_submit(scope.row)" v-auth="'mio.submit'"
-                v-if="scope.row.state == 10">
-                提交
-              </el-button>
-              <el-button link type="danger" @click="table_del(scope.row)" v-auth="'mio.delete'"
-                v-if="scope.row.state == 10">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </scTable>
-      </el-main>
-    </el-container>
-    <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
-      @closed="dialog.save = false"></save-dialog>
-  </template>
-  <script>
-  import saveDialog from "./mio_form.vue";
-  
-  export default {
-    name: "mio",
-    components: {
-      saveDialog
+  <el-container>
+    <el-header>
+      <div class="left-panel">
+        <el-button type="primary" @click="add('pur_in')" v-auth="'mio.pur'">采购入库</el-button>
+        <el-select v-model="query.type" clearable style="width: 120px; margin-left: 2px" placeholder="出入库类型"
+          @change="handleQuery">
+          <el-option v-for="item in cateOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+        </el-select>
+        <el-select v-model="query.state" clearable style="width: 120px; margin-left: 2px" placeholder="状态"
+          @change="handleQuery">
+          <el-option v-for="item in stateOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+        </el-select>
+      </div>
+      <div class="right-panel">
+        <el-input v-model="query.search" placeholder="编号" clearable style="margin-right: 5px;"></el-input>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
+      </div>
+    </el-header>
+    <el-main class="nopadding">
+      <scTable ref="table" :apiObj="apiObj" row-key="id" :params="query" stripe>
+        <el-table-column type="index" width="50" />
+        <el-table-column label="记录编号" prop="number"></el-table-column>
+        <el-table-column label="出/入库类型">
+          <template #default="scope">
+            {{ typeDict[scope.row.type] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="记录状态">
+          <template #default="scope">
+            {{ stateDict[scope.row.state] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="出/入库日期" prop="inout_date">
+        </el-table-column>
+
+        <el-table-column label="创建人" prop="create_by_name">
+        </el-table-column>
+        <el-table-column label="创建时间" prop="create_time">
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" align="center" width="150px">
+          <template #default="scope">
+            <el-button link type="primary" @click="table_detail(scope.row)">
+              查看
+            </el-button>
+            <el-button link type="primary" @click="table_submit(scope.row)" v-auth="'mio.submit'"
+              v-if="scope.row.state == 10">
+              提交
+            </el-button>
+            <el-button link type="danger" @click="table_del(scope.row)" v-auth="'mio.delete'"
+              v-if="scope.row.state == 10">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </scTable>
+    </el-main>
+  </el-container>
+  <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
+    @closed="dialog.save = false"></save-dialog>
+</template>
+<script>
+import saveDialog from "./mio_form.vue";
+
+export default {
+  name: "mio",
+  components: {
+    saveDialog
+  },
+  data() {
+    return {
+      stateDict: {
+        10: '创建中',
+        20: '已提交'
+      },
+      stateOptions: [
+        { id: 10, name: '创建中' },
+        { id: 20, name: '已提交' },
+      ],
+      typeDict: { 'pur_in': '采购入库' },
+      cateOptions: [
+        { id: 'pur_in', name: '采购入库' }
+      ],
+      dialog: {
+        save: false,
+      },
+      query: {
+        type__in: 'pur_in,do_out',
+        item_mio__material__type: 40
+      },
+      form: {
+
+      },
+      apiObj: this.$API.inm.mio.list,
+      selection: [],
+    };
+  },
+  methods: {
+    //添加
+    add(type) {
+      this.dialog.save = true;
+      this.$nextTick(() => {
+        this.$refs.saveDialog.open("add", type);
+      });
     },
-    data() {
-      return {
-        stateDict: {
-          10: '创建中',
-          20: '已提交'
-        },
-        stateOptions: [
-          { id: 10, name: '创建中' },
-          { id: 20, name: '已提交' },
-        ],
-        typeDict: {'pur_in': '采购入库'},
-        dialog: {
-          save: false,
-        },
-        query: {
-          type: 'pur_in'
-        },
-        form: {
-  
-        },
-        apiObj: this.$API.inm.mio.list,
-        selection: [],
-      };
+    //编辑
+    table_edit(row) {
+      this.dialog.save = true;
+      this.$nextTick(() => {
+        this.$refs.saveDialog.open("edit", type).setData(row);
+      });
     },
-    methods: {
-      //添加
-      add(type) {
-        this.dialog.save = true;
-        this.$nextTick(() => {
-          this.$refs.saveDialog.open("add", type);
+    //查看
+    table_detail(row) {
+      this.$router.push({
+        name: "mioitem",
+        query: { mio: row.id, type: row.type, cate: 'helpso' }
+
+      });
+    },
+    //删除
+    table_del(row) {
+      this.$confirm(`确定删除吗？`, "提示", {
+        type: "warning",
+      }).then(() => {
+        this.$API.inm.mio.delete.req(row.id).then((res) => {
+          this.$message.success("删除成功");
+          this.$refs.table.refresh();
+          return res;
+        }).catch((err) => {
+          return err;
         });
-      },
-      //编辑
-      table_edit(row) {
-        this.dialog.save = true;
-        this.$nextTick(() => {
-          this.$refs.saveDialog.open("edit", type).setData(row);
-        });
-      },
-      //查看
-      table_detail(row) {
-        this.$router.push({
-          name: "mioitem",
-          query: { mio: row.id,type:row.type,cate:'helpso' }
-  
-        });
-      },
-      //删除
-      table_del(row) {
-        this.$confirm(`确定删除吗？`, "提示", {
-          type: "warning",
-        }).then(() => {
-          this.$API.inm.mio.delete.req(row.id).then((res) => {
-            this.$message.success("删除成功");
-            this.$refs.table.refresh();
-            return res;
-          }).catch((err) => {
-            return err;
-          });
-        }).catch(() => { });
-      },
-      table_submit(row) {
-        this.$API.inm.mio.submit.req(row.id).then(res => {
-          this.$message.success("提交成功");
-          this.$refs.table.refresh()
-        })
-      },
-      handleQuery() {
-        this.$refs.table.queryData(this.query)
-      },
-      resetQuery() {
-        this.query = {};
-      },
-      handleSaveSuccess() {
+      }).catch(() => { });
+    },
+    table_submit(row) {
+      this.$API.inm.mio.submit.req(row.id).then(res => {
+        this.$message.success("提交成功");
         this.$refs.table.refresh()
-      }
+      })
     },
-  };
-  </script>
\ No newline at end of file
+    handleQuery() {
+      this.$refs.table.queryData(this.query)
+    },
+    resetQuery() {
+      this.query = {};
+    },
+    handleSaveSuccess() {
+      this.$refs.table.refresh()
+    }
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/inm/mainso_mio.vue b/src/views/inm/mainso_mio.vue
index 7a3eb424..263c184e 100644
--- a/src/views/inm/mainso_mio.vue
+++ b/src/views/inm/mainso_mio.vue
@@ -1,156 +1,157 @@
 <template>
-    <el-container>
-      <el-header>
-        <div class="left-panel">
-          <el-button type="primary" @click="add('do_out')" v-auth="'mio.do'">生产领料</el-button>
-          <el-button type="primary" @click="add('pur_in')" v-auth="'mio.pur'">采购入库</el-button>
-          <el-select v-model="query.type" clearable style="width: 120px; margin-left: 2px" placeholder="出入库类型"
-            @change="handleQuery">
-            <el-option v-for="item in cateOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
-          </el-select>
-          <el-select v-model="query.state" clearable style="width: 120px; margin-left: 2px" placeholder="状态"
-            @change="handleQuery">
-            <el-option v-for="item in stateOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
-          </el-select>
-        </div>
-        <div class="right-panel">
-          <el-input v-model="query.search" placeholder="编号" clearable style="margin-right: 5px;"></el-input>
-          <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
-        </div>
-      </el-header>
-      <el-main class="nopadding">
-        <scTable ref="table" :apiObj="apiObj" row-key="id" :params="query" stripe>
-          <el-table-column type="index" width="50" />
-          <el-table-column label="记录编号" prop="number"></el-table-column>
-          <el-table-column label="出/入库类型">
-            <template #default="scope">
-              {{ typeDict[scope.row.type] }}
-            </template>
-          </el-table-column>
-          <el-table-column label="记录状态">
-            <template #default="scope">
-              {{ stateDict[scope.row.state] }}
-            </template>
-          </el-table-column>
-          <el-table-column label="出/入库日期" prop="inout_date">
-          </el-table-column>
-  
-          <el-table-column label="创建人" prop="create_by_name">
-          </el-table-column>
-          <el-table-column label="创建时间" prop="create_time">
-          </el-table-column>
-          <el-table-column label="操作" fixed="right" align="center" width="150px">
-            <template #default="scope">
-              <el-button link type="primary" @click="table_detail(scope.row)">
-                查看
-              </el-button>
-              <el-button link type="primary" @click="table_submit(scope.row)" v-auth="'mio.submit'"
-                v-if="scope.row.state == 10">
-                提交
-              </el-button>
-              <el-button link type="danger" @click="table_del(scope.row)" v-auth="'mio.delete'"
-                v-if="scope.row.state == 10">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </scTable>
-      </el-main>
-    </el-container>
-    <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
-      @closed="dialog.save = false"></save-dialog>
-  </template>
-  <script>
-  import saveDialog from "./mio_form.vue";
-  
-  export default {
-    name: "mio",
-    components: {
-      saveDialog
+  <el-container>
+    <el-header>
+      <div class="left-panel">
+        <el-button type="primary" @click="add('do_out')" v-auth="'mio.do'">生产领料</el-button>
+        <el-button type="primary" @click="add('pur_in')" v-auth="'mio.pur'">采购入库</el-button>
+        <el-select v-model="query.type" clearable style="width: 120px; margin-left: 2px" placeholder="出入库类型"
+          @change="handleQuery">
+          <el-option v-for="item in cateOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+        </el-select>
+        <el-select v-model="query.state" clearable style="width: 120px; margin-left: 2px" placeholder="状态"
+          @change="handleQuery">
+          <el-option v-for="item in stateOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+        </el-select>
+      </div>
+      <div class="right-panel">
+        <el-input v-model="query.search" placeholder="编号" clearable style="margin-right: 5px;"></el-input>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
+      </div>
+    </el-header>
+    <el-main class="nopadding">
+      <scTable ref="table" :apiObj="apiObj" row-key="id" :params="query" stripe>
+        <el-table-column type="index" width="50" />
+        <el-table-column label="记录编号" prop="number"></el-table-column>
+        <el-table-column label="出/入库类型">
+          <template #default="scope">
+            {{ typeDict[scope.row.type] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="记录状态">
+          <template #default="scope">
+            {{ stateDict[scope.row.state] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="出/入库日期" prop="inout_date">
+        </el-table-column>
+
+        <el-table-column label="创建人" prop="create_by_name">
+        </el-table-column>
+        <el-table-column label="创建时间" prop="create_time">
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" align="center" width="150px">
+          <template #default="scope">
+            <el-button link type="primary" @click="table_detail(scope.row)">
+              查看
+            </el-button>
+            <el-button link type="primary" @click="table_submit(scope.row)" v-auth="'mio.submit'"
+              v-if="scope.row.state == 10">
+              提交
+            </el-button>
+            <el-button link type="danger" @click="table_del(scope.row)" v-auth="'mio.delete'"
+              v-if="scope.row.state == 10">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </scTable>
+    </el-main>
+  </el-container>
+  <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
+    @closed="dialog.save = false"></save-dialog>
+</template>
+<script>
+import saveDialog from "./mio_form.vue";
+
+export default {
+  name: "mio",
+  components: {
+    saveDialog
+  },
+  data() {
+    return {
+      stateDict: {
+        10: '创建中',
+        20: '已提交'
+      },
+      stateOptions: [
+        { id: 10, name: '创建中' },
+        { id: 20, name: '已提交' },
+      ],
+      typeDict: {
+        'do_out': '生产领料',
+        'pur_in': '采购入库'
+      },
+      cateOptions: [
+        { id: 'do_out', name: '生产领料' },
+        { id: 'pur_in', name: '采购入库' }
+      ],
+      dialog: {
+        save: false,
+      },
+      query: {
+        type__in: 'pur_in,do_out',
+        item_mio__material__type: 30
+      },
+      form: {
+
+      },
+      apiObj: this.$API.inm.mio.list,
+      selection: [],
+    };
+  },
+  methods: {
+    //添加
+    add(type) {
+      this.dialog.save = true;
+      this.$nextTick(() => {
+        this.$refs.saveDialog.open("add", type);
+      });
     },
-    data() {
-      return {
-        stateDict: {
-          10: '创建中',
-          20: '已提交'
-        },
-        stateOptions: [
-          { id: 10, name: '创建中' },
-          { id: 20, name: '已提交' },
-        ],
-        typeDict: {
-          'do_out': '生产领料',
-          'pur_in': '采购入库'
-        },
-        cateOptions: [
-          { id: 'do_out', name: '生产领料' },
-          { id: 'pur_in', name: '采购入库' }
-        ],
-        dialog: {
-          save: false,
-        },
-        query: {
-          type: 'do_out'
-        },
-        form: {
-  
-        },
-        apiObj: this.$API.inm.mio.list,
-        selection: [],
-      };
+    //编辑
+    table_edit(row) {
+      this.dialog.save = true;
+      this.$nextTick(() => {
+        this.$refs.saveDialog.open("edit", type).setData(row);
+      });
     },
-    methods: {
-      //添加
-      add(type) {
-        this.dialog.save = true;
-        this.$nextTick(() => {
-          this.$refs.saveDialog.open("add", type);
+    //查看
+    table_detail(row) {
+      this.$router.push({
+        name: "mioitem",
+        query: { mio: row.id, type: row.type, cate: 'mainso' }
+
+      });
+    },
+    //删除
+    table_del(row) {
+      this.$confirm(`确定删除吗？`, "提示", {
+        type: "warning",
+      }).then(() => {
+        this.$API.inm.mio.delete.req(row.id).then((res) => {
+          this.$message.success("删除成功");
+          this.$refs.table.refresh();
+          return res;
+        }).catch((err) => {
+          return err;
         });
-      },
-      //编辑
-      table_edit(row) {
-        this.dialog.save = true;
-        this.$nextTick(() => {
-          this.$refs.saveDialog.open("edit", type).setData(row);
-        });
-      },
-      //查看
-      table_detail(row) {
-        this.$router.push({
-          name: "mioitem",
-          query: { mio: row.id ,type:row.type,cate:'mainso'}
-  
-        });
-      },
-      //删除
-      table_del(row) {
-        this.$confirm(`确定删除吗？`, "提示", {
-          type: "warning",
-        }).then(() => {
-          this.$API.inm.mio.delete.req(row.id).then((res) => {
-            this.$message.success("删除成功");
-            this.$refs.table.refresh();
-            return res;
-          }).catch((err) => {
-            return err;
-          });
-        }).catch(() => { });
-      },
-      table_submit(row) {
-        this.$API.inm.mio.submit.req(row.id).then(res => {
-          this.$message.success("提交成功");
-          this.$refs.table.refresh()
-        })
-      },
-      handleQuery() {
-        this.$refs.table.queryData(this.query)
-      },
-      resetQuery() {
-        this.query = {};
-      },
-      handleSaveSuccess() {
+      }).catch(() => { });
+    },
+    table_submit(row) {
+      this.$API.inm.mio.submit.req(row.id).then(res => {
+        this.$message.success("提交成功");
         this.$refs.table.refresh()
-      }
+      })
     },
-  };
-  </script>
\ No newline at end of file
+    handleQuery() {
+      this.$refs.table.queryData(this.query)
+    },
+    resetQuery() {
+      this.query = {};
+    },
+    handleSaveSuccess() {
+      this.$refs.table.refresh()
+    }
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/inm/warehouse.vue b/src/views/inm/warehouse.vue
index 36580b6c..4daa4a14 100644
--- a/src/views/inm/warehouse.vue
+++ b/src/views/inm/warehouse.vue
@@ -22,9 +22,9 @@
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="150px">
           <template #default="scope">
-            <el-button link type="primary" @click="toMb(scope.row)">
+            <!-- <el-button link type="primary" @click="toMb(scope.row)">
               查看
-            </el-button>
+            </el-button> -->
             <el-button link type="primary" @click="table_edit(scope.row)" v-auth="'warehouse.update'">
               编辑
             </el-button>
diff --git a/src/views/wpm/mlog_dept10.vue b/src/views/wpm/mlog_dept10.vue
index 94ede52d..b1915dbc 100644
--- a/src/views/wpm/mlog_dept10.vue
+++ b/src/views/wpm/mlog_dept10.vue
@@ -100,7 +100,7 @@
                                         <el-table-column label="班次" prop="shift_name"> </el-table-column>
                                         <el-table-column label="出管总数" prop="count_real">
                                         </el-table-column>
-                                        <el-table-column label="规格" prop="mlogb" width="250">
+                                        <el-table-column label="规格" prop="mlogb" width="300">
                                             <template #default="scope">
                                                 <div v-for="item in scope.row.mlogb" :key="item" class="cateItem" style="">
                                                     <span>{{ item.material_out_name }}|</span>