修改

build/utils.js

@@ -15,17 +15,13 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 // ['index','appoint'，'configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
-// <<<<<<< HEAD
-// let devModules = ['index', 'statisticalReport', 'queue', 'sale','TMS','QMS','appoint']
-// //let devModules = ['all']
-// =======
-
-// let devModules = ['index', 'statisticalReport', 'appoint']
-// let devModules = ['index', 'statisticalReport', 'appoint']
-// let devModules = ['index', 'statisticalReport', 'appoint']
-let devModules = ['index', 'statisticalReport', 'appoint']
+
 // >>>>>>> ecb211626d4aa9a51230114ced8866039cba10e1
 // let devModules = ['all']
+//let devModules = ['all']
+//let devModules = ['index', 'statisticalReport', 'queue', 'sale','TMS','QMS','appoint']
+let devModules = ['all']
+
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules
 }

config/index.js

@@ -73,7 +73,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   '/api/v1': {
     target: 'http://172.16.33.166:80',
-    // target: 'http://localhost:8080',
+    //target: 'http://localhost:8080',
     // target: 'http://192.168.1.104:8080',
     ws: true,
     pathRewrite: {

src/views/ADMINISTRATORS/components/ADMINISTRATORS1.vue

@@ -198,7 +198,7 @@
               </div>
             </div>
           </el-tab-pane>
-          <el-tab-pane label="手动车辆排队" name="fourth">
+          <el-tab-pane label="副产品或焦炭超重允许出厂" name="seventh">
             <div class="admin2">
               <div class="carrier from">
                 <el-form
@@ -229,14 +229,14 @@
               <div class="button_box">
                 <el-button
                   type="primary"
-                  @click="queueClick"
+                  @click="updateCanwork"
                   :disabled="disabled"
                   >确认</el-button
                 >
               </div>
             </div>
           </el-tab-pane>
-          <el-tab-pane label="钢材车辆手动放行" name="fifth">
+          <el-tab-pane label="运输订单状态调整接口" name="eighth">
             <div class="admin2">
               <div class="carrier from">
                 <el-form
@@ -264,10 +264,14 @@
                 <span class="text">运输订单号:</span>
                 <el-input v-model="orderNumber" disabled></el-input>
               </div>
+              <div class="poundNo from">
+                <span class="text">订单状态:</span>
+                <el-input v-model.number="orderStatus"></el-input>
+              </div>
               <div class="button_box">
                 <el-button
                   type="primary"
-                  @click="allowEnfactoryClick"
+                  @click="updateOrderStatus"
                   :disabled="disabled"
                   >确认</el-button
                 >
@@ -302,20 +306,21 @@
                 <span class="text">运输订单号:</span>
                 <el-input v-model="orderNumber" disabled></el-input>
               </div>
-              <span class="text">进厂门岗:</span>
-              <el-select
-                v-model="enFactoryGatepost"
-                placeholder="请选择"
-                @change="onchangeGatepost(enFactoryGatepost)"
-              >
-                <el-option
-                  v-for="item in gatePostList"
-                  :key="item.gatepostId"
-                  :label="item.gatepostName"
-                  :value="item.gatepostName"
+              <div class="from">
+                <span class="text">进厂门岗:</span>
+                <el-select
+                  v-model="enFactoryGatepost"
+                  placeholder="请选择"
                 >
-                </el-option>
+                  <el-option
+                    v-for="item in gatePostList"
+                    :key="item.gatepostId"
+                    :label="item.gatepostName"
+                    :value="item.gatepostId"
+                  >
+                  </el-option>
               </el-select>
+              </div>
               <div class="button_box">
                 <el-button
                   type="primary"
@@ -326,7 +331,7 @@
               </div>
             </div>
           </el-tab-pane>
-          <el-tab-pane label="副产品或焦炭超重允许出厂" name="seventh">
+          <el-tab-pane label="车辆手动出厂" name="ninth">
             <div class="admin2">
               <div class="carrier from">
                 <el-form
@@ -354,17 +359,32 @@
                 <span class="text">运输订单号:</span>
                 <el-input v-model="orderNumber" disabled></el-input>
               </div>
+              <div class="from">
+                <span class="text">出厂门岗:</span>
+                <el-select
+                  v-model="enFactoryGatepost"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in gatePostList"
+                    :key="item.gatepostId"
+                    :label="item.gatepostName"
+                    :value="item.gatepostId"
+                  >
+                  </el-option>
+                </el-select>
+              </div>
               <div class="button_box">
                 <el-button
                   type="primary"
-                  @click="updateCanwork"
+                  @click="leaveFactoryResultByPDA"
                   :disabled="disabled"
                   >确认</el-button
                 >
               </div>
             </div>
           </el-tab-pane>
-          <el-tab-pane label="运输订单状态调整接口" name="eighth">
+          <el-tab-pane label="手动车辆排队" name="fourth">
             <div class="admin2">
               <div class="carrier from">
                 <el-form
@@ -392,14 +412,48 @@
                 <span class="text">运输订单号:</span>
                 <el-input v-model="orderNumber" disabled></el-input>
               </div>
+              <div class="button_box">
+                <el-button
+                  type="primary"
+                  @click="queueClick"
+                  :disabled="disabled"
+                  >确认</el-button
+                >
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="钢材车辆手动放行" name="fifth">
+            <div class="admin2">
+              <div class="carrier from">
+                <el-form
+                  :inline="true"
+                  class="demo-form-inline"
+                  label-width="80px"
+                >
+                  <el-form-item label="车牌号:">
+                    <el-autocomplete
+                      class="inline-input"
+                      v-model="capacityName"
+                      :fetch-suggestions="querySearchCapacity"
+                      placeholder="车牌号"
+                      :trigger-on-focus="false"
+                      @select="handleSelectCapacity"
+                    >
+                      <template slot-scope="{ item }">
+                        <div class="name">{{ item.capacityNumber }}</div>
+                      </template>
+                    </el-autocomplete>
+                  </el-form-item>
+                </el-form>
+              </div>
               <div class="poundNo from">
-                <span class="text">订单状态:</span>
-                <el-input v-model.number="orderStatus"></el-input>
+                <span class="text">运输订单号:</span>
+                <el-input v-model="orderNumber" disabled></el-input>
               </div>
               <div class="button_box">
                 <el-button
                   type="primary"
-                  @click="updateOrderStatus"
+                  @click="allowEnfactoryClick"
                   :disabled="disabled"
                   >确认</el-button
                 >
@@ -481,20 +535,33 @@ export default {
           this.$router.go(0)
         })
     },
