luobang 2 vuotta sitten
vanhempi
commit
362650db3c
24 muutettua tiedostoa jossa 1444 lisäystä ja 1237 poistoa
  1. 1 1
      build/utils.js
  2. 1 1
      src/views/appoint/components/saleContract/addSaleCokeSend.vue
  3. 1 1
      src/views/appoint/components/saleContract/addSaleOrderArrange.vue
  4. 1 1
      src/views/appoint/components/saleContract/addSaleOrderSteelSend.vue
  5. 1 2
      src/views/appoint/components/saleContract/addSaleOrderSteelSendCarrier.vue
  6. 4 4
      src/views/appoint/components/saleContract/saleOrderSteel.vue
  7. 1 1
      src/views/appoint/components/ship/modifyDeliveryAttroney.vue
  8. 1 0
      src/views/inward/app.html
  9. 1 1
      src/views/inward/components/inwardBillet/addInwardBillet.vue
  10. 1 1
      src/views/inward/components/inwardFactory/unload.vue
  11. 53 22
      src/views/inward/components/offsetSteel/saleSteelTruckOrder/kucunList.vue
  12. 693 686
      src/views/inward/components/offsetSteel/saleSteelTruckOrder/saleTruckOrder.vue
  13. 343 342
      src/views/inward/components/offsetSteel/saleSteelTruckOrder/saleTruckPreview.vue
  14. 1 1
      src/views/inward/components/truckAppoint/addRequirement.vue
  15. 0 2
      src/views/inward/components/truckAppoint/addRequirement2.vue
  16. 0 1
      src/views/statisticalReport/components/ShipWorkReport.vue
  17. 122 153
      src/views/statisticalReport/components/Ship_dynamic_table.vue
  18. 19 12
      src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue
  19. 0 1
      src/views/statisticalReport/components/salesLogisticsStatistics/steelReportCom.vue
  20. 200 0
      src/views/statisticalReport/components/salesLogisticsStatistics/steelTransportReport.vue
  21. 0 1
      src/views/statisticalReport/components/sporadicReport/sporadicReportEnterFactory.vue
  22. 0 1
      src/views/statisticalReport/components/wanzhouReport/loadWagonWorkReport.vue
  23. 0 1
      src/views/statisticalReport/components/wanzhouReport/unloadShipWorkReport.vue
  24. 0 1
      src/views/statisticalReport/components/wanzhouReport/wagonWorkReport.vue

+ 1 - 1
build/utils.js

@@ -17,7 +17,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
 let devModules = ['all']
-// let devModules = ['index', 'statisticalReport', 'sale']
+// let devModules = ['index', 'statisticalReport']
 // let devModules = ['all']
 
 // let devModules = ['index', 'ADMINISTRATORS']

+ 1 - 1
src/views/appoint/components/saleContract/addSaleCokeSend.vue

@@ -272,7 +272,7 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { getCookie } from "@/utils/util.js";
-import { sjTime,isNumber } from "@/utils/sharedJsFile";
+import { isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/appoint/components/saleContract/addSaleOrderArrange.vue

@@ -251,7 +251,7 @@
 </template>
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime,isNumber } from "@/utils/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/appoint/components/saleContract/addSaleOrderSteelSend.vue

