Merge remote-tracking branch 'origin/master'

build/utils.js

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

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

@@ -110,19 +110,6 @@
         </el-autocomplete>
         <el-button type="primary" @click="ondrawerOut">选择</el-button>
       </el-form-item>
-      <el-form-item>
-        <label class="el-form-item__label" style="width: auto;"
-          >可装货时间</label
-        >
-        <el-date-picker
-          class="textinput3"
-          v-model.number="saleDateOfReceipt"
-          type="datetime"
-          placeholder="选择日期时间"
-          disabled
-        >
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <label
           class="el-form-item__label"
@@ -151,6 +138,19 @@
           placeholder="(非必填)"
         ></el-input>
       </el-form-item>
+      <el-form-item>
+        <label class="el-form-item__label" style="width: auto;"
+          >可装货时间</label
+        >
+        <el-date-picker
+          class="textinput3"
+          v-model.number="saleDateOfReceipt"
+          type="datetime"
+          placeholder="选择日期时间"
+          disabled
+        >
+        </el-date-picker>
+      </el-form-item>
     </el-form>
 
     <div class="button-box">
@@ -315,10 +315,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 == 'Specification'">
@@ -372,10 +374,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>
               <!-- 收货日期 -->
@@ -412,7 +415,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)"
@@ -873,6 +881,14 @@ export default {
         {
           values1: "dgsm",
           label1: "四川达钢商贸有限公司"
+        },
+        {
+          values1: "jxjl",
+          label1: "江西久隆贸易有限公司"
+        },
+        {
+          values1: "hnht",
+          label1: "海南瀚途贸易有限公司"
         }
       ],
       values1: "dzgt",
@@ -962,7 +978,7 @@ export default {
       saleAreaId: null,
       isNiTui: 0,
       datalistindex: 0,
-      temporarylist:[],
+      temporarylist: []
     };
   },
   created() {
@@ -1934,15 +1950,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;
           }
         }
       }
@@ -2011,15 +2027,15 @@ export default {
           i++;
         }
       });
-      let flag=0
+      let flag = 0;
       await this.axios