-    onchangeGatepost(value) {
-      console.log(value)
-      this.gatePostList.forEach(e => {
-        if (e.gatepostName == value) {
-          this.gatePostId = e.gatePostId
-        }
-      })
-    },
     enFactoryResultByPDA() {
       let map = {
         orderNumber: this.orderNumber + ' ',
-        gatepostId: this.gatePostId
+        gatepostId: this.enFactoryGatepost
       }
-      this.axios.post('')
+      this.axios.post('/api/v1/tms/enFactoryResultByPDA',map).then(res=>{
+        console.log(res);
+        if(res.data.status=='succeed'){
+          this.$message.success("进厂成功！");
+        }else{
+          this.$message.error("操作失败："+res.data.data);
+        }
+      });
+    },
+    leaveFactoryResultByPDA(){
+       let map = {
+        orderNumber: this.orderNumber + ' ',
+        gatepostId:  this.enFactoryGatepost
+      }
+      this.axios.post('/api/v1/tms/addLeaveFactoryResult',map).then(res=>{
+        console.log(res);
+        if(res.data.status=='succeed'){
+          this.$message.success("出厂成功！");
+        }else{
+          this.$message.error("操作失败："+res.data.data);
+        }
+      });
     },
     allowEnfactoryClick() {},
     queueClick() {

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="getSteelReport">
             <i class="el-icon-search"></i>
           </el-button>
         </el-form-item>
@@ -104,11 +104,16 @@
             ><i class="el-icon-map-location"></i>实时路径</el-button
           > -->
         </el-form-item>
-        <el-form-item>
+        <el-form-item v-show="activeName=='first'">
           <el-button type="primary" @click="makeSurePrice"
           v-if="!notRoutList.includes('capacityNo')"
             ><i class="el-icon-circle-check"></i>确认执行价</el-button
           >
+        </el-form-item>
+         <el-form-item v-show="activeName=='second'">
+          <el-button type="primary" @click="openStatement">
+            <i class="el-icon-circle-check"></i>生成账单
+          </el-button>
         </el-form-item>
         <!-- <el-form-item v-if="isShowOperate">
           <el-button type="primary" @click="openReceive()">
@@ -168,11 +173,10 @@
               >
               </el-table-column>
               <el-table-column
-                prop="orderMakingTime"
+                prop="saleMakeDate"
                 label="制单时间"
                 width="110px"
                 align="center"
-                show-overflow-tooltip
               >
               </el-table-column>
               <el-table-column
@@ -346,7 +350,7 @@
             </el-table>
           </div>
         </el-tab-pane>
-        <el-tab-pane label="已结算" name="second">
+        <el-tab-pane label="已确认" name="second">
           <div class="table1">
             <el-table
               :data="visibleList1"
@@ -355,18 +359,12 @@
               border
               style="width: 100%; margin-top: 20px"
               :height="maxHeight"
-              :row-class-name="tableRowClassName"
-              @cell-click="cellClik"
-              @cell-mouse-enter="cellMouse1"
-              @cell-mouse-leave="cellLeave1"
-              @row-click="rowClick"
               :cell-style="cellStyle"
               @filter-change="filterChange"
-              :key="saleSteelKey"
               id="salesLogisticsStat_saleSteelReports_table"
               individual-panel
-              @resetTable="reset"
             >
+            <el-table-column type="selection" width="30" label="选择"></el-table-column>
             <el-table-column
                 width="50"
                 label="序号"
@@ -386,11 +384,10 @@
               >
               </el-table-column>
               <el-table-column
-                prop="orderMakingTime"
+                prop="saleMakeDate"
                 label="制单时间"
                 width="110px"
                 align="center"
-                show-overflow-tooltip
               >
               </el-table-column>
               <el-table-column
@@ -668,6 +665,42 @@
         <el-button type="primary" @click="makeSure">只修改单价</el-button>
       </div>
     </el-drawer>
+    <el-dialog
+      title="上传账单"
+      :visible.sync="showStatementUpLoad"
+      :before-close="closeUpload"
+    >
+      <el-form style="margin-left:20%">
+        <el-form-item label="发票金额">
+          <el-input v-model="excludeTax" style="width:200px" type="number"></el-input>
+        </el-form-item>
+        <el-form-item label="发票图片" style="">
+          <el-upload
+            ref="statementUpload"
+            list-type="picture-card"
+            action="/api/v1/otms/addtmstruckArrivalResult"
+            :limit="1"
+            :on-change="fileChange1"
+            :on-preview="handlePictureCardPreview"
+            :on-exceed="exceed"
+            accept=".jpg,.jpeg,.png,.gif,.bmp,.pdf,.JPG,.JPEG,.PBG,.GIF,.BMP,.PDF"
+            :auto-upload="false"
+          >
+            <i class="el-icon-plus"></i>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <el-button
+        type="primary"
+        @click="generateStatement"
+        :loading="isLoading"
+        style="margin-left:40%"
+        >确定</el-button
+      >
+    </el-dialog>
+    <el-dialog :visible.sync="dialogVisible" width="80%">
+      <img width="100%" :src="dialogImageUrl" alt="" />
+    </el-dialog>
   </div>
 </template>
 
@@ -910,7 +943,6 @@ export default {
       location: null,
       orderNumber: null,
       capacityNumber: null,
-      arrivalReceiving: false,
       fileListArrival: [],
       fileListReceive: [],
       dialogImageUrl: '',
@@ -948,7 +980,10 @@ export default {
           opacity: 0.8, //滚动条透明度
           'overflow-x': 'hidden'
         }
-      }
+      },
+      excludeTax:null,
+      statementList:[],
+      showStatementUpLoad:false
     }
   },
   created() {
@@ -1096,6 +1131,53 @@ export default {
           })
         })
     },
