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

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

@@ -267,8 +267,8 @@
               </div>
 
               <div class="card-footer">
-                <el-button v-if="item.dataType == 1" type="primary" icon="el-icon-check" size="mini" @click="handlePickMaterial(item)"
+                <el-button v-if="item.dataType == 1" type="primary" icon="el-icon-check" size="mini"
-                  :loading="item.picking" class="action-btn">领料</el-button>
+                  @click="handlePickMaterial(item)" :loading="item.picking" class="action-btn">领料</el-button>
               </div>
             </div>
           </div>

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

@@ -3,11 +3,11 @@
     <el-row>
       <el-form label-width="80px" inline>
         <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker style="width: 200px;" v-model="queryParams.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+          <el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeStart" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="选择开始时间"></el-date-picker>
         </el-form-item>
         <el-form-item label="结束时间" prop="endTime">
-          <el-date-picker style="width: 200px;" v-model="queryParams.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+          <el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeEnd" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="选择结束时间"></el-date-picker>
         </el-form-item>
         <el-form-item label="入场钢卷号" prop="endTime">
@@ -127,8 +127,8 @@ export default {
         pageNum: 1,
         pageSize: 9999,
         status: 1,
-        startTime: startTime,
+        byCreateTimeStart: startTime,
-        endTime: endTime,
+        byCreateTimeEnd: endTime,
         selectType: 'product',
         enterCoilNo: '',
         currentCoilNo: '',

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

@@ -3,11 +3,11 @@
     <el-row>
       <el-form label-width="80px" inline>
         <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker style="width: 200px;" v-model="queryParams.startTime" type="datetime"
+          <el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeStart" type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker>
         </el-form-item>
         <el-form-item label="结束时间" prop="endTime">
-          <el-date-picker style="width: 200px;" v-model="queryParams.endTime" type="datetime"
+          <el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeEnd" type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
         </el-form-item>
         <el-form-item label="入场钢卷号" prop="endTime">
@@ -128,8 +128,8 @@ export default {
         pageNum: 1,
         pageSize: 9999,
         // status: 1,
-        startTime: startTime,
+        byCreateTimeStart: startTime,
-        endTime: endTime,
+        byCreateTimeEnd: endTime,
         selectType: 'product',
         enterCoilNo: '',
         currentCoilNo: '',
@@ -163,8 +163,8 @@ export default {
         actionType: 401,
         pageSize: 999,
         pageNum: 1,
-        startTime: this.queryParams.startTime,
+        byCreateTimeStart: this.queryParams.byCreateTimeStart,
-        endTime: this.queryParams.endTime,
+        byCreateTimeEnd: this.queryParams.byCreateTimeEnd,
       }).then(res => {
         const actions = res.rows
         const coilIds = actions.map(item => item.coilId).join(',')

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

@@ -3,11 +3,11 @@
     <el-row>
       <el-form label-width="80px" inline>
         <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker style="width: 200px;" v-model="queryParams.startTime" type="datetime"
+          <el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeStart" type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker>
         </el-form-item>
         <el-form-item label="结束时间" prop="endTime">
-          <el-date-picker style="width: 200px;" v-model="queryParams.endTime" type="datetime"
+          <el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeEnd" type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
         </el-form-item>
         <el-form-item label="入场钢卷号" prop="endTime">
@@ -129,8 +129,8 @@ export default {
         pageNum: 1,
         pageSize: 9999,
         // status: 1,
-        startTime: startTime,
+        byCreateTimeStart: startTime,
-        endTime: endTime,
+        byCreateTimeEnd: endTime,
         selectType: 'product',
         enterCoilNo: '',
         currentCoilNo: '',
@@ -163,8 +163,6 @@ export default {
         // 酸连轧成品库
         listMaterialCoil({
           ...this.queryParams,
-          startTime: this.queryParams.startTime,
-          endTime: this.queryParams.endTime,
           pageSize: 9999,
           pageNum: 1,
           dataType: 1,
@@ -175,8 +173,6 @@ export default {
         // 镀锌原料库
         listMaterialCoil({
           ...this.queryParams,
-          startTime: this.queryParams.startTime,
-          endTime: this.queryParams.endTime,
           pageSize: 9999,
           pageNum: 1,
           dataType: 1,
@@ -187,17 +183,24 @@ export default {
         // 脱脂原料库
         listMaterialCoil({
           ...this.queryParams,
-          startTime: this.queryParams.startTime,
-          endTime: this.queryParams.endTime,
           pageSize: 9999,
           pageNum: 1,
           dataType: 1,
           createBy: 'suanzhakuguan',
           warehouseId: '1988150545175736322'
         }),
-      ]).then(([res1, res2, res3]) => {
+        // 酸连轧纵剪分条原料库1988150150521090049
-        console.log(res1, res2, res3)
+        listMaterialCoil({
-        this.list = [...res1.rows, ...res2.rows, ...res3.rows]
+          ...this.queryParams,
+          pageSize: 9999,
+          pageNum: 1,
+          dataType: 1,
+          createBy: 'suanzhakuguan',
+          warehouseId: '1988150150521090049'
+        }),
+      ]).then(([res1, res2, res3, res4]) => {
+        console.log(res1, res2, res3, res4)
+        this.list = [...res1.rows, ...res2.rows, ...res3.rows, ...res4.rows]
         this.loading = false
       })
       // listPendingAction({