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

build/utils.js

@@ -20,6 +20,7 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "statisticalReport", "inward"];
 // let devModules = ["index", "WMS", "inward"];
 let devModules = ["all"];
+
 //let devModules = ["BMS","index","sale","appoint","AMS","queue","QMS","RMS",'statisticalReport'];
 
 if (pathSrc.indexOf("node_modules") > -1) {

config/index.js

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

src/views/TMS/components/bmsship/threeSectionFeeDetails.vue

@@ -9,10 +9,10 @@
         clearable
       >
       </el-input>
-<!-- 
+
        <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期"></el-date-picker>
       <span>至</span>
-      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期"></el-date-picker> -->
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期"></el-date-picker>
 
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
@@ -48,16 +48,25 @@ export default {
       startTime: null,
       endTime: null,
       input: "",
-       startTime: null,
-      endTime: null,
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getLoadShipList?apiId=63",
+        requestUrl: "/api/v1/tms/getLoadShipList?apiId=512",
       },
     };
   },
-  mounted() {},
+  mounted() {
+    this.initDate();
+    this.onclick();
+  },
   methods: {
+    initDate(){
+      this.startTime=new Date();
+      this.endTime=new Date();
+      this.startTime.setDate(1);
+      this.startTime.setHours(0);
+      this.startTime.setMinutes(0);
+      this.startTime.setSeconds(0);
+    },
     onclick() {
       let startTime = null;
       let endTime = null;
@@ -68,13 +77,13 @@ export default {
         endTime = sjTime(this.endTime);
       }
       if(startTime && endTime && startTime < endTime){
-          this.option.requestUrl = "/api/v1/tms/getLoadShipList?apiId=63&con=" + this.input+
+          this.option.requestUrl = "/api/v1/tms/getLoadShipList?apiId=512&con=" + this.input+
                 "&startTime=" +
                 startTime +
                 "&endTime=" +
                 endTime;
       }else{
-          this.option.requestUrl = "/api/v1/tms/getLoadShipList?apiId=63&con=" + this.input;
+          this.option.requestUrl = "/api/v1/tms/getLoadShipList?apiId=512&con=" + this.input;
       }
     },
     click(resultId) {
@@ -99,7 +108,7 @@ export default {
               message: "删除成功!",
             });
             this.option.requestUrl =
-              "/api/v1/tms/getLoadShipList?apiId=63&i=" + new Date();
+              "/api/v1/tms/getLoadShipList?apiId=512&i=" + new Date();
           });
         })
         .catch(() => {

src/views/appoint/components/inward/transPrice.vue

@@ -70,7 +70,10 @@ export default {
   },
   methods: {
     updatePriceMaterial(row) {
-      console.log(row);
+      // 修改运价
+      // console.log(row);
+      // this.$router.push("/updateTransPrice/" +row);
+      this.$router.push({ name: "updateTransPrice", query:{row:row||undefined}})
     },
     func() {
       this.loading = false;

src/views/appoint/components/inward/updateTransPrice.vue

@@ -0,0 +1,131 @@
+<template>
+  <!-- 修改运价 -->
+  <div id="contractDetails">
+    <page-title>编辑</page-title>
+    <div class="main">
+      <span class="text">修改运价</span>
+      <span class="a"></span>
+    </div>
+    <div class="form">
+      <div class="form_box">
+        <el-form :model="obj" :rules="batchFormRules" label-width="100px" label-position="left">
+          <div class="preview-group">
+            <el-form-item label="运价" prop="priceValue">
+              <el-input v-model="obj.priceValue" placeholder="请输入内容" type="number"></el-input>
+            </el-form-item>
+            <el-form-item label="货物名称" prop="materialNames">
+              <el-input v-model="obj.materialNames" readonly></el-input>
+            </el-form-item>
+            <el-form-item label="执行日期" prop="priceDate">
+              <el-input v-model="obj.priceDate" readonly></el-input>
+            </el-form-item>
+            <el-form-item label="运力类型" prop="capacityTypeName">
+              <el-input v-model="obj.capacityTypeName" readonly></el-input>
+            </el-form-item>
+            <el-form-item label="当前基准油价" prop="oilpriceBase">
+              <el-input v-model="obj.oilpriceBase" readonly></el-input>
+            </el-form-item>
+            <el-form-item label="油品名称" prop="oilTypeName">
+              <el-input v-model="obj.oilTypeName" readonly></el-input>
+            </el-form-item>
+            <el-form-item label="油价变化率阈值" prop="oilpriceChangeThreshold">
+              <el-input v-model="obj.oilpriceChangeThreshold" readonly></el-input>
+            </el-form-item>
+            <el-form-item label="计价单位" prop="type">
+              <el-input v-model="obj.type" readonly></el-input>
+            </el-form-item>
+          </div>
+        </el-form>
+      </div>
+    </div>
+
+    <div class="button-box">
+      <el-button type="primary" @click="onClickConfirm">修改</el-button>
+      <el-button @click="onClickCancel">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "updateTransPrice",
+  data() {
+    return {
+      obj: {},
+      batchFormRules: {
+        priceValue: [{ required: true, message: '运价不能为空', trigger: 'blur' }]
+      }
+    };
+  },
+  mounted() {
+    this.obj=this.$route.query.row;
+  },
+  methods: {
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 修改
+    onClickConfirm() {
+      if (this.obj.priceValue==''|| this.obj.priceValue == undefined){
+        this.$message.info("修改前请填写运价！")
+          return;
+      }
+
+      let paramsList = {
+        priceId: this.obj.priceId,
+        priceValue: this.obj.priceValue,
+      };
+        this.axios
+          .post(
+            "/api/v1/ams/updateTransPrice",
+            paramsList
+          )
+          .then((res) => {
+            if (res.data.data >=1) {
+              this.$message.success("修改成功！")
+              this.$router.go(-1);
+            }
+          });
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.form {
+  display: flex;
+  .form_box {
+    width: 400px;
+    margin-left: 35%;
+    margin-top: 30px;
+    margin-right: 20px;
+
+    .el-form {
+      .preview-group {
+        .el-form-item {
+          .el-form-item__label {
+            display: inline-block;
+            width: 70px !important;
+          }
+
+          .el-form-item__content {
+            .el-select {
+              width: 250px;
+            }
+
+            .el-input {
+              width: 250px;
+            }
+          }
+        }
+      }
+    }
+  };
+.txt1{
+  display: inline-block;
+  width: 150px;
+  text-align: right;
+};
+}
+</style>

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

@@ -978,7 +978,9 @@ export default {
       saleAreaId: null,
       isNiTui: 0,
       datalistindex: 0,
-      temporarylist: []
+      temporarylist: [],
+      //原始摘要值
+      remarksPro: null
     };
   },
   created() {
@@ -999,6 +1001,7 @@ export default {
     this.getAllProvince();
     //获取所有的业务员
     this.getAllsaleMan();
+    this.getRemarkDate();
   },
   mounted() {
     if (getCookie("orgCode") == "shouhuokehu") {
@@ -1015,7 +1018,10 @@ export default {
             this.axios
               .post("/api/v1/uc/getSaleArea?receiveId=" + this.consigneeId)
               .then(res => {
-                this.remarks = res.data.data;
+                if (res.data.data != null) {
+                  this.remarks = `${this.getRemarkDate()}${res.data.data}`;
+                  this.remarksPro = `${this.getRemarkDate()}${res.data.data}`;
+                }
               });
             this.axios
               .post(
@@ -1031,18 +1037,35 @@ export default {
                   place[0].addressTown +
                   place[0].place;
                 this.saleShipperAddressId = place[0].shipperAddressId;
+                this.addressId = place[0].shipperAddressId;
                 this.place1 = place[0].place;
                 this.saleMan = place[0].salerId;
                 this.saleOrderConsigneeTel = place[0].saleOrderConsigneeTel;
+                this.province = place[0].addressProvince;
+                this.city = place[0].addressDistrict;
+                if (this.city) {
+                  this.remarks = `${this.remarksPro},直发${this.city}`;
+                }
+                this.county = place[0].addressTown;
               });
           }
         });
     }
   },
   methods: {
+    //获取当前日期
+    getRemarkDate() {
+      let day = new Date().getDate();
+      let month = new Date().getMonth() + 1;
+      console.log(day);
+      console.log(month);
+      console.log(`${month}.${day}`);
+      return `${month}.${day}`;
+    },
     handleSelectSaleArea(item) {
       this.saleAreaId = item.areaId;
-      this.remarks = item.value;
+      this.remarks = this.getRemarkDate() + item.value;
+      this.remarksPro = this.getRemarkDate() + item.value;
     },
     onclikSaleArea() {
       if (this.saleAreaId == null) {
@@ -1189,6 +1212,7 @@ export default {
         )
         .then(res => {
           this.countyList = res.data.data;
+          this.remarks = this.remarksPro + `,直发${this.city}`;
         });
     },
     //县(区)改变
@@ -1250,7 +1274,10 @@ export default {
       this.axios
         .post("/api/v1/uc/getSaleArea?receiveId=" + this.consigneeId)
         .then(res => {
-          this.remarks = res.data.data;
+          if (res.data.data != null) {
+            this.remarks = this.getRemarkDate() + res.data.data;
+            this.remarksPro = this.getRemarkDate() + res.data.data;
+          }
         });
       this.axios
         .post(
@@ -1271,6 +1298,9 @@ export default {
           this.saleOrderConsigneeTel = place[0].saleOrderConsigneeTel;
           this.province = place[0].addressProvince;
           this.city = place[0].addressDistrict;
+          if (this.city) {
+            this.remarks = `${this.remarksPro},直发${this.city}`;
+          }
           this.county = place[0].addressTown;
         });
     },

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

@@ -630,15 +630,7 @@ export default {
             if (typeof map.isSelfMention === "undefined") {
               map.isSelfMention = "否";
             }
-            if (
-              map.saleRemark &&
-              map.receiveName &&
-              map.materialName &&
-              map.truckNo &&
-              map.province &&
-              map.district &&
-              map.saleArea
-            ) {
+            if (map.saleRemark && map.receiveName && map.materialName) {
               that.tableData.push(map);
             }
           } catch (e) {

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

@@ -70,9 +70,11 @@ export default {
       this.loading = true;
       this.isKuang = true;
       if(this.input){
-        this.option.requestUrl ="/api/v1/ams/getAmsContractTransportPrice1?apiId=109&con=" +this.input;
+        this.option.requestUrl ="/api/v1/ams/getAmsContractTransportPrice1?apiId=109&deleted=0&con=" +this.input+"&i="+new Date();
+        this.option2.requestUrl ="/api/v1/ams/getAmsContractTransportPrice1?apiId=109&deleted=1&con=" +this.input+"&i="+new Date();
       }else{
-        this.option.requestUrl ="/api/v1/ams/getAmsContractTransportPrice1?apiId=109&i="+new Date();
+        this.option.requestUrl ="/api/v1/ams/getAmsContractTransportPrice1?apiId=109&deleted=0&i="+new Date();
+        this.option2.requestUrl ="/api/v1/ams/getAmsContractTransportPrice1?apiId=109&deleted=1&con=" +this.input+"&i="+new Date();
       }
     },
     btnclick() {

src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -114,11 +114,12 @@
             :row-key="getRowKey"
             style="width: 100%; margin-top: 20px"
             @selection-change="handleSelectionChange"
-            max-height="500px"
+            max-height="600px"
           >
             <el-table-column
               type="selection"
               width="55"
+              :selectable="selectInit"
               reserve-selection
             ></el-table-column>
             <el-table-column type="index" width="50"> </el-table-column>

src/views/sale/components/offSiteTransportation/checkGPS.vue

@@ -481,7 +481,12 @@ export default {
       let that = this;
       that.listPath = [];
       if (that.carNumber == "") {
-        this.$message.error("车牌号不能为空！");
+        this.$message({
+          message:"车牌号不能为空！",
+          offset:40,
+          type:"warning",
+          showClose:true
+        });
         return;
       }
       if (that.time == null && that.time.length != 2) {
@@ -513,7 +518,12 @@ export default {
             that.listPath = res.data.data.startAndEndRoutes;
             that.initMap([105.602725, 37.076636]);
           } else {
-            this.$message.error("车辆没有开启GPS或尚未注册!");
+            this.$message({
+              message:"车辆没有开启GPS或尚未注册！",
+              offset:40,
+              type:"warning",
+              showClose:true
+            });
           }
         });
     },

src/views/sale/components/saleSelfMachine/printReceipt.vue

@@ -9,144 +9,144 @@
       </el-button>
     </div>
     <div id="pdfDom1">
-    <div id="pdfDom" v-for="(item, index) in dataList" :key="index">
-      <div class="blank"></div>
+      <div id="pdfDom" v-for="(item, index) in dataList" :key="index">
+        <div class="blank"></div>
 
-      <div class="title">
-        <h5 align="center">{{ shippername }} 物资送货单</h5>
-        <!--        <h5 align="center">物资送货单</h5>-->
-      </div>
-      <div>
-        <!-- tablePart0 -->
-        <table
-          border="0"
-          cellpadding="10"
-          cellspacing="0"
-          style="margin: auto; font-size: 20px"
-          width="1000px"
-          class="tablePart0"
-        >
-          <tr>
-            <th style="width: 14.5%">销售订单号：</th>
-            <td style="width: 85.5%">{{ saleNo }}</td>
-          </tr>
-        </table>
-      </div>
-      <div class="tableBody">
-        <!-- tablePart1 -->
-        <table
-          border="1"
-          cellpadding="10"
-          cellspacing="0"
-          style="margin-top: 10px; text-align: center"
-          width="1000px"
-          class="tablePart1"
-        >
-          <tr>
-            <th style="width: 5%; text-align: center">序号</th>
-            <th style="width: 23.5%; text-align: center">物资名称</th>
-            <th style="width: 22.5%; text-align: center">规格型号</th>
-            <th style="width: 14%">件数</th>
-            <th style="width: 14%">重量</th>
-            <th style="width: 21%">订单日期</th>
-          </tr>
-          <tr v-for="(item, index) in deliveryOrderMaterialList" :key="index">
-            <td>{{ index + 1 }}</td>
-            <td>{{ item.materialName }}</td>
-            <td>{{ item.materialSpe }}{{ item.materialModel }}</td>
-            <td>{{ item.materialNumber }}</td>
-            <td>{{ item.materialWeight }}</td>
-            <td>{{ item.makeDate }}</td>
-          </tr>
-        </table>
+        <div class="title">
+          <h5 align="center">{{ shippername }} 物资送货单</h5>
+          <!--        <h5 align="center">物资送货单</h5>-->
+        </div>
+        <div>
+          <!-- tablePart0 -->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="margin: auto; font-size: 20px"
+            width="1000px"
+            class="tablePart0"
+          >
+            <tr>
+              <th style="width: 14.5%">销售订单号：</th>
+              <td style="width: 85.5%">{{ saleNo }}</td>
+            </tr>
+          </table>
+        </div>
+        <div class="tableBody">
+          <!-- tablePart1 -->
+          <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            style="margin-top: 10px; text-align: center"
+            width="1000px"
+            class="tablePart1"
+          >
+            <tr>
+              <th style="width: 5%; text-align: center">序号</th>
+              <th style="width: 23.5%; text-align: center">物资名称</th>
+              <th style="width: 22.5%; text-align: center">规格型号</th>
+              <th style="width: 14%">件数</th>
+              <th style="width: 14%">重量</th>
+              <th style="width: 21%">订单日期</th>
+            </tr>
+            <tr v-for="(item, index) in deliveryOrderMaterialList" :key="index">
+              <td>{{ index + 1 }}</td>
+              <td>{{ item.materialName }}</td>
+              <td>{{ item.materialSpe }}{{ item.materialModel }}</td>
+              <td>{{ item.materialNumber }}</td>
+              <td>{{ item.materialWeight }}</td>
+              <td>{{ item.makeDate }}</td>
+            </tr>
+          </table>
 
-        <!-- tablePart2 -->
-        <table
-          border="1"
-          cellpadding="10"
-          cellspacing="0"
-          style="border-top: 0px"
-          width="1000px"
-          class="tablePart2"
-        >
-          <tr>
-            <th style="width: 28.5%">收货地点</th>
-            <td style="width: 71.5%">
-              {{ province }}{{ district }}{{ town }}{{ deliveryAddress }}
-            </td>
-          </tr>
-        </table>
+          <!-- tablePart2 -->
+          <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            style="border-top: 0px"
+            width="1000px"
+            class="tablePart2"
+          >
+            <tr>
+              <th style="width: 28.5%">收货地点</th>
+              <td style="width: 71.5%">
+                {{ province }}{{ district }}{{ town }}{{ deliveryAddress }}
+              </td>
+            </tr>
+          </table>
 
-        <!-- tablePart3 -->
-        <table
-          border="1"
-          cellpadding="10"
-          cellspacing="0"
-          style="border-top: 0px"
-          width="1000px"
-          class="tablePart3"
-        >
-          <tr>
-            <th style="width: 28.5%">收货人</th>
-            <td style="width: 22.5%">{{ consignee }}</td>
-            <th style="width: 14%">电话</th>
-            <td style="width: 35%">{{ consigneeTel }}</td>
-          </tr>
-        </table>
+          <!-- tablePart3 -->
+          <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            style="border-top: 0px"
+            width="1000px"
+            class="tablePart3"
+          >
+            <tr>
+              <th style="width: 28.5%">收货人</th>
+              <td style="width: 22.5%">{{ consignee }}</td>
+              <th style="width: 14%">电话</th>
+              <td style="width: 35%">{{ consigneeTel }}</td>
+            </tr>
+          </table>
 
-        <!-- tablePart4 -->
-        <table
-          border="0"
-          cellpadding="10"
-          cellspacing="0"
-          style="border-top: 0px"
-          width="1000px"
-          class="tablePart4"
-        >
-          <tr>
-            <th style="width: 28.5%">承运商</th>
-            <td style="width: 36.5%">{{ carrierName }}</td>
-            <th style="width: 14%">车牌号</th>
-            <td style="width: 35%">{{ capacityNumber }}</td>
-          </tr>
-        </table>
+          <!-- tablePart4 -->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="border-top: 0px"
+            width="1000px"
+            class="tablePart4"
+          >
+            <tr>
+              <th style="width: 28.5%">承运商</th>
+              <td style="width: 36.5%">{{ carrierName }}</td>
+              <th style="width: 14%">车牌号</th>
+              <td style="width: 35%">{{ capacityNumber }}</td>
+            </tr>
+          </table>
 
-        <!-- tablePart9 -->
-        <table
-          border="1"
-          cellpadding="10"
-          cellspacing="0"
-          style="border-top: 0px"
-          width="1000px"
-          class="tablePart9"
-        >
-          <tr>
-            <th style="width: 28.5%">备注</th>
-            <td style="width: 71.5%">{{ note }}</td>
-          </tr>
-        </table>
-      </div>
+          <!-- tablePart9 -->
+          <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            style="border-top: 0px"
+            width="1000px"
+            class="tablePart9"
+          >
+            <tr>
+              <th style="width: 28.5%">备注</th>
+              <td style="width: 71.5%">{{ note }}</td>
+            </tr>
+          </table>
+        </div>
 
-      <div>
-        <!-- tablePart6 margin-top: 10px-->
-        <table
-          border="0"
-          cellpadding="10"
-          cellspacing="0"
-          style="margin: auto; font-size: 20px"
-          width="1000px"
-          class="tablePart6"
-        >
-          <tr>
-            <th style="width: 8.25%">发货单位：</th>
-            <td style="width: 30.5%">{{ shippername }}</td>
-            <th style="width: 8.25%">收货单位：</th>
-            <td style="width: 30.5%">{{ consigeeName }}</td>
-          </tr>
-        </table>
-      </div>
+        <div>
+          <!-- tablePart6 margin-top: 10px-->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="margin: auto; font-size: 20px"
+            width="1000px"
+            class="tablePart6"
+          >
+            <tr>
+              <th style="width: 8.25%">发货单位：</th>
+              <td style="width: 30.5%">{{ shippername }}</td>
+              <th style="width: 8.25%">收货单位：</th>
+              <td style="width: 30.5%">{{ consigeeName }}</td>
+            </tr>
+          </table>
+        </div>
 
-      <!--          <div>
+        <!--          <div>
         &lt;!&ndash; tablePart6 &ndash;&gt;
         <table
           border="0"
@@ -162,23 +162,23 @@
           </tr>
         </table>
       </div>-->
-      <div>
-        <!-- tablePart6 margin-top: 10px-->
-        <table
-          border="0"
-          cellpadding="10"
-          cellspacing="0"
-          style="margin: auto; font-size: 20px"
-          width="1000px"
-          class="tablePart6"
-        >
-          <tr>
-            <th style="width: 14.5%">签收人：</th>
-            <th style="width: 14.5%">签收时间：</th>
-          </tr>
-        </table>
-      </div>
-      <!--      <div>
+        <div>
+          <!-- tablePart6 margin-top: 10px-->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="margin: auto; font-size: 20px"
+            width="1000px"
+            class="tablePart6"
+          >
+            <tr>
+              <th style="width: 14.5%">签收人：</th>
+              <th style="width: 14.5%">签收时间：</th>
+            </tr>
+          </table>
+        </div>
+        <!--      <div>
         &lt;!&ndash; tablePart6 &ndash;&gt;
         <table
           border="0"
@@ -193,7 +193,7 @@
           </tr>
         </table>
       </div>-->
-    </div>
+      </div>
     </div>
     <!-- <el-button style="margin-left: 45%;" type="primary" @click="getPdf()">
         <i class="el-icon-download"></i>导出(pdf)

src/views/statisticalReport/components/loadCapacityDetail/loadCapacityDetail.vue

@@ -3,7 +3,11 @@
   <div class="loadCapacityDetail">
     <div class="frameCalculation">
       <span>装车开始时间</span>
-      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
       </el-date-picker>
       <span>至</span>
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
@@ -11,23 +15,39 @@
       <el-button type="primary" class="btn" @click="onclickSearch">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" @click="exportData()"
+      <el-button type="primary" @click="exportSignleReport"
         ><i class="el-icon-download"></i>导出(Excel)</el-button
       >
       <span style="margin-left: 1rem;">合计净重：</span>
-      <el-input v-model="totalNumber" :disabled="true" style="width: 100px;"></el-input>
+      <el-input
+        v-model="totalNumber"
+        :disabled="true"
+        style="width: 100px;"
+      ></el-input>
       <span style="margin-left: 1rem;">合计车数：</span>
-      <el-input v-model="totalCapacity" :disabled="true" style="width: 100px;"></el-input>
-     
-       <el-input placeholder="请输入装机车牌号/可查询当天车辆数据" v-model="input" style="width: 220px;margin-left: 1rem;" clearable>
+      <el-input
+        v-model="totalCapacity"
+        :disabled="true"
+        style="width: 100px;"
+      ></el-input>
+
+      <el-input
+        placeholder="请输入装机车牌号/可查询当天车辆数据"
+        v-model="input"
+        style="width: 220px;margin-left: 1rem;"
+        clearable
+      >
       </el-input>
-         <el-button type="primary" class="btn" @click="onclickCapacity">
+      <el-button type="primary" class="btn" @click="onclickCapacity">
         <i class="el-icon-search"></i>查询
       </el-button>
-   
     </div>
     <div class="table">
-      <mergeRowTable ref="excelDom" v-bind.sync="option" @func="func"></mergeRowTable>
+      <mergeRowTable
+        ref="excelDom"
+        v-bind.sync="option"
+        @func="func"
+      ></mergeRowTable>
     </div>
   </div>
 </template>
@@ -42,15 +62,17 @@ export default {
       totalCapacity: null,
       startTime: null,
       endTime: null,
-
       input: "",
       tableTitle: "装机计重明细报表",
       option: {
         // 表格请求数据的地址
         requestUrl: "api/v1/tms/getLoaderForResultDetail?apiId=480",
         comparison: "orderNumber",
-        columnIndexs: [0, 1, 2, 4, 5, 6],
+        columnIndexs: [0, 1, 2, 4, 5, 6]
       },
+      inwardArr: [],
+      tableTitle: "装机计重明细",
+      totalArr: []
     };
   },
   created() {
@@ -74,11 +96,98 @@ export default {
     }
   },
   methods: {
+    exportSignleReport() {
+      if (this.startTime && this.endTime) {
+        this.openFullScreen1();
+      } else {
+        this.$confirm(
+          "没有输入时间区间，系统将默认导出今天0点到24点的单个报表数据,是否继续?",
+          "提示",
+          {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }
+        )
+          .then(() => {
+            this.openFullScreen1();
+          })
+          .catch(() => {
+            this.$message.info("取消导出");
+          });
+      }
+    },
+    openFullScreen1() {
+      let startTime = null;
+      let endTime = null;
+      let orgCode = null;
+      if (this.startTime && this.endTime) {
+        startTime = sjTime(this.startTime);
+        endTime = sjTime(this.endTime);
+      }
+      if (
+        getCookie("orgCode") != "dagangadmin" &&
+        getCookie("orgCode") != "zidonghuabu" &&
+        getCookie("orgCode") != "wuliuchuyunzhongxin"
+      ) {
+        orgCode = getCookie("orgCode");
+      }
+      const loading = this.$loading({
+        lock: true,
+        text: "请等待导出",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)"
+      });
+      this.axios
+        .post(
+          "/api/v1/tms/getLoaderForResultDetail?apiId=480&isPage=yes&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&orgCode=" +
+            orgCode
+        )
+        .then(res => {
+          this.totalArr = [];
+          this.inwardArr = [];
+          this.tableTitle = "装机计重明细统计";
+          this.inwardArr = res.data.data;
+          this.totalArr = this.totalArr.concat(this.inwardArr);
+          this.exportAllReportToExcel();
+          setTimeout(() => {
+            loading.close();
+          }, 2000);
+        });
+    },
+    exportAllReportToExcel() {
+      var title = this.tableTitle;
+      let tHeader = [];
+      let filterVal = [];
+      this.dataColumnData.forEach(e1 => {
+        if (tHeader.indexOf(e1.label) === -1) {
+          tHeader.push(e1.label);
+        }
+        if (filterVal.indexOf(e1.prop) === -1) {
+          filterVal.push(e1.prop);
+        }
+      });
+      //导出为excel
+      this.downloadLoading = true;
+      require.ensure([], () => {
+        const {
+          export_json_to_excel
+        } = require("@/assets/excel/Export2Excel.js"); //这里必须使用绝对路径，使用@/+存放export2Excel的路径
+        // let list = this.$refs.excelDom.dataTabel;
+        let data = this.totalArr.map(v => filterVal.map(j => v[j])); //3.formatJson格式转换
+        export_json_to_excel(tHeader, data, title); // (title)导出的表格名称
+      });
+    },
     func(res) {
+      this.dataColumnData = res.columnData;
       console.log(res);
       var resultNetWeightTotal = 0;
       var currentCapacityTotal = 0;
-      res.list.forEach((e) => {
+      res.list.forEach(e => {
         currentCapacityTotal++;
         resultNetWeightTotal = resultNetWeightTotal + e.resultNetWeight;
       });
@@ -92,13 +201,13 @@ export default {
     getRequestUrl() {
       if (
         getCookie("orgCode") == "dagangadmin" ||
-        getCookie("orgCode") == "zidonghuabu"||
-        getCookie("orgCode")=="wuliuchuyunzhongxin"
+        getCookie("orgCode") == "zidonghuabu" ||
+        getCookie("orgCode") == "wuliuchuyunzhongxin"
       ) {
         this.option.requestUrl =
           "/api/v1/tms/getLoaderForResultDetail?apiId=480&startTime=null&endTime=null&i=" +
           new Date();
-      }  else {
+      } else {
         this.option.requestUrl =
           "/api/v1/tms/getLoaderForResultDetail?apiId=480&userId=" +
           getCookie("orgCode") +
@@ -150,8 +259,8 @@ export default {
       } else {
         this.getRequestUrl();
       }
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>