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

# Conflicts:
#	src/views/index/components/login.vue
#	src/views/index/components/printScan.vue
#	src/views/index/router/index.js
#	src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelAllReport.vue

build/utils.js

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

src/views/RMS/components/addOilPrice.vue

@@ -132,6 +132,7 @@ export default {
 };
 </script>
 <style lang='scss'>
+
 .addWagonLoad{
   .form_you{
     margin-left: 35%;
@@ -142,6 +143,7 @@ export default {
     }
     .el-select{
       width: 250px;
+      margin-left: 54px;
       margin-right: 20px;
     }
   }
@@ -158,9 +160,6 @@ export default {
           .el-input{
             width: 250px;
           }
-          .el-switch{
-            margin-left: -250px;
-          }
         }
       }
     }

src/views/RMS/components/oilPrice.vue

@@ -32,14 +32,6 @@
             >
               启用
             </el-button>
-            <el-button
-              type="text"
-              size="small"
-              @click="onDeactivate(scope)"
-              v-else
-            >
-              停用
-            </el-button>
             <el-button
               type="text"
               size="mini"
@@ -121,7 +113,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.axios.post("/api/v1/rms/updateOilPrice/"+scope.row.priceId).then((res) => {
+        this.axios.post("/api/v1/rms/updateOilPrice",{"priceId":scope.row.priceId}).then((res) => {
           if (res.data.code == "200") {
             this.$message({ type: "success", message: "启用成功!",});
             this.options.requestUrl = "/api/v1/rms/getOilPriceResultList?apiId=380&i="+ new Date();

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

@@ -72,7 +72,7 @@
       :visible.sync="drawer"
       :direction="direction"
       :before-close="handleClose"
-      size="50%"
+      size="60%"
     >
       <el-input
         placeholder="请输入内容"
@@ -131,7 +131,7 @@ export default {
       batchName:null,
       cargoPictureUrl: "",
       batchOption: {
-        requestUrl: "/api/v1/uc/selectPurchaseOrderForShip?apiId=502",
+        requestUrl: "/api/v1/uc/getBatchOfNotice?apiId=513",
         selectionType: "radio",
         map: [],
       },
@@ -159,7 +159,7 @@ export default {
     onclick(a) {
         if(a==5){
             this.batchOption.requestUrl =
-            "/api/v1/uc/selectPurchaseOrderForShip?apiId=502&index=" + this.input;
+            "/api/v1/uc/getBatchOfNotice?apiId=513&index=" + this.input;
         }else if(a==6){
             this.contractPriceOption.requestUrl =
             "/api/v1/rms/selectbmsshipContractPriceList?apiId=500&con=" + this.input;

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

@@ -75,7 +75,7 @@
             border
             stripe
             style="width: 100%; margin-top: 20px"
-            max-height="600px"
+            max-height="500px"
             :row-style="{ height: '30px' }"
             :cell-style="{ fontWeight: '700' }"
             class="table"

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

@@ -74,7 +74,7 @@
       :visible.sync="drawer"
       :direction="direction"
       :before-close="handleClose"
-      size="50%"
+      size="60%"
     >
       <el-input
         placeholder="请输入内容"
@@ -133,7 +133,7 @@ export default {
       batchName:null,
       cargoPictureUrl: "",
       batchOption: {
-        requestUrl: "/api/v1/uc/selectPurchaseOrderForShip?apiId=502",
+        requestUrl: "/api/v1/uc/getBatchOfNotice?apiId=513",
         selectionType: "radio",
         map: [],
       },
@@ -178,7 +178,7 @@ export default {
     onclick(a) {
         if(a==5){
             this.batchOption.requestUrl =
-            "/api/v1/uc/selectPurchaseOrderForShip?apiId=502&index=" + this.input;
+            "/api/v1/uc/getBatchOfNotice?apiId=513&index=" + this.input;
         }else if(a==6){
             this.contractPriceOption.requestUrl =
             "api/v1/rms/selectbmsshipContractPriceList?apiId=500&con=" + this.input;

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

@@ -133,7 +133,7 @@ export default {
       batchName:null,
       cargoPictureUrl: "",
       batchOption: {
-        requestUrl: "/api/v1/uc/selectPurchaseOrderForShip?apiId=502",
+        requestUrl: "/api/v1/uc/getBatchOfNotice?apiId=513",
         selectionType: "radio",
         map: [],
       },
@@ -178,7 +178,7 @@ export default {
     onclick(a) {
         if(a==5){
             this.batchOption.requestUrl =
-            "/api/v1/uc/selectPurchaseOrderForShip?apiId=502&index=" + this.input;
+            "/api/v1/uc/getBatchOfNotice?apiId=513&index=" + this.input;
         }else if(a==6){
             this.contractPriceOption.requestUrl =
             "api/v1/rms/selectbmsshipContractPriceList?apiId=500&con=" + this.input;

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

@@ -265,10 +265,10 @@ export default {
       this.isKuang = true;
       if (this.LineText) {
         this.oilPriceFormula.requestUrl =
-          "api/v1/uc/getOilFormula?apiId=444&con=" + this.LineText;
+          "/api/v1/uc/getOilFormula?apiId=444&con=" + this.LineText;
       } else {
         this.oilPriceFormula.requestUrl =
-          "api/v1/uc/getOilFormula?apiId=444&i=" + new Date();
+          "/api/v1/uc/getOilFormula?apiId=444&i=" + new Date();
       }
     },
     //选定联动公式确定

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

@@ -4,47 +4,27 @@
     <page-title>编辑</page-title>
     <div class="form">
       <div class="form_box">
-        <el-form
-          :model="obj"
-          :rules="batchFormRules"
-          label-width="100px"
-          label-position="left"
-        >
+        <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-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-button type="primary" class="btnml" @click="materialDrawer"
-                >浏览物资</el-button
-              >
+              >浏览物资</el-button>
             </el-form-item>
             <el-form-item label="执行日期" prop="priceDate">
               <el-date-picker
                 v-model="obj.priceDate"
                 type="date"
-                placeholder="选择日期"
-              >
+                placeholder="选择日期">
               </el-date-picker>
             </el-form-item>
             <el-form-item label="联动公式" prop="oilPriceFormula">
-              <el-input
-                v-model="obj.oilPriceFormula"
-                placeholder="请选择油价联动公式"
-                readonly
-                disabled
-              ></el-input>
-              <el-button
-                type="primary"
-                class="btn"
-                @click="oilPriceFormulaClick"
-                >浏览</el-button
-              >
+              <el-input v-model="obj.oilPriceFormula" placeholder="请选择油价联动公式" readonly disabled></el-input>
+              <el-button type="primary" class="btn" @click="oilPriceFormulaClick"
+              >浏览</el-button>
             </el-form-item>
             <el-form-item label="运力类型" prop="capacityTypeName">
               <el-input v-model="obj.capacityTypeName" readonly></el-input>
@@ -56,10 +36,7 @@
               <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-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>
@@ -119,7 +96,7 @@
           type="primary"
           @click="selectLineClick"
           :loading="selectLineLoading"
-          ><i class="el-icon-search"></i>查询</el-button
+        ><i class="el-icon-search"></i>查询</el-button
         >
         <el-button type="primary" @click="addoilPriceFormula">确定</el-button>
       </div>
@@ -152,7 +129,7 @@
           type="primary"
           @click="selectMaterial"
           :loading="selectLineLoading"
-          ><i class="el-icon-search"></i>查询</el-button
+        ><i class="el-icon-search"></i>查询</el-button
         >
         <el-button type="primary" @click="addMaterialList">确定</el-button>
       </div>
@@ -218,16 +195,10 @@ export default {
         capacityTypeId: 1
       },
       batchFormRules: {
-        priceValue: [
-          { required: true, message: "运价不能为空", trigger: "blur" }
-        ],
-        priceDate: [
-          { required: true, message: "执行日期不能为空", trigger: "blur" }
-        ],
-        oilpriceBase: [
-          { required: true, message: "油价基准不能为空", trigger: "blur" }
-        ]
-      },
+        priceValue: [{ required: true, message: '运价不能为空', trigger: 'blur' }],
+        priceDate: [{ required: true, message: '执行日期不能为空', trigger: 'blur' }],
+        oilpriceBase: [{ required: true, message: '油价基准不能为空', trigger: 'blur' }]
+  },
       tableTop: [
         {
           prop: "materialName",
@@ -258,21 +229,17 @@ export default {
     this.axios.get("/api/v1/uc/getTransRange").then(res => {
       this.options = res.data.data;
     });
-    this.obj = this.$route.query.row;
-    this.axios
-      .post("/api/v1/ams/getwz", { priceId: this.obj.priceId })
-      .then(res => {
-        this.selectionList = res.data.data;
-      });
+    this.obj=this.$route.query.row;
+    this.axios.post("/api/v1/ams/getwz",{"priceId":this.obj.priceId}).then(res => {
+      this.selectionList = res.data.data;
+    });
     //根据price_id查询联动公式和列表传过去
-    this.axios
-      .post("/api/v1/ams/getcargonameId", { priceId: this.obj.priceId })
-      .then(res => {
-        (this.obj.oilPriceFormula = res.data.data.formulaString),
-          (this.obj.cargonameId = res.data.data.formulaId);
-        this.oilPriceFormulaId = this.obj.cargonameId;
-      });
-    this.rangeId = this.obj.rangeId;
+    this.axios.post("/api/v1/ams/getcargonameId",{"priceId":this.obj.priceId}).then(res => {
+      this.obj.oilPriceFormula = res.data.data.formulaString,
+      this.obj.cargonameId = res.data.data.formulaId;
+      this.oilPriceFormulaId=this.obj.cargonameId;
+    });
+    this.rangeId=this.obj.rangeId
   },
   methods: {
     //打开线路的模态窗口
@@ -286,11 +253,10 @@ export default {
     },
     //选定联动公式确定
     addoilPriceFormula() {
-      (this.obj.oilPriceFormula = this.formulaString),
-        (this.obj.cargonameId = this.oilPriceFormulaId);
+      this.obj.oilPriceFormula=this.formulaString,
+      this.obj.cargonameId = this.oilPriceFormulaId;
       this.obj.capacityTypeId = this.form1.capacityTypeId;
-      (this.obj.priceDate = this.form1.priceDate),
-        (this.obj.oilTypeId = this.form1.oilTypeId);
+      this.obj.oilTypeId=this.form1.oilTypeId
 
       this.oilPriceFormulaDrawer = false;
     },
@@ -364,9 +330,9 @@ export default {
     },
     // 修改
     onClickConfirm() {
-      if (this.obj.priceValue == "" || this.obj.priceValue == undefined) {
-        this.$message.info("修改前请填写运价！");
-        return;
+      if (this.obj.priceValue==''|| this.obj.priceValue == undefined){
+        this.$message.info("修改前请填写运价！")
+          return;
       }
       let mapValue = {
         cargonameId: this.oilPriceFormulaId,
@@ -381,15 +347,20 @@ export default {
         mapList: this.selectionList,
         priceId: this.obj.priceId
       };
-      this.axios.post("/api/v1/ams/updateTransPrice", mapValue).then(res => {
-        if (res.data.data >= 1) {
-          this.$message.success("修改成功！");
-          this.$router.go(-1);
-        }
-      });
+        this.axios
+          .post(
+            "/api/v1/ams/updateTransPrice",
+            mapValue
+          )
+          .then((res) => {
+            if (res.data.data >=1) {
+              this.$message.success("修改成功！")
+              this.$router.go(-1);
+            }
+          });
     }
   }
-};
+}
 </script>
 
 <style lang="scss" scoped>
@@ -421,12 +392,12 @@ export default {
         }
       }
     }
-  }
-  .txt1 {
-    display: inline-block;
-    width: 150px;
-    text-align: right;
-  }
+  };
+  .txt1{
+  display: inline-block;
+  width: 150px;
+  text-align: right;
+};
 }
 .elForm {
   margin-left: 30%;

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

@@ -435,18 +435,33 @@ export default {
         getCookie("userId") +
         "&i=" +
         new Date();
+      this.option2.requestUrl =
+        "/api/v1/ams/getSaleOrderReportedes?apiId=408&consigneeSsoId=" +
+        getCookie("userId") +
+        "&i=" +
+        new Date();
     } else if (getCookie("orgCode") == "xiaoshouyewuyuan") {
       this.option.requestUrl =
         "/api/v1/ams/getSaleOrderInfoes?apiId=408&saler=" +
         getCookie("loginName") +
         "&i=" +
         new Date();
+      this.option2.requestUrl =
+        "/api/v1/ams/getSaleOrderReportedes?apiId=408&saler=" +
+        getCookie("loginName") +
+        "&i=" +
+        new Date();
     } else {
       this.option.requestUrl =
         "/api/v1/ams/getSaleOrderInfoes?apiId=408&consigneeSsoId=" +
         null +
         "&i=" +
         new Date();
+      this.option2.requestUrl =
+        "/api/v1/ams/getSaleOrderReportedes?apiId=408&consigneeSsoId=" +
+        null +
+        "&i=" +
+        new Date();
     }
     let loadTime1 = new Date(
       new Date(new Date().toLocaleDateString()).getTime() +
@@ -588,6 +603,11 @@ export default {
                 map.salerName = e[e1];
               }
               if (e1.includes("摘要")) {
+                if (e[e1].includes("范围定尺")) {
+                  map.saleRemark = e[e1];
+                } else {
+                  map.saleRemark = e[e1];
+                }
                 map.saleRemark = e[e1];
                 let regex = /钢材.*组/g;
                 if (e[e1].match(regex)) {
@@ -596,7 +616,7 @@ export default {
                 let regex1 = /范围.*米/g;
                 if (e[e1].match(regex1)) {
                   map.steelMeters = Number(
-                    str.match(regex)[0].match(/(\d+(\.\d+)?)/g)
+                    e[e1].match(regex1)[0].match(/(\d+(\.\d+)?)/g)
                   );
                 }
               }
@@ -717,7 +737,6 @@ export default {
       // result即为所求
       let result = Object.values(map1);
       console.log(result);
-      debugger;
       //遍历数组
       let saleOrderListMap = [];
       result.forEach((saleOrderList, index) => {

src/views/index/components/login.vue

@@ -174,6 +174,8 @@ export default {
                     this.$router.push({ name: "default" }).catch(() => {});
                   }
                   // 普通用户
+                } else {
+                  // this.$router.push("printScan");
                 }else if(userInfo.orgCode == 'zizhuyitiji'){
                   this.$router.push("/printScan")
                 }else {

src/views/index/components/printScan.vue

@@ -19,6 +19,16 @@
       <i class="el-icon-full-screen" @click="fullScreen"
       v-show="edit1"></i>
 <!--      <el-switch
+        :disabled="!isEdit"
+        v-show="false"
+      >
+      </el-input>
+      <!--style="display:block;width:120px"-->
+      <div v-show="false">
+        手动输入开关：
+      </div>
+      <i class="el-icon-full-screen" @click="fullScreen" v-show="edit1"></i>
+      <!--      <el-switch
         v-model="isEdit"
         active-color="#66ccff"
         inactive-color="#ffffff"
@@ -28,11 +38,16 @@
     <div class="tip">
       手机二维码对准下方摄像头<br>
       <i class="el-icon-bottom" style="padding-left: 450px;font-size: 300px"></i>
+      <h1>将手机二维码对准摄像头</h1>
+      <h1>扫描</h1>
+      <!-- 将手机二维码对准摄像头 扫描<br /> -->
+      <i class="el-icon-bottom" style="font-size: 100px"></i>
     </div>
   </div>
 </template>
 <script>
 import screenfull from "screenfull"
+import screenfull from "screenfull";
 export default {
   data() {
     return {
@@ -76,6 +91,25 @@ export default {
         })
       console.log(i)
       return i
+        this.edit1 = false;
+      }
+    },
+    async querynumber() {
+      console.log(this.orderNumber);
+      let orderNumber = this.orderNumber;
+      let i = 0;
+      await this.axios
+        .post("/api/v1/tms/queryNumber?orderNumber=" + orderNumber)
+        .then(res => {
+          console.log("查找出来的数据");
+          console.log(res.data);
+          console.log("-------------------------");
+          if (res.data.printnumber == 1) {
+            i = 1;
+          }
+        });
+      console.log(i);
+      return i;
     }
     //失去焦点后自动执行获得焦点事件
     // onInputBlur(){
@@ -107,6 +141,11 @@ export default {
             this.$message.error("你已经打印过了")
             this.orderNumber=null
             return
+          console.log(promise);
+          if (promise == 1) {
+            this.$message.error("你已经打印过了");
+            this.orderNumber = null;
+            return;
           }
           this.$router.push({
             path: "/printReceipt?orderNumber=" + this.orderNumber
@@ -148,6 +187,13 @@ export default {
     font-size: 100px;
     padding-left: 100px;
     padding-top: 200px;
+  .tip {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 1000px;
+    height: 300px;
+    font-size: 60px;
     color: #e6e6e6;
   }
 }

src/views/index/router/index.js

@@ -1,26 +1,96 @@
-import Vue from 'vue'
-import Router from 'vue-router'
-import routerBefore from '@/config/routerBefore.js'
+import Vue from "vue";
+import Router from "vue-router";
+import routerBefore from "@/config/routerBefore.js";
 
 // 主页
-import main from '@/components/main.vue'
+import main from "@/components/main.vue";
 
 // 登录
-import login from '@/views/index/components/login.vue'// 登录
-import download from '@/views/index/components/download.vue'
+import login from "@/views/index/components/login.vue"; // 登录
+import download from "@/views/index/components/download.vue";
 // 抽奖结果
+import luckDraw from "@/views/index/components/luckDraw.vue";
+
 import luckDraw from '@/views/index/components/luckDraw.vue'
 
 import printScan from "../components/printScan";
 import printReceipt from "../components/printReceipt";
 // 网页登录不可访问
-import page404 from '@/views/index/components/page404.vue'
+import page404 from "@/views/index/components/page404.vue";
 
 // 集团公司选择过渡页
-import selectCompany from '@/views/index/components/selectCompany.vue'
+import selectCompany from "@/views/index/components/selectCompany.vue";
+
+import printScan from "@/views/index/components/printScan.vue";
 
-Vue.use(Router)
+Vue.use(Router);
 
+export const constantRouterMap = [
+  {
+    path: "/",
+    meta: {
+      title: "登录"
+    },
+    component: login
+  },
+  {
+    path: "/printScan",
+    name: "printScan",
+    meta: {
+      title: "自助一体机"
+    },
+    component: printScan
+  },
+  {
+    path: "/download",
+    name: "download",
+    meta: {
+      title: "下载"
+    },
+    component: download
+  },
+  {
+    path: "/login",
+    name: "login",
+    meta: {
+      title: "登录"
+    },
+    component: login
+  },
+  {
+    path: "/luckDraw",
+    name: "luckDraw",
+    meta: {
+      title: "抽奖结果"
+    },
+    component: luckDraw
+  },
+  {
+    path: "/default",
+    name: "default",
+    component: main,
+    meta: {
+      title: "首页"
+    }
+  },
+  {
+    path: "/selectCompany",
+    name: "selectCompany",
+    component: selectCompany,
+    meta: {
+      title: "集团与公司用户跳转页"
+    }
+  },
+  ,
+  {
+    path: "/page404",
+    name: "page404",
+    meta: {
+      title: "404"
+    },
+    component: page404
+  }
+];
 export const constantRouterMap = [{
         path: '/',
         meta: {

src/views/inward/components/inwardFactory/countResult.vue

@@ -1,51 +1,267 @@
-// 计数作业
+// 计次作业
 <template>
-    <div class="sale">
-        <div class="top">
-            <!-- 框计算 -->
-            <el-input
-                placeholder="请输入内容"
-                v-model="inputText"
-                clearable>
-            </el-input>
-            <el-button type="primary" class="btn" @click="onclick">
-                <i class="el-icon-search"></i>查询
-            </el-button>
-        </div>
-        <div class="tab">
-            <dilTable v-bind.sync="option"></dilTable>
-        </div>
+  <div class="sale">
+    <div class="top">
+      <!-- 框计算 -->
+      <span class="text">计次时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span class="text">至</span>
+      <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>查询
+      </el-button>
+      <!-- excel导出 -->
+      <el-button type="primary" @click="exportData()">
+        <i class="el-icon-download"></i>导出(Excel)
+      </el-button>
     </div>
+    <div class="tab">
+      <dilTable v-bind.sync="option" ref="excelDom">
+        <el-table-column fixed="right" label="操作" width="180">
+          <template slot-scope="scope">
+            <div class="step">
+              <el-button
+                @click="detailclick1(scope.row)"
+                type="text"
+                size="small"
+              >运输详情</el-button
+              >
+            </div>
+            <!-- <el-button @click="" type="primary" style="margin-left: 16px;">
+                    运输详情
+                  </el-button> -->
+          </template>
+        </el-table-column>
+        <!-- 运输进程详情 -->
+        <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData1" border>
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
 </template>
 <script>
+import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
-    data(){
-        return{
-            inputText:'',
-            option: {       
-                // 表格请求数据的地址
-                requestUrl: "",
-            },
+  data() {
+    return {
+      inputText: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: ""
+      },
+      tableHead: [
+        {
+          prop: "linkName",
+          label: "计次状态",
+          width: 150
+        },
+        {
+          prop: "pointDate",
+          label: "时间",
+          width: 150
+        }
+      ],
+      tableData1: [],
+      tableData: [],
+      startTime: null,
+      endTime: null,
+      oldRow1: "",
+      oldRowCount1: 1,
+      drawer: false,
+      direction: "rtl",
+      orderId: 0,
+      stepList: [],
+      tableTitle: "计次统计"
+    };
+  },
+  created() {
+    if (
+      getCookie("orgCode") == "dagangadmin" ||
+      getCookie("orgCode") == "zidonghuabu" ||
+      getCookie("orgCode") == "wuliuchuyunzhongxin"
+    ) {
+      this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=26";
+    } else {
+      this.option.requestUrl =
+        "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=26&userId=" +
+        getCookie("orgCode");
+    }
+  },
+  methods: {
+    // -------查看物资详情(已拒绝)
+    detailclick1(row) {
+      // 记录重复点击次数
+      if (this.oldRow1 === row) {
+        this.oldRowCount1 += 1;
+      }
+      this.orderId = row.orderId;
+      let map = {
+        orderId: this.orderId
+      };
+      // 切换当前详情表
+      this.$refs.excelDom.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow1 != "") {
+        if (this.oldRow1 != row) {
+          if (this.oldRowCount1 % 2 === 1) {
+            this.$refs.excelDom.toggleRowExpansion(this.oldRow1);
+          } else {
+            this.oldRowCount1 = 1;
+          }
+        } else {
+          this.oldRow1 = null;
+          return;
         }
+      }
+      // 重置上一个点击对象
+      this.oldRow1 = row;
+      // 根据销售订单物资中间表id查询物资信息
+      this.axios.post("/api/v1/oms/getOrderResult?orderId=", map).then(res => {
+        console.log("res", res);
+        this.tableData1 = res.data;
+      });
     },
-    created(){
-        this.option.requestUrl = "/api/v1/tms/selectCountList?apiId=364"
+    getStepsList(row) {
+      console.log(row.orderId);
+      this.orderId = row.orderId;
+      this.drawer = true;
+      let map = {
+        orderId: this.orderId
+      };
+      this.axios.post("/api/v1/oms/getOrderResult", map).then(res => {
+        console.log(res);
+        if (res.status == 200) {
+          this.stepList = res.data;
+        } else {
+          this.$message.error("展示失败！");
+        }
+      });
+      console.log(this.stepList);
+    },
+    getRequirementMaterial1(row) {
+      // 记录重复点击次数
+      if (this.oldRow1 === row) {
+        this.oldRowCount1 += 1;
+      }
+      // 切换当前详情表
+      this.$refs.excelDom.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow1 != "") {
+        if (this.oldRow1 != row) {
+          if (this.oldRowCount1 % 2 === 1) {
+            this.$refs.excelDom.toggleRowExpansion(this.oldRow1);
+          } else {
+            this.oldRowCount1 = 1;
+          }
+        } else {
+          this.oldRow1 = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow1 = row;
+      this.getMaterial(row.orderId);
     },
-    methods:{
-
-        onclick(){
-            this.option.requestUrl = "/api/v1/tms/selectCountList?apiId=364&con="+this.inputText;
+    onclick() {
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          console.log(startTime);
+          console.log(endTime);
+          if (
+            getCookie("orgCode") == "dagangadmin" ||
+            getCookie("orgCode") == "zidonghuabu" ||
+            getCookie("orgCode") == "wuliuchuyunzhongxin"
+          ) {
+            this.option.requestUrl =
+              "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=26&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i=" +
+              new Date();
+          } else {
+            this.option.requestUrl =
+              "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=26&userId=" +
+              getCookie("orgCode") +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i=" +
+              new Date();
+          }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
         }
+      } else {
+      }
+    },
+    getMaterial(orderId) {
+      console.log(orderId);
+      this.axios
+        .post("/api/v1/oms/getPauseTimeTaskDetail/" + orderId)
+        .then(res => {
+          console.log(res);
+          this.tableData = res.data.data;
+        });
     }
-}
+  }
+};
 </script>
 <style lang="scss">
-    .sale{
-        .top {
-            padding: 1.25rem 1.875rem;
-            .el-input{
-            width: 20%;
-            }
-        }
+.sale {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 20%;
     }
-</style>
+  }
+}
+.el-table th.el-table__cell > .cell {
+  display: inline-block;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  position: relative;
+  vertical-align: middle;
+  padding-left: 10px;
+  padding-right: 10px;
+  width: 100%;
+  text-align: center;
+}
+.step {
+  text-align: center;
+}
+</style>

src/views/inward/components/inwardFactory/timeTaskResult.vue

@@ -41,7 +41,7 @@
         <!-- 运输进程详情 -->
         <el-table-column type="expand" width="1">
           <template slot-scope="props">
-            <el-form label-position="center" inline class="demo-table-expand">
+            <el-form label-position="center" inline class="demo-table-expand" style="margin-left:30%">
               <div v-if="false">{{ props }}</div>
               <div>
                 <el-table :data="tableData1" border>
@@ -126,10 +126,10 @@ export default {
       getCookie("orgCode") == "zidonghuabu" ||
       getCookie("orgCode") == "wuliuchuyunzhongxin"
     ) {
-      this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=458";
+      this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=21";
     } else {
       this.option.requestUrl =
-        "/api/v1/tms/getAllTimeTaskResult?apiId=458&userId=" +
+        "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=21&userId=" +
         getCookie("orgCode");
     }
   },
@@ -227,7 +227,7 @@ export default {
             getCookie("orgCode") == "wuliuchuyunzhongxin"
           ) {
             this.option.requestUrl =
-              "/api/v1/tms/getAllTimeTaskResult?apiId=458&startTime=" +
+              "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=21&startTime=" +
               startTime +
               "&endTime=" +
               endTime +
@@ -235,7 +235,7 @@ export default {
               new Date();
           } else {
             this.option.requestUrl =
-              "/api/v1/tms/getAllTimeTaskResult?apiId=458&userId=" +
+              "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=21&userId=" +
               getCookie("orgCode") +
               "&startTime=" +
               startTime +

src/views/inward/components/inwardSettlement/countDetailOrder.vue

@@ -2,10 +2,22 @@
 <template>
   <div class="steel_inbound">
     <div class="sache">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+      <span>详单时间：</span>
+      <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-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="exportData()"
+      ><i class="el-icon-download"></i>导出(Excel)</el-button
+      >
     </div>
     <div class="table">
       <el-tabs v-model="activeName">
@@ -24,53 +36,58 @@
 
   </div>
 </template>
-
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 import { getCookie } from "@/utils/util.js";
 export default {
-  data(){
-    return{
+  data() {
+    return {
+      startTime: null,
+      endTime: null,
+      totalMoney: null,
+      totalTime: null,
       //单价
-      Fee:null,
+      Fee: null,
       //加载
-      selectLineLoading:false,
-      input:"",
-      activeName:"first",
-      ssoId:null,
+      selectLineLoading: false,
+      input: "",
+      activeName: "first",
+      ssoId: null,
       //详单Id
-      detailsId:null,
-      options1:{
+      detailsId: null,
+      options1: {
         // first请求数据的地址
-        requestUrl: "",
+        requestUrl: ""
       },
-      options2:{
+      options2: {
         // second请求数据的地址
-        requestUrl: "",
+        requestUrl: ""
       },
       //是否打开修改详单地址弹出框
-      dialogFormVisible:false,
+      dialogFormVisible: false,
       //原详单单价
-      originalPriceValue:null,
+      originalPriceValue: null,
       //新详单单价
-      newPriceValue:null,
+      newPriceValue: null,
       //原详单地址
-      originalAddress:null,
+      originalAddress: null,
       //新详单地址
-      newAddress:null,
+      newAddress: null,
       //新单价Id
-      priceId:null,
+      priceId: null,
       //是否打开运输单价的模态框
-      addressDrawer:false,
+      addressDrawer: false,
       //运输单价的表格
       Address: {
         requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=255",
-        selectionType: "radio",
+        selectionType: "radio"
       },
       // addressText:null,
       //缓存当前选中的运输单价
-      priceMap:{},
-      formLabelWidth: '125px'
-    }
+      priceMap: {},
+      formLabelWidth: "125px",
+      tableTitle: "内转计次计费详单"
+    };
   },
   created(){
      this.options1GetRequestUrl();
@@ -81,41 +98,106 @@ export default {
     options1GetRequestUrl(){
     if(getCookie("orgCode") == "chengyunshang"){
       this.ssoId=getCookie('userId');
-      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&carrierSsoId="+ getCookie('userId');
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0&carrierSsoId="+ getCookie('userId');
     }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
-      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0"
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0"
     }else{
-      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&userId=" + getCookie("orgCode");  
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0&userId=" + getCookie("orgCode");
     }
     },
     //已结算数据
     options2GetRequestUrl(){
      if(getCookie("orgCode") == "chengyunshang"){
       this.ssoId=getCookie('userId');
-      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1&carrierSsoId="+ getCookie('userId');
-    }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
-      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1"
-    }else{
-      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1&userId=" + getCookie("orgCode");  
-    }
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1&carrierSsoId="+ getCookie('userId');
+      }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
+        this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1"
+      }else{
+        this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1&userId=" + getCookie("orgCode");
+      }
     },
-     toInsert() {
-      this.$router.push("/insertCheckInventory");
-    },
-
-    onclick(){
-      console.log("查询待定值")
-      // this.options.requestUrl = "/api/v1/bms/getTruckDetailsOrderList?apiId=176&orderType=1&con="+this.input;
+    onclick() {
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          if (
+            getCookie("orgCode") == "dagangadmin" ||
+            getCookie("orgCode") == "zidonghuabu" ||
+            getCookie("orgCode") == "wuliuchuyunzhongxin"
+          ) {
+            this.options1.requestUrl =
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0" +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i" +
+              new Date();
+            this.options2.requestUrl =
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1" +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i" +
+              new Date();
+          } else if (getCookie("orgCode") == "chengyunshang") {
+            this.options1.requestUrl =
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0&carrierSsoId=" +
+              getCookie("userId") +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i" +
+              new Date();
+            this.options2.requestUrl =
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1&carrierSsoId=" +
+              getCookie("userId") +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i" +
+              new Date();
+          } else {
+            this.options1.requestUrl =
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0&userId=" +
+              getCookie("orgCode") +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i" +
+              new Date();
+            this.options2.requestUrl =
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1&userId=" +
+              getCookie("orgCode") +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i" +
+              new Date();
+          }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      }
     },
     //运输订单点击浏览的事件
     select(){
       this.addressDrawer = true;
-    },
-    //运输单价模态窗口的框计算
-    selectAddressClick(){
-      this.Price.requestUrl = '/api/v1/ams/getAddressDeliveryAddress?apiId=255&con='+this.addressText;
-    },
-   
+    }
   }
 }
 </script>
@@ -130,4 +212,4 @@ export default {
 			}
   }
 }
-</style>
+</style>

src/views/inward/components/inwardSettlement/detailOrder.vue

@@ -86,9 +86,9 @@
         <el-tab-pane label="已结算" name="second">
           <dilTable v-bind.sync="options2" @func="func2"> </dilTable>
         </el-tab-pane>
-        <el-tab-pane label="未生成详单" name="third">
+        <!-- <el-tab-pane label="未生成详单" name="third">
           <dilTable v-bind.sync="options3" @func="func3"> </dilTable>
-        </el-tab-pane>
+        </el-tab-pane> -->
       </el-tabs>
     </div>
   </div>
@@ -255,7 +255,6 @@ export default {
       } else {
         orderList = this.orderList1;
       }
-      debugger;
       this.axios
         .post("/api/v1/bms/newInwardSettle", { orderIds: orderList })
         .then(res => {

src/views/inward/components/truckOrder/plan.vue

@@ -4,7 +4,7 @@
     <div class="sache">
       <el-input placeholder="请输入内容" v-model="inputText" clearable>
       </el-input>
-      <el-button type="primary" class="btn">
+      <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
@@ -53,32 +53,8 @@
                   </el-button>
                 </template>
               </el-table-column>
-              <!-- 物资详情抽屉 -->
-              <el-table-column type="expand" width="1">
-                <template slot-scope="props">
-                  <el-form
-                    label-position="center"
-                    inline
-                    class="demo-table-expand"
-                  >
-                    <div v-if="false">{{ props }}</div>
-                    <div>
-                      <el-table :data="tableData" border>
-                        <el-table-column
-                          v-for="(item, i) in tableHead"
-                          :key="i"
-                          :prop="item.prop"
-                          :label="item.label"
-                          :width="item.width"
-                        ></el-table-column>
-                      </el-table>
-                    </div>
-                  </el-form>
-                </template>
-              </el-table-column>
             </mergeRowTable>
           </el-tab-pane>
-
           <el-tab-pane label="已完成" name="four">
             <mergeRowTable v-bind.sync="four" ref="table3"> </mergeRowTable>
           </el-tab-pane>
@@ -94,20 +70,14 @@ export default {
     return {
       inputText: "",
       carrierId: 40,
-      first: {
-        columnIndexs:[0,1,2,3,4,5,9.10,21,22],
-        comparison: "requirementNumber",
-        // first请求数据的地址
-        requestUrl: ""
-      },
       second: {
-        columnIndexs:[0,1,2,3,4,5,9.10,21,22],
+        columnIndexs: [0, 1, 2, 3, 4, 5, 9.1, 21, 22],
         comparison: "requirementNumber",
         // second请求数据的地址
         requestUrl: ""
       },
       third: {
-        columnIndexs:[0,1,2,3,4,5,9.10,21,22],
+        columnIndexs: [0, 1, 2, 3, 4, 5, 9.1, 21, 22],
         comparison: "requirementNumber",
         // second请求数据的地址
         requestUrl: ""
@@ -121,9 +91,6 @@ export default {
   },
   created() {
     if (getCookie("orgCode") == "chengyunshang") {
-      this.first.requestUrl =
-        "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&carrierId=" +
-        getCookie("userId");
       this.second.requestUrl =
         "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=" +
         getCookie("userId");
@@ -134,8 +101,6 @@ export default {
         "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4&carrierId=" +
         getCookie("userId");
     } else {
-      this.first.requestUrl =
-        "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1";
       this.second.requestUrl =
         "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2";
       this.third.requestUrl =
@@ -148,15 +113,27 @@ export default {
     handleClick(tab, event) {
       console.log("zhix");
       this.getRequestUrl();
-      this.getRequirementMaterial();
     },
-    getRequestUrl() {
+    onclick() {
       if (getCookie("orgCode") == "chengyunshang") {
-        this.first.requestUrl =
-          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&carrierId=" +
+        this.third.requestUrl =
+          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&carrierId=" +
           getCookie("userId") +
           "&i=" +
-          new Date();
+          new Date() +
+          "&con=" +
+          this.inputText;
+      } else {
+        this.third.requestUrl =
+          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3" +
+          "&i=" +
+          new Date() +
+          "&con=" +
+          this.inputText;
+      }
+    },
+    getRequestUrl() {
+      if (getCookie("orgCode") == "chengyunshang") {
         this.second.requestUrl =
           "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=" +
           getCookie("userId") +
@@ -173,10 +150,6 @@ export default {
           "&i=" +
           new Date();
       } else {
-        this.first.requestUrl =
-          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1" +
-          "&i=" +
-          new Date();
         this.second.requestUrl =
           "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2" +
           "&i=" +
@@ -258,40 +231,6 @@ export default {
     getPlanOrder(scope) {
       this.$router.push("/getPlanOrder/" + scope.row.planId);
     },
-    deletePlan(scope) {
-      this.$confirm("是否删除", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true
-      })
-        .then(() => {
-          this.axios
-            .post(
-              "/api/v1/bms/deleteTrainSettlement/" + scope.row.requirementId
-            )
-            .then(res => {
-              if (res.data.code == 200) {
-                this.$message({
-                  type: "success",
-                  message: "删除成功!"
-                });
-                this.getRequestUrl();
-              } else {
-                this.$message({
-                  message: "删除失败",
-                  type: "warning"
-                });
-              }
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "删除操作已取消!"
-          });
-        });
-    },
     Issue() {
       console.log(this.first.mapList);
       this.$confirm("是否下发", "提示", {

src/views/inward/components/truckOrder/purInwardTruckOrder.vue

@@ -3,7 +3,7 @@
   <div class="transportOrder">
     <div class="transportOrder_top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
+      <el-button type="primary" class="btn" @click="getRequestUrl">
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-badge
@@ -183,13 +183,17 @@ export default {
         "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&planStatus=3";
     } else {
       this.first.requestUrl =
-        "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1";
+        "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1&userId=" +
+        getCookie("orgCode");
       this.Received.requestUrl =
-        "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5";
+        "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5&userId=" +
+        getCookie("orgCode");
       this.completed.requestUrl =
-        "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2";
+        "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2&userId=" +
+        getCookie("orgCode");
       this.dispatched.requestUrl =
-        "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&planStatus=3";
+        "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&planStatus=3&userId=" +
+        getCookie("orgCode");
     }
     // this.initWebSocket();
   },
@@ -269,15 +273,21 @@ export default {
           "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1&carrierId=" +
           this.carrierUserId +
           "&test=" +
-          new Date()),
+          new Date() +
+          "&con=" +
+          this.input),
           (this.Received.requestUrl =
             "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5&planEnableStatus=1&carrierId=" +
             this.carrierUserId +
             "&test=" +
-            new Date());
-        this.completed.requestUrl =
-          "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2&carrierId=" +
-          getCookie("userId");
+            new Date() +
+            "&con=" +
+            this.input),
+          (this.completed.requestUrl =
+            "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2&carrierId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input);
       } else if (
         getCookie("orgCode") == "dagangadmin" ||
         getCookie("orgCode") == "zidonghuabu"
@@ -285,24 +295,50 @@ export default {
         this.first.requestUrl =
           "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1" +
           "&test=" +
-          new Date();
+          new Date() +
+          "&con=" +
+          this.input;
+
         this.Received.requestUrl =
           "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5" +
           "&test=" +
-          new Date();
+          new Date() +
+          "&con=" +
+          this.input;
+
         this.completed.requestUrl =
-          "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2";
+          "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2" +
+          "&test=" +
+          new Date() +
+          "&con=" +
+          this.input;
       } else {
         this.first.requestUrl =
           "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1" +
           "&test=" +
-          new Date();
+          new Date() +
+          "&con=" +
+          this.input +
+          "&userId=" +
+          getCookie("orgCode");
+
         this.Received.requestUrl =
           "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5" +
           "&test=" +
-          new Date();
+          new Date() +
+          "&con=" +
+          this.input +
+          "&userId=" +
+          getCookie("orgCode");
+
         this.completed.requestUrl =
-          "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2";
+          "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2" +
+          "&test=" +
+          new Date() +
+          "&con=" +
+          this.input +
+          "&userId=" +
+          getCookie("orgCode");
       }
     },
     getTruckRequestUrl() {

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

@@ -159,7 +159,12 @@
           width="150px"
         >
         </el-table-column>
-        <el-table-column prop="materialSpe" label="物资规格" align="center" sortable>
+        <el-table-column
+          prop="materialSpe"
+          label="物资规格"
+          align="center"
+          sortable
+        >
         </el-table-column>
         <el-table-column
           prop="materialNum"
@@ -309,7 +314,7 @@
               @click="updateconsigneeTel(scope.row)"
               type="primary"
               v-if="scope.row.isconsigneeTelShow == 1"
-            >提交</el-button
+              >提交</el-button
             >
           </template>
         </el-table-column>
@@ -1051,9 +1056,9 @@ export default {
       }
       this.axios
         .post("/api/v1/ams/updateConsigneeTel", {
-          saleOrderNo:row.saleOrderNo,
-          saleMaterialId:row.saleMaterialId,
-          consigneeTel:row.consigneeTel
+          saleOrderNo: row.saleOrderNo,
+          saleOrderMaterialId: row.saleOrderMaterialId,
+          consigneeTel: row.consigneeTel
         })
         .then(res => {
           if (res.data.code == "200") {
@@ -1219,6 +1224,8 @@ export default {
                 type:"success"
               })
               //this.$message.success("授权承运商成功");
+            if (res.data.code == "0") {
+              this.$message.success("授权承运商成功");
               this.getSteelReport();
               loading.close();
             } else {

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

@@ -0,0 +1,1718 @@
+//钢材统计报表
+<template>
+  <div class="purchasFuelNewMonitor">
+    <div class="tableTop">
+      <el-form :inline="true" style="margin-top :5px">
+        <el-form-item>
+          <el-select
+            v-model="screen"
+            placeholder="请选择需筛选的内容"
+            clearable
+            @change="changeScreen"
+            style="width:120px"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <el-input
+            style="width:180px"
+            v-model="input"
+            placeholder="请输入查询条件"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-select
+            v-model="screen1"
+            placeholder="请选择需筛选的内容"
+            clearable
+            style="width:120px"
+          >
+            <el-option
+              v-for="item in options1"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <el-input
+            style="width:180px"
+            v-model="input1"
+            placeholder="请输入查询条件"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <label class="el-form-item__label" style="width: auto;"
+            >订单时间：</label
+          >
+          <el-date-picker
+            v-model="startTime"
+            type="datetime"
+            placeholder="选择日期时间"
+            style="width:180px"
+          >
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker
+            v-model="endTime"
+            type="datetime"
+            placeholder="选择日期时间"
+            style="width:180px"
+          >
+          </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"
+            ><i class="el-icon-download"></i>Excel</el-button
+          >
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="refresh">
+            <i class="el-icon-refresh"></i>
+          </el-button>
+        </el-form-item>
+        <el-form-item>
+          <span style="margin-left: 1rem;font-size:16px">车数/件数：</span>
+          <span style="font-size:16px"
+            >{{ totalCapacity }}/{{ totalNumber }}</span
+          >
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="table">
+      <el-table
+        :data="tableData"
+        :span-method="objectSpanMethod"
+        ref="tableRef"
+        border
+        style="width: 100%; margin-top: 20px"
+        max-height="650px"
+        :row-style="{ height: '30px' }"
+        :cell-style="{ fontWeight: '500' }"
+      >
+        <el-table-column
+          width="50"
+          label="序号"
+          align="center"
+          :resizable="false"
+        >
+          <template slot-scope="scope">{{ scope.row.group + 1 }}</template>
+        </el-table-column>
+        <el-table-column
+          prop="consigneeName"
+          label="下单客户"
+          width="160px"
+          align="center"
+          show-overflow-tooltip
+        >
+        </el-table-column>
+        <el-table-column
+          prop="carrierName"
+          label="承运商"
+          align="center"
+          width="120px"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="capacityNo"
+          column-key="capacityNo"
+          label="车牌号"
+          align="center"
+          width="150px"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="materialName"
+          label="物资名称"
+          align="center"
+          width="150px"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="materialSpe"
+          label="物资规格"
+          align="center"
+          sortable
+        >
+        </el-table-column>
+        <el-table-column
+          prop="materialNum"
+          label="物资件数"
+          align="center"
+          width="150px"
+        >
+        </el-table-column>
+        <el-table-column prop="addressPlace" label="收货地址" width="200px">
+        </el-table-column>
+        <el-table-column prop="orderStatus" label="运单状态" align="center">
+        </el-table-column>
+        <el-table-column prop="grossWeight" label="毛重"> </el-table-column>
+        <el-table-column prop="grossWeightTime" label="毛重时间" width="130px">
+        </el-table-column>
+        <el-table-column prop="tareWeight" label="皮重"> </el-table-column>
+        <el-table-column prop="tareWeightTime" label="皮重时间" width="130px">
+        </el-table-column>
+        <el-table-column prop="netWeight" label="净重"> </el-table-column>
+        <el-table-column prop="entryGateTime" label="进厂时间" width="130px">
+        </el-table-column>
+        <el-table-column prop="loadTime" label="装货时间" width="130px">
+        </el-table-column>
+        <el-table-column prop="outGateTime" label="出厂时间" width="130px">
+        </el-table-column>
+        <el-table-column
+          prop="arrivalAddress"
+          label="抵达地址"
+          width="280px"
+          show-overflow-tooltip
+        >
+        </el-table-column>
+        <el-table-column
+          prop="receiptAddress"
+          label="签收地址"
+          width="280px"
+          show-overflow-tooltip
+        >
+        </el-table-column>
+        <el-table-column
+          prop="orderNo"
+          label="运输订单号"
+          width="180px"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="capacityTel"
+          label="司机电话"
+          width="250px"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="isPrintDelivery"
+          label="送货单打印状态"
+          align="center"
+          width="150px"
+        ></el-table-column>
+        <el-table-column prop="saler" label="业务员" align="center">
+        </el-table-column>
+        <el-table-column
+          prop="shipperName"
+          label="发货单位"
+          width="170px"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column prop="truckNo" label="车序号"> </el-table-column>
+        <el-table-column prop="consigneeTel" label="收货客户电话" width="120px">
+        </el-table-column>
+        <el-table-column prop="isSelfMention" label="是否自提" align="center">
+        </el-table-column>
+        <el-table-column
+          prop="saleOrderNo"
+          label="销售订单号"
+          width="200px"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="saleOrderStatus"
+          label="销售订单状态"
+          width="100px"
+        >
+        </el-table-column>
+        <el-table-column prop="closeEntryId" label="金蝶分录ID" width="100px">
+        </el-table-column>
+        <el-table-column
+          prop="operation"
+          label="操作"
+          width="100px"
+          fixed="right"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <el-button type="text" @click="operation(scope.row)"
+              >编辑</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="dialog">
+      <el-dialog
+        title="运单详情"
+        :visible.sync="centerDialogVisible"
+        width="90%"
+        center
+      >
+        <div class="steelMapClass">
+          <div class="steelMapClass1">
+            <div class="steelMapClass12">
+              <span>销售订单号:</span>
+              <span>{{ steelMap.saleOrderNo }}</span>
+            </div>
+            <div class="steelMapClass12">
+              <span>订单状态:</span>
+              <span>{{ steelMap.saleOrderStatus }}</span>
+            </div>
+            <div class="steelMapClass12">
+              <span>业务员:</span>
+              <span>{{ steelMap.saler }}</span>
+            </div>
+            <div class="steelMapClass12">
+              <span>下单客户:</span>
+              <span>{{ steelMap.consigneeName }}</span>
+            </div>
+          </div>
+          <div class="steelMapClass2">
+            <div class="steelMapClass22">
+              <span>收货地址:</span>
+              <el-select
+                v-model="steelMap.addressProvince"
+                filterable
+                placeholder="请选择"
+                @change="onchangeProvince"
+                style="width:120px"
+              >
+                <el-option
+                  v-for="item in provinceList"
+                  :key="item.id"
+                  :label="item.addressProvince"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+              <el-select
+                v-model="steelMap.addressDistrict"
+                filterable
+                placeholder="请选择"
+                @change="onchangeCity"
+                style="width:120px"
+              >
+                <el-option
+                  v-for="item in cityList"
+                  :key="item.id"
+                  :label="item.addressDistrict"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+              <el-select
+                v-model="steelMap.addressTown"
+                filterable
+                placeholder="请选择"
+                @change="onchangeCounty"
+                style="width:120px"
+              >
+                <el-option
+                  v-for="item in countyList"
+                  :key="item.id"
+                  :label="item.addressTown"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+              <el-autocomplete
+                class="inline-input"
+                v-model="steelMap.place"
+                :fetch-suggestions="querySearch1"
+                placeholder="请输入具体收货地址"
+                :trigger-on-focus="false"
+                @select="handleSelect1"
+                style="width:250px"
+              >
+              </el-autocomplete>
+              <el-button
+                type="success"
+                icon="el-icon-check"
+                circle
+                @click="addAddressClick"
+              ></el-button>
+            </div>
+            <div
+              class="steelMapClass23"
+              v-if="
+                steelMap.carStatus == 4 ||
+                  steelMap.carStatus == 5 ||
+                  steelMap.carStatus == null
+              "
+            >
+              <el-button type="danger" round @click="deleteEasEntryId"
+                >关闭运单</el-button
+              >
+            </div>
+          </div>
+          <div class="steelMapClass3">
+            <div class="steelMapClass32">
+              <span>收货客户电话:</span>
+              <el-input
+                v-model="steelMap.consigneeTel"
+                style="width:200px"
+              ></el-input>
+              <el-button
+                type="success"
+                icon="el-icon-check"
+                circle
+                @click="updateconsigneeTel"
+              ></el-button>
+            </div>
+            <div class="steelMapClass33">
+              <span>承运商:</span>
+              <el-autocomplete
+                style="width:150px"
+                v-model="steelMap.carrierName"
+                :fetch-suggestions="querySearchCarrier"
+                placeholder="请输入承运商"
+                @select="handleSelectCarrier"
+              >
+              </el-autocomplete>
+              <el-button
+                type="success"
+                icon="el-icon-check"
+                circle
+                @click="updateTruckCarrier"
+              ></el-button>
+            </div>
+            <div class="steelMapClass33">
+              <span>车牌号:</span>
+              <el-autocomplete
+                style="width:120px"
+                v-model="steelMap.capacityNo"
+                :fetch-suggestions="querySearch"
+                placeholder="请输入车牌号"
+                @select="handleSelect()"
+              ></el-autocomplete>
+              <el-button
+                type="success"
+                icon="el-icon-check"
+                circle
+                @click="updateCapacity"
+              ></el-button>
+            </div>
+            <div class="steelMapClass33">
+              <span>司机电话:</span>
+              <el-input
+                style="width:120px"
+                v-model="steelMap.capacityTel"
+                placeholder="请输入电话号码"
+              ></el-input>
+              <el-button
+                type="success"
+                icon="el-icon-check"
+                circle
+                @click="updateDriverTel"
+              ></el-button>
+            </div>
+          </div>
+          <div class="steelMapClass4">
+            <div class="steelMapClass42" v-if="steelMap.orderNo != null">
+              <span>运输订单号:</span>
+              <span>{{ steelMap.orderNo }}</span>
+            </div>
+            <div class="steelMapClass43">
+              <span>运单状态:</span>
+              <span>{{ steelMap.orderStatus }}</span>
+            </div>
+            <div
+              class="steelMapClass43"
+              v-if="steelMap.orderStatusTime != null"
+            >
+              <span>状态更新时间:</span>
+              <span>{{ steelMap.orderStatusTime }}</span>
+            </div>
+          </div>
+          <div class="steelMapClass5">
+            <div class="steelMapClass52" v-if="steelMap.arrivalAddress != null">
+              <span>抵达地址:</span>
+              <span>{{ steelMap.arrivalAddress }}</span>
+              <span class="steelMapClass521"
+                ><el-button
+                  type="success"
+                  icon="el-icon-money"
+                  circle
+                  @click="toPhotoClick"
+                ></el-button
+              ></span>
+            </div>
+          </div>
+          <div class="steelMapClass6">
+            <div class="steelMapClass62" v-if="steelMap.receiptAddress != null">
+              <span>签收地址:</span>
+              <span>{{ steelMap.receiptAddress }}</span>
+              <span class="steelMapClass621"
+                ><el-button
+                  type="success"
+                  icon="el-icon-money"
+                  circle
+                  @click="receipctPhotoClick"
+                ></el-button
+              ></span>
+            </div>
+          </div>
+        </div>
+
+        <div class="table">
+          <el-table
+            :data="steelMap.mapList"
+            border
+            style="width: 100%; margin-top: 20px"
+          >
+            <el-table-column
+              prop="materialName"
+              label="物资名称"
+              align="center"
+              width="150px"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="materialSpe"
+              label="物资规格"
+              align="center"
+              sortable
+            >
+            </el-table-column>
+            <el-table-column
+              prop="materialNum"
+              label="物资件数"
+              align="center"
+              width="200px"
+            >
+              <template slot-scope="scope">
+                <button
+                  type="primary"
+                  @click="scope.row.materialNum--"
+                  style="height:40px"
+                >
+                  -
+                </button>
+                <input
+                  v-model="scope.row.materialNum"
+                  style="width:40px;height: 40px;font-size:16px;line-height: 40px;text-align: center;"
+                />
+                <button
+                  type="primary"
+                  @click="scope.row.materialNum--"
+                  style="height:40px"
+                >
+                  +
+                </button>
+                <el-button type="primary" @click="updateBillOrder(scope.row)"
+                  >提交</el-button
+                >
+              </template>
+            </el-table-column>
+            <el-table-column prop="grossWeight" label="毛重"> </el-table-column>
+            <el-table-column
+              prop="grossWeightTime"
+              label="毛重时间"
+              width="130px"
+            >
+            </el-table-column>
+            <el-table-column prop="tareWeight" label="皮重"> </el-table-column>
+            <el-table-column
+              prop="tareWeightTime"
+              label="皮重时间"
+              width="130px"
+            >
+            </el-table-column>
+            <el-table-column prop="netWeight" label="净重"> </el-table-column>
+            <el-table-column prop="loadTime" label="装货时间" width="130px">
+            </el-table-column>
+            <el-table-column
+              prop="closeEntryId"
+              label="金蝶分录ID"
+              width="100px"
+            >
+            </el-table-column>
+            <el-table-column
+              label="分录操作"
+              fixed="right"
+              width="120px"
+              align="center"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  size="small"
+                  @click="closeEasEntryId(scope.row)"
+                  v-if="scope.row.deletedStatus == null"
+                  >关闭分录</el-button
+                >
+                <el-button
+                  type="text"
+                  size="small"
+                  @click="adverseCloseSaleMaterial(scope.row)"
+                  v-if="scope.row.deletedStatus != null"
+                  >反关闭分录</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="centerDialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="centerDialogVisible = false"
+            >确 定</el-button
+          >
+        </span>
+      </el-dialog>
+    </div>
+    <div>
+      <vxe-modal width="549px" height="731px" v-model="isShow" show-footer>
+        <div class="demo-image__preview">
+          <el-image
+            style=" height:731px;text-align:center;"
+            :src="src"
+            :preview-src-list="srcList"
+          >
+          </el-image>
+        </div>
+      </vxe-modal>
+      <vxe-modal width="549px" height="731px" v-model="isShow2" show-footer>
+        <div class="demo-image__preview">
+          <el-image
+            style=" height:731px;text-align:center"
+            :src="src2"
+            :preview-src-list="srcList2"
+          >
+          </el-image>
+        </div>
+      </vxe-modal>
+    </div>
+  </div>
+</template>
+
+<script>
+import { sjTime, isVehicleNumber } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
+
+export default {
+  data() {
+    return {
+      consigneeFiltList: [],
+      //弹出框
+      centerDialogVisible: false,
+      //根据车序号查询的值
+      steelMap: {},
+      //钢材子表数据
+      steelList: [],
+      drawer: false,
+      input: null,
+      screen: "",
+      screen1: "",
+      options: [
+        {
+          value: "下单客户",
+          lable: "下单客户"
+        },
+        {
+          value: "承运商",
+          lable: "承运商"
+        },
+        {
+          value: "车牌号",
+          lable: "车牌号"
+        }
+      ],
+      options1: [
+        {
+          value: "下单客户",
+          lable: "下单客户"
+        },
+        {
+          value: "承运商",
+          lable: "承运商"
+        },
+        {
+          value: "车牌号",
+          lable: "车牌号"
+        }
+      ],
+      startTime: null,
+      endTime: null,
+      //合计净重
+      totalNumber: 0,
+      //合计车数
+      totalCapacity: 0,
+      tableTitle: "销售统计报表",
+      capacityList: [],
+      carrierList: [],
+      tableData: [],
+      spanArr: [],
+      pos: 0,
+      mergeList: [
+        "序号",
+        "整车操作",
+        "销售订单状态",
+        "销售订单号",
+        "发货单位",
+        "司机电话",
+        "运输订单号",
+        "签收地址",
+        "抵达地址",
+        "出厂时间",
+        "进厂时间",
+        "运单状态",
+        "车牌号",
+        "承运商",
+        "下单客户",
+        "收货地址",
+        "业务员",
+        "送货单打印状态",
+        "车序号",
+        "收货客户电话",
+        "金蝶分录ID",
+        "是否自提",
+        "操作"
+      ],
+      //钢材多拼车辆线路ID
+      //索引从1-10为1-10拼路线ID
+      lineSpelling: [
+        0,
+        110001,
+        110002,
+        110003,
+        110004,
+        110005,
+        110006,
+        110007,
+        110008,
+        110009,
+        110010
+      ],
+      tableTitle: "销售钢材统计报表",
+      //所有省
+      provinceList: [],
+      //选中的省
+      province: "",
+      //所有市
+      cityList: [],
+      //选中的市
+      city: "",
+      //所有的县(区)
+      countyList: [],
+      //选中的县
+      county: "",
+      //地址输入框的值
+      addresText: "",
+      //已选中省市县
+      address: null,
+      //具体地址
+      place: null,
+      //暂存具体地址
+      place1: null,
+      //省市县Id
+      addressId: null,
+      addressRow: {},
+      srcList: [],
+      src: "",
+      isShow: false,
+      srcList2: [],
+      src2: "",
+      isShow2: false,
+      input1: ""
+    };
+  },
+  created() {
+    this.getSteelReport();
+  },
+  mounted() {},
+  computed: {},
+  methods: {
+    //筛选
+    //筛选客户
+    filterConsignee(value, row, column) {
+      return row.consigneeName === value;
+    },
+    //点击操作弹出框
+    operation(row) {
+      console.log(row);
+      this.steelMap = {};
+      this.axios
+        .post(
+          "/api/v1/tms/getSteelReportDetailsBySmId?saleOrderMaterialId=" +
+            row.saleOrderMaterialId
+        )
+        .then(res => {
+          this.steelMap = res.data.data;
+          this.addressId = row.shipperAddressId;
+          this.getAllProvince();
+          this.onchangeProvince();
+          this.onchangeCity();
+        });
+      this.centerDialogVisible = true;
+    },
+    //查看抵达图
+    toPhotoClick() {
+      this.axios
+        .post(
+          "/api/v1/otms/getArrivalPhoto?orderNumber=" + this.steelMap.orderNo
+        )
+        .then(res => {
+          this.srcList = [];
+          this.src = res.data.data;
+          this.isShow = true;
+          this.srcList.push(res.data.data);
+        });
+    },
+    //查看签收图
+    receipctPhotoClick() {
+      this.axios
+        .post(
+          "/api/v1/otms/getReceivingPhotoByUrl?orderNumber=" +
+            this.steelMap.orderNo
+        )
+        .then(res => {
+          console.log(res.data);
+          this.isShow2 = true;
+          this.srcList2 = [];
+          this.src2 = res.data.resultSignedNotePhoto;
+          this.srcList2.push(res.data.resultSignedNotePhoto);
+          this.srcList2.push(res.data.resultEmptyContainerPhoto);
+          if (res.data.resultReceiveNotePhoto != null) {
+            this.srcList2.push(res.data.resultReceiveNotePhoto);
+          }
+        });
+    },
+    //反关闭整条分录
+    adverseCloseSaleMaterial(row) {
+      console.log(row.saleMaterialId);
+      this.$confirm("确定反关闭该条分录?", "提示", {
+        cancelButtonText: "取消",
+        confirmButtonText: "确定",
+        center: true
+      }).then(() => {
+        this.axios
+          .post(
+            "/api/v1/ams/adverseCloseSaleMaterial?saleMaterialId=" +
+              row.saleMaterialId
+          )
+          .then(res => {
+            if (res.data.code == "200") {
+              this.$message.success("反关闭成功");
+              this.operation(this.steelMap);
+              this.getSteelReport();
+            } else {
+              this.$message.error("反关闭失败");
+              this.operation(this.steelMap);
+              this.getSteelReport();
+            }
+          })
+          .catch(() => {
+            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 => {
+        if (item.label != undefined && item.prop != undefined) {
+          if (tHeader.indexOf(item.label) === -1) {
+            tHeader.push(item.label);
+          }
+          if (filterVal.indexOf(item.prop) === -1) {
+            filterVal.push(item.prop);
+          }
+        }
+      });
+      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();
+    },
+    changeScreen() {},
+    //承运商弹出层
+    handleSelectCarrier() {
+      this.carrierList.forEach(item => {
+        if (item.carrierName == this.steelMap.carrierName) {
+          this.steelMap.newCarrierId = item.carrierId;
+          this.steelMap.carrierId = item.carrierId;
+        }
+      });
+    },
+    //承运商边输边查
+    querySearchCarrier(queryString, cb) {
+      if (queryString != null && queryString != "" && queryString.length > 1) {
+        this.axios
+          .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;
+              }
+              var restaurants = res.data.data;
+              this.carrierList = res.data.data;
+              var results = queryString
+                ? restaurants.filter(this.createFilterCarrier(queryString))
+                : restaurants;
+              cb(results);
+            }
+          });
+      }
+    },
+    createFilterCarrier(queryString) {
+      return restaurants => {
+        return (
+          restaurants.value1.toLowerCase().indexOf(queryString.toLowerCase()) >
+          -1
+        );
+      };
+    },
+    //以下是车牌号边输边查搜索
+    querySearch(queryString, cb) {
+      if (queryString != null && queryString != "" && queryString.length > 3) {
+        this.axios
+          .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;
+              }
+              var restaurants = res.data.data;
+              this.capacityList = res.data.data;
+              var results = queryString
+                ? restaurants.filter(this.createFilter(queryString))
+                : restaurants;
+              // 调用 callback 返回建议列表的数据
+              cb(results);
+            }
+          });
+      }
+    },
+    createFilter(queryString) {
+      return restaurants => {
+        return (
+          restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) >
+          -1
+        );
+      };
+    },
+    //车牌号弹出层
+    handleSelect() {
+      this.capacityList.forEach(item => {
+        if (item.capacityNumber === this.steelMap.capacityNo) {
+          this.steelMap.newsCapacityId = item.capacityId;
+        }
+      });
+    },
+    updateCapacity() {
+      this.steelMap.capacityId = this.steelMap.newsCapacityId;
+      if (this.steelMap.newsCapacityId == null) {
+        this.$message.warning("请先注册车牌号或者选中弹出后再提交!");
+        return;
+      }
+      if (!isVehicleNumber(this.steelMap.capacityNo)) {
+        this.$message.error("请输入正确格式的车牌号!");
+        return;
+      }
+      if (this.steelMap.capacityIds != 0) {
+        const loading = this.$loading({
+          lock: true,
+          text: "正在变更车牌号",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
+        });
+        this.axios
+          .post("/api/v1/ams/updateCapacityNumberInFactory", this.steelMap)
+          .then(res => {
+            if (res.data.code == 200) {
+              this.$message.success("变更车牌号成功!");
+              this.operation(this.steelMap);
+              this.getSteelReport();
+              loading.close();
+            } else {
+              this.$message.success("变更失败，请联系管理员");
+              this.operation(this.steelMap);
+              this.getSteelReport();
+              loading.close();
+            }
+          })
+          .catch(() => {
+            this.$message.success("变更失败，请联系管理员");
+            this.operation(this.steelMap);
+            this.getSteelReport();
+            loading.close();
+          });
+      } else {
+        if (this.steelMap.carrierIds == 0) {
+          this.$message.error("请先选择承运商！");
+          return;
+        }
+        this.steelMap.lineId = this.lineSpelling[this.steelMap.mapList.length];
+        this.steelMap.driverTel = this.steelMap.capacityTel;
+        this.steelMap.capacityNumber = this.steelMap.capacityNo;
+        let arr = [];
+        arr.push(this.steelMap);
+        const loading = this.$loading({
+          lock: true,
+          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.operation(this.steelMap);
+              this.getSteelReport();
+              loading.close();
+            } else {
+              this.$message.error("派车失败,请联系管理员");
+              this.getSteelReport();
+              this.operation(this.steelMap);
+              loading.close();
+            }
+          })
+          .catch(() => {
+            this.$message.error("派车失败,请联系管理员");
+            this.operation(this.steelMap);
+            this.getSteelReport();
+            loading.close();
+          });
+      }
+    },
+    //修改司机电话号码
+    updateDriverTel() {
+      const loading = this.$loading({
+        lock: true,
+        text: "修改电话号码中",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)"
+      });
+      if (
+        this.steelMap.capacityTel == null ||
+        this.steelMap.capacityTel == ""
+      ) {
+        this.$message.error("电话号码不能为空");
+        return;
+      }
+      this.axios
+        .post("/api/v1/uc/updateDriverTel", {
+          orderId: parseInt(this.steelMap.orderId),
+          driverTel: this.steelMap.capacityTel
+        })
+        .then(res => {
+          if (res.data.code == "200") {
+            this.$message.success("修改成功");
+            this.operation(this.steelMap);
+            this.getSteelReport();
+            loading.close();
+          } else {
+            this.$message.error("修改失败");
+            this.operation(this.steelMap);
+            this.getSteelReport();
+            loading.close();
+          }
+        })
+        .catch(() => {
+          this.$message.error("修改失败");
+          this.operation(this.steelMap);
+          this.getSteelReport();
+          loading.close();
+        });
+    },
+    //修改收货客户电话
+    updateconsigneeTel() {
+      const loading = this.$loading({
+        lock: true,
+        text: "修改电话号码中",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)"
+      });
+      if (
+        this.steelMap.consigneeTel == null ||
+        this.steelMap.consigneeTel == ""
+      ) {
+        this.$message.error("电话号码不能为空");
+        return;
+      }
+      this.axios
+        .post("/api/v1/ams/updateConsigneeTel", {
+          saleOrderNo: this.steelMap.saleOrderNo,
+          saleOrderMaterialId: this.steelMap.saleOrderMaterialId,
+          consigneeTel: this.steelMap.consigneeTel
+        })
+        .then(res => {
+          if (res.data.code == "200") {
+            this.$message.success("修改成功");
+            this.operation(this.steelMap);
+            this.getSteelReport();
+            loading.close();
+          } else {
+            this.$message.error("修改失败");
+            this.operation(this.steelMap);
+            this.getSteelReport();
+            loading.close();
+          }
+        })
+        .catch(() => {
+          this.$message.error("修改失败");
+          this.operation(this.steelMap);
+          this.getSteelReport();
+          loading.close();
+        });
+    },
+    //关闭车辆金蝶分录
+    deleteEasEntryId() {
+      this.$confirm("确定关闭该车金蝶分录吗?", "提示", {
+        confirmButtonText: "是",
+        cancelButtonText: "否",
+        center: true,
+        type: "warning"
+      })
+        .then(() => {
+          let map = this.steelMap;
+          map.operateName = getCookie("loginName");
+          map.isCloseEas = Number(0);
+          const loading = this.$loading({
+            lock: true,
+            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();
+                this.operation(this.steelMap);
+                loading.close();
+              } else {
+                this.$message.error("关闭车辆失败");
+                this.operation(this.steelMap);
+                this.getSteelReport();
+                loading.close();
+              }
+            })
+            .catch(() => {
+              this.$message.error("关闭车辆失败");
+              this.operation(this.steelMap);
+              this.getSteelReport();
+              loading.close();
+            });
+        })
+        .catch(() => {
+          this.$message.info("取消关闭");
+        });
+    },
+    //修改承运商授权
+    updateTruckCarrier() {
+      console.log(this.steelMap);
+      if (this.steelMap.newCarrierId == null) {
+        this.$message.warning("请注册承运商或者选中弹出层之后再提交!");
+        this.getSteelReport();
+        return;
+      }
+      if (this.steelMap.carrierIds != 0) {
+        const loading = this.$loading({
+          lock: true,
+          text: "正在修改承运商授权",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
+        });
+        this.axios
+          .post("/api/v1/ams/updateTruckNoCarrier", this.steelMap)
+          .then(res => {
+            if (res.data.code == "200") {
+              this.$message.success("修改承运商授权成功");
+              this.operation(this.steelMap);
+              this.getSteelReport();
+              loading.close();
+            } else {
+              this.$message.error("修改失败,请联系管理员!");
+              this.operation(this.steelMap);
+              this.getSteelReport();
+              loading.close();
+            }
+          })
+          .catch(() => {
+            this.$message.error("修改失败,请联系管理员!");
+            this.operation(this.steelMap);
+            this.getSteelReport();
+            loading.close();
+          });
+      } else {
+        //授权承运商
+        let arr = [];
+        arr.push(this.steelMap);
+        const loading = this.$loading({
+          lock: true,
+          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.operation(this.steelMap);
+              this.getSteelReport();
+              loading.close();
+            } else {
+              this.$message.error("授权失败,请联系管理员");
+              this.operation(this.steelMap);
+              this.getSteelReport();
+              loading.close();
+            }
+          })
+          .catch(() => {
+            this.$message.error("授权失败,请联系管理员");
+            this.operation(this.steelMap);
+            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();
+    },
+    //获取所有省数据
+    getAllProvince() {
+      this.axios.post("/api/v1/uc/getAllProvince").then(res => {
+        this.provinceList = res.data.data;
+      });
+    },
+    //省改变
+    onchangeProvince() {
+      this.axios
+        .post(
+          "/api/v1/uc/getDistrictByProvince?addressProvince=" +
+            this.steelMap.addressProvince +
+            "&i=" +
+            new Date()
+        )
+        .then(res => {
+          this.cityList = res.data.data;
+          // this.city = "";
+          // this.county = "";
+        });
+    },
+    //市改变
+    onchangeCity() {
+      this.axios
+        .post(
+          "/api/v1/uc/getTownByDistrict?addressDistrict=" +
+            this.steelMap.addressDistrict +
+            "&i=" +
+            new Date()
+        )
+        .then(res => {
+          this.countyList = res.data.data;
+        });
+    },
+    //县(区)改变
+    onchangeCounty() {
+      let mapValue = {
+        addressProvince: this.steelMap.addressProvince,
+        addressDistrict: this.steelMap.addressDistrict,
+        addressTown: this.steelMap.addressTown
+      };
+      this.axios.post("/api/v1/uc/getPlaceByAllAddress", mapValue).then(res => {
+        this.addressId = res.data.data[0].addressId;
+      });
+    },
+    //收货地址弹出层
+    handleSelect1(item) {
+      console.log("获取所有下拉值!");
+    },
+    //以下是收货地址边输边查搜索
+    querySearch1(queryString, cb) {
+      this.axios
+        .post(
+          "/api/v1/ams/getRealAddressByLike?addressId=" +
+            this.addressId +
+            "&index=" +
+            queryString
+        )
+        .then(res => {
+          if (res.data.code == "200") {
+            var restaurants = res.data.data;
+            var results = queryString
+              ? restaurants.filter(this.createFilter1(queryString))
+              : restaurants;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    createFilter1(queryString) {
+      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.steelMap;
+      map.isCloseEas = Number(1);
+      map.isNewCar = Number(1);
+      map.shipperAddressId = this.addressId;
+      this.axios
+        .post("/api/v1/ams/updateCarAddress", map)
+        .then(res => {
+          if (res.data.code == "200") {
+            this.$message.success("修改收货地址成功!");
+            this.operation(this.steelMap);
+            this.getSteelReport();
+            loading.close();
+          } else {
+            this.$message.error("修改失败,请联系管理员!");
+            this.operation(this.steelMap);
+            this.getSteelReport();
+            loading.close();
+          }
+        })
+        .catch(() => {
+          this.$message.error("修改失败,请联系管理员!");
+          this.operation(this.steelMap);
+          this.getSteelReport();
+          loading.close();
+        });
+    },
+    //记录每一行的合并数
+    getSpanArr(data) {
+      //每次调用方法初始化
+      this.spanArr = [];
+      for (var i = 0; i < data.length; i++) {
+        if (i === 0) {
+          this.spanArr.push(1);
+          data[i].group = i;
+          this.pos = 0;
+        } else {
+          // 判断当前元素与上一个元素是否相同
+          if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId) {
+            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.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.mergeList.indexOf(column.label) != -1) {
+        const _row = this.spanArr[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col
+        };
+      }
+    },
+    //减少物资件数
+    updateBillOrder(row) {
+      const loading = this.$loading({
+        lock: true,
+        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);
+      let updateMap = {
+        orderId: this.steelMap.orderId,
+        saleOrderId: this.steelMap.saleOrderId,
+        saleOrderMaterialId: this.steelMap.saleOrderMaterialId,
+        mapList: arr
+      };
+      this.axios
+        .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();
+          }
+        })
+        .catch(() => {
+          this.$message.error("修改物资数量失败,请联系管理员");
+          this.getSteelReport();
+          loading.close();
+        });
+    },
+    //关闭单条分录
+    closeEasEntryId(row) {
+      if (this.steelMap.mapList.length == 1) {
+        this.deleteEasEntryId();
+        return;
+      }
+      this.$prompt("确定关闭该条分录吗?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        center: true,
+        inputPlaceholder: "请输入关闭理由"
+      })
+        .then(({ value }) => {
+          if (value != null || value != "") {
+            const loading = this.$loading({
+              lock: true,
+              text: "正在关闭该条分录",
+              spinner: "el-icon-loading",
+              background: "rgba(0, 0, 0, 0.7)"
+            });
+            let map = {
+              orderId: this.steelMap.orderId,
+              saleOrderMaterialId: this.steelMap.saleOrderMaterialId,
+              saleMaterialId: row.saleMaterialId,
+              reason: value,
+              number: this.steelMap.saleOrderNo,
+              closeEntryId: row.closeEntryId
+            };
+            this.axios
+              .post("/api/v1/ams/closeSteelMaterialId", map)
+              .then(res => {
+                if (res.data.code == "200") {
+                  this.$message.success("关闭成功");
+                  this.operation(this.steelMap);
+                  this.getSteelReport();
+                  loading.close();
+                } else {
+                  this.$message.error("关闭失败,请联系管理员");
+                  this.operation(this.steelMap);
+                  this.getSteelReport();
+                  loading.close();
+                }
+              })
+              .catch(() => {
+                this.$message.error("关闭失败,请联系管理员");
+                this.operation(this.steelMap);
+                this.getSteelReport();
+                loading.close();
+              });
+          }
+        })
+        .catch(() => {
+          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;
+      if (this.startTime && this.endTime) {
+        startTime = sjTime(this.startTime);
+        endTime = sjTime(this.endTime);
+      }
+      if (getCookie("orgCode") == "chengyunshang") {
+        carrierSsoId = getCookie("userId");
+      }
+      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;
+      } else {
+        remark = this.input;
+      }
+      if (this.screen1 == "下单客户") {
+        consigneeName = this.input1;
+      } else if (this.screen == "承运商") {
+        carrierName = this.input1;
+      } else if (this.screen == "车牌号") {
+        capacityNo = this.input1;
+      } else {
+        remark = this.input1;
+      }
+      this.axios
+        .post(
+          "/api/v1/tms/getSaleSteelReport?startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&carrierSsoId=" +
+            carrierSsoId +
+            "&i=" +
+            new Date() +
+            "&remark=" +
+            remark +
+            "&consigneeName=" +
+            consigneeName +
+            "&carrierName=" +
+            carrierName +
+            "&capacityNo=" +
+            capacityNo +
+            "&saler=" +
+            saler
+        )
+        .then(res => {
+          this.tableData = res.data.data;
+          this.getSpanArr(res.data.data);
+        });
+    },
+    //重新获取表格数据
+    refresh() {
+      this.getSteelReport();
+    },
+    //获取钢材统计报表
+    getSteelReport() {
+      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);
+      }
+      if (getCookie("orgCode") == "chengyunshang") {
+        carrierSsoId = getCookie("userId");
+      }
+      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;
+      } else {
+        remark = this.input;
+      }
+      if (this.screen1 == "下单客户") {
+        consigneeName = this.input1;
+      } else if (this.screen == "承运商") {
+        carrierName = this.input1;
+      } else if (this.screen == "车牌号") {
+        capacityNo = this.input1;
+      } else {
+        remark = this.input1;
+      }
+      if (getCookie("orgCode") == "chengyunshang") {
+        carrierSsoId = getCookie("userId");
+      }
+      if (getCookie("orgCode") == "xiaoshouyewuyuan") {
+        saler = getCookie("loginName");
+      }
+      this.axios
+        .post(
+          "/api/v1/tms/getSaleSteelReport?startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&carrierSsoId=" +
+            carrierSsoId +
+            "&saler=" +
+            saler +
+            "&i=" +
+            new Date() +
+            "&remark=" +
+            remark +
+            "&consigneeName=" +
+            consigneeName +
+            "&carrierName=" +
+            carrierName +
+            "&capacityNo=" +
+            capacityNo
+        )
+        .then(res => {
+          this.tableData = res.data.data;
+
+          // { text: '专用线', value: '专用线' }
+          // { text: '达州站', value: '达州站' }
+          // this.consigneeFiltList = this.tableData.forEach(e => {
+          //   let map = {};
+          //   map.text = e.consigneeName;
+          //   map.value = e.consigneeName;
+          //   return map;
+          // });
+
+          this.getSpanArr(res.data.data);
+        });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.purchasFuelNewMonitor {
+  .tableTop {
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+  .table {
+    margin-left: 20px;
+    margin-top: 20px;
+    ::-webkit-scrollbar {
+      // width: 20px;
+      height: 30px;
+      background-color: transparent;
+    }
+  }
+  .dialog {
+    .steelMapClass {
+      .steelMapClass1 {
+        display: flex;
+        flex-direction: row;
+        justify-content: flex-start;
+        align-items: flex-start;
+        font-size: 16px;
+        .steelMapClass12 {
+          margin-left: 50px;
+          margin-right: 10px;
+        }
+      }
+      .steelMapClass2 {
+        margin-top: 20px;
+        display: flex;
+        flex-direction: row;
+        justify-content: flex-start;
+        align-items: flex-start;
+        font-size: 16px;
+        .steelMapClass22 {
+          margin-left: 50px;
+          margin-right: 10px;
+          .el-select {
+            .el-input .el-input--suffix {
+              .el-input__inner {
+                border: 0px solid !important;
+              }
+            }
+          }
+        }
+      }
+      .steelMapClass3 {
+        margin-top: 20px;
+        display: flex;
+        flex-direction: row;
+        justify-content: flex-start;
+        align-items: flex-start;
+        font-size: 16px;
+        .steelMapClass32 {
+          margin-left: 50px;
+          margin-right: 10px;
+        }
+        .steelMapClass33 {
+          margin-left: 40px;
+          margin-right: 10px;
+        }
+      }
+      .steelMapClass4 {
+        margin-top: 20px;
+        display: flex;
+        flex-direction: row;
+        justify-content: flex-start;
+        align-items: flex-start;
+        font-size: 16px;
+
+        .steelMapClass42 {
+          margin-left: 50px;
+          margin-right: 10px;
+        }
+        .steelMapClass43 {
+          margin-left: 50px;
+          margin-right: 10px;
+        }
+      }
+      .steelMapClass5 {
+        margin-top: 20px;
+        display: flex;
+        flex-direction: row;
+        justify-content: flex-start;
+        align-items: flex-start;
+        font-size: 16px;
+
+        .steelMapClass52 {
+          margin-left: 50px;
+          margin-right: 10px;
+          .steelMapClass521 {
+            margin-left: 20px;
+          }
+        }
+      }
+      .steelMapClass6 {
+        margin-top: 20px;
+        display: flex;
+        flex-direction: row;
+        justify-content: flex-start;
+        align-items: flex-start;
+        font-size: 16px;
+        .steelMapClass62 {
+          margin-left: 50px;
+          margin-right: 10px;
+        }
+      }
+    }
+  }
+  .address {
+    .button-box {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+}
+</style>

src/views/statisticalReport/router/index.js

@@ -36,6 +36,8 @@ import loadWagonWorkReport from "../components/wanzhouReport/loadWagonWorkReport
 import unloadShipWorkReport from "../components/wanzhouReport/unloadShipWorkReport.vue";
 import wagonWorkReport from "../components/wanzhouReport/wagonWorkReport.vue";
 import saleSteelCarrierReport from "@/views/statisticalReport/components/salesLogisticsStatistics/saleSteelCarrierReport";
+import saleSteelReports from "@/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports";
+
 Vue.use(Router);
 
 const constantRouterMap = [
@@ -235,6 +237,14 @@ const constantRouterMap = [
           code: "xtpzgl-yhgl"
         },
         component: saleSteelCarrierReport
+      },
+      {
+        path: "saleSteelReports",
+        name: "saleSteelReports",
+        meta: {
+          code: "xtpzgl-yhgl"
+        },
+        component: saleSteelReports
       }
     ]
   }