修改

build/utils.js

@@ -19,7 +19,6 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 let devModules = ['all']
 // let devModules = ['index', 'statisticalReport']
 // let devModules = ['index', 'ADMINISTRATORS']
-//let devModules=['index']
 
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules

src/components/main.vue

@@ -330,7 +330,6 @@
             class="sl-header-li-websocket"
             @mouseenter="updatecss"
             @mouseleave="leave"
-            style="margin-top:0px"
           >
             <el-badge
               :value="taskAllNum"
@@ -339,8 +338,8 @@
               style="margin-right: 20px"
               :hidden="badgeshow"
             >
-              <el-button type="text" size="small" @click="goMyTaskPage" style="padding:3px;"
-                > <i class="el-icon-message-solid" style="font-size:20px;"></i></el-button
+              <el-button type="text" size="small" @click="goMyTaskPage"
+                > <i class="el-icon-message-solid" style="width:30px;height: 30px;"></i></el-button
               >
             </el-badge>
             <div

src/views/appoint/components/saleContract/addSaleOrder.vue

@@ -1055,50 +1055,6 @@ export default {
               })
           }
         })
-    } else if (getCookie('orgCode') == 'chengyunshang') {
-      this.consigneeDisable = true
-      this.axios
-        .post(
-          '/api/v1/uc/getConsigneeInfo?consigneeName=' + getCookie('loginName')
-        )
-        .then(res => {
-          this.consigneeName = res.data.consigneeCompanyName
-          this.consigneeId = res.data.consigneeId
-          //带出摘要
-          this.axios
-            .post('/api/v1/uc/getSaleArea?receiveId=' + this.consigneeId)
-            .then(res => {
-              if (res.data.data != null) {
-                this.remarks = `${this.getRemarkDate()}${res.data.data}`
-                this.remarksPro = `${this.getRemarkDate()}${res.data.data}`
-              }
-            })
-          this.axios
-            .post(
-              '/api/v1/ams/matchingAddressRecently?receiveId=' +
-                this.consigneeId
-            )
-            .then(res => {
-              this.restaurants = res.data.data
-              const place = res.data.data
-              this.saleShipperAddressName =
-                place[0].addressProvince +
-                place[0].addressDistrict +
-                place[0].addressTown +
-                place[0].place
-              this.saleShipperAddressId = place[0].shipperAddressId
-              this.addressId = place[0].shipperAddressId
-              this.place1 = place[0].place
-              this.saleMan = place[0].salerId
-              this.saleOrderConsigneeTel = place[0].saleOrderConsigneeTel
-              this.province = place[0].addressProvince
-              this.city = place[0].addressDistrict
-              if (this.city) {
-                this.remarks = `${this.remarksPro},直发${this.city}`
-              }
-              this.county = place[0].addressTown
-            })
-        })
     }
   },
   methods: {

src/views/appoint/components/saleContract/addTransportPrice.vue

@@ -510,12 +510,12 @@ export default {
       }
     },
     makeSure() {
-      // if (this.haulDistance=="" || this.haulDistance==null){
-      //   this.$message({
-      //     type: "warning",
-      //     message: "请输入运输距离!",});
-      //   return;
-      // }
+      if (this.haulDistance=="" || this.haulDistance==null){
+        this.$message({
+          type: "warning",
+          message: "请输入运输距离!",});
+        return;
+      }
       for (let i = 0; i < this.selectionList.length; i++) {
         this.carrierIdArray.push(this.selectionList[i].carrierId)
       }

src/views/appoint/components/saleContract/addTransportPriceNew.vue

@@ -456,12 +456,12 @@ export default {
       }
     },
     makeSure() {
-      // if (this.haulDistance=="" || this.haulDistance==null){
-      //   this.$message({
-      //     type: "warning",
-      //     message: "请输入运输距离!",});
-      //   return;
-      // }
+      if (this.haulDistance=="" || this.haulDistance==null){
+        this.$message({
+          type: "warning",
+          message: "请输入运输距离!",});
+        return;
+      }
       for (let i = 0; i < this.selectionList.length; i++) {
         this.carrierIdArray.push(this.selectionList[i].carrierId)
       }
@@ -512,7 +512,6 @@ export default {
         return
       }
       console.log("进入了修改单价的方法")
-      this.form1.haulDistance=this.haulDistance
       console.log(this.form1)
       this.axios.post("/api/v1/ams/updatePriceValue",this.form1).
       then(res=>{

src/views/appoint/components/saleContract/editSaleOrder.vue

@@ -34,7 +34,6 @@
           :trigger-on-focus="false"
           @select="handleSelectConsignee"
           style="width:300px"
-          :disabled="consigneeDisable"
         >
           <template slot-scope="{ item }">
             <div class="name">{{ item.consigneeCompanyName }}</div>
@@ -690,7 +689,6 @@ export default {
   components: { PageTitle },
   data() {
     return {
-      consigneeDisable: false,
       isCellClick: null,
       truckRemark: '',
       shipperName: '四川省达州钢铁集团有限责任公司',
@@ -959,14 +957,6 @@ export default {
     //获取所有的销售订单信息
     this.getAllSaleMessages()
   },
-  mounted() {
-    if (
-      getCookie('orgCode') == 'shouhuokehu' ||
-      getCookie('orgCode') == 'chengyunshang'
-    ) {
-      this.consigneeDisable = true
-    }
-  },
   methods: {
     getRmsReceivingCompany() {
       this.axios.post('/api/v1/rmsReceivingCompany/map').then(res => {

src/views/appoint/components/saleContract/saleOrderSteel.vue

@@ -46,7 +46,7 @@
           <el-button
             type="primary"
             @click="batchReport"
-            v-if="activeName == 'first' && isShow"
+            v-if="activeName == 'first'"
           >
             <i class="upload2"></i>批量上传
           </el-button>
@@ -137,7 +137,6 @@
                   @click="uploadclick(scope.row.saleOrderId)"
                   type="text"
                   size="small"
-                  v-if="isShow"
                   >上传</el-button
                 >
                 <el-button
@@ -163,7 +162,7 @@
           </mergeRowTable>
         </el-tab-pane>
         <!-- 已审批 -->
-        <el-tab-pane label="已审批" name="four" v-if="isShow">
+        <el-tab-pane label="已审批" name="four">
           <mergeRowTable
             v-bind.sync="option4"
             ref="table"
@@ -205,7 +204,7 @@
             </el-table-column>
           </mergeRowTable>
         </el-tab-pane>
-        <el-tab-pane label="反审批" name="five" v-if="isShow">
+        <el-tab-pane label="反审批" name="five">
           <mergeRowTable v-bind.sync="option5" ref="table2" :pageSize="200">
             <el-table-column
               fixed="right"
@@ -225,7 +224,7 @@
           >
         </el-tab-pane>
         <!-- 已上报 -->
-        <el-tab-pane label="已上报" name="second" v-if="isShow">
+        <el-tab-pane label="已上报" name="second">
           <mergeRowTable
             v-bind.sync="option2"
             ref="table2"
@@ -272,7 +271,6 @@ export default {
   },
   data() {
     return {
-      isShow: false,
       dialogTableVisible: false,
       startTime: null,
       endTime: null,
@@ -399,8 +397,20 @@ export default {
         getCookie('userId') +
         '&i=' +
         new Date()
+      this.option2.requestUrl =
+        '/api/v1/ams/getSaleOrderReportedes?apiId=408&consigneeSsoId=' +
+        getCookie('userId') +
+        '&i=' +
+        new Date()
+      this.option4.requestUrl =
+        '/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1&saleType=1&consigneeSsoId=' +
+        getCookie('userId')
+      this.option5.requestUrl =
+        '/api/v1/ams/getSteelOrderDeletedList?apiId=409&consigneeSsoId=' +
+        getCookie('userId') +
+        '&i=' +
+        new Date()
     } else if (getCookie('orgCode') == 'xiaoshouyewuyuan') {
-      this.isShow = true
       this.option.requestUrl =
         '/api/v1/ams/getSaleOrderInfoes?apiId=408&saler=' +
         getCookie('loginName') +
@@ -419,17 +429,7 @@ export default {
       this.option5.requestUrl =
         '/api/v1/ams/getSteelOrderDeletedList?apiId=409&saler=' +
         getCookie('loginName')
-    } else if (getCookie('orgCode') == 'chengyunshang') {
-      this.option.requestQuery = {
-        consigneeName: getCookie('loginName')
-      }
-      this.option.requestUrl =
-        '/api/v1/ams/getSaleOrderInfoes?apiId=408&consigneeSsoId=' +
-        null +
-        '&i=' +
-        new Date()
     } else {
-      this.isShow = true
       this.option.requestUrl =
         '/api/v1/ams/getSaleOrderInfoes?apiId=408&consigneeSsoId=' +
         null +

src/views/appoint/components/saleContract/transportPrice.vue

@@ -9,7 +9,7 @@
       <el-button type="primary" @click="btnclick(0)">
         <i class="el-icon-plus"></i>新增
       </el-button>
-       <el-button type="primary" @click="exportAllExcel()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+       <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
     </div>
 
 <el-tabs v-model="activeName">
@@ -163,105 +163,6 @@ export default {
     };
   },
   methods: {
-    exportAllExcel() {
-      if (this.activeName == 'first') {
-        this.tableTitle = '正在启用的运输单价'
-        this.loading = true;
-      this.isKuang = true;
-      if(this.input){
-        this.axios
-                .post(
-                  "/api/v1/ams/getAmsContractTransportPrice1?apiId=109&deleted=0&con=" +this.input+"&i="+new Date()
-                )
-                .then(res => {
-                  console.log(res.data.data)
-                  this.exportAllList = res.data.data.list
-                  this.noSettleDetailsColumn=res.data.data.columnData
-                  this.exportAllReportToExcel(
-                    this.tableTitle,
-                    this.exportAllList,
-                    this.noSettleDetailsColumn
-                  )
-                })
-      }else{
-        this.axios
-                .post(
-                  "/api/v1/ams/getAmsContractTransportPrice1?apiId=109&deleted=0&i="+new Date()
-                )
-                .then(res => {
-                  console.log(res.data.data)
-                  this.exportAllList = res.data.data.list
-                  this.noSettleDetailsColumn=res.data.data.columnData
-                  this.exportAllReportToExcel(
-                    this.tableTitle,
-                    this.exportAllList,
-                    this.noSettleDetailsColumn
-                  )
-                })
-      }
-       }else if (this.activeName == 'second') {
-        this.tableTitle = '历史启用的运输单价'
-        this.loading = true;
-        this.isKuang = true;
-      if(this.input){
-        this.axios
-                .post(
-                  "/api/v1/ams/getAmsContractTransportPrice1?apiId=109&deleted=1&con=" +this.input+"&i="+new Date()
-                )
-                .then(res => {
-                  console.log(res.data.data)
-                  this.exportAllList = res.data.data.list
-                  this.noSettleDetailsColumn=res.data.data.columnData
-                  this.exportAllReportToExcel(
-                    this.tableTitle,
-                    this.exportAllList,
-                    this.noSettleDetailsColumn
-                  )
-                })
-      }else{
-        this.axios
-                .post(
-                  "/api/v1/ams/getAmsContractTransportPrice1?apiId=109&deleted=1&con=" +this.input+"&i="+new Date()
-                )
-                .then(res => {
-                  console.log(res.data.data)
-                  this.exportAllList = res.data.data.list
-                  this.noSettleDetailsColumn=res.data.data.columnData
-                  this.exportAllReportToExcel(
-                    this.tableTitle,
-                    this.exportAllList,
-                    this.noSettleDetailsColumn
-                  )
-                })
-      }
-        } else {
-        }
-        this.loading=false
-      },
-    //导出excel
-    exportAllReportToExcel(tableTitle, dataArr, columnData) {
-      var title = tableTitle
-      let tHeader = []
-      let filterVal = []
-      columnData.forEach(e1 => {
-        if (tHeader.indexOf(e1.label) === -1) {
-          tHeader.push(e1.label)
-        }
-        if (filterVal.indexOf(e1.prop) === -1) {
-          filterVal.push(e1.prop)
-        }
-      })
-      //导出为excel
-      this.downloadLoading = true
-      require.ensure([], () => {
-        const {
-          export_json_to_excel
-        } = require('@/assets/excel/Export2Excel.js') //这里必须使用绝对路径，使用@/+存放export2Excel的路径
-        // let list = this.$refs.excelDom.dataTabel;
-        let data = dataArr.map(v => filterVal.map(j => v[j])) //3.formatJson格式转换
-        export_json_to_excel(tHeader, data, title) // (title)导出的表格名称
-      })
-    },
     func(){
       this.loading = false;
       this.isKuang = false;
@@ -298,12 +199,7 @@ export default {
     //修改运价
     //删除运价
     deletePrice(row){
-      this.$confirm('您确定要删除吗？','提示',{
-        confirmButtonText:'确定',
-        cancelButtonText:'取消',
-        type:'warning'
-      }).then(()=>{
-        let mapValue={
+      let mapValue={
         addressProvince:row.addressProvince,
         addressDistrict:row.addressDistrict,
         addressTown:row.addressTown,
@@ -318,8 +214,6 @@ export default {
         }
       })
       this.onclick()
-      }).catch({
-      })
     },
     //修改
     async updatePrice(row){

src/views/index/components/printScan1.vue

@@ -188,17 +188,17 @@ export default {
           this.orderNumber.startsWith('WYSDD') == true ||
           this.orderNumber.startsWith('wysdd') == true
         ) {
-          // let promise = await this.querynumber(this.orderNumber)
-          // console.log(promise)
-          // if (promise == 1) {
-          //   this.backgroundImgURL=this.backgroundImgURLList[1]
-          //   this.orderNumber = null
-          //   setTimeout(()=>{
-          //     this.backgroundImgURL=this.backgroundImgURLList[0]
-          //     console.log("进入该方法了")
-          //   },4000)
-          //   return
-          // }
+          let promise = await this.querynumber(this.orderNumber)
+          console.log(promise)
+          if (promise == 1) {
+            this.backgroundImgURL=this.backgroundImgURLList[1]
+            this.orderNumber = null
+            setTimeout(()=>{
+              this.backgroundImgURL=this.backgroundImgURLList[0]
+              console.log("进入该方法了")
+            },4000)
+            return
+          }
           this.$router.push({
             path: '/printReceipt1?orderNumber=' + this.orderNumber
           })

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

@@ -723,6 +723,7 @@ export default {
   },
   data() {
     return {
+      saleOrderMaterialIds:[],
       batchAddressProvince: '',
       batchAddressDistrict: '',
       batchAddressTown: '',
@@ -1120,6 +1121,13 @@ export default {
         this.amsPriceList.push(mapvalue)
         return e.orderId
       })
+      //车序号和订单ID
+      this.saleOrderMaterialIds = this.$refs.tableRef.selection.map(e => {
+        return {
+            saleOrderMaterialId:e.saleOrderMaterialId,
+            orderId:e.orderId
+          }
+      })
       console.log(this.makeSurePriceOrderList)
       console.log(this.amsPriceList)
       console.log(this.someOnePriceValueList)
@@ -1330,9 +1338,9 @@ export default {
       //若没有单价Id
       console.log('获取数据')
       console.log(this.userId)
-      console.log(this.makeSurePriceOrderList)
-      if (this.makeSurePriceOrderList.length == 0) {
-        this.amsPriceList = []
+      console.log(this.saleOrderMaterialIds)
+      if (this.saleOrderMaterialIds.length == 0) {
+        this.amsPriceList=[]
         this.$message({
           type: 'success',
           message: '请先选择需要修改的单价',
@@ -1341,17 +1349,13 @@ export default {
         })
         return
       }
-      let mapList = []
-      this.makeSurePriceOrderList.forEach(e => {
-        let map = {}
-        map.orderId = e
-        map.priceId = this.makeSurePriceId
-        map.placeId = this.makeSurePlaceId
-        mapList.push(map)
+      this.saleOrderMaterialIds.forEach(e => {
+        e.priceId = this.makeSurePriceId
+        e.placeId = this.makeSurePlaceId
       })
       let mapValue = {}
-      mapValue.mapList = mapList
-      mapValue.userId = this.userId
+      mapValue.mapList = this.saleOrderMaterialIds
+      mapValue.userId=this.userId
       // //是否确定修改详单地址!
       // this.$confirm('确定修改', '提示', {
       //   confirmButtonText: '仅修改单价',
@@ -1383,8 +1387,8 @@ export default {
     makeSureAll() {
       console.log('获取数据')
       console.log(this.userId)
-      if (this.makeSurePriceOrderList.length == 0) {
-        this.amsPriceList = []
+      if (this.saleOrderMaterialIds.length == 0) {
+        this.amsPriceList=[]
         this.$message({
           type: 'success',
           message: '请先选择需要修改的单价',
@@ -1394,15 +1398,13 @@ export default {
         return
       }
       let mapList = []
-      this.makeSurePriceOrderList.forEach(e => {
-        let map = {}
-        map.orderId = e
-        map.priceId = this.makeSurePriceId
-        map.placeId = this.makeSurePlaceId
-        mapList.push(map)
+      this.saleOrderMaterialIds.forEach(e => {
+        e.priceId = this.makeSurePriceId
+        e.placeId = this.makeSurePlaceId
+        e.updatePlace = 1
       })
       let mapValue = {}
-      mapValue.mapList = mapList
+      mapValue.mapList = this.saleOrderMaterialIds
       mapValue.updatePlace = 1
       mapValue.userId = this.userId
       console.log('要的数据')

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

@@ -2,35 +2,42 @@
 <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>
+          <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>
+      <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
@@ -45,18 +52,16 @@
       </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>
     <!-- 查询账单底下的计费详单-->
@@ -64,171 +69,180 @@
       title="详单信息"
       :visible.sync="isShowDetails"
       style="height:600px;width:100%"
-    >
+      >
       <div>
-        <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>
+        <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>
     </el-dialog>
   </div>
 </template>
@@ -236,21 +250,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',
@@ -290,47 +304,37 @@ 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 => {
@@ -338,56 +342,57 @@ 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) {
       //每次调用方法初始化
@@ -420,19 +425,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

@@ -1647,9 +1647,7 @@ export default {
         '排队开始时间',
         '钢材科放行时间',
         '备注',
-        '订单变更时间',
-        '运输订单变更记录',
-        '销售订单变更记录'
+        '订单变更时间'
       ],
       //钢材多拼车辆线路ID
       //索引从1-10为1-10拼路线ID
@@ -3845,6 +3843,7 @@ 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)
         })
@@ -3934,6 +3933,7 @@ export default {
         )
         .then(res => {
           this.tableData = res.data.data
+          this.steelMap = {}
           this.totalHeight += this.itemHeight
           this.visibleList = []
           this.maxHeight = window.innerHeight - 130

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

@@ -657,6 +657,7 @@ export default {
               e.saleRemark =
                 this.remarkDateNew + e.saleRemark.split(this.remarkDateOld)[1]
             }
+
             map.saleMaterialId = e.saleMaterialId
             map.closeEntryId = e.closeEntryId
             map.number = e.saleOrderNo