Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2

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: {
 

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: {
 

src/views/inm/helpso_mio.vue

@@ -3,6 +3,10 @@
     <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>
@@ -74,11 +78,15 @@
         { id: 20, name: '已提交' },
       ],
       typeDict: { 'pur_in': '采购入库' },
+      cateOptions: [
+        { id: 'pur_in', name: '采购入库' }
+      ],
       dialog: {
         save: false,
       },
       query: {
-          type: 'pur_in'
+        type__in: 'pur_in,do_out',
+        item_mio__material__type: 40
       },
       form: {
 

src/views/inm/mainso_mio.vue

@@ -90,7 +90,8 @@
         save: false,
       },
       query: {
-          type: 'do_out'
+        type__in: 'pur_in,do_out',
+        item_mio__material__type: 30
       },
       form: {
 

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>

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>