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

build/utils.js

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

config/index.js

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

src/views/WMS/components/billingOrder/orderDetails.vue

@@ -31,6 +31,8 @@
             style="width:200px"
           >
           </el-date-picker>
+        </el-form-item>
+        <el-form-item>
           <el-button type="primary" class="btn" @click="onclick">
             <i class="el-icon-search"></i>
           </el-button>
@@ -50,7 +52,7 @@
         border
         stripe
         style="width: 100%; margin-top: 20px"
-        max-height="800px"
+        max-height="650px"
         @cell-click="cellClik"
         :row-style="{ height: '30px' }"
         :cell-style="{ fontWeight: '700' }"
@@ -59,7 +61,6 @@
           width="50"
           label="序号"
           align="center"
-          fixed="left"
           :resizable="false"
         >
           <template slot-scope="scope">{{ scope.row.group + 1 }}</template>
@@ -69,8 +70,7 @@
           column-key="capacityNo"
           label="车牌号"
           align="center"
-          width="250px"
-          fixed
+          width="150px"
         >
         </el-table-column>
         <el-table-column
@@ -90,7 +90,7 @@
           prop="materialNumber"
           label="物资件数"
           align="center"
-          width="200px"
+          width="150px"
         >
           <template slot-scope="scope">
             <button
@@ -158,15 +158,21 @@
         <el-table-column
           label="操作"
           fixed="right"
-          width="120px"
+          width="220px"
           align="center"
         >
           <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.numberOfFurnaces"
+              v-if="!scope.row.materialName.includes('乱尺')"
+              placeholder="炉号1-件数/炉号2-件数"
+              style="width:180px"
+            >
+            </el-input>
             <el-button
               type="text"
               size="small"
               @click="disorderlyOutbound(scope.row)"
-              :disabled="!scope.row.materialName.includes('乱尺')"
               >出库申请</el-button
             >
           </template>
