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

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

@@ -178,8 +178,8 @@
             @click="handleAbnormal(scope.row)">查看异常</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCheck(scope.row)"
             v-if="showControl">修正</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+          <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-if="showControl">删除</el-button>
+            v-if="showControl">删除</el-button> -->
           <el-button size="mini" type="text" icon="el-icon-search" @click="handleTrace(scope.row)">追溯</el-button>
         </template>
       </el-table-column>
@@ -287,7 +287,8 @@
       <label-render :forceSpecialTag="forceSpecialTag" :content="labelRender.data" :labelType="labelRender.type" />
     </el-dialog>
 
-    <label-render :forceSpecialTag="forceSpecialTag" ref="labelRender" v-show="false" :content="labelRender.data" :labelType="labelRender.type" />
+    <label-render :forceSpecialTag="forceSpecialTag" ref="labelRender" v-show="false" :content="labelRender.data"
+      :labelType="labelRender.type" />
 
     <!-- 批量导出标签PDF弹窗 -->
     <el-dialog title="批量导出标签PDF" :visible.sync="batchPrint.visible" width="520px" append-to-body>

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

@@ -1,5 +1,14 @@
 <template>
-  <BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery" :hideType="hideType" />
+  <el-tabs class="app-container" v-model="activeTab">
+    <el-tab-pane label="待收卷" name="second">
+      <BasePage :qrcode="qrcode" :querys="querys2" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
+        :hideType="hideType" />
+    </el-tab-pane>
+    <el-tab-pane label="已收卷" name="first">
+      <BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
+        :hideType="hideType" />
+    </el-tab-pane>
+  </el-tabs>
 </template>
 
 <script>
@@ -12,12 +21,19 @@ export default {
   data() {
     return {
       qrcode: false,
+      activeTab: 'second',
       querys: {
         dataType: 1,
         status: 0,
         warehouseId: '2019583656787259393', // 技术部逻辑库
         // materialType: '废品'
       },
+      querys2: {
+        dataType: 1,
+        status: 0,
+        nextWarehouseId: '2019583656787259393', // 技术部逻辑库
+        // materialType: '废品'
+      },
       hideWarehouseQuery: true,
       showAbnormal: true,
       labelType: '2',

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

@@ -1,5 +1,14 @@
 <template>
-  <BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery" :hideType="hideType" />
+  <el-tabs class="app-container" v-model="activeTab">
+    <el-tab-pane label="待收卷" name="second">
+      <BasePage :qrcode="qrcode" :querys="querys2" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
+        :hideType="hideType" />
+    </el-tab-pane>
+    <el-tab-pane label="已收卷" name="first">
+      <BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
+        :hideType="hideType" />
+    </el-tab-pane>
+  </el-tabs>
 </template>
 
 <script>
@@ -12,10 +21,17 @@ export default {
   data() {
     return {
       qrcode: false,
+      activeTab: 'second',
       querys: {
         dataType: 1,
         status: 0,
-        warehouseId: '2019583325311414274', // 小钢卷仓
+        warehouseId: '2019583325311414274', // 小钢卷库
+        // materialType: '废品'
+      },
+      querys2: {
+        dataType: 1,
+        status: 0,
+        nextWarehouseId: '2019583325311414274', // 小钢卷库
         // materialType: '废品'
       },
       hideWarehouseQuery: true,

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

@@ -1,5 +1,14 @@
 <template>
-  <BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery" :hideType="hideType" />
+  <el-tabs class="app-container" v-model="activeTab">
+    <el-tab-pane label="待收卷" name="second">
+      <BasePage :qrcode="qrcode" :querys="querys2" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
+        :hideType="hideType" />
+    </el-tab-pane>
+    <el-tab-pane label="已收卷" name="first">
+      <BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
+        :hideType="hideType" />
+    </el-tab-pane>
+  </el-tabs>
 </template>
 
 <script>
@@ -12,10 +21,17 @@ export default {
   data() {
     return {
       qrcode: false,
+      activeTab: 'second',
       querys: {
         dataType: 1,
         status: 0,
-        warehouseId: '2019583137616310273', // 退货仓
+        warehouseId: '2019583137616310273', // 退货库
+        // materialType: '废品'
+      },
+      querys2: {
+        dataType: 1,
+        status: 0,
+        nextWarehouseId: '2019583137616310273', // 退货库
         // materialType: '废品'
       },
       hideWarehouseQuery: true,
@@ -26,3 +42,4 @@ export default {
   }
 }
 </script>
+

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

@@ -1,5 +1,14 @@
 <template>
-  <BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery" :hideType="hideType" />
+  <el-tabs class="app-container" v-model="activeTab">
+    <el-tab-pane label="待收卷" name="second">
+      <BasePage :qrcode="qrcode" :querys="querys2" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
+        :hideType="hideType" />
+    </el-tab-pane>
+    <el-tab-pane label="已收卷" name="first">
+      <BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
+        :hideType="hideType" />
+    </el-tab-pane>
+  </el-tabs>
 </template>
 
 <script>
@@ -12,12 +21,19 @@ export default {
   data() {
     return {
       qrcode: false,
+      activeTab: 'second',
       querys: {
         dataType: 1,
         status: 0,
         warehouseId: '2019583429955104769', // 废品仓
         // materialType: '废品'
       },
+      querys2: {
+        dataType: 1,
+        status: 0,
+        nextWarehouseId: '2019583429955104769', // 废品仓
+        // materialType: '废品'
+      },
       hideWarehouseQuery: true,
       showAbnormal: true,
       labelType: '2',
@@ -26,3 +42,6 @@ export default {
   }
 }
 </script>
+
+
+

klp-ui/src/views/wms/report/zha.vue

@@ -214,47 +214,6 @@ export default {
             ...params
           })
         })
-        // [
-        //   // 酸连轧成品库
-        //   listCoilWithIds({
-        //     ...this.queryParams,
-        //     pageSize: 9999,
-        //     pageNum: 1,
-        //     // dataType: 1,
-        //     createBy: 'suanzhakuguan',
-        //     warehouseId: '1988150099140866050'
-        //   }),
-        //   // 镀锌原料库
-        //   listCoilWithIds({
-        //     ...this.queryParams,
-        //     pageSize: 9999,
-        //     pageNum: 1,
-        //     // dataType: 1,
-        //     selectType: 'raw_material',
-        //     createBy: 'suanzhakuguan',
-        //     warehouseId: '1988150263284953089'
-        //   }),
-        //   // 脱脂原料库
-        //   listCoilWithIds({
-        //     ...this.queryParams,
-        //     pageSize: 9999,
-        //     pageNum: 1,
-        //     // dataType: 1,
-        //     selectType: 'raw_material',
-        //     createBy: 'suanzhakuguan',
-        //     warehouseId: '1988150545175736322'
-        //   }),
-        //   // 酸连轧纵剪分条原料库1988150150521090049
-        //   listCoilWithIds({
-        //     ...this.queryParams,
-        //     pageSize: 9999,
-        //     pageNum: 1,
-        //     // dataType: 1,
-        //     selectType: 'raw_material',
-        //     createBy: 'suanzhakuguan',
-        //     warehouseId: '1988150150521090049'
-        //   }),
-        // ]
       ).then((resList) => {
         console.log(resList)
         const list = resList.flatMap(res => res.rows)