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

klp-ui/src/api/wms/coil.js

@@ -345,4 +345,15 @@ export function categoryWidthStatistics() {
     url: '/wms/materialCoil/statistics/categoryWidthStatistics',
     method: 'get',
   })
+}
+
+/**
+ * 钢卷被退货，发给客户的钢卷被退货
+ */
+export function exportCoilWithAll(data) {
+  return request({
+    url: '/wms/materialCoil/exportAll',
+    method: 'post',
+    data
+  })
 }

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

@@ -51,6 +51,7 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button icon="el-icon-download" size="mini" @click="handleNewExport" v-if="showNewExport">导出</el-button>
       </el-form-item>
     </el-form>
 
@@ -73,6 +74,9 @@
         <el-button type="info" plain icon="el-icon-printer" size="mini" :disabled="multiple"
           @click="handleBatchPrintLabel">批量打印标签</el-button>
       </el-col>
+      <el-col :span="1.5" v-if="showOrderBy">
+        <el-checkbox v-model="queryParams.orderBy" v-loading="loading" @change="getList" label="orderBy">按实际库区排序</el-checkbox>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -405,7 +409,8 @@ import {
   exportCoil,
   cancelExportCoil,
   checkCoilNo,
-  returnCoil
+  returnCoil,
+  exportCoilWithAll
 } from "@/api/wms/coil";
 import { listBoundCoil } from "@/api/wms/deliveryWaybillDetail";
 import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
@@ -530,6 +535,14 @@ export default {
     showRelatedToOrder: {
       type: Boolean,
       default: false,
+    },
+    showOrderBy: {
+      type: Boolean,
+      default: false,
+    },
+    showNewExport: {
+      type: Boolean,
+      default: false,
     }
   },
   data() {
@@ -578,6 +591,7 @@ export default {
         itemIds: undefined,
         status: undefined,
         updateTime: undefined,
+        orderBy: false,
         ...this.querys,
       },
       // 表单参数
@@ -917,12 +931,6 @@ export default {
       }
     },
     handleAbnormal(row) {
-      // this.$router.push({
-      //   path: '/quality/detail',
-      //   query: {
-      //     coilId: row.coilId,
-      //   }
-      // })
       this.currentCoilId = row.coilId;
       this.abnormalOpen = true;
     },
@@ -1038,6 +1046,33 @@ export default {
       }).catch(error => {
         this.$modal.msgError("发货失败");
       });
+    },
+    async handleNewExport(row) {
+      this.loading = true
+      let coilIds = ''
+      const query = {
+        ...this.queryParams,
+        selectType: 'product',
+        pageSize: 9999,
+        pageNum: 1,
+      }
+      if (this.showWaybill) {
+        const res = await listBoundCoil(query)
+        coilIds = res.rows.map(item => item.coilId).join(',')
+        this.loading = false
+        this.download('wms/deliveryWaybill/export', {
+          coilIds,
+        }, 'coil.xlsx')
+      } else {
+        const { rows: coils } = await listMaterialCoil(query)
+        coilIds = coils.map(item => item.coilId).join(',')
+        this.loading = false
+        this.download('wms/materialCoil/exportAll', {
+          coilIds,
+        }, 'coil.xlsx')
+      }
+      
+     
     },
     handleCheck(row) {
       this.isCheck = true;
@@ -1172,7 +1207,6 @@ export default {
         ...this.queryParams
       }, `materialCoil_${new Date().getTime()}.xlsx`)
     },
-
     /** 批量打印标签按钮 */
     handleBatchPrintLabel() {
       if (!this.ids || this.ids.length === 0) {

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

@@ -29,7 +29,8 @@ export default {
       showStatus: true,
       hideType: true,
       showLength: true,
-      canExportAll: true
+      canExportAll: true,
+      showOrderBy: true,
     }
   }
 }

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

@@ -2,6 +2,7 @@
   <BasePage 
     :qrcode="qrcode" 
     :showWaybill="showWaybill"
+    :showNewExport="showNewExport"
     :querys="querys" :labelType="labelType" :showStatus="showStatus" :hideType="hideType" :showControl="showControl" :showExportTime="showExportTime" />
 </template>
 
@@ -27,6 +28,7 @@ export default {
       hideType: false,
       showExportTime: false,
       showWaybill: true,
+      showNewExport: true,
     }
   }
 }

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

@@ -0,0 +1,38 @@
+<template>
+  <BasePage :qrcode="qrcode" 
+    :querys="querys" 
+    :labelType="labelType" 
+    :showStatus="showStatus" 
+    :hideType="hideType" 
+    :showLength="showLength" 
+    :canExportAll="canExportAll"
+  />
+</template>
+
+<script>
+import BasePage from '@/views/wms/coil/panels/base.vue';
+
+export default {
+  components: {
+    BasePage
+  },
+  data() {
+    return {
+      qrcode: false,
+      querys: {
+        dataType: 1,
+        materialType: '成品',
+        itemType: 'product',
+        status: 0,
+        orderBy: true
+      },
+      labelType: '3',
+      showStatus: true,
+      hideType: true,
+      showLength: true,
+      canExportAll: true,
+      showOrderBy: false,
+    }
+  }
+}
+</script>

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

@@ -43,13 +43,20 @@
             <el-table-column label="车牌" align="center" prop="licensePlate" width="100" />
             <el-table-column label="收货单位" align="center" prop="consigneeUnit" />
             <!-- <el-table-column label="发货单位" align="center" prop="senderUnit" /> -->
-            <el-table-column label="订单编号" align="center" prop="orderNo" />
+            <el-table-column label="订单编号" align="center" prop="orderNo">
+              <template slot-scope="scope">
+                <span v-if="scope.row.orderId">{{ scope.row.orderCode }}</span>
+                <span v-else>{{ scope.row.principalPhone }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="发货时间" align="center" prop="deliveryTime" width="100">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.deliveryTime, '{y}-{m}-{d}') }}</span>
               </template>
             </el-table-column>
             <el-table-column label="负责人" align="center" prop="principal" width="60" />
+            <el-table-column label="备注" align="center" prop="remark" width="100" show-overflow-tooltip/>
+
             <!-- <el-table-column label="负责人电话" align="center" prop="principalPhone" width="100" /> -->
             <el-table-column label="完成状态" align="center" prop="status" width="120">
               <template slot-scope="scope">
@@ -109,9 +116,12 @@
         <el-form-item label="负责人" prop="principal">
           <el-input v-model="form.principal" placeholder="请输入负责人" />
         </el-form-item>
-        <!-- <el-form-item label="负责人电话" prop="principalPhone">
-          <el-input v-model="form.principalPhone" placeholder="请输入负责人电话" />
-        </el-form-item> -->
+        <el-form-item label="订单编号" prop="principalPhone" v-if="!form.orderId">
+          <el-input v-model="form.principalPhone" placeholder="请输入订单编号"/>
+        </el-form-item>
+         <el-form-item label="订单编号" prop="principalPhone" v-else title="当前发货单已绑定订单">
+          <el-input v-model="form.orderCode" placeholder="请输入订单编号" readonly disabled/>
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -338,7 +348,10 @@ export default {
       const waybillId = row.waybillId || this.ids
       getDeliveryWaybill(waybillId).then(response => {
         this.loading = false;
-        this.form = response.data;
+        this.form = {
+          ...response.data,
+          orderCode: row.orderCode
+        };
         this.open = true;
         this.title = "修改发货单";
       });