+    openStatement(){
+      console.log(this.$refs.tableRef1.selection, 'selection');
+      if(!this.$refs.tableRef1.selection || this.$refs.tableRef1.selection.length<=0){
+        this.$message.warning("请选择需要上传发票的订单");
+      }else{
+        this.excludeTax=null;
+        this.statementList=[];
+        this.showStatementUpLoad=true;
+      }
+    },
+    generateStatement(){
+      this.isLoading=true;
+      if(!this.excludeTax){
+        this.$message.warning('请填写发票金额')
+        this.isLoading=false;
+      }else if(this.statementList.length < 1) {
+        this.$message.warning('请上传发票')
+        this.isLoading=false;
+      }else{
+        let orderList = this.$refs.tableRef1.selection.map(e => {
+         return e.orderId
+        })
+        let formData = new window.FormData();
+        formData.append('file0', this.statementList[0].raw);
+        formData.append('orderList',orderList);
+        formData.append('excludeTax', this.excludeTax);
+        formData.append('userId',getCookie('userId'));
+        let options = {
+          url: '/api/v1/bms/addTruckStatement',
+          data: formData,
+          method: 'post',
+          headers: {
+            'Content-Type': 'multipart/form-data'
+          }
+        }
+        this.axios(options).then(res => {
+          console.log('uploadRes:', res)
+          if(res.data.status=='succeed'){
+            this.$message.success('上传成功！')
+            this.closeUpload()
+          }else{
+            this.$message.error(res.data.data);
+            this.isLoading = false
+          }
+        })
+      }
+    },
     receiveClick(src, title) {
       // this.dialogImageUrl = src
       downloadFile(src, `${this.downloadCapacityNo}${title}照片`, '.jpg')
@@ -1163,6 +1245,8 @@ export default {
     //只修改单价
     makeSure() {
       //若没有单价Id
+      console.log("获取数据")
+      console.log(this.userId)
       console.log(this.makeSurePriceOrderList)
       if (this.makeSurePriceOrderList.length == 0) {
         this.$message({
@@ -1183,6 +1267,7 @@ export default {
       })
       let mapValue = {}
       mapValue.mapList = mapList
+      mapValue.userId=this.userId
       // //是否确定修改详单地址!
       // this.$confirm('确定修改', '提示', {
       //   confirmButtonText: '仅修改单价',
@@ -1198,7 +1283,7 @@ export default {
         .then(res => {
           if (res.data.code == '200') {
             this.$message.success('修改详单单价成功!')
-            this.$refs.tableRef.clearSelection()
+            //this.$refs.tableRef.clearSelection()
             //重置未结算详单表单信息
             // this.operation(this.steelMap)
             this.loadNewData()
@@ -1211,6 +1296,8 @@ export default {
     },
     //修改单价和收货地址
     makeSureAll(){
+      console.log("获取数据")
+      console.log(this.userId)
       if (this.makeSurePriceOrderList.length == 0) {
         this.$message({
           type: 'success',
@@ -1231,11 +1318,14 @@ export default {
       let mapValue = {}
       mapValue.mapList = mapList
       mapValue.updatePlace = 1
+      mapValue.userId=this.userId
+      console.log("要的数据")
+      console.log(mapValue)
             this.axios
               .post('/api/v1/bms/updateBatchDetailsOrder', mapValue)
               .then(res => {
                 if (res.data.code == '200') {
-                  this.$refs.tableRef.clearSelection()
+                  //this.$refs.tableRef.clearSelection()
                   this.$message.success('修改详单单价和地址成功!')
                   // this.operation(this.steelMap)
                   this.loadNewData()
@@ -1376,7 +1466,7 @@ export default {
       })
     },
     fileChange1(file, fileList) {
-      this.fileListArrival = fileList
+      this.statementList = fileList
     },
     fileChange2(file, fileList) {
       this.fileListReceive = fileList
@@ -1389,10 +1479,10 @@ export default {
       this.dialogVisible = true
     },
     closeUpload() {
-      this.arrivalReceiving = false
+      this.showStatementUpLoad = false
       this.isLoading = false
-      this.$refs.arrival.clearFiles()
-      this.$refs.receive.clearFiles()
+      this.$refs.statementUpload.clearFiles()
+      // this.$refs.receive.clearFiles()
     },
     //防抖函数--防止用户重复点击
     debounce(func, delay) {
@@ -2893,7 +2983,6 @@ export default {
           loading.close()
         })
         .catch(() => {
-          loading.close()
         })
 
       this.axios
@@ -2932,8 +3021,9 @@ export default {
           loading.close()
         })
         .catch(() => {
-          loading.close()
         })
+        loading.close();
+
     }
   }
 }

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

@@ -0,0 +1,421 @@
+// 新计费账单
+<template>
+  <div class="steel_inbound" style="width:100%">
+    <div class="sache">
+      <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"
+          >
+      </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>
+            <el-button
+              type="text"
+              size="small"
+              @click="showDetails(scope.row)"
+            >
+              查看详单
+            </el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="deleteStatement(scope.row)"
+            >
+              删除账单
+            </el-button>
+          </template>
+        </el-table-column>
+      </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>
+      </div>
+    </el-dialog>
+    <!-- 查询账单底下的计费详单-->
+    <el-dialog
+      title="详单信息"
+      :visible.sync="isShowDetails"
+      style="height:600px;width:100%"
+      >
+       <div class="table1">
+            <el-table
+              :data="visibleList1"
+              :span-method="objectSpanMethod1"
+              ref="tableRef1"
+              border
+              style="width: 100%; margin-top: 20px"
+              :height="350"
+              id="salesLogisticsStat_saleSteelReports_table"
+              individual-panel
+            >
+            <el-table-column
+                width="50"
+                label="序号"
+                align="center"
+                :resizable="false"
+                fixed="left"
+              >
+                <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>
+
+<script>
+import { getCookie } from '@/utils/util.js'
+import { sjTime } from '@/utils/sharedJsFile'
+export default {
+  data(){
+    return{
+      input:"",
+      userId:null,
+      photoList:[],
+      isShowPhoto:false,
+      isShowDetails:false,
+      startTime:null,
+      endTime:null,
+      spanArr1:[],
+      visibleList1:[],
+      options:{
+        requestUrl:""
+      },
+      orgCodeList: [
+        'wuliuyunshubu',
+        'dagangadmin',
+        'shichangxinxibu',
+        'zidonghuabu'
+      ],
+      mergeList1: [
+        '选择',
+        '序号',
+        '整车操作',
+        '销售订单状态',
+        '销售订单号',
+        '发货单位',
+        '司机电话',
+        '运输订单号',
+        '签收地址',
+        '签收时间',
+        '抵达地址',
+        '抵达时间',
+        '出厂时间',
+        '进厂时间',
+        '运单状态',
+        '车牌号',
+        '承运商',
+        '客户',
+        '收货地址',
+        '实际收货地址',
+        '业务员',
+        '送货单打印',
+        '收货客户电话',
+        '是否自提',
+        '订单日期',
+        '短信发送',
+        '销售片区',
+        '抵达时间',
+        '签收时间',
+        '最终运价',
+        '摘要'
+      ],
+    }
+  },
+  created(){
+    if (!this.orgCodeList.includes(getCookie('orgCode'))) {
+      this.userId=getCookie("userId");
+    }
+    this.startTime=new Date();
+    this.endTime=new Date();
+    this.startTime.setDate(1);
+    this.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()
+      }
+    },
+    showPhoto(row){
+      this.photoList=[];
+      this.isShowPhoto=true;
+      this.axios
+        .post('/api/v1/bms/getStatementPhoto?statementId=' + row.statementId)
+        .then(res => {
+          console.log('statementPhoto:', res)
+          if (res.data) {
+            this.photoList = res.data
+          }
+      })
+    },
+    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);
+      })
+    },
+    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();
+        })
+      }).catch(()=>{
+
+      });
+      
+    },
+    getSpanArr1(data) {
+      //每次调用方法初始化
+      this.spanArr1 = []
+      for (var i = 0; i < data.length; i++) {
+        if (i === 0) {
+          this.spanArr1.push(1)
+          data[i].group = i
+          this.pos = 0
+        } else {
+          // 判断当前元素与上一个元素是否相同
+          if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId) {
+            this.spanArr1[this.pos] += 1
+            data[i].group = data[i - 1].group
+            this.spanArr1.push(0)
+          } else {
+            this.spanArr1.push(1)
+            this.pos = i
+            data[i].group = data[i - 1].group + 1
+          }
+        }
+      }
+    },
+    objectSpanMethod1({ row, column, rowIndex, columnIndex }) {
+      if (this.mergeList1.indexOf(column.label) != -1) {
+        const _row = this.spanArr1[rowIndex]
+        const _col = _row > 0 ? 1 : 0
+        return {
+          rowspan: _row,
+          colspan: _col
+        }
+      }
+    },
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
+  }
+}
+</style>

