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: {
 
@@ -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' }
       });
     },
     //删除

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' }
 
       });
     },

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>
@@ -54,11 +58,11 @@
   </el-container>
   <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
     @closed="dialog.save = false"></save-dialog>
-  </template>
+</template>
-  <script>
+<script>
-  import saveDialog from "./mio_form.vue";
+import saveDialog from "./mio_form.vue";
 
-  export default {
+export default {
   name: "mio",
   components: {
     saveDialog
@@ -73,12 +77,16 @@
         { id: 10, name: '创建中' },
         { id: 20, name: '已提交' },
       ],
-        typeDict: {'pur_in': '采购入库'},
+      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: {
 
@@ -106,7 +114,7 @@
     table_detail(row) {
       this.$router.push({
         name: "mioitem",
-          query: { mio: row.id,type:row.type,cate:'helpso' }
+        query: { mio: row.id, type: row.type, cate: 'helpso' }
 
       });
     },
@@ -140,5 +148,5 @@
       this.$refs.table.refresh()
     }
   },
-  };
+};
-  </script>
+</script>

src/views/inm/mainso_mio.vue

@@ -59,11 +59,11 @@
   </el-container>
   <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
     @closed="dialog.save = false"></save-dialog>
-  </template>
+</template>
-  <script>
+<script>
-  import saveDialog from "./mio_form.vue";
+import saveDialog from "./mio_form.vue";
 
-  export default {
+export default {
   name: "mio",
   components: {
     saveDialog
@@ -90,7 +90,8 @@
         save: false,
       },
       query: {
-          type: 'do_out'
+        type__in: 'pur_in,do_out',
+        item_mio__material__type: 30
       },
       form: {
 
@@ -118,7 +119,7 @@
     table_detail(row) {
       this.$router.push({
         name: "mioitem",
-          query: { mio: row.id ,type:row.type,cate:'mainso'}
+        query: { mio: row.id, type: row.type, cate: 'mainso' }
 
       });
     },
@@ -152,5 +153,5 @@
       this.$refs.table.refresh()
     }
   },
-  };
+};
-  </script>
+</script>

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>