Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

build/utils.js

@@ -17,8 +17,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
 let devModules = ['all']
-//let devModules=['index']
-//let devModules = ['index', 'appoint', 'RMS','sale','statisticalReport','TMS','AMS']
+// let devModules = ['index', 'appoint', 'statisticalReport','']
 // let devModules = ['index', 'ADMINISTRATORS']
 
 if (pathSrc.indexOf('node_modules') > -1) {

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

@@ -2,42 +2,35 @@
 <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"
-            placeholder="选择日期"
-            style="width:150px"
-          >
-          </el-date-picker>
-          <span>至</span>
-          <el-date-picker
-            v-model="endTime"
-            type="date"
-            placeholder="选择日期"
-            style="width:150px"
-          >
+        v-model="startTime"
+        type="date"
+        placeholder="选择日期"
+        style="width:150px"
+      >
       </el-date-picker>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="date"
+        placeholder="选择日期"
+        style="width:150px"
+      >
+      </el-date-picker>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
     </div>
     <div class="table">
       <dilTable v-bind.sync="options">
         <el-table-column fixed="right" label="操作" width="180">
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click="showPhoto(scope.row)"
-            >
+            <el-button type="text" size="small" @click="showPhoto(scope.row)">
               查看发票
             </el-button>
-            <el-button
-              type="text"
-              size="small"
-              @click="showDetails(scope.row)"
-            >
+            <el-button type="text" size="small" @click="showDetails(scope.row)">
               查看详单
             </el-button>
             <el-button
@@ -52,16 +45,18 @@
       </dilTable>
     </div>
     <!-- 发票图片 -->
-    <el-dialog
-      title="发票图片"
-      :visible.sync="isShowPhoto"
-    >
-      <div  v-for="(item, i) in photoList" :key="i">
-          <el-image :src="item" fit="fill" :preview-src-list="photoList" style="width:300px;height:300px">
-            <div slot="error" class="image-slot">
-              <span>图片加载失败</span>
-            </div>
-          </el-image>
+    <el-dialog title="发票图片" :visible.sync="isShowPhoto">
+      <div v-for="(item, i) in photoList" :key="i">
+        <el-image
+          :src="item"
+          fit="fill"
+          :preview-src-list="photoList"
+          style="width:300px;height:300px"
+        >
+          <div slot="error" class="image-slot">
+            <span>图片加载失败</span>
+          </div>
+        </el-image>
       </div>
     </el-dialog>
     <!-- 查询账单底下的计费详单-->
@@ -69,180 +64,171 @@
       title="详单信息"
       :visible.sync="isShowDetails"
       style="height:600px;width:100%"
-      >
+    >
       <div>
-        <el-button icon="el-download" type="primary" @click="exportExcel('详单信息')">导出Excel</el-button>
+        <el-button
+          icon="el-download"
+          type="primary"
+          @click="exportExcel('详单信息')"
+          >导出Excel</el-button
+        >
+      </div>
+      <div class="table1">
+        <el-table
+          :data="visibleList1"
+          :span-method="objectSpanMethod1"
+          ref="tableRef1"
+          border
+          style="width: 100%; margin-top: 20px"
+          :height="350"
+          id="details"
+          individual-panel
+        >
+          <el-table-column
+            width="50"
+            label="序号"
+            align="center"
+            :resizable="false"
+          >
+            <template slot-scope="scope">{{ scope.row.group + 1 }}</template>
+          </el-table-column>
+          <el-table-column
+            prop="orderTime"
+            label="订单日期"
+            width="110px"
+            align="center"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column
+            prop="saleMakeDate"
+            label="制单时间"
+            width="110px"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="capacityNo"
+            column-key="capacityNo"
+            label="车牌号"
+            align="center"
+            width="90px"
+            sortable
+            show-overflow-tooltip
+          >
+          </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"
+            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="物资名称"
+            align="center"
+            width="150px"
+            sortable
+          >
+          </el-table-column>
+          <el-table-column
+            prop="materialSpe"
+            label="物资规格"
+            column-key="materialSpe"
+            align="center"
+            sortable
+            width="120px"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="materialPlanNumber"
+            label="计划件数"
+            align="center"
+            width="50px"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="materialNum"
+            label="装车件数"
+            align="center"
+            width="50px"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="saleRemark"
+            column-key="saleRemark"
+            label="摘要"
+            width="150px"
+            align="center"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column
+            prop="actualCity"
+            label="卸货城市"
+            width="120px"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column
+            prop="areaName"
+            label="分区"
+            width="150px"
+            align="center"
+            column-key="saleAreaList"
+          >
+          </el-table-column>
+          <el-table-column prop="unloadType" label="卸货类别" width="60px">
+          </el-table-column>
+          <el-table-column
+            prop="paymentCustomer"
+            label="付款单位"
+            width="120px"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column
+            prop="consingneeSettlementMethod"
+            label="结算方式"
+            width="120px"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column
+            prop="saleOrderReceiveCustomer"
+            label="收款单位"
+            width="120px"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+        </el-table>
       </div>
-       <div class="table1">
-            <el-table
-              :data="visibleList1"
-              :span-method="objectSpanMethod1"
-              ref="tableRef1"
-              border
-              style="width: 100%; margin-top: 20px"
-              :height="350"
-              id="details"
-              individual-panel
-            >
-            <el-table-column
-                width="50"
-                label="序号"
-                align="center"
-                :resizable="false"
-              >
-                <template slot-scope="scope">{{
-                  scope.row.group + 1
-                }}</template>
-              </el-table-column>
-              <el-table-column
-                prop="orderTime"
-                label="订单日期"
-                width="110px"
-                align="center"
-                show-overflow-tooltip
-              >
-              </el-table-column>
-              <el-table-column
-                prop="saleMakeDate"
-                label="制单时间"
-                width="110px"
-                align="center"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="capacityNo"
-                column-key="capacityNo"
-                label="车牌号"
-                align="center"
-                width="90px"
-                sortable
-                show-overflow-tooltip
-              >
-              </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"
-                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="物资名称"
-                align="center"
-                width="150px"
-                sortable
-              >
-              </el-table-column>
-              <el-table-column
-                prop="materialSpe"
-                label="物资规格"
-                column-key="materialSpe"
-                align="center"
-                sortable
-                width="120px"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="materialPlanNumber"
-                label="计划件数"
-                align="center"
-                width="50px"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="materialNum"
-                label="装车件数"
-                align="center"
-                width="50px"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="saleRemark"
-                column-key="saleRemark"
-                label="摘要"
-                width="150px"
-                align="center"
-                show-overflow-tooltip
-              >
-              </el-table-column>
-              <el-table-column
-                prop="actualCity"
-                label="卸货城市"
-                width="120px"
-                show-overflow-tooltip
-              >
-              </el-table-column>
-              <el-table-column
-                prop="areaName"
-                label="分区"
-                width="150px"
-                align="center"
-                column-key="saleAreaList"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="unloadType"
-                label="卸货类别"
-                width="60px"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="paymentCustomer"
-                label="付款单位"
-                width="120px"
-                show-overflow-tooltip
-              >
-              </el-table-column>
-              <el-table-column
-                prop="consingneeSettlementMethod"
-                label="结算方式"
-                width="120px"
-                show-overflow-tooltip
-              >
-              </el-table-column>
-              <el-table-column
-                prop="saleOrderReceiveCustomer"
-                label="收款单位"
-                width="120px"
-                show-overflow-tooltip
-              >
-              </el-table-column>
-            </el-table>
-          </div>
     </el-dialog>
   </div>
 </template>
@@ -250,21 +236,21 @@
 <script>
 import { getCookie } from '@/utils/util.js'
 import { sjTime } from '@/utils/sharedJsFile'
-import FileSaver from "file-saver";
+import FileSaver from 'file-saver'
 export default {
-  data(){
-    return{
-      input:"",
-      userId:null,
-      photoList:[],
-      isShowPhoto:false,
-      isShowDetails:false,
-      startTime:null,
-      endTime:null,
-      spanArr1:[],
-      visibleList1:[],
-      options:{
-        requestUrl:""
+  data() {
+    return {
+      input: '',
+      userId: null,
+      photoList: [],
+      isShowPhoto: false,
+      isShowDetails: false,
+      startTime: null,
+      endTime: null,
+      spanArr1: [],
+      visibleList1: [],
+      options: {
+        requestUrl: ''
       },
       orgCodeList: [
         'wuliuyunshubu',
@@ -304,37 +290,47 @@ export default {
         '签收时间',
         '最终运价',
         '摘要'
-      ],
+      ]
     }
   },
-  created(){
+  created() {
     if (!this.orgCodeList.includes(getCookie('orgCode'))) {
-      this.userId=getCookie("userId");
+      this.userId = getCookie('userId')
     }
-    this.startTime=new Date();
-    this.endTime=new Date();
-    this.startTime.setDate(1);
-    this.onclick();
+    this.startTime = new Date()
+    this.endTime = new Date()
+    this.startTime.setDate(1)
+    this.onclick()
   },
-  methods:{
-    onclick(){
+  methods: {
+    onclick() {
       if (this.startTime && this.endTime) {
         let startTime = sjTime(this.startTime)
         let endTime = sjTime(this.endTime)
-        this.options.requestUrl = "/api/v1/bms/getTruckStatementList?apiId=179&con="+this.input
-        +"&userId="+this.userId
-        +"&i="+new Date()
-        +"&startTime="+startTime
-        +"&endTime="+endTime
-      }else{
-         this.options.requestUrl = "/api/v1/bms/getTruckStatementList?apiId=179&con="+this.input
-        +"&userId="+this.userId
-        +"&i="+new Date()
+        this.options.requestUrl =
+          '/api/v1/bms/getTruckStatementList?apiId=179&con=' +
+          this.input +
+          '&userId=' +
+          this.userId +
+          '&i=' +
+          new Date() +
+          '&startTime=' +
+          startTime +
+          '&endTime=' +
+          endTime
+      } else {
+        this.options.requestUrl =
+          '/api/v1/bms/getTruckStatementList?apiId=179&con=' +
+          this.input +
+          '&userId=' +
+          this.userId +
+          '&i=' +
+          new Date()
       }
     },
-    showPhoto(row){
-      this.photoList=[];
-      this.isShowPhoto=true;
+    showPhoto(row) {
+      this.photoList = []
+      this.isShowPhoto = true
       this.axios
         .post('/api/v1/bms/getStatementPhoto?statementId=' + row.statementId)
         .then(res => {
@@ -342,57 +338,56 @@ export default {
           if (res.data) {
             this.photoList = res.data
           }
-      })
+        })
     },
-    showDetails(row){
-      this.isShowDetails=true;
-      this.visibleList1=[];
-      let map={
-        statementId:row.statementId
+    showDetails(row) {
+      this.isShowDetails = true
+      this.visibleList1 = []
+      let map = {
+        statementId: row.statementId
       }
-      this.axios
-        .post('/api/v1/bms/findDetailsForStatement',map)
-        .then(res => {
-          console.log('findDetailsForStatement:', res)
-          this.visibleList1=res.data.data;
-          this.getSpanArr1(this.visibleList1);
+      this.axios.post('/api/v1/bms/findDetailsForStatement', map).then(res => {
+        console.log('findDetailsForStatement:', res)
+        this.visibleList1 = res.data.data
+        this.getSpanArr1(this.visibleList1)
       })
     },
-    exportExcel(tableTitle){
-      let tables = document.getElementById("details");//此处是拿表格document元素,也可以取父div的ref
-        let table_book = XLSX.utils.table_to_book(tables);
-        console.log("table_book",table_book);
-        var table_write = XLSX.write(table_book, {
-            bookType: "xlsx",
-            bookSST: true,
-            type: "array"
-        });
-        try {
-            FileSaver.saveAs(
-                new Blob([table_write], { type: "application/octet-stream" }),
-                tableTitle+".xlsx"
-            );
-        } catch (e) {
-            if (typeof console !== "undefined") console.log(e, table_write);
-        }
-        return table_write;
+    exportExcel(tableTitle) {
+      let tables = document.getElementById('details') //此处是拿表格document元素,也可以取父div的ref
+      let table_book = XLSX.utils.table_to_book(tables)
+      console.log('table_book', table_book)
+      var table_write = XLSX.write(table_book, {
+        bookType: 'xlsx',
+        bookSST: true,
+        type: 'array'
+      })
+      try {
+        FileSaver.saveAs(
+          new Blob([table_write], { type: 'application/octet-stream' }),
+          tableTitle + '.xlsx'
+        )
+      } catch (e) {
+        if (typeof console !== 'undefined') console.log(e, table_write)
+      }
+      return table_write
     },
-    deleteStatement(row){
-      this.$confirm('此操作将永久删除该账单, 是否继续?', '提示',{
+    deleteStatement(row) {
+      this.$confirm('此操作将永久删除该账单, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(()=>{
-         this.axios
-        .post('/api/v1/bms/deleteConvertedTruckStatement/' + row.statementId)
-        .then(res => {
-          this.$message.success(res.data.data);
-          this.onclick();
+      })
+        .then(() => {
+          this.axios
+            .post(
+              '/api/v1/bms/deleteConvertedTruckStatement/' + row.statementId
+            )
+            .then(res => {
+              this.$message.success(res.data.data)
+              this.onclick()
+            })
         })
-      }).catch(()=>{
-
-      });
-      
+        .catch(() => {})
     },
     getSpanArr1(data) {
       //每次调用方法初始化
@@ -425,19 +420,19 @@ export default {
           colspan: _col
         }
       }
-    },
+    }
   }
 }
 </script>
 
 <style lang="scss" scode>
-.steel_inbound{
-  .sache{
+.steel_inbound {
+  .sache {
     padding: 1.25rem 0.375rem;
-			.el-input {
-			width: 20%;
-			margin-right: 1.25rem;
-			}
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
-</style>
+</style>

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

@@ -702,11 +702,12 @@
                 "
                 >提交</el-button
               >
-              <span v-show="orgCode!='chengyunshang'">是否校验GPS:</span>
+              <span v-show="orgCode != 'chengyunshang'">是否校验GPS:</span>
               <el-switch
                 v-model="isCheckGPS"
-                v-show="orgCode!='chengyunshang'"
-                :disabled="orgCode=='chengyunshang'">
+                v-show="orgCode != 'chengyunshang'"
+                :disabled="orgCode == 'chengyunshang'"
+              >
               </el-switch>
             </div>
             <div class="steelMapClass33">
@@ -1432,11 +1433,11 @@ export default {
   },
   data() {
     return {
-      isCheckGPS:true,
-      userId:null,
-      orgCode:null,
-      taskAllNum:0,
-      noticeInterval:null,
+      isCheckGPS: true,
+      userId: null,
+      orgCode: null,
+      taskAllNum: 0,
+      noticeInterval: null,
       exceptionHandleVisible: false,
       batchCarrierName: null,
       batchCarrierVisible: false,
@@ -3056,7 +3057,7 @@ export default {
         return
       }
       //是否校验GPS
-      this.steelMap.isCheckGPS=this.isCheckGPS;
+      this.steelMap.isCheckGPS = this.isCheckGPS
       if (this.steelMap.capacityIds != 0) {
         const loading = this.$loading({
           lock: true,
@@ -3713,7 +3714,6 @@ export default {
           console.log(this.maxHeight, 'this.maxHeight')
           this.maxHeight = window.innerHeight - 130
           console.log(this.maxHeight, 'this.maxHeight')
-          this.steelMap = {}
           loading.close()
           console.log(this.visibleList)
         })
@@ -3803,7 +3803,6 @@ export default {
         )
         .then(res => {
           this.tableData = res.data.data
-          this.steelMap = {}
           this.totalHeight += this.itemHeight
           this.visibleList = []
           this.maxHeight = window.innerHeight - 130