Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

src/views/book/book-list.vue

@@ -137,7 +137,7 @@
         <a-button type="primary" @click="addBookDrawer" icon="plus">新增</a-button>
         <a-button type="primary" @click="batchSubmit()"  icon="plus">批量提交</a-button>
         <a-button type="primary" @click="batchCanaleSubmit()" icon="plus">批量取消提交</a-button>
-        <a-button type="primary" @click="batchPushU8()" icon="plus">批量推送U8</a-button>
+        <a-button type="primary" @click="batchPushU8()" icon="plus" :disabled="loadingU8">批量推送U8</a-button>
         <a-button type="primary" @click="batchPushInvoice()" icon="plus">批量推送装箱单发票  </a-button>
       </div>
 
@@ -366,6 +366,7 @@ export default {
       shippingOrderDate:[], //单据日期区间
       id: '',
       selectedRowKeys:[],//选中行id
+      loadingU8:false,
       loading: false, // 表格加载
       pagination:{
         pageSizeOptions: ["50", "100", "150"],
@@ -559,13 +560,16 @@ export default {
       if(this.selectedRowKeys.length==0){
         this.$message.success('请勾选数据')
       }else{
+        this.loadingU8 = true
         getAction('/syShippingOrder/syShippingOrder/expensesU8Batch',{ids:this.selectedRowKeys.join(',')}).then((res) => {
           if (res.success) {
             this.getBookList('await')
           }else{
             this.$message.warning(res.message);
           }
-        })
+        }).finally(() => {
+            this.loadingU8 = false          
+        });
       }
     },
     //批量推送装箱单发票 

src/views/cost-allocation-total/inancialReconciliation.vue

@@ -105,6 +105,16 @@
                   /> -->
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-item label="核纱结束日期">
+                <a-range-picker
+                  :placeholder="['开始时间', '结束时间']"
+                  format="YYYY-MM-DD"
+                  v-model="ffinalApproveDate"
+                  @change="changeFfinalApproveDate"
+                />
+              </a-form-item>
+            </a-col>
             
             </template>
 
@@ -193,6 +203,7 @@ export default {
     return {
       dverifyDate:[],
       ffirstApproveDate:[],
+      ffinalApproveDate:[],
       costAllocationColumns: [
         { title: '计划单号', width: 120, dataIndex: 'planNo', fixed: 'left', className: 'replacecolor' },
         { title: '日期', width: 120, dataIndex: 'dverifyDate', className: 'replacecolor' },
@@ -492,6 +503,10 @@ export default {
        this.queryParam.ffirstApproveDateE=( this.ffirstApproveDate.length==2)?this.ffirstApproveDate[1].format('YYYY-MM-DD'):''
        this.queryParam.ffirstApproveDateB=(  this.ffirstApproveDate.length==2)?this.ffirstApproveDate[0].format('YYYY-MM-DD'):''
     },
+    changeFfinalApproveDate(){
+        this.queryParam.ffinalApproveDateE=(this.ffinalApproveDate.length==2)?this.ffinalApproveDate[1].format('YYYY-MM-DD'):''
+        this.queryParam.ffinalApproveDateB=( this.ffinalApproveDate.length==2)?this.ffinalApproveDate[0].format('YYYY-MM-DD'):''
+    },
     rowClick(record)  {
       return {
         on: {

src/views/shipment-details/editShipDetDrawer.vue

@@ -87,6 +87,12 @@
                   <a-input style="width:100%" type="text" v-model="record.smallPo" @change="changeSmallPo(record)"/>
                 </a-form-model-item>
               </template>
+              <!-- 分销点 -->
+              <template slot="distributionPoint" slot-scope="text, record, index">
+                <a-form-model-item prop="distributionPoint">
+                  <a-input style="width:100%" type="text" v-model="record.distributionPoint" @change="changeDistributionPoint(record)"/>
+                </a-form-model-item>
+              </template>
               <!-- 运输方式 -->
               <template slot="typeOfShipping" slot-scope="text, record, index">
                 <a-form-model-item prop="typeOfShipping">
@@ -375,6 +381,7 @@ export default {
           width: 110,
           className: 'replacecolor',
            ellipsis: true,
+           scopedSlots: { customRender: 'distributionPoint' },
         },
         {
           title: '存货编码',
@@ -842,6 +849,12 @@ export default {
         item.smallPo = record.smallPo
       })
     },
+    // 修改分销点
+    changeDistributionPoint(record){
+      this.syShippingDetailsItemList.map(item=>{
+        item.distributionPoint = record.distributionPoint
+      })
+    },
     changeTypeOfShipping(record){
       this.syShippingDetailsItemList.map(item=>{
         item.typeOfShipping = record.typeOfShipping