修改

src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckDetailsOrderNew.vue

@@ -67,7 +67,7 @@
             style="width:150px"
           >
           </el-date-picker>
-          <el-button type="primary" class="btn" @click="onclick()">
+          <el-button type="primary" class="btn" @click="onclick">
             <i class="el-icon-search"></i>
           </el-button>
         </el-form-item>
@@ -784,6 +784,15 @@
             type="number"
           ></el-input>
         </el-form-item>
+        <el-form-item label="发票日期">
+            <el-date-picker
+            v-model="statementTime"
+            type="date"
+            placeholder="选择日期"
+            style="width:200px"
+          >
+        </el-date-picker>
+        </el-form-item>
         <el-form-item label="发票图片" style="">
           <el-upload
             ref="statementUpload"
@@ -828,6 +837,7 @@ export default {
   },
   data() {
     return {
+      statementTime:null,
       saleOrderMaterialIds: [],
       batchAddressProvince: '',
       batchAddressDistrict: '',
@@ -884,6 +894,10 @@ export default {
         {
           value: '下货地址',
           lable: '下货地址'
+        },
+        {
+          value: '收款客户',
+          lable: '收款客户'
         }
       ],
       options1: [
@@ -902,6 +916,10 @@ export default {
         {
           value: '下货地址',
           lable: '下货地址'
+        },
+        {
+          value: '收款客户',
+          lable: '收款客户'
         }
       ],
       //合计净重（磅重）
@@ -1550,8 +1568,8 @@ export default {
     },
     generateStatement() {
       this.isLoading = true
-      if (!this.excludeTax) {
-        this.$message.warning('请填写发票金额')
+      if (!this.excludeTax ||! this.statementTime) {
+        this.$message.warning('请填写所有信息！')
         this.isLoading = false
       } else if (this.statementList.length < 1) {
         this.$message.warning('请上传发票')
@@ -1574,6 +1592,8 @@ export default {
         formData.append('orderList', orderList)
         formData.append('excludeTax', this.excludeTax)
         formData.append('userId', getCookie('userId'))
+        console.log("statementTime:",this.statementTime);
+        formData.append('statementTime',this.statementTime.getTime());
         let options = {
           url: '/api/v1/bms/addTruckStatement',
           data: formData,
@@ -3236,6 +3256,9 @@ export default {
       this.selecteddetailsOrderAmount = 0
       this.amsPriceList = []
       this.isRowClick = 0
+      if(!obj){
+        obj=new Object();
+      }
       if (this.activeName == 'first') {
         const loading = this.$loading({
           lock: true,
@@ -3268,6 +3291,16 @@ export default {
             JSON.parse(getCookie('userInfo')).userCode || getCookie('loginName')
           obj.consigneeLoginName = consigneeLoginName
         }
+        if (this.screen == '收款客户' && this.screen1 == '收款客户') {
+          obj.paymentCustomer = [this.input, this.input1]
+        }else {
+          if (this.screen == '收款客户') {
+            obj.paymentCustomer = [this.input]
+          } 
+          if (this.screen1 == '收款客户') {
+            obj.paymentCustomer = [this.input1]
+          } 
+        }
         if (this.screen == '客户') {
           consigneeName = this.input
         } else if (this.screen == '承运商') {
@@ -3277,7 +3310,7 @@ export default {
         } else if (this.screen == '分录ID') {
           console.log('进入了分录')
           easPrimaryId = this.input
-        } else {
+        } else if(!this.screen && this.input){
           remark = this.input
         }
         if (
@@ -3298,7 +3331,7 @@ export default {
           this.input1 != ''
         ) {
           capacityNo = this.input1
-        } else if (this.input1 != null && this.input1 != '') {
+        } else if (!this.screen1 && this.input1) {
           remark = this.input1
         }
         this.axios
@@ -3379,6 +3412,16 @@ export default {
           obj.consigneeLoginName = consigneeLoginName
         }
         console.log(this.screen1, this.input1, 'here')
+        if (this.screen == '收款客户' && this.screen1 == '收款客户') {
+          obj.paymentCustomer = [this.input, this.input1]
+        }else {
+          if (this.screen == '收款客户') {
+            obj.paymentCustomer = [this.input]
+          } 
+          if (this.screen1 == '收款客户') {
+            obj.paymentCustomer = [this.input1]
+          } 
+        }
         if (this.screen == '客户') {
           consigneeName = this.input
         } else if (this.screen == '承运商') {
@@ -3388,7 +3431,7 @@ export default {
         } else if (this.screen == '分录ID') {
           console.log('进入了分录')
           easPrimaryId = this.input
-        } else {
+        } else if(!this.screen && this.input){
           remark = this.input
         }
         if (
@@ -3409,7 +3452,7 @@ export default {
           this.input1 != ''
         ) {
           capacityNo = this.input1
-        } else if (this.input1 != null && this.input1 != '') {
+        } else if(!this.screen1 && this.input1) {
           remark = this.input1
         }
         this.axios

src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckStatementNew.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="steel_inbound" style="width:100%">
     <div class="sache">
-      <el-input placeholder="请输入收货客户" v-model="input" clearable> </el-input>
+      <el-input placeholder="请输入收货客户或承运商" v-model="input" clearable> </el-input>
       <el-date-picker
             v-model="startTime"
             type="date"
@@ -68,7 +68,7 @@
     <el-dialog
       title="详单信息"
       :visible.sync="isShowDetails"
-      style="height:600px;width:100%"
+      width="80%"
       >
       <div>
         <el-button icon="el-download" type="primary" @click="exportExcel('详单信息')">导出Excel</el-button>
@@ -85,7 +85,7 @@
               individual-panel
             >
             <el-table-column
-                width="50"
+                width="40"
                 label="序号"
                 align="center"
                 :resizable="false"
@@ -99,95 +99,82 @@
                 label="订单日期"
                 width="110px"
                 align="center"
-                show-overflow-tooltip
               >
               </el-table-column>
               <el-table-column
                 prop="saleMakeDate"
-                label="制单时间"
-                width="110px"
+                label="制单日期"
+                width="130px"
                 align="center"
               >
               </el-table-column>
               <el-table-column
-                prop="capacityNo"
-                column-key="capacityNo"
-                label="车牌号"
+                prop="newCapacityNo"
+                column-key="newCapacityNo"
+                label="车号"
                 align="center"
                 width="90px"
                 sortable
                 show-overflow-tooltip
+                :filters="filterCapacityList"
               >
               </el-table-column>
               <el-table-column
-                prop="addressPlace"
-                label="收货地址"
-                width="250px"
-                sortable
-                column-key="addressPlace"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="actualAddress"
-                label="实际收货地址"
-                width="250px"
+                prop="consigneeName"
+                label="客户"
+                width="160px"
+                align="center"
+                column-key="consigneeName"
+                :filters="filterConsigneeList"
                 sortable
-                column-key="actualAddress"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="priceValue"
-                label="最终运价"
-                width="100px"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="detailsAmount"
-                label="最终运费"
-                width="100px"
-              ></el-table-column>
-              <el-table-column
-                prop="netWeight"
-                label="净重"
-                show-overflow-tooltip
-              >
-              </el-table-column>
-              <el-table-column
-                prop="materialWeight"
-                label="理重"
                 show-overflow-tooltip
               >
               </el-table-column>
               <el-table-column
                 prop="materialName"
                 column-key="materialNameList"
-                label="物资名称"
+                label="物料名称"
                 align="center"
                 width="150px"
                 sortable
+                :filters="filtermaterialNameList"
               >
               </el-table-column>
               <el-table-column
                 prop="materialSpe"
-                label="物资规格"
+                label="规格型号"
                 column-key="materialSpe"
                 align="center"
                 sortable
+                :filters="filtermaterialSpe"
                 width="120px"
               >
               </el-table-column>
               <el-table-column
                 prop="materialPlanNumber"
-                label="计划件数"
+                label="辅助数量"
                 align="center"
-                width="50px"
+                width="100px"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="materialAcWeight"
+                label="累计出库数量"
+                align="center"
+                width="100px"
               >
               </el-table-column>
               <el-table-column
                 prop="materialNum"
-                label="装车件数"
+                label="累计检斤通知单辅助数量"
                 align="center"
-                width="50px"
+                width="150px"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="netWeight"
+                label="磅重"
+                show-overflow-tooltip
               >
               </el-table-column>
               <el-table-column
@@ -196,6 +183,40 @@
                 label="摘要"
                 width="150px"
                 align="center"
+                :filters="filterSaleRemark"
+                show-overflow-tooltip
+              >
+              </el-table-column>
+              <el-table-column
+                prop="carrierName"
+                label="承运商"
+                align="center"
+                width="80px"
+                column-key="carrierList"
+                sortable
+                show-overflow-tooltip
+                :filters="filterCarrierList"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="addressPlace"
+                label="下货地点"
+                width="300px"
+                sortable
+                column-key="actualAddress"
+              >
+              </el-table-column>
+              <el-table-column prop="priceValue" label="单价" width="100px">
+              </el-table-column>
+              <el-table-column
+                prop="detailsAmount"
+                label="运费"
+                width="100px"
+              ></el-table-column>
+              <el-table-column
+                prop="closeEntryId"
+                label="分录ID"
+                width="120px"
                 show-overflow-tooltip
               >
               </el-table-column>
@@ -212,14 +233,34 @@
                 width="150px"
                 align="center"
                 column-key="saleAreaList"
+                :filters="filterSaleAreaList"
               >
               </el-table-column>
+              <el-table-column prop="unloadType" label="卸货类型" width="60px">
+              </el-table-column>
               <el-table-column
-                prop="unloadType"
-                label="卸货类别"
-                width="60px"
+                prop="saleOrderReceiveCustomer"
+                label="收款客户"
+                width="120px"
+                show-overflow-tooltip
               >
               </el-table-column>
+              <!-- <el-table-column
+                prop="addressPlace"
+                label="收货地址"
+                width="250px"
+                sortable
+                column-key="addressPlace"
+                :filters="filteraddressPlace"
+              >
+              </el-table-column> -->
+              <el-table-column
+                prop="materialWeight"
+                label="理重"
+                show-overflow-tooltip
+              >
+              </el-table-column>
+
               <el-table-column
                 prop="paymentCustomer"
                 label="付款单位"
@@ -234,9 +275,10 @@
                 show-overflow-tooltip
               >
               </el-table-column>
+
               <el-table-column
-                prop="saleOrderReceiveCustomer"
-                label="收款单位"
+                prop="recordUserName"
+                label="操作人"
                 width="120px"
                 show-overflow-tooltip
               >
@@ -313,7 +355,15 @@ export default {
     }
     this.startTime=new Date();
     this.endTime=new Date();
-    this.startTime.setDate(1);
+    this.startTime.setDate(26);
+    this.endTime.setDate(25);
+    console.log("month:",this.startTime.getMonth());
+    if(this.startTime.getMonth()==0){
+      this.startTime.setFullYear(this.startTime.getFullYear()-1);
+      this.startTime.setMonth(11);
+    }else{
+      this.startTime.setMonth(this.startTime.getMonth()-1);
+    }
     this.onclick();
   },
   methods:{