-        .post("/api/v1/ams/queryFormat",this.selectionList)
-        .then(res=>{
-          if (res.data.code=="500"){
-            flag=1
+        .post("/api/v1/ams/queryFormat", this.selectionList)
+        .then(res => {
+          if (res.data.code == "500") {
+            flag = 1;
           }
-        })
-      if (flag== 1){
+        });
+      if (flag == 1) {
         this.$message.error("规格型号有问题，请重新输入");
         return;
       }
@@ -2065,25 +2081,25 @@ export default {
       var orderPlanWeightAllFill = 0;
       //根据规格型号与物资名称获取对应的物资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.selectionList=this.temporarylist
+      this.selectionList = this.temporarylist;
       //初始化maplist
       var mapList = [];
       this.selectionList.forEach(item => {
@@ -2170,41 +2186,42 @@ export default {
         .catch(_ => {});
     },
     //点击事件（上）
-    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]
         //tbl.childNodes[len].childNodes[0].childNodes[0].focus()children[3]
         //const rowlist=this.$refs.materialTableTop.$el.children[3].children[1].children[0]
-          //.children[1].children[len].children[3].children[0].children[0].children[0].focus()
+        //.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/appoint/components/saleContract/editSaleOrder.vue

@@ -109,19 +109,6 @@
         </el-autocomplete>
         <el-button type="primary" @click="ondrawerOut">选择</el-button>
       </el-form-item>
-      <el-form-item>
-        <label class="el-form-item__label" style="width: auto;"
-          >可装货时间</label
-        >
-        <el-date-picker
-          class="textinput3"
-          v-model.number="saleDateOfReceipt"
-          type="datetime"
-          placeholder="选择日期时间"
-          disabled
-        >
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <label
           class="el-form-item__label"
@@ -150,6 +137,19 @@
           placeholder="(非必填)"
         ></el-input>
       </el-form-item>
+      <el-form-item>
+        <label class="el-form-item__label" style="width: auto;"
+        >可装货时间</label
+        >
+        <el-date-picker
+          class="textinput3"
+          v-model.number="saleDateOfReceipt"
+          type="datetime"
+          placeholder="选择日期时间"
+          disabled
+        >
+        </el-date-picker>
+      </el-form-item>
     </el-form>
 
     <div class="button-box">

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

@@ -255,20 +255,22 @@ export default {
       shipperId: 1,
       receivingCompany: [
         "四川省达州钢铁集团有限责任公司",
-        "四川达钢商贸有限公司"
+        "四川达钢商贸有限公司",
+        "江西久隆贸易有限公司",
+        "海南瀚途贸易有限公司"
       ],
       option: {
         // 表格请求数据的地址
         requestUrl: "",
         selectionType: "select",
         comparison: "saleNumber",
-        columnIndexs: [0, 1, 2, 3, 4, 9, 10, 11, 12, 13, 14, 15, 16, 17]
+        columnIndexs: [0, 1, 2, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17]
       },
       option2: {
         // 表格请求数据的地址
         requestUrl: "",
         comparison: "saleNumber",
-        columnIndexs: [0, 1, 2, 3, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+        columnIndexs: [0, 1, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
       },
       option4: {
         // 表格请求数据的地址
@@ -277,8 +279,8 @@ export default {
         columnIndexs: [
           0,
           1,
-          2,
-          3,
+          6,
+          7,
           8,
           9,
           10,
@@ -301,9 +303,7 @@ export default {
         comparison: "saleNumber",
         columnIndexs: [
           0,
-          1,
-          2,
-          3,
+          6,
           7,
           8,
           9,
@@ -480,7 +480,6 @@ export default {
       var workbook = null;
       //设置读取操作
       reader.onload = function(e) {
-        console.log(e);
         data = e.target.result;
         workbook = XLSX.read(data, {
           type: "binary"
@@ -567,7 +566,7 @@ export default {
                 }
               }
               if (e1.includes("车序号")) {
-                if (isNumber(e[e1])) {
+                if (typeof e[e1] != "undefined" && isNumber(e[e1])) {
                   map.truckNo = e[e1];
                 } else {
                   throw new Error(
@@ -631,7 +630,15 @@ export default {
             if (typeof map.isSelfMention === "undefined") {
               map.isSelfMention = "否";
             }
-            if (map.saleRemark && map.receiveName && map.materialName) {
+            if (
+              map.saleRemark &&
+              map.receiveName &&
+              map.materialName &&
+              map.truckNo &&
+              map.province &&
+              map.district &&
+              map.saleArea
+            ) {
               that.tableData.push(map);
             }
           } catch (e) {
@@ -886,6 +893,7 @@ export default {
         });
     },
     deleteSaleOrder(row) {
+      console.log(row);
       this.$prompt("此操作将关闭订单且下面的待运输订单，是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -901,7 +909,9 @@ export default {
               reason: value
             };
             this.axios
-              .post("/api/v1/ams/deleteSaleOrderSame", mapValue)
+              .post(
+                "/api/v1/ams/deleteSaleOrderById?saleOrderId=" + row.saleOrderId
+              )
               .then(res => {
                 if (res.data.code == 200) {
                   this.$message.success("关闭成功");

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

@@ -10,6 +10,18 @@
         <i class="el-icon-plus"></i>新增
       </el-button>
        <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+<!--      <el-upload
+        class="upload-excel"
+        action=""
+        :on-change="importExcel"
+        :show-file-list="false"
+        accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+        :auto-upload="false"
+      >
+        <el-button type="primary">
+          导入单价表
+        </el-button>
+      </el-upload>-->
     </div>
 
 <el-tabs v-model="activeName">
@@ -23,7 +35,7 @@
           <dilTable ref="excelDom" v-bind.sync="option2" :loading="loading" :isKuang="isKuang" @func="func">
           </dilTable>
       </el-tab-pane>
-      
+
     </el-tabs>
   </div>
 </template>
@@ -66,8 +78,148 @@ export default {
     btnclick() {
       this.$router.push("/addTransportPrice");
     },
+    /*importExcel(file){
+      let that = this;
+      if (!file) {
+        that.$message({
+          message: "文件错误!",
+          type: "warning"
+        });
+        return;
+      }
+      let excelData =[]
+      var reader=new FileReader();
+      var data=null;
+      var workbook = null;
+      //设置读取操作
+      reader.onload = function (e){
+        console.log(e);
+        data = e.target.result;
+        workbook=XLSX.read(data,{type:'binary'});
+        console.log(workbook)
+        //只取第一个表的数据
+        let rows= XLSX.utils.sheet_to_json(
+          workbook.Sheets[workbook.SheetNames[0]]
+        );
+        console.log(rows)
+        let index=1;
+        // for (index=1;index<rows.length;index++){
+        //   if (
+        //     typeof workbook.Sheets[workbook.SheetNames[0]]["A"+index] !=
+        //     "undefined"
+        //   ){
+        //     index++;
+        //     break
+        //   }
+        // }
+        // console.log("表头行数:" + index);
+        // if(index>=rows.length){
+        //   that.$message({
+        //     message: "文件错误!",
+        //     type: "warning",
+        //   });
+        //   return
+        // }
+        if (
+          typeof workbook.Sheets[workbook.SheetNames[0]]["A" + index] == 'undefined' ||
+          typeof workbook.Sheets[workbook.SheetNames[0]]["B" + index] == 'undefined' ||
+          typeof workbook.Sheets[workbook.SheetNames[0]]["C" + index] == 'undefined' ||
+          typeof workbook.Sheets[workbook.SheetNames[0]]["D" + index] == 'undefined' ||
+          typeof workbook.Sheets[workbook.SheetNames[0]]["E" + index] == 'undefined' ||
+          typeof workbook.Sheets[workbook.SheetNames[0]]["F" + index] == 'undefined' ||
+          typeof workbook.Sheets[workbook.SheetNames[0]]["G" + index] == 'undefined' ||
+          typeof workbook.Sheets[workbook.SheetNames[0]]["H" + index] == 'undefined' ||
+          workbook.Sheets[workbook.SheetNames[0]]["A" + index].v != "序号" ||
+          workbook.Sheets[workbook.SheetNames[0]]["B" + index].v != "省份" ||
+          workbook.Sheets[workbook.SheetNames[0]]["C" + index].v != "市/区" ||
+          workbook.Sheets[workbook.SheetNames[0]]["D" + index].v != "县/镇" ||
+          workbook.Sheets[workbook.SheetNames[0]]["E" + index].v != "卸货地点" ||
+          workbook.Sheets[workbook.SheetNames[0]]["F" + index].v != "参考运距（公里）" ||
+          workbook.Sheets[workbook.SheetNames[0]]["G" + index].v != "运价（元/吨）" ||
+          workbook.Sheets[workbook.SheetNames[0]]["H" + index].v != "吨公里（元/吨.km）"
+        ){
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["A" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["A" + index].v != "序号"
+          ) {
+            that.$message({
+              message: "表格格式错误:序号错误",
+              type: "warning"
+            });
+          }
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["B" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["B" + index].v != "省份"
+          ) {
+            that.$message({
+              message: "表格格式错误:省份错误",
+              type: "warning"
+            });
+          }
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["C" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["C" + index].v != "市/区"
+          ) {
+            that.$message({
+              message: "表格格式错误:市/区错误",
+              type: "warning"
+            });
+          }
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["D" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["D" + index].v != "县/镇"
+          ) {
+            that.$message({
+              message: "表格格式错误:县/镇错误",
+              type: "warning"
+            });
+          }
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["E" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["E" + index].v != "卸货地点"
+          ) {
+            that.$message({
+              message: "表格格式错误:卸货地点错误",
+              type: "warning"
+            });
+          }
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["F" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["F" + index].v != "参考运距（公里）"
+          ) {
+            that.$message({
+              message: "表格格式错误:参考运距（公里）错误",
+              type: "warning"
+            });
+          }
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["G" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["G" + index].v != "运价（元/吨）"
+          ) {
+            that.$message({
+              message: "表格格式错误:运价（元/吨）错误",
+              type: "warning"
+            });
+          }
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["G" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["H" + index].v != "吨公里（元/吨.km）"
+          ) {
+            that.$message({
+              message: "表格格式错误:吨公里（元/吨.km）错误",
+              type: "warning"
+            });
+          }
+        }
+        //读取表格
+        for (let i = index+1; i <= rows.length+1 ; i++){
+          console.log(workbook.Sheets[workbook.SheetNames[0]]["B" + i].v)
+        }
+      }
+      reader.readAsBinaryString(file.raw);
+    }*/
   },
-  
+
 };
 </script>
 <style lang='scss' scoped>
@@ -80,4 +232,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/appoint/components/ship/addDeliveryAttorney.vue

@@ -220,6 +220,7 @@ export default {
         downSwimPortId: this.downSwimPortId,
         attorenyPickupIdcard: this.form1.attorenyPickupIdcard,
         attorneyContactTelephone: this.form1.attorneyContactTelephone,
+        realForeignShipName:this.form1.realForeignShipName,
         batchId: this.batchIds,
         attorneyTime: sjTime(this.form1.attorneyTime),
         attorneyPdffile: this.form1.attorneyPdffile,
@@ -264,7 +265,8 @@ export default {
         typeof AmsshipDeliveryAttorney.requesterGroupId =='undefined' ||  AmsshipDeliveryAttorney.requesterGroupId == null ||
         AmsshipDeliveryAttorney.attorenyPickupIdcard == null ||
         AmsshipDeliveryAttorney.attorneyContactTelephone == null ||
-        AmsshipDeliveryAttorney.attorneyPickupContactPerson == null
+        AmsshipDeliveryAttorney.attorneyPickupContactPerson == null ||
+        AmsshipDeliveryAttorney.realForeignShipName == null
       )
         this.$message.error("存在空值,请核实以后再提交");
       else if (!isTelePhone(val2)) 

src/views/appoint/components/ship/attorneytext.vue

@@ -49,7 +49,7 @@
                 }}
                 前来贵港办理我公司的货权提货和水路运输事宜，品种:{{
                   item.materialName
-                }};外轮船名：{{ item.resultForeignShipName }}; 数量:{{
+                }};外轮船名：{{ item.realForeignShipName }}; 数量:{{
                   item.purchaseOrderMaterialNum
                 }}
                 湿吨（如遇该轮最后一批提货请清场),物流流向:{{

src/views/appoint/components/ship/deliveryAttorney.vue

@@ -86,7 +86,7 @@
                 @click="modifyClick(scope.row.attorneyId)"
                 type="text"
                 size="small"
-                :disabled="scope.row.purchaseOrderMaterialNum"
+                :disabled="scope.row.purchaseOrderMaterialNum && scope.row.realForeignShipName && scope.row.realForeignShipName != '' && scope.row.realForeignShipName != 'null'"
               >
                 修改
               </el-button>

src/views/appoint/components/ship/deliveryNotice.vue

@@ -3,7 +3,7 @@
   <div class="shipTransport">
     <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <!-- <el-date-picker
+      <el-date-picker
         v-model="startTime"
         type="datetime"
         placeholder="选择日期"
@@ -11,7 +11,7 @@
       </el-date-picker>
       <span>至</span>
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
-      </el-date-picker> -->
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -21,6 +21,9 @@
       <el-button type="primary" @click="refresh()">
         <i class="el-icon-refresh"></i>刷新
       </el-button>
+      <el-button type="primary" @click="exportData()" v-if="activeName == 'second'">
+        <i class="el-icon-download"></i>导出(Excel)
+      </el-button>
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <!-- 未下发 -->
@@ -67,7 +70,7 @@
       </el-tab-pane>
       <!-- 已下发 -->
       <el-tab-pane label="已下发" name="second">
-        <dilTable v-bind.sync="option2">
+        <dilTable v-bind.sync="option2"  ref="excelDom">
           <el-table-column
             fixed="right"
             align="center"
@@ -128,6 +131,7 @@ export default {
       src: "",
       startTime: null,
       endTime: null,
+      tableTitle: "发货通知",
       // restaurants: [],
       input: "",
       activeName: "first",
@@ -141,7 +145,19 @@ export default {
       },
     };
   },
+  mounted(){
+    this.initDate();
+    this.onclick();
+  },
   methods: {
+    initDate(){
+      this.startTime=new Date();
+      this.endTime=new Date();
+      this.startTime.setDate(1);
+      this.startTime.setHours(0);
+      this.startTime.setMinutes(0);
+      this.startTime.setSeconds(0);
+    },
     onclick() {
       let startTime = null;
       let endTime = null;
@@ -152,7 +168,7 @@ export default {
         endTime = sjTime(this.endTime);
       }
       if (startTime && endTime && startTime < endTime) {
-        if (this.activeName == "first") {
+
           this.option1.requestUrl =
             "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=0&carrierSSOId=" +
             getCookie("userId") +
@@ -162,7 +178,7 @@ export default {
             startTime +
             "&endTime=" +
             endTime;
-        } else {
+       
           this.option2.requestUrl =
             "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=1&carrierSSOId=" +
             getCookie("userId") +
@@ -172,21 +188,19 @@ export default {
             startTime +
             "&endTime=" +
             endTime;
-        }
       } else {
-        if (this.activeName == "first") {
+        
           this.option1.requestUrl =
             "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=0&carrierSSOId=" +
             getCookie("userId") +
             "&con=" +
             this.input;
-        } else {
+       
           this.option2.requestUrl =
             "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=1&carrierSSOId=" +
             getCookie("userId") +
             "&con=" +
             this.input;
-        }
       }
     },
     addClick() {

src/views/appoint/components/ship/modifyDeliveryAttroney.vue

@@ -137,6 +137,7 @@ export default {
         portId: this.portId,
         batchId:this.batchInfactoryId,
         attorneyContactTelephone:this.form1.attorneyContactTelephone,
+        realForeignShipName:this.form1.realForeignShipName,
         attorenyPickupIdcard: this.form1.attorenyPickupIdcard,
         attorneyPickupContactPerson: this.form1.attorneyPickupContactPerson,
         downSwimPortId: this.downSwimPortId,

src/views/sale/components/dilNotice/addNotice1.vue

@@ -0,0 +1,70 @@
+<template>
+  <!-- 添加公告信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+
+    <div class="form-box" style="margin-right: 10rem">
+      <dil-form :formId="389" v-model="form1" ref="from1"></dil-form>
+    </div>
+
+    <div class="button-box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+      value: undefined,
+    };
+  },
+  mounted() {},
+  methods: {
+    makeSure() {
+      console.log(this.form1);
+      let DilNotice = {
+        noticeTitle:this.form1.noticeTitle,
+        insertUsername:this.form1.insertUsername,
+        noticeContent:this.form1.noticeContent,
+        permissions:this.form1.permission,
+        /*这里permissions拿的是描述也就是name值*/
+      }
+      this.axios
+        .post(
+          "/api/v1/ams/insertNotice",DilNotice
+        )
+        .then((res) => {
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+</style>

src/views/sale/components/dilNotice/addNotice2.vue

@@ -0,0 +1,71 @@
+<template>
+  <!-- 添加公告信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+
+    <div class="form-box" style="margin-right: 10rem">
+      <dil-form :formId="390" v-model="form1" ref="from1"></dil-form>
+    </div>
+
+    <div class="button-box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+      value: undefined,
+    };
+  },
+  mounted() {},
+  methods: {
+    makeSure() {
+      console.log(this.form1);
+      let DilNotice = {
+        noticeTitle:this.form1.noticeTitle,
+        insertUsername:this.form1.insertUsername,
+        noticeContent:this.form1.noticeContent,
+        permissions:this.form1.permission,
+        /*这里permissions拿的是描述也就是name值*/
+      }
+      this.axios
+        .post(
+          "/api/v1/ams/insertNotice",DilNotice
+        )
+        .then((res) => {
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+</style>
+

src/views/sale/components/dilNotice/clientNotice.vue

@@ -77,7 +77,7 @@ export default {
     },
     /*新增通知*/
     toInsert() {
-      this.$router.push("/addNotice");
+      this.$router.push("/addNotice2");
 
     },
 

src/views/sale/components/dilNotice/marketingNotice.vue

@@ -78,7 +78,7 @@ export default {
     },
     /*新增通知*/
     toInsert() {
-      this.$router.push("/addNotice");
+      this.$router.push("/addNotice1");
 
     },
 

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

@@ -1,10 +1,12 @@
 <template>
   <div class="tableAllDate">
-    <div id="pdfDom">
+    <div id="pdfDom1">
+    <div id="pdfDom" v-for="(item, index) in dataList" :key="index">
       <div class="blank"></div>
+
       <div class="title">
-        <h1 align="center">{{ shippername }}</h1>
-        <h1 align="center">物资送货单</h1>
+        <h5 align="center">{{ shippername }} 物资送货单</h5>
+        <!--        <h5 align="center">物资送货单</h5>-->
       </div>
       <div>
         <!-- tablePart0 -->
@@ -34,13 +36,12 @@
         >
           <tr>
             <th style="width: 5%; text-align: center">序号</th>
-            <th style="width: 21.5%; text-align: center">物资名称</th>
-            <th style="width: 21.5%; text-align: center">规格型号</th>
+            <th style="width: 23.5%; text-align: center">物资名称</th>
+            <th style="width: 22.5%; text-align: center">规格型号</th>
             <th style="width: 14%">件数</th>
             <th style="width: 14%">重量</th>
-            <th style="width: 19%">订单日期</th>
+            <th style="width: 21%">订单日期</th>
           </tr>
-
           <tr v-for="(item, index) in deliveryOrderMaterialList" :key="index">
             <td>{{ index + 1 }}</td>
             <td>{{ item.materialName }}</td>
@@ -61,8 +62,8 @@
           class="tablePart2"
         >
           <tr>
-            <th style="width: 19.25%">收货地点</th>
-            <td style="width: 50%">
+            <th style="width: 28.5%">收货地点</th>
+            <td style="width: 71.5%">
               {{ province }}{{ district }}{{ town }}{{ deliveryAddress }}
             </td>
           </tr>
@@ -78,16 +79,13 @@
           class="tablePart3"
         >
           <tr>
-            <th style="width: 21.65%">收货人</th>
-            <td style="width: 20%">{{ consignee }}</td>
-            <th style="width: 10.5%">电话</th>
-            <td style="width: 26%">{{ consigneeTel }}</td>
+            <th style="width: 28.5%">收货人</th>
+            <td style="width: 22.5%">{{ consignee }}</td>
+            <th style="width: 14%">电话</th>
+            <td style="width: 35%">{{ consigneeTel }}</td>
           </tr>
         </table>
 
-
-
-
         <!-- tablePart4 -->
         <table
           border="0"
@@ -98,15 +96,14 @@
           class="tablePart4"
         >
           <tr>
-            <th style="width: 27.75%">承运商</th>
+            <th style="width: 28.5%">承运商</th>
             <td style="width: 36.5%">{{ carrierName }}</td>
-            <th style="width: 13%">车牌号</th>
-            <td style="width: 40%">{{ capacityNumber }}</td>
+            <th style="width: 14%">车牌号</th>
+            <td style="width: 35%">{{ capacityNumber }}</td>
           </tr>
         </table>
 
-
-              <!-- tablePart9 -->
+        <!-- tablePart9 -->
         <table
           border="1"
           cellpadding="10"
@@ -116,34 +113,33 @@
           class="tablePart9"
         >
           <tr>
-            <th style="width: 7.62%">备注</th>
-            <td style="width: 20%">{{note}}</td>
-
+            <th style="width: 28.5%">备注</th>
+            <td style="width: 71.5%">{{ note }}</td>
           </tr>
         </table>
       </div>
 
-
-
       <div>
-        <!-- tablePart6 -->
+        <!-- tablePart6 margin-top: 10px-->
         <table
           border="0"
           cellpadding="10"
           cellspacing="0"
-          style="margin: auto; font-size: 20px; margin-top: 10px"
+          style="margin: auto; font-size: 20px"
           width="1000px"
           class="tablePart6"
         >
           <tr>
-            <th style="width: 6.25%">发货单位：</th>
-            <td style="width: 53.5%">{{ shippername }}</td>
+            <th style="width: 8.25%">发货单位：</th>
+            <td style="width: 30.5%">{{ shippername }}</td>
+            <th style="width: 8.25%">收货单位：</th>
+            <td style="width: 30.5%">{{ consigeeName }}</td>
           </tr>
         </table>
-</div>
+      </div>
 
-          <div>
-        <!-- tablePart6 -->
+      <!--          <div>
+        &lt;!&ndash; tablePart6 &ndash;&gt;
         <table
           border="0"
           cellpadding="10"
@@ -157,24 +153,25 @@
             <td style="width: 53.5%">{{ consigeeName }}</td>
           </tr>
         </table>
-      </div>
+      </div>-->
       <div>
-        <!-- tablePart6 -->
+        <!-- tablePart6 margin-top: 10px-->
         <table
           border="0"
           cellpadding="10"
           cellspacing="0"
-          style="margin: auto; font-size: 20px; margin-top: 10px"
+          style="margin: auto; font-size: 20px"
           width="1000px"
           class="tablePart6"
         >
           <tr>
             <th style="width: 14.5%">签收人：</th>
+            <th style="width: 14.5%">签收时间：</th>
           </tr>
         </table>
       </div>
-      <div>
-        <!-- tablePart6 -->
+      <!--      <div>
+        &lt;!&ndash; tablePart6 &ndash;&gt;
         <table
           border="0"
           cellpadding="10"
@@ -187,13 +184,14 @@
             <th style="width: 14.5%">签收时间：</th>
           </tr>
         </table>
-      </div>
+      </div>-->
+    </div>
     </div>
     <!-- <el-button style="margin-left: 45%;" type="primary" @click="getPdf()">
         <i class="el-icon-download"></i>导出(pdf)
       </el-button> -->
     <div class="button-box">
-      <el-button type="primary" v-print="'#pdfDom'" @click="backScan()">
+      <el-button type="primary" v-print="'#pdfDom1'" @click="backScan()">
         <i class="el-icon-printer"></i>打印
       </el-button>
       <el-button type="primary" @click="backScan()">
@@ -225,8 +223,8 @@ export default {
           materialModel: "",
           materialNumber: 0,
           materialWeight: 0,
-          makeDate: "",
-        },
+          makeDate: ""
+        }
       ],
       carrierName: "",
       province: "",
@@ -239,6 +237,7 @@ export default {
       date: new Date().getDate(),
       htmlTitle: "客户换票送货单",
       note: "",
+      dataList:['1','2','3']
     };
   },
   created() {
@@ -258,7 +257,7 @@ export default {
       let orderNumber = this.$route.query.orderNumber;
       this.axios
         .post("/api/v1/tms/getDeliveryOrder?orderNumber=" + orderNumber)
-        .then((res) => {
+        .then(res => {
           console.log(res);
           this.orderNumber = res.data.orderNumber;
           this.carrierName = res.data.carrierName;
@@ -275,13 +274,13 @@ export default {
           this.town = res.data.town;
           this.deliveryAddress = res.data.deliveryAddress;
           this.deliveryOrderMaterialList = res.data.deliveryOrderMaterialList;
-          this.note=res.data.note;
+          this.note = res.data.note;
         });
     },
     backScan() {
       this.$router.go(-2);
-    },
-  },
+    }
+  }
 };
 </script>
 

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

@@ -1,97 +1,107 @@
 <template>
-    <div class="saleSelfMachine">
-        <div class="background">
-            <img :src="backgroundImgURL" width="100%" height="100%"/>
-        </div>
-        <div class="orderNumberData">
-            <el-input placeholder="请将二维码放置在扫描区" v-model="orderNumber" :focus="true" ref="inputs" :disabled="!isEdit">
-            </el-input>
-            <div style="display:block;width:120px">
-                手动输入开关：
-            </div>
-            <el-switch
-            v-model="isEdit"
-            active-color="#66ccff"
-            inactive-color="#ffffff">
-            </el-switch>
-        </div>
-    </div>    
+  <div class="saleSelfMachine">
+    <div class="background">
+      <img :src="backgroundImgURL" width="100%" height="100%" />
+    </div>
+    <div class="orderNumberData">
+      <el-input
+        placeholder="请将二维码放置在扫描区"
+        v-model="orderNumber"
+        :focus="true"
+        ref="inputs"
+        :disabled="!isEdit"
+      >
+      </el-input>
+      <div style="display:block;width:120px">
+        手动输入开关：
+      </div>
+      <el-switch
+        v-model="isEdit"
+        active-color="#66ccff"
+        inactive-color="#ffffff"
+      >
+      </el-switch>
+    </div>
+  </div>
 </template>
 <script>
 export default {
-    data(){
-        return{
-            orderNumber:null,
-            isEdit:false,
-            backgroundImgURL:require('@/assets/saleSelfMachine/scanCode.jpg'),
-        }
-    },
-    created(){
-        this.changfouce();
-    },
-    // watch:{
-    //    data:"toSaleSelfMachine"
-    // },
-    methods:{
-        //输入框自动聚焦
-        changfouce(){
-        this.$nextTick((x)=>{
+  data() {
+    return {
+      orderNumber: null,
+      isEdit: true,
+      backgroundImgURL: require("@/assets/saleSelfMachine/scanCode.jpg")
+    };
+  },
+  created() {
+    this.changfouce();
+  },
+  // watch:{
+  //    data:"toSaleSelfMachine"
+  // },
+  methods: {
+    //输入框自动聚焦
+    changfouce() {
+      this.$nextTick(x => {
         this.$refs.inputs.focus();
-        })
-        },
-        //失去焦点后自动执行获得焦点事件
-        // onInputBlur(){
-        //     console.log("获取焦点")
-        //     this.changfouce();
-        // }
-        // toSaleSelfMachine(){
-        //      this.$router.push({
-        //         path:'/saleSelfMachine',
-        //     })
-        // }
-    },
-    mounted(){
-        // this.changfouce();
-    const timer = setInterval(()=>{
-        // if(this.$refs.inputs.focus==false){
-        //     console.log("false")
-            this.changfouce();
-        //}
-         if(this.orderNumber!=null&&this.orderNumber.length==21){
-            if(this.orderNumber.startsWith('WYSDD')==true||this.orderNumber.startsWith('wysdd')==true){
-                this.$router.push({
-                        path:"/saleSelfMachine?orderNumber="+this.orderNumber,
-                })
-            }
-        }else if(this.orderNumber.length>21){
-            //清空输入框，免得一次多个重复订单还无法删除
-            this.orderNumber=null;
-        } 
-    },3000)
-    this.$once('hook:beforeDestroy', ()=>{
-        clearInterval(timer)
-    })
-} 
-}
+      });
+    }
+    //失去焦点后自动执行获得焦点事件
+    // onInputBlur(){
+    //     console.log("获取焦点")
+    //     this.changfouce();
+    // }
+    // toSaleSelfMachine(){
+    //      this.$router.push({
+    //         path:'/saleSelfMachine',
+    //     })
+    // }
+  },
+  mounted() {
+    // this.changfouce();
+    const timer = setInterval(() => {
+      // if(this.$refs.inputs.focus==false){
+      //     console.log("false")
+      this.changfouce();
+      //}
+      if (this.orderNumber != null && this.orderNumber.length == 21) {
+        if (
+          this.orderNumber.startsWith("WYSDD") == true ||
+          this.orderNumber.startsWith("wysdd") == true
+        ) {
+          this.$router.push({
+            path: "/saleSelfMachine?orderNumber=" + this.orderNumber
+          });
+        }
+      } else if (this.orderNumber.length > 21) {
+        //清空输入框，免得一次多个重复订单还无法删除
+        this.orderNumber = null;
+      }
+    }, 3000);
+    this.$once("hook:beforeDestroy", () => {
+      clearInterval(timer);
+    });
+  }
+};
 </script>
 <style lang="scss">
-    .saleSelfMachine{
-        width: 100vh;
-        height: 100vh;
-        .background {
-            width: 100%;
-            height: 100%; 
-            z-index: -1;
-            position: absolute;
-            overflow: hidden;
-        }
-        .orderNumberData{
-            width: 100%;
-            color: #fff;
-            position: absolute;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-        }
-    }
-</style>
+.saleSelfMachine {
+  width: 100vh;
+  height: 100vh;
+  .background {
+    width: 100%;
+    height: 100%;
+    z-index: -1;
+    position: absolute;
+    overflow: hidden;
+  }
+  .orderNumberData {
+    width: 100%;
+    color: #fff;
+    position: absolute;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
+</style>

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

@@ -63,7 +63,7 @@
       append-to-body
     >
       <!-- 内层单价选择弹出框 -->
-      <el-dialog
+<!--      <el-dialog
         width="40%"
         title="地址筛选"
         :visible.sync="addressDrawer"
@@ -80,7 +80,7 @@
           :loading="selectLineLoading"
           ><i class="el-icon-search"></i>查询</el-button
         >
-        <!-- 已选中 省市(区)县 -->
+        &lt;!&ndash; 已选中 省市(区)县 &ndash;&gt;
         <el-form :inline="true" style="margin-top: 0.5rem;">
           <el-form-item>
             <label class="el-form-item__label" style="width: auto;"
@@ -96,7 +96,7 @@
             ></el-input>
           </el-form-item>
         </el-form>
-        <!-- 具体收货地址 -->
+        &lt;!&ndash; 具体收货地址 &ndash;&gt;
         <div v-if="address != null">
           <el-form :inline="true" style="margin-top: 0.5rem;">
             <el-form-item label="具体收货地址:">
@@ -116,13 +116,13 @@
         </div>
 
         <div class="tablecls">
-          <!-- 查询所有的运输单价 -->
+          &lt;!&ndash; 查询所有的运输单价 &ndash;&gt;
           <dilTable
             v-bind.sync="Address"
             @radio-change="currentRadioChange2"
           ></dilTable>
         </div>
-      </el-dialog>
+      </el-dialog>-->
       <!-- 内层单价选择弹出框 -->
 
       <el-form>
@@ -139,7 +139,26 @@
             disabled
           ></el-input>
         </el-form-item>
-        <el-form-item label="新详单地址" :label-width="formLabelWidth">
+        <el-input
+          v-model="addresText"
+          placeholder="请输入内容"
+          style="margin-top: 10px; margin-left: 20px; width: 250px"
+          @keyup.native.enter="selectAddresClick"
+        ></el-input>
+        <el-button
+          type="primary"
+          @click="selectAddresClick"
+          :loading="selectLineLoading"
+        ><i class="el-icon-search"></i>查询</el-button
+        >
+        <div class="tablecls">
+          <!-- 查询所有的运输单价 -->
+          <dilTable
+            v-bind.sync="Address"
+            @radio-change="currentRadioChange2"
+          ></dilTable>
+        </div>
+<!--        <el-form-item label="新详单地址" :label-width="formLabelWidth">
           <el-input
             style="width:250px"
             v-model="newAddress"
@@ -154,7 +173,7 @@
           <el-button type="primary" placeholder="()" @click="select"
             >浏览</el-button
           >
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
@@ -240,7 +259,7 @@ export default {
       addressDrawer: false,
       //运输单价的表格
       Address: {
-        requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=255",
+        requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=511",
         selectionType: "radio"
       },
       // addressText:null,
@@ -287,11 +306,11 @@ export default {
     selectAddresClick() {
       if (this.addresText) {
         this.Address.requestUrl =
-          "/api/v1/ams/getAddressDeliveryAddress?apiId=255&con=" +
+          "/api/v1/ams/getAddressDeliveryAddress?apiId=511&con=" +
           this.addresText;
       } else {
         this.Address.requestUrl =
-          "/api/v1/ams/getAddressDeliveryAddress?apiId=255&i=" + new Date();
+          "/api/v1/ams/getAddressDeliveryAddress?apiId=511&i=" + new Date();
       }
     },
     //以下是收货地址边输边查搜索
@@ -464,6 +483,7 @@ export default {
         this.place = null;
       }
       (this.address = val.address), (this.addressId = val.addressId);
+
       // this.priceMap = {};
       // this.priceMap = val;
     },

src/views/sale/router/index.js

@@ -48,6 +48,8 @@ import add_sale_dilNotice from "../components/dilNotice/add_sale_dilNotice.vue";
 import Carrier_dilNotice from "../components/dilNotice/Carrier_dilNotice.vue";
 import sale_dilNotice from "../components/dilNotice/sale_dilNotice.vue";
 import addNotice from "../components/dilNotice/addNotice.vue";
+import addNotice1 from "../components/dilNotice/addNotice1.vue";
+import addNotice2 from "../components/dilNotice/addNotice2.vue";
 import carrierNotice from "../components/dilNotice/carrierNotice.vue";
 import clientNotice from "../components/dilNotice/clientNotice.vue";
 import editNotice from "../components/dilNotice/editNotice.vue";
@@ -374,6 +376,18 @@ const constantRouterMap = [
         meta: { code: "xtpzgl-yhgl" },
         component: addNotice
       },
+      {
+        path: "addNotice1",
+        name: "addNotice1",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addNotice1
+      },
+      {
+        path: "addNotice2",
+        name: "addNotice2",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addNotice2
+      },
       {
         path: "carrierNotice",
         name: "carrierNotice",

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

@@ -83,13 +83,12 @@
         :span-method="objectSpanMethod"
         ref="tableRef"
         border
-        stripe
         style="width: 100%; margin-top: 20px"
-        max-height="600px"
+        max-height="650px"
         @cell-click="cellClik"
         @row-click="rowClick"
         :row-style="{ height: '30px' }"
-        :cell-style="{ fontWeight: '700' }"
+        :cell-style="{ fontWeight: '500' }"
       >
         <el-table-column
           width="50"
@@ -120,7 +119,6 @@
               :fetch-suggestions="querySearchCarrier"
               placeholder="请输入承运商"
               @select="handleSelectCarrier(scope.row, scope.$index)"
-              :disabled="scope.row.isCarrierShow != 1"
             >
             </el-autocomplete>
             <el-button
@@ -145,7 +143,6 @@
               :fetch-suggestions="querySearch"
               placeholder="请输入车牌号"
               @select="handleSelect(scope.row, scope.$index)"
-              :disabled="scope.row.isCapacityShow != 1"
             ></el-autocomplete>
             <el-button
               @click="updateCapacity(scope.row)"
@@ -181,7 +178,6 @@
             </button>
             <input
               v-model="scope.row.materialNum"
-              disabled
               style="width:40px;height: 40px;font-size:16px;line-height: 40px;text-align: center;"
             />
             <el-button
@@ -202,7 +198,6 @@
               style="width:280px"
               v-model="scope.row.addressPlace"
               placeholder="请输入收货地址"
-              :disabled="scope.row.isAddressShow != 1"
             ></el-input>
             <el-button
               @click="updateAddress(scope.row)"
@@ -259,7 +254,6 @@
               style="width:120px"
               v-model="scope.row.capacityTel"
               placeholder="请输入电话号码"
-              :disabled="scope.row.isTelShow != 1"
             ></el-input>
             <el-button
               @click="updateDriverTel(scope.row)"
@@ -713,6 +707,7 @@ export default {
       });
     },
     updateCapacity(row) {
+      row.capacityId = row.newsCapacityId;
       if (row.newsCapacityId == null) {
         this.$message.warning("请先注册车牌号或者选中弹出后再提交!");
         return;
@@ -1234,8 +1229,33 @@ export default {
     },
     //获取钢材统计报表
     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 (getCookie("orgCode") == "chengyunshang") {
         carrierSsoId = getCookie("userId");
       }
@@ -1253,7 +1273,15 @@ export default {
             "&saler=" +
             saler +
             "&i=" +
-            new Date()
+            new Date() +
+            "&remark=" +
+            remark +
+            "&consigneeName=" +
+            consigneeName +
+            "&carrierName=" +
+            carrierName +
+            "&capacityNo=" +
+            capacityNo
         )
         .then(res => {
           this.tableData = res.data.data;