@@ -275,6 +281,7 @@ export default {
       let updateMap = {
         orderId: row.orderId,
         saleOrderMaterialId: row.saleOrderMaterialId,
+        saleOrderId: row.saleOrderId,
         mapList: arr
       };
       this.axios
@@ -298,6 +305,7 @@ export default {
     },
     //查询，输入查询条件
     onclick() {
+      console.log("我点击实践");
       let startTime = null;
       let endTime = null;
       let capacityNo = null;
@@ -307,12 +315,10 @@ export default {
       }
       this.axios
         .post(
-          "/api/v1/tms/getSaleSteelReport?startTime=" +
+          "/api/v1/oms/getWarehouseMes?startTime=" +
             startTime +
             "&endTime=" +
             endTime +
-            "&carrierSsoId=" +
-            carrierSsoId +
             "&i=" +
             new Date() +
             "&capacityNo=" +
@@ -346,10 +352,17 @@ export default {
     },
     disorderlyOutbound(row) {
       console.log(row);
+      this.$set(row, "input", "true");
+      if (!row.materialName.includes("乱尺") && !row.numberOfFurnaces) {
+        this.$message.error("请先输入炉号");
+        return;
+      }
+      console.log(row.numberOfFurnaces);
       if (row.warehouseId == null) {
         this.$message.error("请先选择装货点");
         return;
       }
+      //对炉号解码判断格式件数是否输入准确
       row.userId = getCookie("userId");
       let title = `确定对${row.capacityNumber}的${row.materialNumber}${row.materialName}出库吗?`;
       this.$confirm(title, "提醒", {
@@ -375,6 +388,11 @@ export default {
   .table {
     margin-left: 20px;
     margin-top: 20px;
+    ::-webkit-scrollbar {
+      // width: 20px;
+      height: 30px;
+      background-color: transparent;
+    }
   }
   .address {
     .button-box {

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

@@ -4,27 +4,47 @@
     <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>
@@ -36,7 +56,10 @@
               <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>
@@ -96,7 +119,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>
@@ -129,7 +152,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>
@@ -195,11 +218,16 @@ export default {
         capacityTypeId: 1
       },
       batchFormRules: {
-        priceValue: [{ required: true, message: '运价不能为空', trigger: 'blur' }],
-        priceDate: [{ required: true, message: '执行日期不能为空', trigger: 'blur' }],
-        oilPriceFormula: [{ 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",
@@ -230,9 +258,21 @@ export default {
     this.axios.get("/api/v1/uc/getTransRange").then(res => {
       this.options = res.data.data;
     });
-    this.obj=this.$route.query.row;
-    // console.log("obj "+JSON.stringify(this.obj))
-    this.rangeId=this.obj.rangeId
+    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;
   },
   methods: {
     //打开线路的模态窗口
@@ -246,11 +286,11 @@ 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.priceDate = this.form1.priceDate),
+        (this.obj.oilTypeId = this.form1.oilTypeId);
 
       this.oilPriceFormulaDrawer = false;
     },
@@ -324,9 +364,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,
@@ -341,20 +381,15 @@ 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>
@@ -386,72 +421,17 @@ export default {
         }
       }
     }
-  };
-.txt1{
-  display: inline-block;
-  width: 150px;
-  text-align: right;
-};
+  }
+  .txt1 {
+    display: inline-block;
+    width: 150px;
+    text-align: right;
+  }
 }
 .elForm {
   margin-left: 30%;
 }
-.addTransportPrice {
-  .form {
-    display: flex;
-    .form_box {
-      width: 320px;
-      margin-left: 30%;
-      margin-top: 30px;
-      margin-right: 20px;
-      .el-form {
-        .preview-group {
-          .el-form-item {
-            .el-form-item__label {
-              display: inline-block;
-              width: 70px !important;
-            }
-            .el-form-item__content {
-              .el-select {
-                width: 250px;
-              }
-              .el-input {
-                width: 250px;
-              }
-            }
-          }
-        }
-      }
-    }
-    .liulan {
-      width: 120px;
-      margin-top: 30px;
-      .el-button {
-        width: 100px !important;
-        margin: auto;
-      }
-      .btn {
-        margin-top: 54px;
-      }
-    }
-  }
-  .button_box {
-    margin-left: 45%;
-  }
-  .selectText {
-    .el-input {
-      width: 250px;
-    }
-  }
-  .LineTable {
-    width: 100%;
-    height: 480px;
-    overflow: hidden;
-    margin-top: 10px;
-  }
-  .btnml {
-    width: 250px;
-    margin-left: 50px;
-  }
+.button_box {
+  margin-left: 45%;
 }
 </style>

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

@@ -1058,8 +1058,9 @@ export default {
       let day = new Date().getDate();
       let month = new Date().getMonth() + 1;
       console.log(day);
-      console.log(month);
-      console.log(`${month}.${day}`);
+      if (day < 10) {
+        day = "0" + day;
+      }
       return `${month}.${day}`;
     },
     handleSelectSaleArea(item) {

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

@@ -139,7 +139,7 @@
       </el-form-item>
       <el-form-item>
         <label class="el-form-item__label" style="width: auto;"
-        >可装货时间</label
+          >可装货时间</label
         >
         <el-date-picker
           class="textinput3"
@@ -183,7 +183,7 @@
                   class="textinput111"
                   v-model.number="scope.row.orderPlanWeight"
                   placeholder="(必填)"
-                  :id="'input'+scope.$index"
+                  :id="'input' + scope.$index"
                   @keyup.up.native="clicks(scope.$index)"
                   @keyup.down.native="clickx(scope.$index)"
                   @keyup.enter.native="createACar"
@@ -313,10 +313,12 @@
                 >
                 </el-input>
                 <!--更改-->
-                <i class="el-icon-edit"
-                   @click="changeMaterial(scope.$index)"
-                   style="font-size: 20px"
-                   v-if="isCellClick == 1"></i>
+                <i
+                  class="el-icon-edit"
+                  @click="changeMaterial(scope.$index)"
+                  style="font-size: 20px"
+                  v-if="isCellClick == 1"
+                ></i>
               </template>
               <!-- 物资件数 -->
               <template v-if="item.prop == 'orderPlanWeight'">
@@ -326,7 +328,7 @@
                 ></el-input>
               </template>
               <!--规格型号-->
-              <template v-if="item.prop=='Specification'">
+              <template v-if="item.prop == 'Specification'">
                 <el-input
                   class="textinput"
                   v-model.number="scope.row.Specification"
@@ -370,10 +372,11 @@
                 >
                 </el-input>
                 <!--增加-->
-                <i class="el-icon-folder-add"
-                   @click="ondrawer(scope.row, scope.$index)"
-                   v-if="isCellClick == 1"
-                   style="font-size: 20px"
+                <i
+                  class="el-icon-folder-add"
+                  @click="ondrawer(scope.row, scope.$index)"
+                  v-if="isCellClick == 1"
+                  style="font-size: 20px"
                 ></i>
               </template>
               <!-- 收货客户电话号码 -->
@@ -400,8 +403,12 @@
           </template>
         </el-table-column>
         <!-- 操作列 -->
-        <el-table-column fixed="right" label="操作" width="200"
-                         v-if="isCellClick == 1">
+        <el-table-column
+          fixed="right"
+          label="操作"
+          width="200"
+          v-if="isCellClick == 1"
+        >
           <template slot-scope="scope">
             <el-button
               @click.native.prevent="deleteRow(scope.$index, selectionList)"
@@ -717,7 +724,7 @@ export default {
         {
           prop: "Specification",
           label: "规格型号",
-          width: "140",
+          width: "140"
         },
         {
           prop: "orderPlanWeight",
@@ -826,6 +833,14 @@ export default {
         {
           values1: "dgsm",
           label1: "四川达钢商贸有限公司"
+        },
+        {
+          values1: "jxjl",
+          label1: "江西久隆贸易有限公司"
+        },
+        {
+          values1: "hnht",
+          label1: "海南瀚途贸易有限公司"
         }
       ],
       values1: "dzgt",
@@ -913,7 +928,7 @@ export default {
       //是否忽视收货客户电话字段
       ignoreSaleOrderConsigneeTel: 0,
       //暂时存取的数据
-      temporarylist: [],
+      temporarylist: []
     };
   },
   created() {
@@ -1833,15 +1848,15 @@ export default {
     addAddressClick() {
       //不管是外层还是内层都需要修改，如果存在都需要修改收货客户的电话
       //定义一个正则表达式判断是否有电话
-      var est=/\d{11}/g
-      var string2=this.place.match(est)
-      console.log("-----------这是抓取到的数据----------")
-      console.log(string2)
-      if (string2 != null){
-        for(i=0;i<string2.length;i++){
-          var reg=/^1[3456789]\d{9}$/
-          if(reg.test(string2[i])){
-            this.saleOrderConsigneeTel=string2
+      var est = /\d{11}/g;
+      var string2 = this.place.match(est);
+      console.log("-----------这是抓取到的数据----------");
+      console.log(string2);
+      if (string2 != null) {
+        for (i = 0; i < string2.length; i++) {
+          var reg = /^1[3456789]\d{9}$/;
+          if (reg.test(string2[i])) {
+            this.saleOrderConsigneeTel = string2;
           }
         }
       }
@@ -1914,17 +1929,17 @@ export default {
           i++;
         }
       });
-      let s=0
+      let s = 0;
       //确认规格型号格式是否正确
       await this.axios
-        .post("/api/v1/ams/queryFormat",this.selectionList)
-        .then(res=>{
-          if (res.data.code=="500"){
-            s=1
+        .post("/api/v1/ams/queryFormat", this.selectionList)
+        .then(res => {
+          if (res.data.code == "500") {
+            s = 1;
           }
-        })
-      console.log("这是获取到的数据")
-      if (s== 1){
+        });
+      console.log("这是获取到的数据");
+      if (s == 1) {
         this.$message.error("规格型号有问题，请重新输入");
         return;
       }
@@ -1963,36 +1978,38 @@ export default {
       });
       this.orderMakeSure = true;
     },
-    async getlist(){
-      let res=await this.axios
-        .post("/api/v1/ams/queryMaterial",this.selectionList)
-      this.selectionList=res.data.data
-      console.log("这是查询出来的")
-      console.log(res.data.data)
-      console.log("这是修改后的数据")
-      console.log(this.selectionList)
+    async getlist() {
+      let res = await this.axios.post(
+        "/api/v1/ams/queryMaterial",
+        this.selectionList
+      );
+      this.selectionList = res.data.data;
+      console.log("这是查询出来的");
+      console.log(res.data.data);
+      console.log("这是修改后的数据");
+      console.log(this.selectionList);
     },
     //发送请求
     async sendRequest() {
       //根据规格型号与物资名称获取对应的物资ID||确认规格型号格式是否正确
       //先把暂存区的数据清空
-      this.temporarylist=[]
-      let flag=0
+      this.temporarylist = [];
+      let flag = 0;
       await this.axios
-        .post("/api/v1/ams/queryMaterial",this.selectionList)
-        .then(res=>{
-          if (res.data.code === "500"){
-            flag=1
+        .post("/api/v1/ams/queryMaterial", this.selectionList)
+        .then(res => {
+          if (res.data.code === "500") {
+            flag = 1;
           }
-          console.log(res.data.code)
+          console.log(res.data.code);
           //给暂存区的数据赋值
-          this.temporarylist=res.data.data
-          console.log("以下是查询出来的数据")
-          console.log(res.data.data)
-        })
-      if (flag===1){
-        this.$message.error("规格型号不对")
-        return
+          this.temporarylist = res.data.data;
+          console.log("以下是查询出来的数据");
+          console.log(res.data.data);
+        });
+      if (flag === 1) {
+        this.$message.error("规格型号不对");
+        return;
       }
       //先调删除订单接口
       this.axios
@@ -2006,9 +2023,9 @@ export default {
             //是否还有件数未填写
             var orderPlanWeightAllFill = 0;
             //初始化maplist
-            this.selectionList=this.temporarylist
-            console.log("以下是修改过后的数据")
-            console.log(this.selectionList)
+            this.selectionList = this.temporarylist;
+            console.log("以下是修改过后的数据");
+            console.log(this.selectionList);
             var mapList = [];
             this.selectionList.forEach(item => {
               if (!item.orderPlanWeight) {
@@ -2089,32 +2106,33 @@ export default {
     },
     CloseClick() {},
     //点击事件（上）
-    clicks(index){
-      console.log(index)
-      console.log(this.materialList)
-      console.log(this.materialList.length-1)
-      console.log('clicks=e',arguments);
-      if (index==0){
-        console.log("向上1")
+    clicks(index) {
+      console.log(index);
+      console.log(this.materialList);
+      console.log(this.materialList.length - 1);
+      console.log("clicks=e", arguments);
+      if (index == 0) {
+        console.log("向上1");
         //this.datalistindex=this.materialTableTop.length-1
-        document.getElementById("input" + (this.materialList.length-1)).focus()
-      }else {
-        console.log("向上2")
+        document
+          .getElementById("input" + (this.materialList.length - 1))
+          .focus();
+      } else {
+        console.log("向上2");
         //this.$refs.materialTableTop.bodyWrapper.scrollTop=index
-        document.getElementById("input" + (index-1)).focus()
+        document.getElementById("input" + (index - 1)).focus();
       }
-
     },
     //点击事件(下)
-    clickx(index){
-      console.log(index)
-      console.log(this.materialList)
-      console.log(this.materialList.length-1)
-      if (index ==this.materialList.length-1){
-        console.log("向下1")
-        document.getElementById("input" + 0).focus()
-      }else {
-        console.log("向下2")
+    clickx(index) {
+      console.log(index);
+      console.log(this.materialList);
+      console.log(this.materialList.length - 1);
+      if (index == this.materialList.length - 1) {
+        console.log("向下1");
+        document.getElementById("input" + 0).focus();
+      } else {
+        console.log("向下2");
         //this.datalistindex+=1
         //this.$refs.materialTableTop.bodyWrapper.scrollTop=(index+1)*height
         //var tbl=document.getElementById("table").childNodes[0]
@@ -2123,7 +2141,7 @@ export default {
         //.children[1].children[len].children[3].children[0].children[0].children[0].focus()
         //console.log(rowlist)
         var nextInput = document.getElementById("input" + (index + 1));
-        nextInput.focus()
+        nextInput.focus();
       }
     }
   }

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

@@ -4,37 +4,42 @@
     <el-form :inline="true">
       <el-form-item>
         <label class="el-form-item__label" style="width: auto;">时间段</label>
-            <el-date-picker
+        <el-date-picker
           v-model="dateValue"
           type="daterange"
           range-separator="至"
           start-placeholder="开始日期"
-          end-placeholder="结束日期">
+          end-placeholder="结束日期"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item>
         <span class="el-form-item__span" style="width: auto;">产品分类</span>
-          <el-input v-model="inputValue" placeholder="请输入内容"></el-input>
+        <el-input v-model="inputValue" placeholder="请输入内容"></el-input>
       </el-form-item>
       <el-form-item>
-          <span class="el-form-item__span" style="width: auto;">车牌号</span>
-          <el-input v-model="capacityNumber1" placeholder="请输入内容"></el-input>
+        <span class="el-form-item__span" style="width: auto;">车牌号</span>
+        <el-input v-model="capacityNumber1" placeholder="请输入内容"></el-input>
       </el-form-item>
       <el-form-item>
-          <span class="el-form-item__span" style="width: auto;">收货单位</span>
-          <el-input v-model="consigneeCompanyName1" placeholder="请输入内容"></el-input>
-      </el-form-item> 
+        <span class="el-form-item__span" style="width: auto;">收货单位</span>
+        <el-input
+          v-model="consigneeCompanyName1"
+          placeholder="请输入内容"
+        ></el-input>
+      </el-form-item>
       <el-form-item>
-          <span class="el-form-item__span" style="width: auto;">承运单位</span>
-          <el-input v-model="carrierName" placeholder="请输入内容"></el-input>
-      </el-form-item> 
+        <span class="el-form-item__span" style="width: auto;">承运单位</span>
+        <el-input v-model="carrierName" placeholder="请输入内容"></el-input>
+      </el-form-item>
       <el-form-item>
         <span class="el-form-item__span" style="width: auto;">门岗名称</span>
         <el-input v-model="gatepostName" placeholder="请输入内容"></el-input>
-      </el-form-item> 
+      </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="onSearch"><i class="el-icon-search"></i>查询</el-button>
-      
+        <el-button type="primary" @click="onSearch"
+          ><i class="el-icon-search"></i>查询</el-button
+        >
       </el-form-item>
     </el-form>
     <!-- 执行中 -->
@@ -42,21 +47,39 @@
     <mergeRowTable ref="tab" v-bind.sync="option">
       <el-table-column fixed="right" label="操作" width="180">
         <template slot-scope="scope">
-          <el-button @click="click(scope.row)" type="text" size="small" style="font-size: 17px">轨迹</el-button>
-          <el-button @click="toPhotoClick(scope.row.orderNumber)" type="text" size="small" style="font-size: 17px">抵达图</el-button>
-          <el-button @click="receipctPhotoClick(scope.row.orderNumber)" type="text" size="small" style="font-size: 17px">签收图</el-button>
+          <el-button
+            @click="click(scope.row)"
+            type="text"
+            size="small"
+            style="font-size: 17px"
+            >轨迹</el-button
+          >
+          <el-button
+            @click="toPhotoClick(scope.row.orderNumber)"
+            type="text"
+            size="small"
+            style="font-size: 17px"
+            >抵达图</el-button
+          >
+          <el-button
+            @click="receipctPhotoClick(scope.row.orderNumber)"
+            type="text"
+            size="small"
+            style="font-size: 17px"
+            >签收图</el-button
+          >
         </template>
       </el-table-column>
     </mergeRowTable>
 
     <div style="height: 100%">
       <vxe-modal width="1237" height="731" v-model="value7" show-zoom resize>
-            <template #default>
-              <PathView v-bind.sync="pathOption"></PathView>
-            </template>
+        <template #default>
+          <PathView v-bind.sync="pathOption"></PathView>
+        </template>
       </vxe-modal>
     </div>
-     <vxe-modal width="549px" height="731px" v-model="isShow" show-footer>
+    <vxe-modal width="549px" height="731px" v-model="isShow" show-footer>
       <div class="demo-image__preview">
         <el-image
           style=" height:731px;text-align:center;"
@@ -66,7 +89,7 @@
         </el-image>
       </div>
     </vxe-modal>
-     <vxe-modal width="549px" height="731px" v-model="isShow2" show-footer>
+    <vxe-modal width="549px" height="731px" v-model="isShow2" show-footer>
       <div class="demo-image__preview">
         <el-image
           style=" height:731px;text-align:center"
@@ -82,87 +105,85 @@
           <dilTable ref="tableAlarm" v-bind.sync="optionAlarm"></dilTable>
         </template>
       </vxe-modal>
-    </div> 
+    </div>
   </div>
 </template>
 
-
 <script>
 import { sjTime } from "@/utils/sharedJsFile";
-import PathView from "./mapTest.vue"
+import PathView from "./mapTest.vue";
 export default {
   name: "inTransit",
-  components: { 
-    PathView,
+  components: {
+    PathView
   },
   data() {
     return {
-      dateValue:[new Date(), new Date()],
-      inputValue:"",
-      exceptionType:"全部类型",
-      selectOrderNumber:"",
-      capacityNumber1:"",
-      carrierName:"",
-       gatepostName:"",
-       value7:false,
-       value6:false,
-       value5:false,
-       dialogVisible:false,
-      consigneeCompanyName1:"",
+      dateValue: [new Date(), new Date()],
+      inputValue: "",
+      exceptionType: "全部类型",
+      selectOrderNumber: "",
+      capacityNumber1: "",
+      carrierName: "",
+      gatepostName: "",
+      value7: false,
+      value6: false,
+      value5: false,
+      dialogVisible: false,
+      consigneeCompanyName1: "",
       status: "",
       state: "",
       activeName: "first",
-      option: {       
+      option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/otms/transportationPerformance?apiId=479",
-        comparison:"orderNumber",
-        columnIndexs:[1,2,8,9,10,11,12,13,14,15,16,17,18,19],  
+        comparison: "orderNumber",
+        columnIndexs: [1, 2, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
       },
-      
-      optionAlarm:{
-        requestUrl: "",
+
+      optionAlarm: {
+        requestUrl: ""
       },
-      pathOption:{
-           orderNumber:'',
-        capacityNumber:'',
-         startPointName:'',
-        endPointName:'',
+      pathOption: {
+        orderNumber: "",
+        capacityNumber: "",
+        startPointName: "",
+        endPointName: ""
       },
-      mileOption:{
-        orderNumber:''
+      mileOption: {
+        orderNumber: ""
       },
-      alarmOption:{
-        orderNumber:''
+      alarmOption: {
+        orderNumber: ""
       },
       srcList: [],
       src: "",
-      isShow:false,
+      isShow: false,
       srcList2: [],
       src2: "",
-      isShow2:false,
+      isShow2: false
     };
   },
   mounted() {
-    console.log("nijfdsojfosafj")
+    console.log("nijfdsojfosafj");
     this.restaurants = this.loadAll();
     // this.onSearch();
-    
   },
   methods: {
-    receipctPhotoClick(orderNumber){
-      this.axios
-       .post("/api/v1/otms/getReceivingPhotoByUrl?orderNumber="+orderNumber)
-       .then((res)=>{
-         console.log(res.data)
-          this.isShow2=true;
-          this.srcList2=[];
-          this.src2=res.data.resultSignedNotePhoto;
+    receipctPhotoClick(orderNumber) {
+      this.axios
+        .post("/api/v1/otms/getReceivingPhotoByUrl?orderNumber=" + orderNumber)
+        .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);
+          this.srcList2.push(res.data.resultEmptyContainerPhoto);
+          if (res.data.resultReceiveNotePhoto != null) {
+            this.srcList2.push(res.data.resultReceiveNotePhoto);
           }
-       });
+        });
     },
     toPhotoClick(orderNumber) {
       this.axios
@@ -174,14 +195,14 @@ export default {
           this.srcList.push(res.data.data);
         });
     },
-   
-    showPathView(data){
-      this.dialogVisible=!this.dialogVisible;
-      this.selectOrderNumber=data.orderNumber;
+
+    showPathView(data) {
+      this.dialogVisible = !this.dialogVisible;
+      this.selectOrderNumber = data.orderNumber;
     },
- 
+
     createFilter(queryString) {
-      return (restaurant) => {
+      return restaurant => {
         return (
           restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
           0
@@ -190,45 +211,59 @@ export default {
     },
     loadAll() {
       return [
-        { value: "螺纹钢"},
-         { value: "微粉"},
-        { value: "带钢"},
-        { value: "钢坯"},
-        { value: "其他"},
+        { value: "螺纹钢" },
+        { value: "微粉" },
+        { value: "带钢" },
+        { value: "钢坯" },
+        { value: "其他" }
       ];
     },
-    exportData(){
-        
-        let tHeader = [];
-        let filterVal = [];
-        if(this.activeName=="first"){
-          this.$refs.tab.dataColumnData.filter( (item,i) =>{
-                    tHeader.push(item.label);
-                        filterVal.push(item.prop);
-                    } )
-            this.export2Excel(tHeader,filterVal,this.$refs.tab.dataTabel,'执行中表格');
-        }else if(this.activeName=="second"){
-            this.$refs.tab2.dataColumnData.filter( (item,i) =>{
-              tHeader.push(item.label);
-                  filterVal.push(item.prop);
-              } )
-          this.export2Excel(tHeader,filterVal,this.$refs.tab2.dataTabel,'已完成表格');
-        } else if(this.activeName=="third"){
-            this.$refs.tab3.dataColumnData.filter( (item,i) =>{
-                      tHeader.push(item.label);
-                          filterVal.push(item.prop);
-                      } )
-            this.export2Excel(tHeader,filterVal,this.$refs.tab3.dataTabel,'有异常表格');
-        }
-        
-        
+    exportData() {
+      let tHeader = [];
+      let filterVal = [];
+      if (this.activeName == "first") {
+        this.$refs.tab.dataColumnData.filter((item, i) => {
+          tHeader.push(item.label);
+          filterVal.push(item.prop);
+        });
+        this.export2Excel(
+          tHeader,
+          filterVal,
+          this.$refs.tab.dataTabel,
+          "执行中表格"
+        );
+      } else if (this.activeName == "second") {
+        this.$refs.tab2.dataColumnData.filter((item, i) => {
+          tHeader.push(item.label);
+          filterVal.push(item.prop);
+        });
+        this.export2Excel(
+          tHeader,
+          filterVal,
+          this.$refs.tab2.dataTabel,
+          "已完成表格"
+        );
+      } else if (this.activeName == "third") {
+        this.$refs.tab3.dataColumnData.filter((item, i) => {
+          tHeader.push(item.label);
+          filterVal.push(item.prop);
+        });
+        this.export2Excel(
+          tHeader,
+          filterVal,
+          this.$refs.tab3.dataTabel,
+          "有异常表格"
+        );
+      }
     },
-    export2Excel(tHeader,filterVal,dataTabel,exeName) {
+    export2Excel(tHeader, filterVal, dataTabel, exeName) {
       var that = this;
-       this.downloadLoading = true
+      this.downloadLoading = true;
       require.ensure([], () => {
-        const { export_json_to_excel } = require("@/assets/excel/Export2Excel.js"); //这里必须使用绝对路径，使用@/+存放export2Excel的路径
-        console.log("export_json_to_excel",export_json_to_excel)
+        const {
+          export_json_to_excel
+        } = require("@/assets/excel/Export2Excel.js"); //这里必须使用绝对路径，使用@/+存放export2Excel的路径
+        console.log("export_json_to_excel", export_json_to_excel);
         let list = dataTabel;
         let data = that.formatJson(filterVal, list);
         export_json_to_excel(tHeader, data, exeName); // 导出的表格名称
@@ -236,100 +271,106 @@ export default {
     },
     //3.格式转换
     formatJson(filterVal, jsonData) {
-      return jsonData.map((v) => filterVal.map((j) => v[j]));
+      return jsonData.map(v => filterVal.map(j => v[j]));
     },
-    onSearch(){
-  
-      if(this.activeName=="first"){
-      //改变执行中条件
-      console.log(this.$refs.tab)
-      console.log("this.$refs.tab")
-      this.$refs.tab.setDataRequestQuery({"startTime":sjTime(this.dateValue[0]),
-                      "endTime": sjTime(this.dateValue[1]),
-                      "materialNames": this.inputValue,
-                      "capacityNumbers": this.capacityNumber1,
-                      "carrierNames":this.carrierName,
-                      "outGatepostNames":this.gatepostName,
-                      "receiveNames": this.consigneeCompanyName1});
+    onSearch() {
+      if (this.activeName == "first") {
+        //改变执行中条件
+        console.log(this.$refs.tab);
+        console.log("this.$refs.tab");
+        this.$refs.tab.setDataRequestQuery({
+          startTime: sjTime(this.dateValue[0]),
+          endTime: sjTime(this.dateValue[1]),
+          materialNames: this.inputValue,
+          capacityNumbers: this.capacityNumber1,
+          carrierNames: this.carrierName,
+          outGatepostNames: this.gatepostName,
+          receiveNames: this.consigneeCompanyName1
+        });
+      }
+      if (this.activeName == "second") {
+        //改变已完成条件
+        this.$refs.tab2.setDataRequestQuery({
+          startTime: sjTime(this.dateValue[0]),
+          endTime: sjTime(this.dateValue[1]),
+          materialNames: this.inputValue,
+          capacityNumbers: this.capacityNumber1,
+          carrierNames: this.carrierName,
+          outGatepostNames: this.gatepostName,
+          receiveNames: this.consigneeCompanyName1
+        });
       }
-      if(this.activeName=="second"){
-      //改变已完成条件              
-      this.$refs.tab2.setDataRequestQuery({"startTime":sjTime(this.dateValue[0]),
-                      "endTime": sjTime(this.dateValue[1]),
-                      "materialNames": this.inputValue,
-                      "capacityNumbers": this.capacityNumber1,
-                      "carrierNames":this.carrierName,
-                      "outGatepostNames":this.gatepostName,
-                      "receiveNames": this.consigneeCompanyName1});
+      if (this.activeName == "third") {
+        //改变有异常条件
+        this.$refs.tab3.setDataRequestQuery({
+          startTime: sjTime(this.dateValue[0]),
+          endTime: sjTime(this.dateValue[1]),
+          materialNames: this.inputValue,
+          capacityNumber1: this.capacityNumber1,
+          carrierName1: this.carrierName,
+          abnormalType:
+            this.exceptionType == "全部类型" ? "" : this.exceptionType,
+          outGatepostNames: this.gatepostName,
+          receiveNames: this.consigneeCompanyName1
+        });
       }
-      if(this.activeName=="third"){
-      //改变有异常条件              
-      this.$refs.tab3.setDataRequestQuery({"startTime":sjTime(this.dateValue[0]),
-                      "endTime": sjTime(this.dateValue[1]),
-                      "materialNames": this.inputValue,
-                      "capacityNumber1": this.capacityNumber1,
-                      "carrierName1":this.carrierName,
-                      "abnormalType":this.exceptionType=="全部类型"?"":this.exceptionType,
-                      "outGatepostNames":this.gatepostName,
-                      "receiveNames": this.consigneeCompanyName1});
-      }                              
     },
 
-
     //other
     click(row) {
-        let that = this;
-        that.axios
-          .post("/api/v1/otms/fullPath?orderNumber=" + row.orderNumber)
-          .then(res => {
-            console.log(res.data);
-            if (res.data.data == "-1") {
-              this.$message.error("运输订单未关闭的自提车辆无权查看!");
-            } else if (res.data.data.startAndEndRoutes != null) {
-              that.pathOption.orderNumber=row.orderNumber;
-              that.pathOption.capacityNumber=row.capacityNumber;
-              that.pathOption.startPointName="达钢集团"+row.outGatepostName,
-              that.pathOption.endPointName=row.deliveryAddress,
-              that.value7=true;
-            } else {
-              this.$message.error("车辆没有开启GPS");
-            }
-          });
+      let that = this;
+      that.axios
+        .post("/api/v1/otms/fullPath?orderNumber=" + row.orderNumber)
+        .then(res => {
+          console.log(res.data);
+          if (res.data.data == "-1") {
+            this.$message.error("运输订单未关闭的自提车辆无权查看!");
+          } else if (res.data.data.startAndEndRoutes != null) {
+            that.pathOption.orderNumber = row.orderNumber;
+            that.pathOption.capacityNumber = row.capacityNumber;
+            (that.pathOption.startPointName = "达钢集团" + row.outGatepostName),
+              (that.pathOption.endPointName = row.deliveryAddress),
+              (that.value7 = true);
+          } else {
+            this.$message.error("车辆没有开启GPS");
+          }
+        });
     },
-    historyclick(row){
-      
-      this.pathOption.orderNumber=row.orderNumber;
-        this.pathOption.capacityNumber=row.capacityNumber;
-        this.pathOption.startPointName="达钢集团"+row.outGatepostName,
-        this.pathOption.endPointName=row.deliveryAddress,
-         console.log(this.pathOption,"this.pathOption")
-        this.value7=true;
+    historyclick(row) {
+      this.pathOption.orderNumber = row.orderNumber;
+      this.pathOption.capacityNumber = row.capacityNumber;
+      (this.pathOption.startPointName = "达钢集团" + row.outGatepostName),
+        (this.pathOption.endPointName = row.deliveryAddress),
+        console.log(this.pathOption, "this.pathOption");
+      this.value7 = true;
     },
-    allDistanceclick(orderNumber){
+    allDistanceclick(orderNumber) {
       //this.$router.push("/offsite/inTransitOrderMileage?orderNumber="+orderNumber);
-    
-      this.mileOption.orderNumber=orderNumber;
-      this.value6=true;
-    },
-    inTransitAlarmclick(orderNumber){
-      this.optionAlarm.requestUrl="/api/v1/otms/getTransportAbnormalInfo?apiId=472&orderNumbers="+orderNumber;
-      this.value5=true;
-    },
+
+      this.mileOption.orderNumber = orderNumber;
+      this.value6 = true;
     },
+    inTransitAlarmclick(orderNumber) {
+      this.optionAlarm.requestUrl =
+        "/api/v1/otms/getTransportAbnormalInfo?apiId=472&orderNumbers=" +
+        orderNumber;
+      this.value5 = true;
+    }
+  }
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .el-input {
-    width: 150px;
-    margin-left: 5px;
+  width: 150px;
+  margin-left: 5px;
 }
 span.el-form-item__span {
-    float: left;
-    margin-top: 7px;
+  float: left;
+  margin-top: 7px;
 }
 .homeworkPath {
   .top {
     padding: 20px 30px;
   }
 }
-</style>
+</style>

src/views/statisticalReport/app.js

@@ -26,6 +26,11 @@ Vue.use(tableToExcel);
 import htmlToPdf from "@/components/exportPdfs/exportPdfs";
 Vue.use(htmlToPdf);
 //导出PDF组件
+import "xe-utils";
+import VXETable from "vxe-table";
+import "vxe-table/lib/style.css";
+Vue.use(VXETable);
+Vue.prototype.$XModal = VXETable.modal;
 
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;

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

@@ -228,6 +228,16 @@
           width="280px"
           show-overflow-tooltip
         >
+          <template slot-scope="scope">
+            <el-input style="width:150px" v-model="scope.row.arrivalAddress">
+            </el-input>
+            <el-button
+              v-if="scope.row.arrivalAddress != null"
+              @click="toPhotoClick(scope.row.orderNo)"
+              type="primary"
+              >查看抵达图</el-button
+            >
+          </template>
         </el-table-column>
         <el-table-column
           prop="receiptAddress"
@@ -235,6 +245,16 @@
           width="280px"
           show-overflow-tooltip
         >
+          <template slot-scope="scope">
+            <el-input style="width:150px" v-model="scope.row.arrivalAddress">
+            </el-input>
+            <el-button
+              v-if="scope.row.arrivalAddress != null"
+              @click="receipctPhotoClick(scope.row.orderNo)"
+              type="primary"
+              >查看签收图</el-button
+            >
+          </template>
         </el-table-column>
         <el-table-column
           prop="orderNo"
@@ -263,6 +283,11 @@
             >
           </template>
         </el-table-column>
+        <el-table-column
+          prop="isPrintDelivery"
+          label="送货单打印状态"
+          align="center"
+        ></el-table-column>
         <el-table-column prop="saler" label="业务员" align="center">
         </el-table-column>
         <el-table-column
@@ -339,6 +364,28 @@
         </el-table-column>
       </el-table>
     </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 class="address">
       <!-- 收货地址弹出框 -->
       <el-dialog title="收货地址" :visible.sync="drawer" width="90%">
@@ -534,7 +581,13 @@ export default {
       //省市县Id
       addressId: null,
       addressRow: {},
-      operateShow: 0
+      operateShow: 0,
+      srcList: [],
+      src: "",
+      isShow: false,
+      srcList2: [],
+      src2: "",
+      isShow2: false
     };
   },
   created() {},
@@ -542,6 +595,33 @@ export default {
     this.getSteelReport();
   },
   methods: {
+    //查看抵达图
+    toPhotoClick(orderNo) {
+      this.axios
+        .post("/api/v1/otms/getArrivalPhoto?orderNumber=" + orderNo)
+        .then(res => {
+          this.srcList = [];
+          this.src = res.data.data;
+          this.isShow = true;
+          this.srcList.push(res.data.data);
+        });
+    },
+    //查看签收图
+    receipctPhotoClick(orderNo) {
+      this.axios
+        .post("/api/v1/otms/getReceivingPhotoByUrl?orderNumber=" + 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);
+          }
+        });
+    },
     rowClick() {
       if (this.operateShow == 1) {
         this.operateShow = 0;
@@ -553,8 +633,8 @@ export default {
     adverseCloseSaleMaterial(row) {
       console.log(row.saleMaterialId);
       this.$confirm("确定反关闭该条分录?", "提示", {
-        cancelButtonText: "确定",
-        confirmButtonText: "取消",
+        cancelButtonText: "取消",
+        confirmButtonText: "确定",
         center: true
       }).then(() => {
         this.axios