修改

build/utils.js

@@ -16,8 +16,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
-// let devModules = ['all']
-let devModules = ['index', 'sale', 'statisticalReport']
+let devModules = ['all']
+// let devModules = ['index', 'statisticalReport', 'sale']
 // let devModules = ['all']
 
 // let devModules = ['index', 'ADMINISTRATORS']

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

@@ -64,7 +64,7 @@
             </el-option>
           </el-select>
           <el-date-picker
-            v-show="screen2=='制单日期'"
+            v-show="screen2 == '制单日期'"
             v-model="startTime"
             type="datetime"
             placeholder="选择日期"
@@ -72,7 +72,7 @@
           >
           </el-date-picker>
           <el-date-picker
-          v-show="screen2=='订单日期'"
+            v-show="screen2 == '订单日期'"
             v-model="startTime"
             type="date"
             placeholder="选择日期"
@@ -81,7 +81,7 @@
           </el-date-picker>
           <span>至</span>
           <el-date-picker
-            v-show="screen2=='制单日期'"
+            v-show="screen2 == '制单日期'"
             v-model="endTime"
             type="datetime"
             placeholder="选择日期"
@@ -89,8 +89,8 @@
           >
           </el-date-picker>
           <el-date-picker
-          v-show="screen2=='订单日期'"
-            v-model="startTime"
+            v-show="screen2 == '订单日期'"
+            v-model="endTime"
             type="date"
             placeholder="选择日期"
             style="width:150px"
@@ -991,9 +991,7 @@
           align="center"
           :resizable="false"
         >
-          <template slot-scope="scope">{{
-            scope.row.group + 1
-          }}</template>
+          <template slot-scope="scope">{{ scope.row.group + 1 }}</template>
         </el-table-column>
         <el-table-column
           prop="orderTime"
@@ -1072,11 +1070,7 @@
           width="150px"
         >
         </el-table-column>
-        <el-table-column
-          prop="netWeight"
-          label="磅重"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="netWeight" label="磅重" show-overflow-tooltip>
         </el-table-column>
         <el-table-column
           prop="saleRemark"
@@ -1191,11 +1185,7 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            <el-button
-              @click="showPhoto(scope.row)"
-              type="text"
-              size="small"
-            >
+            <el-button @click="showPhoto(scope.row)" type="text" size="small">
               {{ scope.row.detailsRemark }}
             </el-button>
           </template>
@@ -1204,18 +1194,18 @@
       <el-form style="margin-left:20%">
         <el-form-item label="收货客户">
           <el-autocomplete
-          class="inline-input"
-          v-model="consigneeName"
-          :fetch-suggestions="querySearchConsignee"
-          placeholder="请输入收货客户名称"
-          :trigger-on-focus="false"
-          @select="handleSelectConsignee"
-          style="width:300px"
-        >
-          <template slot-scope="{ item }">
-            <div class="name">{{ item.consigneeCompanyName }}</div>
-          </template>
-        </el-autocomplete>
+            class="inline-input"
+            v-model="consigneeName"
+            :fetch-suggestions="querySearchConsignee"
+            placeholder="请输入收货客户名称"
+            :trigger-on-focus="false"
+            @select="handleSelectConsignee"
+            style="width:300px"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.consigneeCompanyName }}</div>
+            </template>
+          </el-autocomplete>
         </el-form-item>
       </el-form>
       <el-button
@@ -1345,7 +1335,7 @@ export default {
           lable: '收款客户'
         }
       ],
