Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/components/CoilSelector/index.vue

@@ -161,7 +161,8 @@ export default {
         pageSize: 10,
         currentCoilNo: null,
         grade: null,
-        selectType: 'raw_material',
+        selectType: 'product',
+        status: 0, // 不包含已发货的钢卷
         dataType: 1 // 只查询当前数据，不查询历史数据
       },
       columns: defaultColumns,

klp-ui/src/views/wms/coil/do/ship.vue

@@ -220,7 +220,9 @@ export default {
       // 钢卷选择器筛选参数
       coilFilters: {
         dataType: 1,
-        materialType: '成品'
+        materialType: '成品',
+        selectType: 'product',
+        status: 0,
       },
       coilSelectorVisible: false,
       loading: false,

klp-ui/src/views/wms/coil/onlySplit.vue

@@ -0,0 +1,26 @@
+<template>
+  <BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery" :hideType="hideType" />
+</template>
+
+<script>
+import BasePage from './panels/base.vue';
+
+export default {
+  components: {
+    BasePage
+  },
+  data() {
+    return {
+      qrcode: false,
+      querys: {
+        dataType: 1,
+        warehouseIds: '1988150150521090049,1988150487185289217,1988150750390448129,1988150971895836674',
+        // materialType: '废品'
+      },
+      hideWarehouseQuery: true,
+      labelType: '2',
+      hideType: false,
+    }
+  }
+}
+</script>

klp-ui/src/views/wms/coil/panels/base.vue

@@ -633,7 +633,7 @@ export default {
         endTime: this.queryParams.updateTime?.[1],
       }
       // 如果没有设置itemType，则设置为raw_material
-      query.selectType = this.querys.materialType === '成品' ? 'product' : 'raw_material';
+      query.selectType = this.querys.materialType === '原料' ? 'raw_material' : 'product';
       listMaterialCoil(query).then(response => {
         if (this.querys.warehouseId != 111) {
           // 排除掉111仓库的

klp-ui/src/views/wms/delivery/mycoil/index.vue

@@ -36,7 +36,7 @@
     </el-table>
 
     <!-- 分页 -->
-    <pagination v-if="!rangeMode" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize" @pagination="getList" />
   </div>
 </template>
@@ -68,8 +68,9 @@ export default {
         currentCoilNo: null,
         grade: null,
         materialType: '成品',
-        selectType: 'raw_material',
+        selectType: 'product',
-        dataType: 1 // 只查询当前数据，不查询历史数据
+        dataType: 1,  // 只查询当前数据，不查询历史数据
+        // status: 0     // 只查询未发货的数据
       },
       columns: [
         {
@@ -122,7 +123,7 @@ export default {
           width: '100'
         },
         {
-          label: '库区',
+          label: '逻辑库区',
           align: 'center',
           prop: 'warehouseName',
           width: '120',

klp-ui/src/views/wms/delivery/permi/index.vue

@@ -223,6 +223,8 @@ export default {
       queryParamsWithSalesId: {
         selectType: 'product',
         materialType: '成品',
+        dataType: 1,
+        status: 0,
         saleId: undefined,
         pageNum: 1,
         pageSize: 10
@@ -231,6 +233,8 @@ export default {
       queryParamsWithUnAssignedId: {
         selectType: 'product',
         materialType: '成品',
+        dataType: 1,
+        status: 0,
         saleId: -1,
         pageNum: 1,
         pageSize: 10