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

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,