-       options2: [
+      options2: [
         {
           value: '订单日期',
           lable: '订单日期'
@@ -1573,13 +1563,13 @@ export default {
       showStatementUpLoad: false,
       detailAmount: null,
       detailsList: [],
-      consigneeUpdList:[],
+      consigneeUpdList: [],
       showDetailsUpLoad: false,
       showDetailsAdd: false,
-      showConsigneeUpd:false,
-      updateConsigneeRow:null,
-      consigneeId:null,
-      consigneeName:'',
+      showConsigneeUpd: false,
+      updateConsigneeRow: null,
+      consigneeId: null,
+      consigneeName: '',
       detailRemark: null,
       showPhotoPreview: false,
       previewList: [],
@@ -2228,7 +2218,7 @@ export default {
         })
       }
     },
-    openConsigneeUpd(){
+    openConsigneeUpd() {
       if (
         !this.$refs.tableRef.selection ||
         this.$refs.tableRef.selection.length != 1
@@ -2236,15 +2226,15 @@ export default {
         this.$message.warning('请选择需要修改的订单,一次只允许选中一个')
         return
       } else {
-        this.consigneeUpdList = [];
+        this.consigneeUpdList = []
         let data = this.$refs.tableRef.selection
         if (!data[0].orderId || !data[0].detailsId) {
           this.$message.warning('没有派发运单或没有详单，无法修改此项')
           return
         }
-        this.consigneeUpdList = this.visibleList.filter((item)=>{
-          return item.orderId == data[0].orderId;
-        });
+        this.consigneeUpdList = this.visibleList.filter(item => {
+          return item.orderId == data[0].orderId
+        })
         this.showConsigneeUpd = true
         this.updateConsigneeRow = null
         this.consigneeId = null
@@ -2252,9 +2242,9 @@ export default {
         this.isLoading = false
       }
     },
-    consigneeUpdSelect(selection){
-      console.log(selection);
-      this.updateConsigneeRow=selection;
+    consigneeUpdSelect(selection) {
+      console.log(selection)
+      this.updateConsigneeRow = selection
     },
     handleSelectConsignee(item) {
       this.consigneeName = item.consigneeCompanyName
@@ -2285,7 +2275,7 @@ export default {
         )
       }
     },
-    updateConsignee(){
+    updateConsignee() {
       this.isLoading = true
       if (!this.consigneeId || !this.updateConsigneeRow) {
         this.$message.warning('请点击物资并填写、选中收货客户！')
@@ -2295,7 +2285,7 @@ export default {
           orderId: this.updateConsigneeRow.orderId,
           detailsId: this.updateConsigneeRow.detailsId,
           userId: getCookie('userId'),
-          consigneeId:this.consigneeId
+          consigneeId: this.consigneeId
         }
         this.axios.post('/api/v1/bms/updateConsignee', map).then(res => {
           if (res.data.status == 'succeed') {
@@ -3985,8 +3975,8 @@ export default {
       if (!obj) {
         obj = new Object()
       }
-      if(this.screen2=='制单日期'){
-        obj.saleMakeDate=1;
+      if (this.screen2 == '制单日期') {
+        obj.saleMakeDate = 1
       }
       if (this.activeName == 'first') {
         const loading = this.$loading({

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -267,13 +267,13 @@
         <el-table-column
           prop="consigneeName"
           label="客户"
-          width="200px"
+          width="220px"
           align="center"
           column-key="consigneeName"
           key="consigneeName"
           :filters="filterConsigneeList"
-          sortable
           show-overflow-tooltip
+          sortable
           v-if="!columnNoRoutList.includes('客户')"
         >
         </el-table-column>
@@ -409,6 +409,7 @@
           label="备注"
           width="150"
           align="center"
+          :filters="filterTruckRemark"
           show-overflow-tooltip
           v-if="!columnNoRoutList.includes('备注')"
         >
@@ -1995,6 +1996,7 @@ export default {
       filteraddressPlace: [],
       filtermaterialSpe: [],
       filterSaleRemark: [],
+      filterTruckRemark: [],
       filterSaleOrderStatus: [
         { text: '关闭', value: '关闭' },
         { text: '提交', value: '提交' },
@@ -2985,6 +2987,11 @@ export default {
         this.closeUpload2()
       })
     },
+    closeUpload2() {
+      this.remarkPic = false
+      this.isLoading = false
+      this.$refs.remarkPic.clearFiles()
+    },
     openReceive() {
       if (Object.values(this.steelMap).length == 0) {
         this.$message.warning('请选择需要补录的实绩')
@@ -3313,6 +3320,20 @@ export default {
         this.headColumnList.splice(this.headColumnList.indexOf('saleRemark'), 1)
         delete this.filterMap.saleRemarkList
       }
+      if (typeof obj.truckRemark != 'undefined' && obj.truckRemark.length > 0) {
+        this.headColumnList.push('truckRemark')
+        this.filterMap.truckRemarkList = obj.truckRemark
+      }
+      if (
+        typeof obj.truckRemark != 'undefined' &&
+        obj.truckRemark.length == 0
+      ) {
+        this.headColumnList.splice(
+          this.headColumnList.indexOf('truckRemark'),
+          1
+        )
+        delete this.filterMap.truckRemarkList
+      }
       // if (obj)
       this.onclick(this.filterMap)
     },
@@ -4609,15 +4630,10 @@ export default {
           if (res.data.data.length > 0) {
             this.totalNumber = res.data.data[0].totalNumber
             this.totalCapacity = res.data.data[0].totalCapacity
-            // this.filterConsigneeList = res.data.data[0].filterConsigneeList
-            // this.filterCarrierList = res.data.data[0].filterCarrierList
-            // this.filterCapacityList = res.data.data[0].filterCapacityList
-            // this.filtermaterialNameList =
-            //   res.data.data[0].filtermaterialNameList
-            // // this.filterorderStatus = res.data.data[0].filterorderStatus
-            // this.filteraddressPlace = res.data.data[0].filteraddressPlace
-            // this.filtermaterialSpe = res.data.data[0].filtermaterialSpe
-            // this.filterSaleRemark = res.data.data[0].filterSaleRemark
+            console.log(obj, 'obj')
+            if (this.filterMap) {
+              this.filterRefreshCtrl(res.data.data, this.filterMap)
+            }
           }
           this.maxHeight =
             window.innerHeight -
@@ -4657,6 +4673,36 @@ export default {
           this.$message.error('查询失败')
         })
     },
+    filterRefreshCtrl(data, obj) {
+      debugger
+      if (!obj.truckRemarkList) {
+        this.filterTruckRemark = data[0].filterTruckRemark
+      }
+      if (!obj.saleRemarkList) {
+        this.filterSaleRemark = data[0].filterSaleRemark
+      }
+      if (!obj.consigneeNameList) {
+        this.filterConsigneeList = data[0].filterConsigneeList
+      }
+      if (!obj.addressPlaceList) {
+        this.filteraddressPlace = data[0].filteraddressPlace
+      }
+      if (!obj.materialSpeList) {
+        this.filtermaterialSpe = data[0].filtermaterialSpe
+      }
+      if (!obj.capacityList) {
+        this.filterCapacityList = data[0].filterCapacityList
+      }
+      if (!obj.materialNameList) {
+        this.filtermaterialNameList = data[0].filtermaterialNameList
+      }
+      if (!obj.carrierList) {
+        this.filterCarrierList = data[0].filterCarrierList
+      }
+      if (!obj.orderStatusList) {
+        this.filterorderStatus = data[0].filterorderStatus
+      }
+    },
     //重新获取表格数据
     refresh() {
       this.filterMap = {}
@@ -4760,6 +4806,7 @@ export default {
             this.filteraddressPlace = res.data.data[0].filteraddressPlace
             this.filtermaterialSpe = res.data.data[0].filtermaterialSpe
             this.filterSaleRemark = res.data.data[0].filterSaleRemark
+            this.filterTruckRemark = res.data.data[0].filterTruckRemark
           }
           this.maxHeight =
             window.innerHeight -