发送明细增加佣金字段，增加报关单价计算公式，预发货日期改为范围查询

src/views/shipment-details/addShipDetDrawer.vue

@@ -491,6 +491,12 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
+        {
+          title: '佣金',
+          dataIndex: 'ymoney',
+          width: 120,
+          className: 'replacecolor'
+        },
 
         {
           title: '单价(销售)',
@@ -652,6 +658,10 @@ export default {
       }
       this.syShippingDetailsItemList = this.syShippingDetailsItemList.concat(copyValList);
       this.msgFormSon = this.syShippingDetailsItemList;
+      this.syShippingDetailsItemList.map(item =>{
+        item.customsDeclarationUnitPrice = item.salesUnitPrice - item.ymoney
+      })
+      this.$forceUpdate()
     },
     // 参照订单数据
     referOrderDataOpen() {

src/views/shipment-details/editShipDetDrawer.vue

@@ -463,6 +463,12 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
+        {
+          title: '佣金',
+          dataIndex: 'ymoney',
+          width: 120,
+          className: 'replacecolor'
+        },
 
         {
           title: '单价(销售)',

src/views/shipment-details/shipmentList.vue

@@ -17,7 +17,7 @@
               <a-form-item label="起始时间">
                 <a-range-picker
                   style="width: 100%"
-                  v-model="queryParam.timeRange"
+                  v-model="timeRange"
                   format="YYYY-MM-DD"
                   :placeholder="['开始时间', '结束时间']"
                   @change="onDateChange"
@@ -28,11 +28,11 @@
 
             <a-col :md="6" :sm="8">
               <a-form-item label="预发货日期">
-                <a-date-picker
-                  placeholder="请选择预发货日期"
+                <a-range-picker
+                  :placeholder="['开始时间', '结束时间']"
                   format="YYYY-MM-DD"
                   style="width: 100%"
-                  v-model="queryParam.preDeliveryDate"
+                  v-model="preDeliveryDate"
                   @change="deliveryDateChange"
                 />
               </a-form-item>
@@ -509,15 +509,18 @@ export default {
         documentNo: '', // 单据号
         startTime: '',
         endTime: '',
+        preDeliveryDateB:'',//预发货日期开始时间
+        preDeliveryDateE:'',//预发货日期结束时间
         // timeRange: [], // 查询条件  时间范围
-        preDeliveryDate: '',
+        // preDeliveryDate: '',
         salesman: '',
         itemNumber: '', // 款号
         refer: '',
         flourOrGarment: '', //类型
         pageNo: '' // 点击的页数
       },
-
+      timeRange:[],//起始时间
+      preDeliveryDate:[],//预发货日期
       pagination: {
         // total: '',
         // current: 0,
@@ -627,6 +630,7 @@ export default {
           this.$refs.editShipDetDrawer.editShipDet = res.result
           res.result.syShippingDetailsItemList.map(item =>{
             item.manualYarnFlag =  res.result.syShippingDetailsItemList[0].manualYarnFlag
+            item.customsDeclarationUnitPrice = item.salesUnitPrice - item.ymoney
             if(item.manualYarnFlag === 0){
               this.$refs.editShipDetDrawer.manualYarnDisabled = true
             }else{
@@ -735,7 +739,8 @@ export default {
 
     deliveryDateChange(value, dateString) {
       console.log('预发货日期', dateString)
-      this.queryParam.preDeliveryDate = dateString
+      this.queryParam.preDeliveryDateB = dateString[0]
+      this.queryParam.preDeliveryDateE = dateString[1]
     },
 
     searchQuery() {
@@ -749,10 +754,12 @@ export default {
 
     searchReset() {
       this.queryParam.documentNo = ''
-      this.queryParam.timeRange = []
+      this.timeRange = []
+      this.preDeliveryDate = []
       this.queryParam.startTime = ''
       this.queryParam.endTime = ''
-      this.queryParam.preDeliveryDate = ''
+      this.queryParam.preDeliveryDateB = ''
+      this.queryParam.preDeliveryDateE = ''
       this.queryParam.salesman = ''
       this.queryParam.itemNumber = ''
       this.queryParam.refer = ''
@@ -770,10 +777,12 @@ export default {
     //关闭新增弹窗
     closeAdd(){
       this.queryParam.documentNo = ''
-      this.queryParam.timeRange = []
+      this.timeRange = []
       this.queryParam.startTime = ''
       this.queryParam.endTime = ''
-      this.queryParam.preDeliveryDate = ''
+      this.preDeliveryDate = []
+      this.queryParam.preDeliveryDateB = ''
+      this.queryParam.preDeliveryDateE = ''
       this.queryParam.salesman = ''
       this.queryParam.itemNumber = ''
       this.queryParam.refer = ''