@@ -179,7 +179,7 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { getCookie } from "@/utils/util.js";
-import { sjTime, isNumber, isIntegerNumber } from "@/utils/sharedJsFile";
+import {  isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 2
src/views/appoint/components/saleContract/addSaleOrderSteelSendCarrier.vue

@@ -168,8 +168,7 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { getCookie } from "@/utils/util.js";
-import { sjTime, isNumber, isIntegerNumber } from "@/utils/sharedJsFile";
-import returnResultVue from "../../../inward/components/offsetSteel/truckTransport/returnResult.vue";
+import { isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 4 - 4
src/views/appoint/components/saleContract/saleOrderSteel.vue

@@ -125,7 +125,7 @@
             @selection-change="selectionChange"
             :pageSize="200"
             @func="func"
-            :max-height="300"
+            :max-height="500"
           >
             <el-table-column
               fixed="right"
@@ -169,7 +169,7 @@
             ref="table"
             :pageSize="200"
             @func="func1"
-            :max-height="300"
+            :max-height="500"
           >
             <el-table-column
               fixed="right"
@@ -213,7 +213,7 @@
               label="操作"
               align="center"
               width="200"
-              :max-height="300"
+              :max-height="500"
             >
               <template slot-scope="scope">
                 <el-button
@@ -232,7 +232,7 @@
             v-bind.sync="option2"
             ref="table2"
             @selection-change="selectionChange2"
-            :pageSize="200"
+            :pageSize="500"
             @func="func2"
             :max-height="300"
           >

+ 1 - 1
src/views/appoint/components/ship/modifyDeliveryAttroney.vue

@@ -57,7 +57,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "../../../ADMINISTRATORS/app";
+import { sjTime } from '@/utils/sharedJsFile'
 export default {
   components: { PageTitle },
   data() {

+ 1 - 0
src/views/inward/app.html

@@ -6,6 +6,7 @@
     <meta name="renderer" content="webkit">
     <meta content="智慧物流平台" name="keywords">
     <meta content="智慧物流平台" name="description">
+    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
     <title>内转物流运输管理 - 智慧物流平台</title>
     <link href="../static/css/common.css" rel="stylesheet"/>
     <link href="../static/img/favicon.ico" rel="shortcut icon"/>

+ 1 - 1
src/views/inward/components/inwardBillet/addInwardBillet.vue

@@ -288,7 +288,7 @@
 import PageTitle from '@/components/Page/Title'
 import { sjTime } from '@/utils/sharedJsFile'
 import { getCookie } from '@/utils/util.js'
-import { isNumber } from '@/utils/sharedJsFile'
+import {  isNumber } from '@/utils/sharedJsFile'
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/inward/components/inwardFactory/unload.vue

@@ -36,7 +36,7 @@
 
 <script>
 import { getCookie } from "@/utils/util.js";
-import { sjTime } from "../../../ADMINISTRATORS/app";
+import { sjTime } from '@/utils/sharedJsFile'
 export default {
   name: "homeworkPath",
   data() {

+ 53 - 22
src/views/inward/components/offsetSteel/saleSteelTruckOrder/kucunList.vue

@@ -1,6 +1,6 @@
 //站台库存信息一览表
 <template>
-  <div id="platformStockInfo">
+  <div class="kucunListClass">
     <div class="head">
       <!-- //需要一个日期查询框 -->
       <el-form :inline="true">
@@ -12,7 +12,7 @@
             v-model="startTime"
             type="datetime"
             placeholder="选择日期时间"
-            style="width:200px"
+            style="width:180px"
           >
           </el-date-picker>
           <span>至</span>
@@ -20,7 +20,7 @@
             v-model="endTime"
             type="datetime"
             placeholder="选择日期时间"
-            style="width:200px"
+            style="width:180px"
           >
           </el-date-picker>
         </el-form-item>
@@ -29,7 +29,7 @@
             v-model="screen"
             placeholder="请选择需筛选的内容"
             clearable
-            style="width:150px"
+            style="width:120px"
           >
             <el-option
               v-for="item in options"
@@ -40,7 +40,7 @@
             </el-option>
           </el-select>
           <el-input
-            style="width:200px"
+            style="width:170px"
             v-model="input"
             placeholder="请输入查询条件"
             clearable
@@ -51,7 +51,7 @@
             v-model="screen1"
             placeholder="请选择需筛选的内容"
             clearable
-            style="width:150px"
+            style="width:120px"
           >
             <el-option
               v-for="item in options1"
@@ -62,7 +62,7 @@
             </el-option>
           </el-select>
           <el-input
-            style="width:200px"
+            style="width:170px"
             v-model="input1"
             placeholder="请输入查询条件"
             clearable
@@ -93,7 +93,7 @@
             @select="handleSelectionChange()"
           >
           </el-autocomplete>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item>
           <el-select
             size="mini"
@@ -108,7 +108,7 @@
             >
             </el-option>
           </el-select>
-        </el-form-item> -->
+        </el-form-item>
       </el-form>
     </div>
     <div class="main">
@@ -116,27 +116,27 @@
         :data="tableData"
         ref="tableRef"
         border
-        stripe
         style="width: 100%; margin-top: 20px"
-        max-height="500px"
+        :max-height="maxHeight"
+        :height="maxHeight"
         :row-style="{ height: '30px' }"
         :cell-style="{ fontWeight: '700' }"
-        class="table"
-        :span-method="objectSpanMethod"
-        id="offsetSteel_kucunList_Table"
+        :key="saleSteelKey"
+        id="salesLogisticsStat_saleSteelReports_table"
         individual-panel
+        :span-method="objectSpanMethod"
         @selection-change="
           handleSelectionChange()
           handleMulSendChange()
         "
       >
-        <el-table-column type="selection" width="55"> </el-table-column>
+        <el-table-column type="selection" width="55" align="center">
+        </el-table-column>
         <el-table-column
           prop="group"
           width="50"
           label="序号"
           align="center"
-          fixed="left"
           :resizable="false"
         >
           <template slot-scope="scope">{{ scope.row.group + 1 }}</template>
@@ -275,7 +275,6 @@
           label="操作"
           align="center"
           width="150px"
-          fixed="right"
         >
           <template slot-scope="scope">
             <el-button type="text" @click="operate(scope.row)">保存</el-button>
@@ -326,17 +325,20 @@ export default {
       input: null,
       input1: null,
       tableData: [],
+      saleSteelKey: false,
       screen: null,
       screen1: null,
+      maxHeight: 650,
       //需要合并的列集合
       mergeList: [
         'saleNo',
         'saleRemark',
         'receiveName',
-        'index',
+        // 'index',
         'operate',
         'transInDep',
-        'transOutDep'
+        'transOutDep',
+        'group'
       ],
       spanArr: [],
       pos: null,
@@ -352,6 +354,20 @@ export default {
   },
   mounted() {
     this.information()
+    this.$nextTick(() => {
+      window.onresize = () => {
+        return (() => {
+          this.maxHeight =
+            window.innerHeight -
+            document.querySelector('.head').offsetHeight -
+            40
+        })()
+      }
+    })
+  },
+  activated() {
+    this.maxHeight =
+      window.innerHeight - document.querySelector('.head').offsetHeight - 40
   },
   methods: {
     batchOperate() {
@@ -553,6 +569,10 @@ export default {
         .then(res => {
           this.tableData = res.data.data
           this.getSpanArr(this.tableData)
+          this.maxHeight =
+            window.innerHeight -
+            document.querySelector('.head').offsetHeight -
+            40
         })
     },
     //获取后台数据
@@ -565,6 +585,10 @@ export default {
           console.log(res.data.data)
           this.tableData = res.data.data
           this.getSpanArr(this.tableData)
+          this.maxHeight =
+            window.innerHeight -
+            document.querySelector('.head').offsetHeight -
+            40
         })
     },
     //刷新
@@ -611,8 +635,8 @@ export default {
   }
 }
 </script>
-<style lang="scss">
-#platformStockInfo {
+<style lang="scss" scoped>
+.kucunListClass {
   .head {
     margin-top: 20px;
     margin-left: 20px;
@@ -620,8 +644,15 @@ export default {
   .main {
     margin-top: 20px;
     margin-left: 20px;
+    /deep/ .el-table__body {
+      overflow-y: auto;
+      position: absolute !important;
+      tr:hover > td {
+        background-color: #fff;
+      }
+    }
     ::-webkit-scrollbar {
-      // width: 20px;
+      width: 10px;
       height: 20px;
       background-color: transparent;
     }

+ 693 - 686
src/views/inward/components/offsetSteel/saleSteelTruckOrder/saleTruckOrder.vue

@@ -76,9 +76,7 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="showDialog"
-            >多拼派车</el-button
-          >
+          <el-button type="primary" @click="showDialog">多拼派车</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -88,17 +86,13 @@
         :span-method="objectSpanMethod"
         ref="tableRef"
         border
-        stripe
         style="width: 100%; margin-top: 20px"
         max-height="800px"
         @cell-click="cellClik"
         :row-style="{ height: '30px' }"
         :cell-style="{ fontWeight: '700' }"
       >
-      <el-table-column
-        type="selection"
-        width="55">
-      </el-table-column>
+        <el-table-column type="selection" width="55"> </el-table-column>
         <el-table-column
           width="50"
           label="序号"
@@ -115,17 +109,17 @@
           align="center"
           fixed
         >
-        <template slot-scope="scope">
-          <el-autocomplete
-            class="inline-input"
-            v-model="scope.row.consigneeName"
-            :fetch-suggestions="querySearchConsignee"
-            placeholder="请输入收货客户名称"
-            @select="handleSelectConsignee(scope.row, scope.$index)"
-            style="width:300px"
-          >
-          </el-autocomplete>
-        </template>
+          <template slot-scope="scope">
+            <el-autocomplete
+              class="inline-input"
+              v-model="scope.row.consigneeName"
+              :fetch-suggestions="querySearchConsignee"
+              placeholder="请输入收货客户名称"
+              @select="handleSelectConsignee(scope.row, scope.$index)"
+              style="width:300px"
+            >
+            </el-autocomplete>
+          </template>
         </el-table-column>
         <el-table-column
           prop="carrierName"
@@ -152,7 +146,7 @@
             >
           </template>
         </el-table-column>
-        
+
         <el-table-column
           prop="sendStationName"
           column-key="sendStationName"
@@ -163,9 +157,17 @@
         >
           <!-- 选择发站 -->
           <template slot-scope="scope">
-            <el-select filterable  v-model="scope.row.sendStationId"
-            @change="updateSendStation($event,scope.row)">
-                <el-option v-for="item in sendStations" :value="item.sendStationId" :key="item.sendStationId" :label="item.sendStation"></el-option>
+            <el-select
+              filterable
+              v-model="scope.row.sendStationId"
+              @change="updateSendStation($event, scope.row)"
+            >
+              <el-option
+                v-for="item in sendStations"
+                :value="item.sendStationId"
+                :key="item.sendStationId"
+                :label="item.sendStation"
+              ></el-option>
             </el-select>
             <!-- <el-button
               @click="updateStation(scope.row)"
@@ -183,8 +185,8 @@
           width="250px"
           fixed
         > -->
-          <!-- 选择路线 -->
-          <!-- <template slot-scope="scope">
+        <!-- 选择路线 -->
+        <!-- <template slot-scope="scope">
             <el-autocomplete
               style="width: 120px"
               v-model="scope.row.lineName"
@@ -402,8 +404,8 @@
               @click="deleteEasEntryId(scope.row)"
               v-if="
                 scope.row.carStatus == 4 ||
-                scope.row.carStatus == 5 ||
-                scope.row.carStatus == null
+                  scope.row.carStatus == 5 ||
+                  scope.row.carStatus == null
               "
               >关闭车辆</el-button
             >
@@ -503,7 +505,11 @@
       </el-dialog>
     </div>
     <!-- 多拼弹出层-->
-    <el-dialog title="生成多拼" :visible.sync="dialogTableVisible" style="width:500px">
+    <el-dialog
+      title="生成多拼"
+      :visible.sync="dialogTableVisible"
+      style="width:500px"
+    >
       <el-form :inline="true">
         <el-form-item>
           <el-autocomplete
@@ -513,51 +519,47 @@
             placeholder="请输入车牌号"
             @select="handleMulSelect"
           ></el-autocomplete>
-          <el-button
-            @click="updateMulCapacity"
-            type="primary"
-            >提交</el-button
-          >
+          <el-button @click="updateMulCapacity" type="primary">提交</el-button>
         </el-form-item>
       </el-form>
     </el-dialog>
   </div>
 </template>
 <script>
-import { sjTime, isVehicleNumber } from "@/utils/sharedJsFile";
-import { getCookie } from "@/utils/util.js";
+import { sjTime, isVehicleNumber } from '@/utils/sharedJsFile'
+import { getCookie } from '@/utils/util.js'
 export default {
   data() {
     return {
       // 线路名称
-      lineName: "",
+      lineName: '',
       //线路id
       lineId: null,
       drawer: false,
       clickIndex: null,
       input: null,
-      screen: "",
-      dialogTableVisible:false,
-      newsCapacityId:null,
-      capacityNo:null,
-      selection:[],
+      screen: '',
+      dialogTableVisible: false,
+      newsCapacityId: null,
+      capacityNo: null,
+      selection: [],
       options: [
         {
-          value: "下单客户",
-          lable: "下单客户",
+          value: '下单客户',
+          lable: '下单客户'
         },
         {
-          value: "承运商",
-          lable: "承运商",
+          value: '承运商',
+          lable: '承运商'
         },
         {
-          value: "车牌号",
-          lable: "车牌号",
+          value: '车牌号',
+          lable: '车牌号'
         },
         {
-          value: "路线",
-          lable: "路线",
-        },
+          value: '路线',
+          lable: '路线'
+        }
       ],
       startTime: null,
       endTime: null,
@@ -565,7 +567,7 @@ export default {
       totalNumber: 0,
       //合计车数
       totalCapacity: 0,
-      tableTitle: "销售统计报表",
+      tableTitle: '销售统计报表',
       capacityList: [],
       carrierList: [],
       // 线路
@@ -576,8 +578,27 @@ export default {
       a: 1,
       isCellClick: 0,
       columnIndexs: [
-          1, 2, 3,4, 7, 8, 14, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
-        29, 31,
+        1,
+        2,
+        3,
+        4,
+        7,
+        8,
+        14,
+        16,
+        17,
+        18,
+        19,
+        20,
+        21,
+        22,
+        23,
+        24,
+        25,
+        26,
+        27,
+        29,
+        31
       ],
       //钢材多拼车辆线路ID
       //索引从1-10为1-10拼路线ID
@@ -595,40 +616,26 @@ export default {
       //   110010
       // ],
       //达州站内转多拼车辆线路ID,从1-5为1-5拼线路id
-      lineDazhou:[
-        0,
-        189982,
-        189983,
-        189984,
-        189985,
-        189986
-      ],
+      lineDazhou: [0, 189982, 189983, 189984, 189985, 189986],
       //专用线内转多拼车辆线路ID,从1-5为1-5拼线路id
-      lineZhuanxian:[
-        0,
-        189987,
-        189988,
-        189989,
-        189990,
-        189991
-      ],
-      sendStationId:null,
-      sendStations:[],
-      tableTitle: "销售钢材统计报表",
+      lineZhuanxian: [0, 189987, 189988, 189989, 189990, 189991],
+      sendStationId: null,
+      sendStations: [],
+      tableTitle: '销售钢材统计报表',
       //所有省
       provinceList: [],
       //选中的省
-      province: "",
+      province: '',
       //所有市
       cityList: [],
       //选中的市
-      city: "",
+      city: '',
       //所有的县(区)
       countyList: [],
       //选中的县
-      county: "",
+      county: '',
       //地址输入框的值
-      addresText: "",
+      addresText: '',
       //已选中省市县
       address: null,
       //具体地址
@@ -637,154 +644,154 @@ export default {
       place1: null,
       //省市县Id
       addressId: null,
-      direction: "rtl",
+      direction: 'rtl',
       addressRow: {},
-      consigneeDisable: false,
-    };
+      consigneeDisable: false
+    }
   },
   created() {},
   mounted() {
-    this.getSteelReport();
-    this.getSendStations();
+    this.getSteelReport()
+    this.getSendStations()
   },
   methods: {
     //反关闭整条分录
     adverseCloseSaleMaterial(row) {
-      console.log(row.saleMaterialId);
-      this.$confirm("确定反关闭该条分录?", "提示", {
-        cancelButtonText: "确定",
-        confirmButtonText: "取消",
-        center: true,
+      console.log(row.saleMaterialId)
+      this.$confirm('确定反关闭该条分录?', '提示', {
+        cancelButtonText: '确定',
+        confirmButtonText: '取消',
+        center: true
       }).then(() => {
         this.axios
           .post(
-            "/api/v1/ams/adverseCloseSaleMaterial?saleMaterialId=" +
+            '/api/v1/ams/adverseCloseSaleMaterial?saleMaterialId=' +
               row.saleMaterialId
           )
-          .then((res) => {
-            if (res.data.code == "200") {
-              this.$message.success("反关闭成功");
-              this.getSteelReport();
+          .then(res => {
+            if (res.data.code == '200') {
+              this.$message.success('反关闭成功')
+              this.getSteelReport()
             } else {
-              this.$message.error("反关闭失败");
-              this.getSteelReport();
+              this.$message.error('反关闭失败')
+              this.getSteelReport()
             }
           })
           .catch(() => {
-            this.$message.error("反关闭失败");
-            this.getSteelReport();
-          });
-      });
+            this.$message.error('反关闭失败')
+            this.getSteelReport()
+          })
+      })
     },
 
     //销售钢材报表导出excel
     exportAllReportToExcel() {
       const loading = this.$loading({
         lock: true,
-        text: "正在导出Excel",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
-      var title = this.tableTitle;
-      let tHeader = [];
-      let filterVal = [];
-      console.log(this.$refs.tableRef);
-      this.$refs.tableRef.$children.forEach((item) => {
+        text: '正在导出Excel',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      var title = this.tableTitle
+      let tHeader = []
+      let filterVal = []
+      console.log(this.$refs.tableRef)
+      this.$refs.tableRef.$children.forEach(item => {
         if (item.label != undefined && item.prop != undefined) {
           if (tHeader.indexOf(item.label) === -1) {
-            tHeader.push(item.label);
+            tHeader.push(item.label)
           }
           if (filterVal.indexOf(item.prop) === -1) {
-            filterVal.push(item.prop);
+            filterVal.push(item.prop)
           }
         }
-      });
-      this.downloadLoading = true;
+      })
+      this.downloadLoading = true
       require.ensure([], () => {
         const {
-          export_json_to_excel,
-        } = require("@/assets/excel/Export2Excel.js"); //这里必须使用绝对路径,使用@/+存放export2Excel的路径
-        let data = this.tableData.map((v) => filterVal.map((j) => v[j])); //3.formatJson格式转换
-        export_json_to_excel(tHeader, data, title); // (title)导出的表格名称
-      });
-      loading.close();
+          export_json_to_excel
+        } = require('@/assets/excel/Export2Excel.js') //这里必须使用绝对路径,使用@/+存放export2Excel的路径
+        let data = this.tableData.map(v => filterVal.map(j => v[j])) //3.formatJson格式转换
+        export_json_to_excel(tHeader, data, title) // (title)导出的表格名称
+      })
+      loading.close()
     },
     changeScreen() {
-      console.log(this.screen);
+      console.log(this.screen)
     },
     cellClik(row, column, cell, event) {
       if (row.group != this.clickIndex) {
         // this.getSteelReport();
-        this.tableData.forEach((item) => {
+        this.tableData.forEach(item => {
           if (item.group == this.clickIndex) {
-            this.$set(item, "isCapacityShow", 0);
-            this.$set(item, "isCarrierShow", 0);
-            this.$set(item, "isTelShow", 0);
-            this.$set(item, "isAddressShow", 0);
-            this.$set(item, "isNumShow", 0);
-            this.$set(item, "isLineName", 0);
-            this.$set(item, "isSendStationName", 0);
+            this.$set(item, 'isCapacityShow', 0)
+            this.$set(item, 'isCarrierShow', 0)
+            this.$set(item, 'isTelShow', 0)
+            this.$set(item, 'isAddressShow', 0)
+            this.$set(item, 'isNumShow', 0)
+            this.$set(item, 'isLineName', 0)
+            this.$set(item, 'isSendStationName', 0)
           }
-        });
+        })
       }
-      if (column.property == "capacityNo") {
-        this.$set(row, "isCapacityShow", 1);
-        this.clickIndex = row.group;
+      if (column.property == 'capacityNo') {
+        this.$set(row, 'isCapacityShow', 1)
+        this.clickIndex = row.group
       }
-      if (column.property == "lineName") {
-        this.$set(row, "isLineName", 1);
-        this.clickIndex = row.group;
+      if (column.property == 'lineName') {
+        this.$set(row, 'isLineName', 1)
+        this.clickIndex = row.group
       }
-      if (column.property == "sendStationName") {
-        this.$set(row, "isSendStationName", 1);
-        this.clickIndex = row.group;
+      if (column.property == 'sendStationName') {
+        this.$set(row, 'isSendStationName', 1)
+        this.clickIndex = row.group
       }
-      if (column.property == "carrierName") {
-        this.$set(row, "isCarrierShow", 1);
-        this.clickIndex = row.group;
+      if (column.property == 'carrierName') {
+        this.$set(row, 'isCarrierShow', 1)
+        this.clickIndex = row.group
       }
-      if (column.property == "capacityTel") {
-        this.$set(row, "isTelShow", 1);
-        this.clickIndex = row.group;
+      if (column.property == 'capacityTel') {
+        this.$set(row, 'isTelShow', 1)
+        this.clickIndex = row.group
       }
-      if (column.property == "addressPlace") {
-        this.$set(row, "isAddressShow", 1);
-        this.clickIndex = row.group;
+      if (column.property == 'addressPlace') {
+        this.$set(row, 'isAddressShow', 1)
+        this.clickIndex = row.group
       }
-      if (column.property == "materialNum") {
-        this.$set(row, "isNumShow", 1);
-        this.clickIndex = row.group;
+      if (column.property == 'materialNum') {
+        this.$set(row, 'isNumShow', 1)
+        this.clickIndex = row.group
       }
     },
     //承运商弹出层
     handleSelectCarrier(row, index, item) {
-      this.carrierList.forEach((item) => {
+      this.carrierList.forEach(item => {
         if (item.carrierName == row.carrierName) {
-          row.newCarrierId = item.carrierId;
-          row.carrierId = item.carrierId;
+          row.newCarrierId = item.carrierId
+          row.carrierId = item.carrierId
         }
-      });
+      })
     },
     //承运商边输边查
     querySearchCarrier(queryString, cb) {
       if (queryString.length > 1) {
         this.axios
-          .post("/api/v1/uc/getCarrierMesByLike?index=" + queryString)
-          .then((res) => {
-            if (res.data.code == "200") {
-              this.carrierList = [];
+          .post('/api/v1/uc/getCarrierMesByLike?index=' + queryString)
+          .then(res => {
+            if (res.data.code == '200') {
+              this.carrierList = []
               if (res.data.data.length == 0) {
-                this.$message.info("承运商不存在,请前往注册");
-                return;
+                this.$message.info('承运商不存在,请前往注册')
+                return
               }
-              var restaurants = res.data.data;
-              this.carrierList = res.data.data;
+              var restaurants = res.data.data
+              this.carrierList = res.data.data
               var results = queryString
                 ? restaurants.filter(this.createFilterCarrier(queryString))
-                : restaurants;
-              cb(results);
+                : restaurants
+              cb(results)
             }
-          });
+          })
       }
     },
 
@@ -792,133 +799,131 @@ export default {
       if (queryString.length > 1) {
         this.axios
           .post(
-            "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + queryString
+            '/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=' + queryString
           )
-          .then((res) => {
-            console.log(res.data.data.list.length);
-            console.log(res.data.data);
-            if (res.data.code == "200") {
-              this.LineList = [];
+          .then(res => {
+            console.log(res.data.data.list.length)
+            console.log(res.data.data)
+            if (res.data.code == '200') {
+              this.LineList = []
               if (res.data.data.list.length == 0) {
-                this.$message.info("线路不存在,请前往注册");
-                return;
+                this.$message.info('线路不存在,请前往注册')
+                return
               }
-              var restaurants = res.data.data.list;
-              this.LineList = res.data.data.list;
-              console.log(this.LineList);
+              var restaurants = res.data.data.list
+              this.LineList = res.data.data.list
+              console.log(this.LineList)
               var results = queryString
                 ? restaurants.filter(this.createFilterLine(queryString))
-                : restaurants;
-              cb(results);
+                : restaurants
+              cb(results)
             }
-          });
+          })
       }
     },
     //获取发站
-     getSendStations() {
-      this.axios
-        .get(
-          "/api/v1/uc/getInwardSendStation"
-        )
-        .then((res) => {
-          console.log(res.data.data);
-          if (res.data.code == "200") {
-            this.sendStations = res.data.data;
-          }
-        });
+    getSendStations() {
+      this.axios.get('/api/v1/uc/getInwardSendStation').then(res => {
+        console.log(res.data.data)
+        if (res.data.code == '200') {
+          this.sendStations = res.data.data
+        }
+      })
     },
     // 过滤器
     createFilterLine(queryString) {
-      return (restaurants) => {
+      return restaurants => {
         return (
           restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) >
           -1
-        );
-      };
+        )
+      }
     },
 
     createFilterCarrier(queryString) {
-      return (restaurants) => {
+      return restaurants => {
         return (
           restaurants.value1.toLowerCase().indexOf(queryString.toLowerCase()) >
           -1
-        );
-      };
+        )
+      }
     },
     //以下是车牌号边输边查搜索
     querySearch(queryString, cb) {
       if (queryString.length > 3) {
         this.axios
-          .post("/api/v1/uc/getCapacityByLike?index=" + queryString)
-          .then((res) => {
-            this.capacityList = [];
-            if (res.data.code == "200") {
+          .post('/api/v1/uc/getCapacityByLike?index=' + queryString)
+          .then(res => {
+            this.capacityList = []
+            if (res.data.code == '200') {
               if (res.data.data.length == 0) {
-                this.$message.info("车牌号不存在,请前往注册");
-                return;
+                this.$message.info('车牌号不存在,请前往注册')
+                return
               }
-              var restaurants = res.data.data;
-              this.capacityList = res.data.data;
+              var restaurants = res.data.data
+              this.capacityList = res.data.data
               var results = queryString
                 ? restaurants.filter(this.createFilter(queryString))
-                : restaurants;
+                : restaurants
               // console.log("res",+results);
               // 调用 callback 返回建议列表的数据
-              cb(results);
+              cb(results)
             }
-          });
+          })
       }
     },
     createFilter(queryString) {
-      return (restaurants) => {
+      return restaurants => {
         return (
           restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) >
           -1
-        );
-      };
+        )
+      }
     },
     //车牌号弹出层
     handleSelect(row, index) {
-      this.capacityList.forEach((item) => {
+      this.capacityList.forEach(item => {
         if (item.capacityNumber === row.capacityNo) {
-          row.newsCapacityId = item.capacityId;
+          row.newsCapacityId = item.capacityId
         }
-      });
+      })
     },
-   //多拼弹出层绑定车牌号
+    //多拼弹出层绑定车牌号
     handleMulSelect(row, index) {
-      this.capacityList.forEach((item) => {
+      this.capacityList.forEach(item => {
         if (item.capacityNumber === row.capacityNo) {
-          this.selection.forEach((selected)=>{
-             selected.newsCapacityId = item.capacityId;
-             selected.capacityNo=row.capacityNo;
-          });
-          this.newsCapacityId=item.capacityId;
-          this.capacityNo=row.capacityNo;
-          console.log("newCapacityId:",this.newsCapacityId);
+          this.selection.forEach(selected => {
+            selected.newsCapacityId = item.capacityId
+            selected.capacityNo = row.capacityNo
+          })
+          this.newsCapacityId = item.capacityId
+          this.capacityNo = row.capacityNo
+          console.log('newCapacityId:', this.newsCapacityId)
         }
-      });
+      })
     },
 
     // 线路弹出层
     handleSelectLine(row, index) {
-      this.capacityList.forEach((item) => {
+      this.capacityList.forEach(item => {
         if (item.lineName === row.lineName) {
-          row.newLineId = item.lineId;
+          row.newLineId = item.lineId
         }
-      });
+      })
     },
 
     // 更新线路
     updateLine(row) {
-      row.lineId = this.lineId;
-      console.log("this.lineId" +this.lineId);
+      row.lineId = this.lineId
+      console.log('this.lineId' + this.lineId)
     },
 
-    updateSendStation(selection,row){
-      let sendStation=this.sendStations.find(item=>item.sendStationId==row.sendStationId);
-      row.sendStation=sendStation.sendStation;
-      console.log("sendStation",sendStation);
+    updateSendStation(selection, row) {
+      let sendStation = this.sendStations.find(
+        item => item.sendStationId == row.sendStationId
+      )
+      row.sendStation = sendStation.sendStation
+      console.log('sendStation', sendStation)
       //绑定线路id
       // let i = 0;
       // this.tableData.forEach((e) => {
@@ -933,790 +938,792 @@ export default {
       // }else{
       //   console.log("没有该发站的线路");
       // }
-      console.log("row:",row);
+      console.log('row:', row)
     },
 
     updateCapacity(row) {
-      row.isIwardSteel=4;
-      row.saleOrderMaterialId=row.saleOrderId;
+      row.isIwardSteel = 4
+      row.saleOrderMaterialId = row.saleOrderId
       if (row.newsCapacityId == null) {
-        this.$message.warning("请先注册车牌号或者选中弹出后再提交!");
-        return;
+        this.$message.warning('请先注册车牌号或者选中弹出后再提交!')
+        return
       }
       if (!isVehicleNumber(row.capacityNo)) {
-        this.$message.error("请输入正确格式的车牌号!");
-        return;
+        this.$message.error('请输入正确格式的车牌号!')
+        return
       }
       if (row.capacityIds != 0) {
         const loading = this.$loading({
           lock: true,
-          text: "正在变更车牌号",
-          spinner: "el-icon-loading",
-          background: "rgba(0, 0, 0, 0.7)",
-        });
+          text: '正在变更车牌号',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
         this.axios
-          .post("/api/v1/ams/updateCapacityNumberInFactory", row)
-          .then((res) => {
-            if (res.data.code == "200") {
-              this.$message.success("变更车牌号成功!");
-              this.getSteelReport();
-              loading.close();
+          .post('/api/v1/ams/updateCapacityNumberInFactory', row)
+          .then(res => {
+            if (res.data.code == '200') {
+              this.$message.success('变更车牌号成功!')
+              this.getSteelReport()
+              loading.close()
             } else {
-              this.$message.success("变更失败,请联系管理员");
-              this.getSteelReport();
-              loading.close();
+              this.$message.success('变更失败,请联系管理员')
+              this.getSteelReport()
+              loading.close()
             }
           })
           .catch(() => {
-            this.$message.success("变更失败,请联系管理员");
-            this.getSteelReport();
-            loading.close();
-          });
+            this.$message.success('变更失败,请联系管理员')
+            this.getSteelReport()
+            loading.close()
+          })
       } else {
         if (row.carrierIds == 0) {
-          this.$message.error("请先选择承运商!");
-          return;
+          this.$message.error('请先选择承运商!')
+          return
         }
-        row.driverTel = row.capacityTel;
-        row.capacityNumber = row.capacityNo;
-        let arr = [];
-        arr.push(row);
+        row.driverTel = row.capacityTel
+        row.capacityNumber = row.capacityNo
+        let arr = []
+        arr.push(row)
         const loading = this.$loading({
           lock: true,
-          text: "正在变更车牌号",
-          spinner: "el-icon-loading",
-          background: "rgba(0, 0, 0, 0.7)",
-        });
+          text: '正在变更车牌号',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
         this.axios
-          .post("/api/v1/ams/dispatchSteelOrder", arr)
-          .then((res) => {
-            if (res.data.code == "200") {
-              this.$message.success("派车成功!");
-              this.getSteelReport();
-              loading.close();
+          .post('/api/v1/ams/dispatchSteelOrder', arr)
+          .then(res => {
+            if (res.data.code == '200') {
+              this.$message.success('派车成功!')
+              this.getSteelReport()
+              loading.close()
             } else {
-              this.$message.error("派车失败,请联系管理员");
-              this.getSteelReport();
-              loading.close();
+              this.$message.error('派车失败,请联系管理员')
+              this.getSteelReport()
+              loading.close()
             }
           })
           .catch(() => {
-            this.$message.error("派车失败,请联系管理员");
-            this.getSteelReport();
-            loading.close();
-          });
+            this.$message.error('派车失败,请联系管理员')
+            this.getSteelReport()
+            loading.close()
+          })
       }
     },
-    
+
     //多拼修改
     updateMulCapacity() {
-      this.selection.forEach((item)=>{
-          item.isIwardSteel=4;
-          item.saleOrderMaterialId=item.saleOrderId;
-          item.capacityId=this.capacityId;
-          item.capacityNumber=this.capacityNo;
-      });
-      if(this.selection[0].sendStation=="达州站"){
-        this.selection.forEach((item)=>{
-          item.lineId=this.lineDazhou[this.selection.length];
-          item.lineName="达州站";
-        });
-      }else if(this.selection[0].sendStation=="专用线"){
-        this.selection.forEach((item)=>{
-          item.lineId=this.lineZhuanxian[this.selection.length];
-          item.lineName="专用线";
-        });
-      }else{
-        console.log("没有该发站的线路");
+      this.selection.forEach(item => {
+        item.isIwardSteel = 4
+        item.saleOrderMaterialId = item.saleOrderId
+        item.capacityId = this.capacityId
+        item.capacityNumber = this.capacityNo
+      })
+      if (this.selection[0].sendStation == '达州站') {
+        this.selection.forEach(item => {
+          item.lineId = this.lineDazhou[this.selection.length]
+          item.lineName = '达州站'
+        })
+      } else if (this.selection[0].sendStation == '专用线') {
+        this.selection.forEach(item => {
+          item.lineId = this.lineZhuanxian[this.selection.length]
+          item.lineName = '专用线'
+        })
+      } else {
+        console.log('没有该发站的线路')
       }
-      console.log("selection:",this.selection);
-      return;
+      console.log('selection:', this.selection)
+      return
       if (row.newsCapacityId == null) {
-        this.$message.warning("请先注册车牌号或者选中弹出后再提交!");
-        return;
+        this.$message.warning('请先注册车牌号或者选中弹出后再提交!')
+        return
       }
       if (!isVehicleNumber(row.capacityNo)) {
-        this.$message.error("请输入正确格式的车牌号!");
-        return;
+        this.$message.error('请输入正确格式的车牌号!')
+        return
       }
       if (row.capacityIds != 0) {
         const loading = this.$loading({
           lock: true,
-          text: "正在变更车牌号",
-          spinner: "el-icon-loading",
-          background: "rgba(0, 0, 0, 0.7)",
-        });
+          text: '正在变更车牌号',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
         this.axios
-          .post("/api/v1/ams/updateCapacityNumberInFactory", row)
-          .then((res) => {
-            if (res.data.code == "200") {
-              this.$message.success("变更车牌号成功!");
-              this.getSteelReport();
-              loading.close();
+          .post('/api/v1/ams/updateCapacityNumberInFactory', row)
+          .then(res => {
+            if (res.data.code == '200') {
+              this.$message.success('变更车牌号成功!')
+              this.getSteelReport()
+              loading.close()
             } else {
-              this.$message.success("变更失败,请联系管理员");
-              this.getSteelReport();
-              loading.close();
+              this.$message.success('变更失败,请联系管理员')
+              this.getSteelReport()
+              loading.close()
             }
           })
           .catch(() => {
-            this.$message.success("变更失败,请联系管理员");
-            this.getSteelReport();
-            loading.close();
-          });
+            this.$message.success('变更失败,请联系管理员')
+            this.getSteelReport()
+            loading.close()
+          })
       } else {
         if (row.carrierIds == 0) {
-          this.$message.error("请先选择承运商!");
-          return;
+          this.$message.error('请先选择承运商!')
+          return
         }
-        row.driverTel = row.capacityTel;
-        row.capacityNumber = row.capacityNo;
-        let arr = [];
-        arr.push(row);
+        row.driverTel = row.capacityTel
+        row.capacityNumber = row.capacityNo
+        let arr = []
+        arr.push(row)
         const loading = this.$loading({
           lock: true,
-          text: "正在变更车牌号",
-          spinner: "el-icon-loading",
-          background: "rgba(0, 0, 0, 0.7)",
-        });
+          text: '正在变更车牌号',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
         this.axios
-          .post("/api/v1/ams/dispatchSteelOrder", arr)
-          .then((res) => {
-            if (res.data.code == "200") {
-              this.$message.success("派车成功!");
-              this.getSteelReport();
-              loading.close();
+          .post('/api/v1/ams/dispatchSteelOrder', arr)
+          .then(res => {
+            if (res.data.code == '200') {
+              this.$message.success('派车成功!')
+              this.getSteelReport()
+              loading.close()
             } else {
-              this.$message.error("派车失败,请联系管理员");
-              this.getSteelReport();
-              loading.close();
+              this.$message.error('派车失败,请联系管理员')
+              this.getSteelReport()
+              loading.close()
             }
           })
           .catch(() => {
-            this.$message.error("派车失败,请联系管理员");
-            this.getSteelReport();
-            loading.close();
-          });
+            this.$message.error('派车失败,请联系管理员')
+            this.getSteelReport()
+            loading.close()
+          })
       }
     },
-    
+
     //修改司机电话号码
     updateDriverTel(row) {
       const loading = this.$loading({
         lock: true,
-        text: "修改电话号码中",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
-      if (row.capacityTel == null || row.capacityTel == "") {
-        this.$message.error("电话号码不能为空");
-        return;
+        text: '修改电话号码中',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      if (row.capacityTel == null || row.capacityTel == '') {
+        this.$message.error('电话号码不能为空')
+        return
       }
       this.axios
-        .post("/api/v1/uc/updateDriverTel", {
+        .post('/api/v1/uc/updateDriverTel', {
           orderId: parseInt(row.orderId),
-          driverTel: row.capacityTel,
+          driverTel: row.capacityTel
         })
-        .then((res) => {
-          if (res.data.code == "200") {
-            this.$message.success("修改成功");
-            this.getSteelReport();
-            loading.close();
+        .then(res => {
+          if (res.data.code == '200') {
+            this.$message.success('修改成功')
+            this.getSteelReport()
+            loading.close()
           } else {
-            this.$message.error("修改失败");
-            this.getSteelReport();
-            loading.close();
+            this.$message.error('修改失败')
+            this.getSteelReport()
+            loading.close()
           }
         })
         .catch(() => {
-          this.$message.error("修改失败");
-          this.getSteelReport();
-          loading.close();
-        });
+          this.$message.error('修改失败')
+          this.getSteelReport()
+          loading.close()
+        })
     },
     //关闭车辆金蝶分录
     deleteEasEntryId(row) {
-      this.$confirm("确定关闭该车金蝶分录吗?", "提示", {
-        confirmButtonText: "是",
-        cancelButtonText: "否",
+      this.$confirm('确定关闭该车金蝶分录吗?', '提示', {
+        confirmButtonText: '是',
+        cancelButtonText: '否',
         center: true,
-        type: "warning",
+        type: 'warning'
       })
         .then(() => {
-          let map = row;
-          map.isCloseEas = Number(0);
+          let map = row
+          map.isCloseEas = Number(0)
           const loading = this.$loading({
             lock: true,
-            text: "正在关闭车辆",
-            spinner: "el-icon-loading",
-            background: "rgba(0, 0, 0, 0.7)",
-          });
+            text: '正在关闭车辆',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
           this.axios
-            .post("/api/v1/ams/updateCarAddress", map)
-            .then((res) => {
-              if (res.data.code == "200") {
-                this.$message.success("关闭车辆成功");
-                this.getSteelReport();
-                loading.close();
+            .post('/api/v1/ams/updateCarAddress', map)
+            .then(res => {
+              if (res.data.code == '200') {
+                this.$message.success('关闭车辆成功')
+                this.getSteelReport()
+                loading.close()
               } else {
-                this.$message.error("关闭车辆失败");
-                this.getSteelReport();
-                loading.close();
+                this.$message.error('关闭车辆失败')
+                this.getSteelReport()
+                loading.close()
               }
             })
             .catch(() => {
-              this.$message.error("关闭车辆失败");
-              this.getSteelReport();
-              loading.close();
-            });
+              this.$message.error('关闭车辆失败')
+              this.getSteelReport()
+              loading.close()
+            })
         })
         .catch(() => {
-          this.$message.info("取消关闭");
-        });
+          this.$message.info('取消关闭')
+        })
     },
     //修改承运商授权
     updateTruckCarrier(row) {
-      if(!row.saleOrderMaterialId){
-        row.saleOrderMaterialId=row.saleOrderId;
+      if (!row.saleOrderMaterialId) {
+        row.saleOrderMaterialId = row.saleOrderId
       }
       if (row.newCarrierId == null) {
-        this.$message.warning("请注册承运商或者选中弹出层之后再提交!");
-        this.getSteelReport();
-        return;
+        this.$message.warning('请注册承运商或者选中弹出层之后再提交!')
+        this.getSteelReport()
+        return
       }
       if (row.carrierIds != 0) {
         const loading = this.$loading({
           lock: true,
-          text: "正在修改承运商授权",
-          spinner: "el-icon-loading",
-          background: "rgba(0, 0, 0, 0.7)",
-        });
+          text: '正在修改承运商授权',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
         this.axios
-          .post("/api/v1/ams/updateTruckNoCarrier", row)
-          .then((res) => {
-            if (res.data.code == "200") {
-              this.$message.success("修改承运商授权成功");
-              this.getSteelReport();
-              loading.close();
+          .post('/api/v1/ams/updateTruckNoCarrier', row)
+          .then(res => {
+            if (res.data.code == '200') {
+              this.$message.success('修改承运商授权成功')
+              this.getSteelReport()
+              loading.close()
             } else {
-              this.$message.error("修改失败,请联系管理员!");
-              this.getSteelReport();
-              loading.close();
+              this.$message.error('修改失败,请联系管理员!')
+              this.getSteelReport()
+              loading.close()
             }
           })
           .catch(() => {
-            this.$message.error("修改失败,请联系管理员!");
-            this.getSteelReport();
-            loading.close();
-          });
+            this.$message.error('修改失败,请联系管理员!')
+            this.getSteelReport()
+            loading.close()
+          })
       } else {
         //授权承运商
-        let arr = [];
-        arr.push(row);
+        let arr = []
+        arr.push(row)
         const loading = this.$loading({
           lock: true,
-          text: "正在授权承运商",
-          spinner: "el-icon-loading",
-          background: "rgba(0, 0, 0, 0.7)",
-        });
+          text: '正在授权承运商',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
         this.axios
-          .post("/api/v1/ams/dispatchToCarrier", arr)
-          .then((res) => {
-            if (res.data.code == "0") {
-              this.$message.success("授权承运商成功");
-              this.getSteelReport();
-              loading.close();
+          .post('/api/v1/ams/dispatchToCarrier', arr)
+          .then(res => {
+            if (res.data.code == '0') {
+              this.$message.success('授权承运商成功')
+              this.getSteelReport()
+              loading.close()
             } else {
-              this.$message.error("授权失败,请联系管理员");
-              this.getSteelReport();
-              loading.close();
+              this.$message.error('授权失败,请联系管理员')
+              this.getSteelReport()
+              loading.close()
             }
           })
           .catch(() => {
-            this.$message.error("授权失败,请联系管理员");
-            this.getSteelReport();
-            loading.close();
-          });
+            this.$message.error('授权失败,请联系管理员')
+            this.getSteelReport()
+            loading.close()
+          })
       }
     },
     updateAddress(row) {
-      this.drawer = true;
-      this.addressRow = row;
-      this.province = row.addressProvince;
-      this.city = row.addressDistrict;
-      this.county = row.addressTown;
-      this.addressId = row.shipperAddressId;
-      this.getAllProvince();
-      this.onchangeProvince();
-      this.onchangeCity();
+      this.drawer = true
+      this.addressRow = row
+      this.province = row.addressProvince
+      this.city = row.addressDistrict
+      this.county = row.addressTown
+      this.addressId = row.shipperAddressId
+      this.getAllProvince()
+      this.onchangeProvince()
+      this.onchangeCity()
     },
     //获取所有省数据
     getAllProvince() {
-      this.axios.post("/api/v1/uc/getAllProvince").then((res) => {
-        this.provinceList = res.data.data;
-      });
+      this.axios.post('/api/v1/uc/getAllProvince').then(res => {
+        this.provinceList = res.data.data
+      })
     },
     //省改变
     onchangeProvince() {
       this.axios
         .post(
-          "/api/v1/uc/getDistrictByProvince?addressProvince=" +
+          '/api/v1/uc/getDistrictByProvince?addressProvince=' +
             this.province +
-            "&i=" +
+            '&i=' +
             new Date()
         )
-        .then((res) => {
-          this.cityList = res.data.data;
+        .then(res => {
+          this.cityList = res.data.data
           // this.city = "";
           // this.county = "";
-        });
+        })
     },
     //市改变
     onchangeCity() {
       this.axios
         .post(
-          "/api/v1/uc/getTownByDistrict?addressDistrict=" +
+          '/api/v1/uc/getTownByDistrict?addressDistrict=' +
             this.city +
-            "&i=" +
+            '&i=' +
             new Date()
         )
-        .then((res) => {
-          this.countyList = res.data.data;
-        });
+        .then(res => {
+          this.countyList = res.data.data
+        })
     },
     //县(区)改变
     onchangeCounty() {
       let mapValue = {
         addressProvince: this.province,
         addressDistrict: this.city,
-        addressTown: this.county,
-      };
-      this.axios
-        .post("/api/v1/uc/getPlaceByAllAddress", mapValue)
-        .then((res) => {
-          this.addressId = res.data.data[0].addressId;
-        });
+        addressTown: this.county
+      }
+      this.axios.post('/api/v1/uc/getPlaceByAllAddress', mapValue).then(res => {
+        this.addressId = res.data.data[0].addressId
+      })
     },
     //收货地址弹出层
     handleSelect1(item) {
-      console.log("获取所有下拉值!");
+      console.log('获取所有下拉值!')
     },
     //以下是收货地址边输边查搜索
     querySearch1(queryString, cb) {
       this.axios
         .post(
-          "/api/v1/ams/getRealAddressByLike?addressId=" +
+          '/api/v1/ams/getRealAddressByLike?addressId=' +
             this.addressId +
-            "&index=" +
+            '&index=' +
             queryString
         )
-        .then((res) => {
-          if (res.data.code == "200") {
-            var restaurants = res.data.data;
+        .then(res => {
+          if (res.data.code == '200') {
+            var restaurants = res.data.data
             var results = queryString
               ? restaurants.filter(this.createFilter1(queryString))
-              : restaurants;
+              : restaurants
             // 调用 callback 返回建议列表的数据
-            cb(results);
+            cb(results)
           }
-        });
+        })
     },
     createFilter1(queryString) {
-      return (restaurants) => {
+      return restaurants => {
         return (
           restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) >
           -1
-        );
-      };
+        )
+      }
     },
     //修改收货地址
     addAddressClick() {
       const loading = this.$loading({
         lock: true,
-        text: "正在修改收货地址",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
-      let map = this.addressRow;
-      map.isCloseEas = Number(1);
-      map.isNewCar = Number(1);
-      map.place = this.place;
-      map.shipperAddressId = this.addressId;
+        text: '正在修改收货地址',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      let map = this.addressRow
+      map.isCloseEas = Number(1)
+      map.isNewCar = Number(1)
+      map.place = this.place
+      map.shipperAddressId = this.addressId
       this.axios
-        .post("/api/v1/ams/updateCarAddress", map)
-        .then((res) => {
-          if (res.data.code == "200") {
-            this.$message.success("修改收货地址成功!");
-            this.getSteelReport();
-            this.drawer = false;
-            loading.close();
+        .post('/api/v1/ams/updateCarAddress', map)
+        .then(res => {
+          if (res.data.code == '200') {
+            this.$message.success('修改收货地址成功!')
+            this.getSteelReport()
+            this.drawer = false
+            loading.close()
           } else {
-            this.$message.error("修改失败,请联系管理员!");
-            this.getSteelReport();
-            this.drawer = false;
-            loading.close();
+            this.$message.error('修改失败,请联系管理员!')
+            this.getSteelReport()
+            this.drawer = false
+            loading.close()
           }
         })
         .catch(() => {
-          this.$message.error("修改失败,请联系管理员!");
-          this.getSteelReport();
-          this.drawer = false;
-          loading.close();
-        });
+          this.$message.error('修改失败,请联系管理员!')
+          this.getSteelReport()
+          this.drawer = false
+          loading.close()
+        })
     },
     //记录每一行的合并数
     getSpanArr(data) {
       //每次调用方法初始化
-      this.spanArr = [];
+      this.spanArr = []
       for (var i = 0; i < data.length; i++) {
         if (i === 0) {
-          this.spanArr.push(1);
-          data[i].group = i;
-          this.pos = 0;
+          this.spanArr.push(1)
+          data[i].group = i
+          this.pos = 0
         } else {
           // 判断当前元素与上一个元素是否相同
           if (data[i].saleOrderId === data[i - 1].saleOrderMaterialId) {
-            this.spanArr[this.pos] += 1;
-            data[i].group = data[i - 1].group;
-            this.spanArr.push(0);
+            this.spanArr[this.pos] += 1
+            data[i].group = data[i - 1].group
+            this.spanArr.push(0)
           } else {
-            this.spanArr.push(1);
-            this.pos = i;
-            data[i].group = data[i - 1].group + 1;
+            this.spanArr.push(1)
+            this.pos = i
+            data[i].group = data[i - 1].group + 1
           }
         }
-        this.totalCapacity = data[data.length - 1].group + 1;
-        this.totalNumber = data.reduce(function (prev, item) {
-          return prev + item.materialNum;
-        }, 0);
+        this.totalCapacity = data[data.length - 1].group + 1
+        this.totalNumber = data.reduce(function(prev, item) {
+          return prev + item.materialNum
+        }, 0)
       }
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (this.columnIndexs.indexOf(columnIndex) != -1) {
-        const _row = this.spanArr[rowIndex];
-        const _col = _row > 0 ? 1 : 0;
+        const _row = this.spanArr[rowIndex]
+        const _col = _row > 0 ? 1 : 0
         return {
           rowspan: _row,
-          colspan: _col,
-        };
+          colspan: _col
+        }
       }
     },
     //减少物资件数
     updateBillOrder(row) {
       const loading = this.$loading({
         lock: true,
-        text: "修改物资件数中",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
+        text: '修改物资件数中',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       let map = {
         materialId: row.materialId,
-        materialNum: row.materialNum,
-      };
-      let arr = [];
-      arr.push(map);
+        materialNum: row.materialNum
+      }
+      let arr = []
+      arr.push(map)
       let updateMap = {
         orderId: row.orderId,
         saleOrderId: row.saleOrderId,
         saleOrderMaterialId: row.saleOrderMaterialId,
-        mapList: arr,
-      };
+        mapList: arr
+      }
       this.axios
-        .post("/api/v1/oms/updateMaterialMes", updateMap)
-        .then((res) => {
-          if (res.data.code == "200") {
-            this.$message.success("修改物资数量成功");
-            this.getSteelReport();
-            loading.close();
+        .post('/api/v1/oms/updateMaterialMes', updateMap)
+        .then(res => {
+          if (res.data.code == '200') {
+            this.$message.success('修改物资数量成功')
+            this.getSteelReport()
+            loading.close()
           } else {
-            this.$message.error("修改物资数量失败,请联系管理员");
-            this.getSteelReport();
-            loading.close();
+            this.$message.error('修改物资数量失败,请联系管理员')
+            this.getSteelReport()
+            loading.close()
           }
         })
         .catch(() => {
-          this.$message.error("修改物资数量失败,请联系管理员");
-          this.getSteelReport();
-          loading.close();
-        });
+          this.$message.error('修改物资数量失败,请联系管理员')
+          this.getSteelReport()
+          loading.close()
+        })
     },
     //关闭单条分录
     closeEasEntryId(row) {
-      console.log(row);
-      this.$prompt("确定关闭该条分录吗?", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
+      console.log(row)
+      this.$prompt('确定关闭该条分录吗?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
         center: true,
-        inputPlaceholder: "请输入关闭理由",
+        inputPlaceholder: '请输入关闭理由'
       })
         .then(({ value }) => {
-          if (value != null || value != "") {
+          if (value != null || value != '') {
             const loading = this.$loading({
               lock: true,
-              text: "正在关闭该条分录",
-              spinner: "el-icon-loading",
-              background: "rgba(0, 0, 0, 0.7)",
-            });
+              text: '正在关闭该条分录',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
             let map = {
               orderId: row.orderId,
               saleOrderMaterialId: row.saleOrderMaterialId,
               saleMaterialId: row.saleMaterialId,
               reason: value,
               number: row.saleOrderNo,
-              closeEntryId: row.closeEntryId,
-            };
+              closeEntryId: row.closeEntryId
+            }
             this.axios
-              .post("/api/v1/ams/closeSteelMaterialId", map)
-              .then((res) => {
-                if (res.data.code == "200") {
-                  this.$message.success("关闭成功");
-                  this.getSteelReport();
-                  loading.close();
+              .post('/api/v1/ams/closeSteelMaterialId', map)
+              .then(res => {
+                if (res.data.code == '200') {
+                  this.$message.success('关闭成功')
+                  this.getSteelReport()
+                  loading.close()
                 } else {
-                  this.$message.error("关闭失败,请联系管理员");
-                  this.getSteelReport();
-                  loading.close();
+                  this.$message.error('关闭失败,请联系管理员')
+                  this.getSteelReport()
+                  loading.close()
                 }
               })
               .catch(() => {
-                this.$message.error("关闭失败,请联系管理员");
-                this.getSteelReport();
-                loading.close();
-              });
+                this.$message.error('关闭失败,请联系管理员')
+                this.getSteelReport()
+                loading.close()
+              })
           }
         })
         .catch(() => {
-          this.$message.info("取消输入");
-        });
+          this.$message.info('取消输入')
+        })
     },
     //查询,输入查询条件
     onclick() {
-      let startTime = null;
-      let endTime = null;
-      let carrierSsoId = null;
-      let carrierName = null;
-      let consigneeName = null;
-      let capacityNo = null;
-      let remark = null;
-      let saler = null;
+      let startTime = null
+      let endTime = null
+      let carrierSsoId = null
+      let carrierName = null
+      let consigneeName = null
+      let capacityNo = null
+      let remark = null
+      let saler = null
       if (this.startTime && this.endTime) {
-        startTime = sjTime(this.startTime);
-        endTime = sjTime(this.endTime);
+        startTime = sjTime(this.startTime)
+        endTime = sjTime(this.endTime)
       }
-      if (getCookie("orgCode") == "chengyunshang") {
-        carrierSsoId = getCookie("userId");
+      if (getCookie('orgCode') == 'chengyunshang') {
+        carrierSsoId = getCookie('userId')
       }
-      if (getCookie("orgCode") == "xiaoshouyewuyuan") {
-        saler = getCookie("loginName");
+      if (getCookie('orgCode') == 'xiaoshouyewuyuan') {
+        saler = getCookie('loginName')
       }
-      if (this.screen == "下单客户") {
-        consigneeName = this.input;
-      } else if (this.screen == "承运商") {
-        carrierName = this.input;
-      } else if (this.screen == "车牌号") {
-        capacityNo = this.input;
+      if (this.screen == '下单客户') {
+        consigneeName = this.input
+      } else if (this.screen == '承运商') {
+        carrierName = this.input
+      } else if (this.screen == '车牌号') {
+        capacityNo = this.input
       } else {
-        remark = this.input;
+        remark = this.input
       }
       this.axios
         .post(
-          "/api/v1/tms/getInwardSaleSteelReport?startTime=" +
+          '/api/v1/tms/getInwardSaleSteelReport?startTime=' +
             startTime +
-            "&endTime=" +
+            '&endTime=' +
             endTime +
-            "&carrierSsoId=" +
+            '&carrierSsoId=' +
             carrierSsoId +
-            "&i=" +
+            '&i=' +
             new Date() +
-            "&remark=" +
+            '&remark=' +
             remark +
-            "&consigneeName=" +
+            '&consigneeName=' +
             consigneeName +
-            "&carrierName=" +
+            '&carrierName=' +
             carrierName +
-            "&capacityNo=" +
+            '&capacityNo=' +
             capacityNo +
-            "&saler=" +
+            '&saler=' +
             saler
         )
-        .then((res) => {
-          this.tableData = res.data.data;
-          this.getSpanArr(res.data.data);
-        });
+        .then(res => {
+          this.tableData = res.data.data
+          this.getSpanArr(res.data.data)
+        })
     },
     //重新获取表格数据
     refresh() {
-      this.getSteelReport();
+      this.getSteelReport()
     },
     //获取钢材统计报表
     getSteelReport() {
-      let carrierSsoId = null;
-      let saler = null;
-      if (getCookie("orgCode") == "chengyunshang") {
-        carrierSsoId = getCookie("userId");
+      let carrierSsoId = null
+      let saler = null
+      if (getCookie('orgCode') == 'chengyunshang') {
+        carrierSsoId = getCookie('userId')
       }
-      if (getCookie("orgCode") == "xiaoshouyewuyuan") {
-        saler = getCookie("loginName");
+      if (getCookie('orgCode') == 'xiaoshouyewuyuan') {
+        saler = getCookie('loginName')
       }
       this.axios
         .post(
-          "/api/v1/tms/getInwardSaleSteelReport?startTime=" +
+          '/api/v1/tms/getInwardSaleSteelReport?startTime=' +
             null +
-            "&endTime=" +
+            '&endTime=' +
             null +
-            "&carrierSsoId=" +
+            '&carrierSsoId=' +
             carrierSsoId +
-            "&saler=" +
+            '&saler=' +
             saler +
-            "&i=" +
+            '&i=' +
             new Date()
         )
-        .then((res) => {
-          this.tableData = res.data.data;
-          this.getSpanArr(res.data.data);
-        });
+        .then(res => {
+          this.tableData = res.data.data
+          this.getSpanArr(res.data.data)
+        })
     },
     //控制列自动撑开
     flexColumnWidth(str, tableData, flag) {
       // str为该列的字段名(传字符串);tableData为该表格的数据源(传变量);
       // flag为可选值,可不传该参数,传参时可选'max'或'equal',默认为'max'
       // flag为'max'则设置列宽适配该列中最长的内容,flag为'equal'则设置列宽适配该列中第一行内容的长度。
-      str = str + "";
-      let columnContent = "";
+      str = str + ''
+      let columnContent = ''
       if (
         !tableData ||
         !tableData.length ||
         tableData.length === 0 ||
         tableData === undefined
       ) {
-        return;
+        return
       }
       if (!str || !str.length || str.length === 0 || str === undefined) {
-        return;
+        return
       }
-      if (flag === "equal") {
+      if (flag === 'equal') {
         // 获取该列中第一个不为空的数据(内容)
         for (let i = 0; i < tableData.length; i++) {
           if (tableData[i][str].length > 0) {
-            columnContent = tableData[i][str] + "";
-            break;
+            columnContent = tableData[i][str] + ''
+            break
           }
         }
       } else {
         // 获取该列中最长的数据(内容)
-        let index = 0;
+        let index = 0
         for (let i = 0; i < tableData.length; i++) {
           if (tableData[i][str] === null) {
             // 当数据为空时跳过本次循环获取下一条数据长度
-            continue;
+            continue
           }
-          const now_temp = tableData[i][str] + "";
-          const max_temp = tableData[index][str] + "";
+          const now_temp = tableData[i][str] + ''
+          const max_temp = tableData[index][str] + ''
           if (now_temp.length > max_temp.length) {
-            index = i;
+            index = i
           }
         }
-        columnContent = tableData[index][str] + "";
+        columnContent = tableData[index][str] + ''
       } // 以下分配的单位长度可根据实际需求进行调整
-      let flexWidth = 0;
+      let flexWidth = 0
       if (columnContent != undefined) {
         for (const char of columnContent) {
-          if ((char >= "A" && char <= "Z") || (char >= "a" && char <= "z")) {
+          if ((char >= 'A' && char <= 'Z') || (char >= 'a' && char <= 'z')) {
             // 如果是英文字符,为字符分配10个单位宽度
-            flexWidth += 10;
-          } else if (char >= "\u4e00" && char <= "\u9fa5") {
+            flexWidth += 10
+          } else if (char >= '\u4e00' && char <= '\u9fa5') {
             // 如果是中文字符,为字符分配16个单位宽度
-            flexWidth += 14;
+            flexWidth += 14
           } else {
             // 其他种类字符,为字符分配10个单位宽度
-            flexWidth += 10;
+            flexWidth += 10
           }
         }
       }
       if (flexWidth < 80) {
         // 设置最小宽度
-        flexWidth = 80;
+        flexWidth = 80
       }
       if (flexWidth > 500) {
         // 设置最大宽度
-        flexWidth = 500;
+        flexWidth = 500
       }
-      return flexWidth + "px";
+      return flexWidth + 'px'
     },
     //多拼弹出层
-    showDialog(){
-      let selection=this.$refs.tableRef.selection;
-      console.log("selection",selection);
-      if(selection && selection.length>0){
-        if(selection.find(item=>item.lineId != selection[0].lineId || item.saleOrderId!=selection[0].saleOrderId)){
-           this.$message({
-            message:"无法生成多拼,订单或者线路不一致",
-            type:"warning"
-          });
-          return;
+    showDialog() {
+      let selection = this.$refs.tableRef.selection
+      console.log('selection', selection)
+      if (selection && selection.length > 0) {
+        if (
+          selection.find(
+            item =>
+              item.lineId != selection[0].lineId ||
+              item.saleOrderId != selection[0].saleOrderId
+          )
+        ) {
+          this.$message({
+            message: '无法生成多拼,订单或者线路不一致',
+            type: 'warning'
+          })
+          return
         }
-        this.dialogTableVisible=true;
-        this.selection=selection;
-        this.capacityNo=selection[0].capacityNo;
-      }else{
+        this.dialogTableVisible = true
+        this.selection = selection
+        this.capacityNo = selection[0].capacityNo
+      } else {
         this.$message({
-          message:"请先勾选再生成多拼",
-          type:"warning"
-        });
+          message: '请先勾选再生成多拼',
+          type: 'warning'
+        })
       }
     },
-     handleSelectConsignee(item) {
-      this.consigneeName = item.consigneeCompanyName;
-      this.consigneeId = item.consigneeId;
-      this.isReceiveHaveArea(this.consigneeId);
+    handleSelectConsignee(item) {
+      this.consigneeName = item.consigneeCompanyName
+      this.consigneeId = item.consigneeId
+      this.isReceiveHaveArea(this.consigneeId)
       //带出摘要
       this.axios
-        .post("/api/v1/uc/getSaleArea?receiveId=" + this.consigneeId)
+        .post('/api/v1/uc/getSaleArea?receiveId=' + this.consigneeId)
         .then(res => {
-          this.remarks = res.data.data;
-        });
+          this.remarks = res.data.data
+        })
       this.axios
         .post(
-          "/api/v1/ams/matchingAddressRecently?receiveId=" + this.consigneeId
+          '/api/v1/ams/matchingAddressRecently?receiveId=' + this.consigneeId
         )
         .then(res => {
-          const place = res.data.data;
-          console.log(place);
+          const place = res.data.data
+          console.log(place)
           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;
-          this.county = 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
+          this.county = place[0].addressTown
+        })
     },
-     //以下是下单客户边输边查搜索
+    //以下是下单客户边输边查搜索
     querySearchConsignee(queryString, cb) {
       this.axios
-        .post("/api/v1/uc/getConsigneeByLike?index=" + queryString)
+        .post('/api/v1/uc/getConsigneeByLike?index=' + queryString)
         .then(res => {
-          if (res.data.code == "200") {
-            this.consignee = res.data.data;
-            var restaurantsConsignee = res.data.data;
+          if (res.data.code == '200') {
+            this.consignee = res.data.data
+            var restaurantsConsignee = res.data.data
             var results = queryString
-              ? restaurantsConsignee.filter(
-                  this.createFilter1(queryString)
-                )
-              : restaurantsConsignee;
+              ? restaurantsConsignee.filter(this.createFilter1(queryString))
+              : restaurantsConsignee
             // 调用 callback 返回建议列表的数据
-            cb(results);
+            cb(results)
           }
-        });
-    },
-  },
-};
+        })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 343 - 342
src/views/inward/components/offsetSteel/saleSteelTruckOrder/saleTruckPreview.vue


+ 1 - 1
src/views/inward/components/truckAppoint/addRequirement.vue

@@ -437,7 +437,7 @@ export default {
       this.purchaseOrderNo = item.purchaseOrderNo;
       item.value = this.shipName;
     },
-    //以下是收货单位边输边查搜索
+    //以下是船名边输边查搜索
     querySearchConsignee(queryString, cb) {
       if (this.materialId) {
         this.axios

+ 0 - 2
src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -367,8 +367,6 @@
 import PageTitle from '@/components/Page/Title'
 import { sjTime } from '@/utils/sharedJsFile'
 import { getCookie } from '@/utils/util.js'
-import { checkTel } from '@/utils/validator.js'
-import returnResultVue from '../offsetSteel/truckTransport/returnResult.vue'
 export default {
   components: { PageTitle },
   data() {

+ 0 - 1
src/views/statisticalReport/components/ShipWorkReport.vue

@@ -92,7 +92,6 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { sjTime } from "@/utils/sharedJsFile";
-import {getCookie} from "@/utils/util.js";
 export default {
   components: { PageTitle },
   data() {

+ 122 - 153
src/views/statisticalReport/components/Ship_dynamic_table.vue

@@ -7,14 +7,15 @@
           v-model="endTime"
           @change="DateChange"
           type="datetime"
-          placeholder="选择截止时间">
+          placeholder="选择截止时间"
+        >
         </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="reflush">
+        <el-button type="primary" class="btn" @click="reflush">
           <i class="el-icon-search"></i>刷新
-        </el-button> -->
+        </el-button>
         <el-button type="primary" class="btn" @click="getPdfs()">
           <i class="el-icon-download"></i>下载PDF
         </el-button>
@@ -22,7 +23,7 @@
           <i class="el-icon-download"></i>下载Excel
         </el-button>
       </div>
-      <table-item ref="ship" v-bind.sync="option" id="pdfDom">
+      <table-item ref="ship" :tableData="tableData" :col="col" id="pdfDom">
       </table-item>
     </div>
   </div>
@@ -39,121 +40,117 @@ export default {
   },
   data() {
     return {
-      endTime:null,
-      option:{
-        endTime:null,
-        deadline:null,
-           // 树型结构表头数据
-        col: [
-          {
-            prop: 'materialType',
-            label: '矿种'
-          },
-          {
-            prop: 'pm',
-            label: '品名'
-          },
-          {
-            prop: 'portName',
-            label: '港口名称'
-          },
-          {
-            prop: 'tonnage',
-            label: '下游港口吨位'
-          },
-          {
-            label: '未到闸船舶',
-            children: [
-              {
-                prop: 'capacity1',
-                label: '船名'
-              },
-              {
-                prop: 'capacityNumber1',
-                label: '吨位'
-              },
-              {
-                prop: 'locationValue1',
-                label: '位置'
-              },
-              {
-                prop: 'outPortTime1',
-                label: '离港时间'
-              }
-            ]
-          },
-          {
-            label: '等闸船舶',
-            children: [
-              {
-                prop: 'capacity2',
-                label: '船名'
-              },
-              {
-                prop: 'capacityNumber2',
-                label: '吨位'
-              },
-              {
-                prop: 'locationValue2',
-                label: '位置'
-              },
-              {
-                prop: 'outPortTime2',
-                label: '离港时间'
-              }
-            ]
-          },
-          {
-            label: '已过闸船舶',
-            children: [
-              {
-                prop: 'capacity3',
-                label: '船名'
-              },
-              {
-                prop: 'capacityNumber3',
-                label: '吨位'
-              },
-              {
-                prop: 'locationValue3',
-                label: '位置'
-              },
-              {
-                prop: 'outPortTime3',
-                label: '离港时间'
-              }
-            ]
-          },
-          {
-            label: '到港待卸船舶',
-            children: [
-              {
-                prop: 'capacity4',
-                label: '船名'
-              },
-              {
-                prop: 'capacityNumber4',
-                label: '吨位'
-              },
-              {
-                prop: 'locationValue4',
-                label: '位置'
-              },
-              {
-                prop: 'outPortTime4',
-                label: '离港时间'
-              },
-              {
-                prop: 'dgsj',
-                label: '到港时间'
-              }
-            ]
-          }
-        ],
-        // 表格数据
-        tableData: [],
-      },
       htmlTitle: '船舶动态表',
+      // 树型结构表头数据
+      col: [
+        {
+          prop: 'materialType',
+          label: '矿种'
+        },
+        {
+          prop: 'pm',
+          label: '品名'
+        },
+        {
+          prop: 'portName',
+          label: '港口名称'
+        },
+        {
+          prop: 'tonnage',
+          label: '下游港口吨位'
+        },
+        {
+          label: '未到闸船舶',
+          children: [
+            {
+              prop: 'capacity1',
+              label: '船名'
+            },
+            {
+              prop: 'capacityNumber1',
+              label: '吨位'
+            },
+            {
+              prop: 'locationValue1',
+              label: '位置'
+            },
+            {
+              prop: 'outPortTime1',
+              label: '离港时间'
+            }
+          ]
+        },
+        {
+          label: '等闸船舶',
+          children: [
+            {
+              prop: 'capacity2',
+              label: '船名'
+            },
+            {
+              prop: 'capacityNumber2',
+              label: '吨位'
+            },
+            {
+              prop: 'locationValue2',
+              label: '位置'
+            },
+            {
+              prop: 'outPortTime2',
+              label: '离港时间'
+            }
+          ]
+        },
+        {
+          label: '已过闸船舶',
+          children: [
+            {
+              prop: 'capacity3',
+              label: '船名'
+            },
+            {
+              prop: 'capacityNumber3',
+              label: '吨位'
+            },
+            {
+              prop: 'locationValue3',
+              label: '位置'
+            },
+            {
+              prop: 'outPortTime3',
+              label: '离港时间'
+            }
+          ]
+        },
+        {
+          label: '到港待卸船舶',
+          children: [
+            {
+              prop: 'capacity4',
+              label: '船名'
+            },
+            {
+              prop: 'capacityNumber4',
+              label: '吨位'
+            },
+            {
+              prop: 'locationValue4',
+              label: '位置'
+            },
+            {
+              prop: 'outPortTime4',
+              label: '离港时间'
+            },
+            {
+              prop: 'dgsj',
+              label: '到港时间'
+            }
+          ]
+        }
+      ],
+      // 表格数据
+
+      tableData: [],
       input: '',
       //万州港库存信息
       stockString: null,
@@ -167,7 +164,6 @@ export default {
   },
   created() {},
   mounted() {
-    this.initialDate()
     this.initialization()
     this.getStockString()
     this.getDownStockString()
@@ -179,42 +175,15 @@ export default {
     reflush() {
       this.$router.go(0)
     },
-    initialDate(){
-      let now=new Date();
-      now.setMinutes(0);
-      now.setSeconds(0);
-      if(now.getHours() >=8 && now.getHours() < 18){
-        now.setHours(8);
-      }else if(now.getHours() >= 18){
-        now.setHours(18)
-      }else if(now.getHours() < 8 ){
-        now = new Date(now.getTime()-1000*60*60*24);
-        now.setHours(18)
-      }
-      this.endTime=now;
-      this.DateChange();
-    },
-    DateChange(){
-      this.option.deadline=this.endTime.getFullYear()+'年'+(this.endTime.getMonth()+1)+'月'+this.endTime.getDate()+'日(数据截止于'+this.endTime.getHours()+':'+this.perfix(this.endTime.getMinutes())+')';
-      this.option.endTime=this.endTime.getTime();
-      this.onclick();
-    },
-    perfix(num){
-      let arr=new Array(2).fill('0');
-      return (arr.join()+num).slice(-2);
-    },
     onclick() {
-      let map={
-        oneDate:this.endTime.getTime()
-      }
       this.axios
-        .post('/api/v1/tms/selectAllShipDynamaics?con=' + this.input,map)
+        .post('/api/v1/tms/selectAllShipDynamaics?con=' + this.input)
         .then(res => {
           if (res.data.code == '200') {
-            this.option.tableData = res.data.data
+            this.tableData = res.data.data
             console.log('aaad' + res.data.data)
           } else if (res.data.data == '暂时没有船舶动态') {
-            this.option.tableData = []
+            this.tableData = []
           }
         })
     },
@@ -510,9 +479,9 @@ export default {
     initialization() {
       this.axios.post('/api/v1/tms/selectAllShipDynamaics').then(res => {
         if (res.data.code == '200') {
-          this.option.tableData = res.data.data
-          console.log('this.option.tableData:', this.option.tableData)
-          this.option.tableData.forEach(item => {
+          this.tableData = res.data.data
+          console.log('this.tableData:', this.tableData)
+          this.tableData.forEach(item => {
             try {
               item.tonnage = item.tonnage.toFixed(2)
             } catch (error) {}
@@ -550,7 +519,7 @@ export default {
               }
             } catch (error) {}
           })
-          console.log(this.option.tableData)
+          console.log(this.tableData)
         } else {
           this.$message({
             type: 'warning',

+ 19 - 12
src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -1736,7 +1736,7 @@ export default {
         capacityNumber: '',
         startPointName: '',
         endPointName: '',
-        statusCode:'位置'
+        statusCode: '位置'
       },
       saleSteelKey: false,
       tableRowIndex: '',
@@ -2990,10 +2990,10 @@ export default {
             that.pathOption.startPointName = '达钢集团小东门'
             that.pathOption.endPointName = row.arrivalAddress
             that.value7 = true
-            if(row.orderStatus=='已完成'){
-              that.pathOption.statusCode='位置'
-            }else{
-              that.pathOption.statusCode='当前位置'
+            if (row.orderStatus == '已完成') {
+              that.pathOption.statusCode = '位置'
+            } else {
+              that.pathOption.statusCode = '当前位置'
             }
           } else {
             this.$message.error('车辆没有开启GPS')
@@ -3060,14 +3060,21 @@ export default {
         .post('/api/v1/otms/getArrivalPhoto?orderNumber=' + orderNo)
         .then(res => {
           this.srcList = []
-          this.srcList.push({
-            title: '车头照片',
-            src: res.data[0]
-          })
-          this.srcList.push({
-            title: '满货箱照片',
-            src: res.data[1]
+          console.log(res.data, 'sd')
+          res.data.forEach(e => {
+            this.srcList.push({
+              title: '',
+              src: e
+            })
           })
+          // this.srcList.push({
+          //   title: '车头照片',
+          //   src: res.data[0]
+          // })
+          // this.srcList.push({
+          //   title: '满货箱照片',
+          //   src: res.data[1]
+          // })
           if (num == 1) {
             this.isShow3 = true
           } else {

+ 0 - 1
src/views/statisticalReport/components/salesLogisticsStatistics/steelReportCom.vue

@@ -176,7 +176,6 @@
 </template>
 
 <script>
-import { sjTime } from "@/utils/sharedJsFile";
 import { getCookie } from "@/utils/util.js";
 export default {
   name: "steelReport",

+ 200 - 0
src/views/statisticalReport/components/salesLogisticsStatistics/steelTransportReport.vue

@@ -0,0 +1,200 @@
+<template>
+  <div class="steelTransportReport">
+    <div class="top">
+      <el-form :inline="true">
+        <el-form-item>
+          <label class="el-form-item__label" style="width: auto;"
+            >订单日期:</label
+          >
+          <el-date-picker
+            v-model="startTime"
+            type="date"
+            placeholder="选择日期"
+            style="width:140px"
+            :picker-options="pickerOptions"
+          >
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker
+            v-model="endTime"
+            type="date"
+            placeholder="选择日期"
+            style="width:140px"
+            :picker-options="pickerOptions1"
+          >
+          </el-date-picker>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>
+          </el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="exportAllReportToExcel"
+            >下载Excel</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="main">
+      <table class="title">
+        <th>{{ titleTXT }}钢材运输情况统计表</th>
+      </table>
+      <div class="null"></div>
+      <el-table>
+        <el-table-column
+          prop="carrierDirection"
+          label="承运方向"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column prop="carrierLine" label="承运线路" align="center">
+        </el-table-column>
+        <el-table-column
+          prop="carrier"
+          label="承运商"
+          align="center"
+          width="100"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="planTruckNumber"
+          label="销售下达计划(车)"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column label="安排运力(车)" align="center">
+          <el-table-column prop="arrageTruckNumber" label="安排" align="center">
+          </el-table-column>
+          <el-table-column
+            prop="actuallyFinish"
+            label="实际完成"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="enFactoryLoading"
+            label="进厂待装"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column prop="unEnfactory" label="未进厂" align="center">
+          </el-table-column>
+        </el-table-column>
+        <el-table-column
+          prop="unArragePlanTruckNumber"
+          label="欠运力"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column prop="remark" label="备注" align="center">
+        </el-table-column>
+      </el-table>
+    </div>
+  </div>
+</template>
+<script>
+import { sjTime } from '@/utils/sharedJsFile'
+import table from '../../../../components/DilCommonUI/packages/table/src/table.vue'
+export default {
+  components: { table },
+  data() {
+    return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now()
+        },
+        shortcuts: [
+          {
+            text: '今天',
+            onClick(picker) {
+              picker.$emit('pick', new Date())
+            }
+          },
+          {
+            text: '昨天',
+            onClick(picker) {
+              const date = new Date()
+              date.setTime(date.getTime() - 3600 * 1000 * 24)
+              picker.$emit('pick', date)
+            }
+          },
+          {
+            text: '一周前',
+            onClick(picker) {
+              const date = new Date()
+              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
+              picker.$emit('pick', date)
+            }
+          }
+        ]
+      },
+      pickerOptions1: {
+        disabledDate(time) {
+          return time.getTime() > Date.now()
+        },
+        shortcuts: [
+          {
+            text: '今天',
+            onClick(picker) {
+              picker.$emit('pick', new Date())
+            }
+          },
+          {
+            text: '昨天',
+            onClick(picker) {
+              const date = new Date()
+              date.setTime(date.getTime() - 3600 * 1000 * 24)
+              picker.$emit('pick', date)
+            }
+          },
+          {
+            text: '一周前',
+            onClick(picker) {
+              const date = new Date()
+              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
+              picker.$emit('pick', date)
+            }
+          }
+        ]
+      },
+      startTime: new Date(),
+      endTime: new Date(),
+      titleTXT: null
+    }
+  },
+  created() {
+    this.titleTXT = `${new Date(
+      new Date().getTime() - 86400000
+    ).getFullYear()}年${new Date(new Date().getTime() - 86400000).getMonth() +
+      1}月${new Date(
+      new Date().getTime() - 86400000
+    ).getDate()}日08:00 - ${new Date().getFullYear()}年${new Date().getMonth() +
+      1}月${new Date().getDate()}日08:00`
+  },
+  mounted() {},
+  methods: {
+    exportAllReportToExcel() {},
+    onclick() {}
+  }
+}
+</script>
+<style lang="scss" scoped>
+.steelTransportReport {
+  .top {
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+  .main {
+    .title {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      font-size: 30px;
+      font-weight: 700;
+      color: #000;
+    }
+    .null {
+      height: 20px;
+    }
+  }
+}
+</style>

+ 0 - 1
src/views/statisticalReport/components/sporadicReport/sporadicReportEnterFactory.vue

@@ -51,7 +51,6 @@
 <script>
 import { sjTime } from "@/utils/sharedJsFile";
 import { getCookie } from "@/utils/util.js";
-import FileSaver from "file-saver";
 export default {
   data() {
     return {

+ 0 - 1
src/views/statisticalReport/components/wanzhouReport/loadWagonWorkReport.vue

@@ -69,7 +69,6 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { sjTime } from "@/utils/sharedJsFile";
-import {getCookie} from "@/utils/util.js";
 import FileSaver from "file-saver";
 import BigNumber from "bignumber.js";
 export default {

+ 0 - 1
src/views/statisticalReport/components/wanzhouReport/unloadShipWorkReport.vue

@@ -60,7 +60,6 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { sjTime } from "@/utils/sharedJsFile";
-import {getCookie} from "@/utils/util.js";
 import FileSaver from "file-saver";
 export default {
   components: { PageTitle },

+ 0 - 1
src/views/statisticalReport/components/wanzhouReport/wagonWorkReport.vue

@@ -60,7 +60,6 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { sjTime } from "@/utils/sharedJsFile";
-import {getCookie} from "@/utils/util.js";
 import FileSaver from "file-saver";
 export default {
   components: { PageTitle },

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä