luobang 2 years ago
parent
commit
4544e73258

+ 1 - 1
build/utils.js

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

+ 2 - 2
config/index.js

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

+ 18 - 9
src/views/TMS/components/bmsship/threeSectionFeeDetails.vue

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

+ 4 - 1
src/views/appoint/components/inward/transPrice.vue

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

+ 130 - 0
src/views/appoint/components/inward/updateTransPrice.vue

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

+ 3 - 1
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)) 

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

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

+ 1 - 1
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>

+ 23 - 9
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() {

+ 1 - 0
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,

+ 12 - 2
src/views/sale/components/offSiteTransportation/checkGPS.vue

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

+ 153 - 151
src/views/sale/components/saleSelfMachine/printReceipt.vue

@@ -1,143 +1,144 @@
 <template>
   <div class="tableAllDate">
-    <div id="pdfDom" v-for="(item, index) in dataList" :key="index">
-      <div class="blank"></div>
+    <div id="pdfDom1">
+      <div id="pdfDom" v-for="(item, index) in dataList" :key="index">
+        <div class="blank"></div>
 
-      <div class="title">
-        <h5 align="center">{{ shippername }} 物资送货单</h5>
-        <!--        <h5 align="center">物资送货单</h5>-->
-      </div>
-      <div>
-        <!-- tablePart0 -->
-        <table
-          border="0"
-          cellpadding="10"
-          cellspacing="0"
-          style="margin: auto; font-size: 20px"
-          width="1000px"
-          class="tablePart0"
-        >
-          <tr>
-            <th style="width: 14.5%">销售订单号:</th>
-            <td style="width: 85.5%">{{ saleNo }}</td>
-          </tr>
-        </table>
-      </div>
-      <div class="tableBody">
-        <!-- tablePart1 -->
-        <table
-          border="1"
-          cellpadding="10"
-          cellspacing="0"
-          style="margin-top: 10px; text-align: center"
-          width="1000px"
-          class="tablePart1"
-        >
-          <tr>
-            <th style="width: 5%; text-align: center">序号</th>
-            <th style="width: 23.5%; text-align: center">物资名称</th>
-            <th style="width: 22.5%; text-align: center">规格型号</th>
-            <th style="width: 14%">件数</th>
-            <th style="width: 14%">重量</th>
-            <th style="width: 21%">订单日期</th>
-          </tr>
-          <tr v-for="(item, index) in deliveryOrderMaterialList" :key="index">
-            <td>{{ index + 1 }}</td>
-            <td>{{ item.materialName }}</td>
-            <td>{{ item.materialSpe }}{{ item.materialModel }}</td>
-            <td>{{ item.materialNumber }}</td>
-            <td>{{ item.materialWeight }}</td>
-            <td>{{ item.makeDate }}</td>
-          </tr>
-        </table>
+        <div class="title">
+          <h5 align="center">{{ shippername }} 物资送货单</h5>
+          <!--        <h5 align="center">物资送货单</h5>-->
+        </div>
+        <div>
+          <!-- tablePart0 -->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="margin: auto; font-size: 20px"
+            width="1000px"
+            class="tablePart0"
+          >
+            <tr>
+              <th style="width: 14.5%">销售订单号:</th>
+              <td style="width: 85.5%">{{ saleNo }}</td>
+            </tr>
+          </table>
+        </div>
+        <div class="tableBody">
+          <!-- tablePart1 -->
+          <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            style="margin-top: 10px; text-align: center"
+            width="1000px"
+            class="tablePart1"
+          >
+            <tr>
+              <th style="width: 5%; text-align: center">序号</th>
+              <th style="width: 23.5%; text-align: center">物资名称</th>
+              <th style="width: 22.5%; text-align: center">规格型号</th>
+              <th style="width: 14%">件数</th>
+              <th style="width: 14%">重量</th>
+              <th style="width: 21%">订单日期</th>
+            </tr>
+            <tr v-for="(item, index) in deliveryOrderMaterialList" :key="index">
+              <td>{{ index + 1 }}</td>
+              <td>{{ item.materialName }}</td>
+              <td>{{ item.materialSpe }}{{ item.materialModel }}</td>
+              <td>{{ item.materialNumber }}</td>
+              <td>{{ item.materialWeight }}</td>
+              <td>{{ item.makeDate }}</td>
+            </tr>
+          </table>
 
-        <!-- tablePart2 -->
-        <table
-          border="1"
-          cellpadding="10"
-          cellspacing="0"
-          style="border-top: 0px"
-          width="1000px"
-          class="tablePart2"
-        >
-          <tr>
-            <th style="width: 28.5%">收货地点</th>
-            <td style="width: 71.5%">
-              {{ province }}{{ district }}{{ town }}{{ deliveryAddress }}
-            </td>
-          </tr>
-        </table>
+          <!-- tablePart2 -->
+          <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            style="border-top: 0px"
+            width="1000px"
+            class="tablePart2"
+          >
+            <tr>
+              <th style="width: 28.5%">收货地点</th>
+              <td style="width: 71.5%">
+                {{ province }}{{ district }}{{ town }}{{ deliveryAddress }}
+              </td>
+            </tr>
+          </table>
 
-        <!-- tablePart3 -->
-        <table
-          border="1"
-          cellpadding="10"
-          cellspacing="0"
-          style="border-top: 0px"
-          width="1000px"
-          class="tablePart3"
-        >
-          <tr>
-            <th style="width: 28.5%">收货人</th>
-            <td style="width: 22.5%">{{ consignee }}</td>
-            <th style="width: 14%">电话</th>
-            <td style="width: 35%">{{ consigneeTel }}</td>
-          </tr>
-        </table>
+          <!-- tablePart3 -->
+          <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            style="border-top: 0px"
+            width="1000px"
+            class="tablePart3"
+          >
+            <tr>
+              <th style="width: 28.5%">收货人</th>
+              <td style="width: 22.5%">{{ consignee }}</td>
+              <th style="width: 14%">电话</th>
+              <td style="width: 35%">{{ consigneeTel }}</td>
+            </tr>
+          </table>
 
-        <!-- tablePart4 -->
-        <table
-          border="0"
-          cellpadding="10"
-          cellspacing="0"
-          style="border-top: 0px"
-          width="1000px"
-          class="tablePart4"
-        >
-          <tr>
-            <th style="width: 28.5%">承运商</th>
-            <td style="width: 36.5%">{{ carrierName }}</td>
-            <th style="width: 14%">车牌号</th>
-            <td style="width: 35%">{{ capacityNumber }}</td>
-          </tr>
-        </table>
+          <!-- tablePart4 -->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="border-top: 0px"
+            width="1000px"
+            class="tablePart4"
+          >
+            <tr>
+              <th style="width: 28.5%">承运商</th>
+              <td style="width: 36.5%">{{ carrierName }}</td>
+              <th style="width: 14%">车牌号</th>
+              <td style="width: 35%">{{ capacityNumber }}</td>
+            </tr>
+          </table>
 
-        <!-- tablePart9 -->
-        <table
-          border="1"
-          cellpadding="10"
-          cellspacing="0"
-          style="border-top: 0px"
-          width="1000px"
-          class="tablePart9"
-        >
-          <tr>
-            <th style="width: 28.5%">备注</th>
-            <td style="width: 71.5%">{{ note }}</td>
-          </tr>
-        </table>
-      </div>
+          <!-- tablePart9 -->
+          <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            style="border-top: 0px"
+            width="1000px"
+            class="tablePart9"
+          >
+            <tr>
+              <th style="width: 28.5%">备注</th>
+              <td style="width: 71.5%">{{ note }}</td>
+            </tr>
+          </table>
+        </div>
 
-      <div>
-        <!-- tablePart6 margin-top: 10px-->
-        <table
-          border="0"
-          cellpadding="10"
-          cellspacing="0"
-          style="margin: auto; font-size: 20px"
-          width="1000px"
-          class="tablePart6"
-        >
-          <tr>
-            <th style="width: 8.25%">发货单位:</th>
-            <td style="width: 30.5%">{{ shippername }}</td>
-            <th style="width: 8.25%">收货单位:</th>
-            <td style="width: 30.5%">{{ consigeeName }}</td>
-          </tr>
-        </table>
-      </div>
+        <div>
+          <!-- tablePart6 margin-top: 10px-->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="margin: auto; font-size: 20px"
+            width="1000px"
+            class="tablePart6"
+          >
+            <tr>
+              <th style="width: 8.25%">发货单位:</th>
+              <td style="width: 30.5%">{{ shippername }}</td>
+              <th style="width: 8.25%">收货单位:</th>
+              <td style="width: 30.5%">{{ consigeeName }}</td>
+            </tr>
+          </table>
+        </div>
 
-      <!--          <div>
+        <!--          <div>
         &lt;!&ndash; tablePart6 &ndash;&gt;
         <table
           border="0"
@@ -153,23 +154,23 @@
           </tr>
         </table>
       </div>-->
-      <div>
-        <!-- tablePart6 margin-top: 10px-->
-        <table
-          border="0"
-          cellpadding="10"
-          cellspacing="0"
-          style="margin: auto; font-size: 20px"
-          width="1000px"
-          class="tablePart6"
-        >
-          <tr>
-            <th style="width: 14.5%">签收人:</th>
-            <th style="width: 14.5%">签收时间:</th>
-          </tr>
-        </table>
-      </div>
-      <!--      <div>
+        <div>
+          <!-- tablePart6 margin-top: 10px-->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="margin: auto; font-size: 20px"
+            width="1000px"
+            class="tablePart6"
+          >
+            <tr>
+              <th style="width: 14.5%">签收人:</th>
+              <th style="width: 14.5%">签收时间:</th>
+            </tr>
+          </table>
+        </div>
+        <!--      <div>
         &lt;!&ndash; tablePart6 &ndash;&gt;
         <table
           border="0"
@@ -184,12 +185,13 @@
           </tr>
         </table>
       </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()">
@@ -234,8 +236,8 @@ export default {
       month: new Date().getMonth() + 1,
       date: new Date().getDate(),
       htmlTitle: "客户换票送货单",
-      note: "",
-      dataList: ["1", "2", "3"]
+      note: ""
+      dataList:['1','2','3']
     };
   },
   created() {

+ 30 - 10
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;
     },