src/views/sale/router/index.js

@@ -107,6 +107,7 @@ import bmsTruckDetailsOrderNew from "../components/transportFreight/saleTruckSet
 import bmsTruckFormula from "../components/transportFreight/saleTruckSettlement/bmsTruckFormula.vue";
 import bmsTruckInvoice from "../components/transportFreight/saleTruckSettlement/bmsTruckInvoice.vue";
 import bmsTruckStatement from "../components/transportFreight/saleTruckSettlement/bmsTruckStatement.vue";
+import bmsTruckStatementNew from "../components/transportFreight/saleTruckSettlement/bmsTruckStatementNew.vue";
 import getBmsTruckStatementOrder from "../components/transportFreight/saleTruckSettlement/getBmsTruckStatementOrder.vue";
 import getTransportResult from "../components/transportFreight/saleTruckSettlement/getTransportResult.vue";
 import mapTest from "../components/offSiteTransportation/mapTest.vue";
@@ -724,6 +725,12 @@ const constantRouterMap = [
         meta: { code: "xtpzgl-yhgl" },
         component: bmsTruckStatement
       },
+      {
+        path: "bmsTruckStatementNew",
+        name: "bmsTruckStatementNew",
+        meta: { code: "xtpzgl-yhgl" },
+        component: bmsTruckStatementNew
+      },
       {
         path: "getBmsTruckStatementOrder/:statementId",
         name: "getBmsTruckStatementOrder",

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

@@ -411,6 +411,14 @@
           label="实际运费"
           width="100px"
         ></el-table-column>
+        <el-table-column
+          prop="isAccept"
+          label="异地库接收标志"
+          width="60px"
+          show-overflow-tooltip
+          align="center"
+        >
+        </el-table-column>
         <el-table-column
           prop="orderNo"
           label="运输订单号"
@@ -459,13 +467,6 @@
           show-overflow-tooltip
         >
         </el-table-column>
-        <el-table-column
-          prop="isAccept"
-          label="异地库接收标志"
-          width="60px"
-          show-overflow-tooltip
-        >
-        </el-table-column>
       </el-table>
     </div>
     <div>