src/config/website.js

@@ -5,7 +5,7 @@ export default {
   title: "saber",
   logo: "S",
   key: 'saber',//配置主键,目前用于存储
-  indexTitle: 'Admin',
+  indexTitle: 'JMS ERP', // Admin
   clientId: 'saber', // 客户端id
   clientSecret: 'saber_secret', // 客户端密钥
   tenantMode: true, // 是否开启企业模式

src/page/index/logo.vue

@@ -30,6 +30,9 @@ export default {
     if (JSON.parse(localStorage.getItem('user-Information')).logoUrl.includes("png")) {
       this.logoUrl = JSON.parse(localStorage.getItem('user-Information')).logoUrl
     }
+    if(!this.logoUrl){
+      this.logoUrl = "/bladex/409341/1703930204684140545/jms.png"
+    }
   },
   computed: {
     ...mapGetters(["website", "keyCollapse"])

src/util/columnSetting.js

@@ -4,58 +4,36 @@ import {
   delColumn
 } from "@/api/saveColumn";
 import {validatenull} from './validate'
-import {getUserSettings, setUserSettings} from "@/api/system/user";
 export const arraySort = (list = [], prop, callback) => {
   return list.filter(ele => !validatenull(ele[prop])).sort((a, b) => callback(a, b)).concat(list.filter(ele => validatenull(ele[prop])));
 }
 
 export async function getColumnData(columnKey, mainOption) {
+  mainOption.column.forEach((item,index)=>{
+    item.index=index+1
+  })
   let option
-
-    // 从远程提取
-  const localData = null; // JSON.parse(localStorage.getItem(columnKey));
-
+  const localData = JSON.parse(localStorage.getItem(columnKey));
   if (localData != null) {
     option = localData;
   } else {
-    /*
     let res = await getColumn({
       fileName: columnKey
     })
     option = res.data.data ? JSON.parse(res.data.data.jsonMessage)?JSON.parse(res.data.data.jsonMessage):mainOption: mainOption;
-    // localStorage.setItem(columnKey, JSON.stringify(option));
-
-    */
-
-    let res = await getUserSettings(
-        'COLUMNS',
-        columnKey,
-        '1'
-     )
-      option = res.data.data ? JSON.parse(res.data.data)?JSON.parse(res.data.data):mainOption: mainOption;
+    localStorage.setItem(columnKey, JSON.stringify(option));
   }
-  // option.column=arraySort(option.column, 'index', (a, b) => a.index - b.index)
+  option.column=arraySort(option.column, 'index', (a, b) => a.index - b.index)
   return option
 }
 export async function saveColumnData(columnKey, option) {
-  option.column.forEach((col, index) => {col.index = index + 1})
-
-  // option.column=arraySort(option.column, 'index', (a, b) => a.index - b.index)
-
-  // let res = await saveColumn({
-  //   fileName: columnKey,
-  //   jsonMessage: JSON.stringify(option)
-  // })
-
-  let res = await setUserSettings({
-      classifyCode: 'COLUMNS',
-      settingCode: columnKey,
-      flag1: '1',
-      settings: JSON.stringify(option)
+  option.column=arraySort(option.column, 'index', (a, b) => a.index - b.index)
+  let res = await saveColumn({
+    fileName: columnKey,
+    jsonMessage: JSON.stringify(option)
   })
-
   if (res.data.code == 200) {
-    // localStorage.setItem(columnKey, JSON.stringify(option));
+    localStorage.setItem(columnKey, JSON.stringify(option));
     return true
   } else {
     return false
@@ -63,23 +41,13 @@ export async function saveColumnData(columnKey, option) {
 }
 export async function delColumnData(columnKey, option) {
   option.column.forEach((item,index)=>{
-    item.index=index + 1
+    item.index=index+1
   })
-  /*
   let res = await delColumn({
     fileName: columnKey
   })
-   */
-
-    let res = await setUserSettings({
-        classifyCode: 'COLUMNS',
-        settingCode: columnKey,
-        flag1: '1',
-        settings: ''
-    })
-
   if (res.data.code == 200) {
-    // localStorage.setItem(columnKey, JSON.stringify(option));
+    localStorage.setItem(columnKey, JSON.stringify(option));
     return true
   } else {
     return false

src/views/iosBasicData/SeafreightExportF/bills/assembly/DocumentCenter.vue

@@ -60,28 +60,78 @@
       :before-close="corpTypeClose"
       v-dialog-drag
     >
-      <Dispatch-Notice v-if="businesstypeData.reportsType == 'PCTZD'" :businesstypeData="businesstypeData" :documentForm="documentForm"></Dispatch-Notice>
+      <Dispatch-Notice
+        v-if="businesstypeData.reportsType == 'PCTZD'"
+        :businesstypeData="businesstypeData"
+        :documentForm="documentForm"
+      ></Dispatch-Notice>
 
-      <Receipt-Notice v-else-if="businesstypeData.reportsType == 'RHTZ'" :businesstypeData="businesstypeData" :documentForm="documentForm"></Receipt-Notice>
-      <Receipt-Notice_CMA v-else-if="businesstypeData.reportsType == 'RHTZ-CMA'" :businesstypeData="businesstypeData" :documentForm="documentForm"></Receipt-Notice_CMA>
-      <Receipt-Notice_HMM v-else-if="businesstypeData.reportsType == 'RHTZ-HMM'" :businesstypeData="businesstypeData" :documentForm="documentForm"></Receipt-Notice_HMM>
-      <Receipt-Notice_MELL v-else-if="businesstypeData.reportsType == 'RHTZ-MELL'" :businesstypeData="businesstypeData" :documentForm="documentForm"></Receipt-Notice_MELL>
-      <Receipt-Notice_OOCL v-else-if="businesstypeData.reportsType == 'RHTZ-OOCL'" :businesstypeData="businesstypeData" :documentForm="documentForm"></Receipt-Notice_OOCL>
-      <Receipt-Notice_ONE v-else-if="businesstypeData.reportsType == 'RHTZ-ONE'" :businesstypeData="businesstypeData" :documentForm="documentForm"></Receipt-Notice_ONE>
+      <Receipt-Notice
+        v-else-if="businesstypeData.reportsType == 'RHTZ'"
+        :businesstypeData="businesstypeData"
+        :documentForm="documentForm"
+      ></Receipt-Notice>
+      <Receipt-Notice_CMA
+        v-else-if="businesstypeData.reportsType == 'RHTZ-CMA'"
+        :businesstypeData="businesstypeData"
+        :documentForm="documentForm"
+      ></Receipt-Notice_CMA>
+      <Receipt-Notice_HMM
+        v-else-if="businesstypeData.reportsType == 'RHTZ-HMM'"
+        :businesstypeData="businesstypeData"
+        :documentForm="documentForm"
+      ></Receipt-Notice_HMM>
+      <Receipt-Notice_MELL
+        v-else-if="businesstypeData.reportsType == 'RHTZ-MELL'"
+        :businesstypeData="businesstypeData"
+        :documentForm="documentForm"
+      ></Receipt-Notice_MELL>
+      <Receipt-Notice_OOCL
+        v-else-if="businesstypeData.reportsType == 'RHTZ-OOCL'"
+        :businesstypeData="businesstypeData"
+        :documentForm="documentForm"
+      ></Receipt-Notice_OOCL>
+      <Receipt-Notice_ONE
+        v-else-if="businesstypeData.reportsType == 'RHTZ-ONE'"
+        :businesstypeData="businesstypeData"
+        :documentForm="documentForm"
+      ></Receipt-Notice_ONE>
 
       <BillofLadingDetails
         v-else-if="businesstypeData.reportsType == 'TDXQ' || businesstypeData.reportsType == 'DCWTS'"
-        :businesstypeData="businesstypeData" :documentForm="documentForm"
+        :businesstypeData="businesstypeData"
+        :documentForm="documentForm"
       ></BillofLadingDetails>
-      <BillofLadingDetailsM v-else-if="businesstypeData.reportsType == 'MBL BOOKING SHEET'" :businesstypeData="businesstypeData" :documentForm="documentForm"></BillofLadingDetailsM>
-      <BillofLadingDetailsJMS v-else-if="businesstypeData.reportsType == 'JMS-BILL'" :businesstypeData="businesstypeData" :documentForm="documentForm"></BillofLadingDetailsJMS>
-      <BillofLadingDetailsSI v-else-if="businesstypeData.reportsType == 'SE-SHIPPING'" :businesstypeData="businesstypeData" :documentForm="documentForm"></BillofLadingDetailsSI>
-      <BillofLadingDetailsCTO v-else-if="businesstypeData.reportsType == 'CTO'" :businesstypeData="businesstypeData" :documentForm="documentForm"></BillofLadingDetailsCTO>
-      <FreightNote v-else-if="businesstypeData.reportsType == 'FREIGHT NOTE'" :businesstypeData="businesstypeData" :documentForm="documentForm"></FreightNote>
+      <BillofLadingDetailsM
+        v-else-if="businesstypeData.reportsType == 'MBL BOOKING SHEET'"
+        :businesstypeData="businesstypeData"
+        :documentForm="documentForm"
+      ></BillofLadingDetailsM>
+      <BillofLadingDetailsJMS
+        v-else-if="businesstypeData.reportsType == 'JMS-BILL'"
+        :businesstypeData="businesstypeData"
+        :documentForm="documentForm"
+      ></BillofLadingDetailsJMS>
+      <BillofLadingDetailsSI
+        v-else-if="businesstypeData.reportsType == 'SE-SHIPPING'"
+        :businesstypeData="businesstypeData"
+        :documentForm="documentForm"
+      ></BillofLadingDetailsSI>
+      <BillofLadingDetailsCTO
+        v-else-if="businesstypeData.reportsType == 'CTO'"
+        :businesstypeData="businesstypeData"
+        :documentForm="documentForm"
+      ></BillofLadingDetailsCTO>
+      <FreightNote
+        v-else-if="businesstypeData.reportsType == 'FREIGHT NOTE'"
+        :businesstypeData="businesstypeData"
+        :documentForm="documentForm"
+      ></FreightNote>
       <span slot="footer" class="dialog-footer">
         <!--<el-button type="success" @click="documentSubmit(true)" >保存并打印</el-button>-->
         <el-button type="primary" @click="documentSubmit(false)">保 存</el-button>
-        <el-button v-if="addShow" type="success" :disabled="!documentForm.id" @click="dialogPreviewfun(editData)">打印</el-button>
+        <!--        <el-button v-if="addShow" type="success" :disabled="!documentForm.id" @click="dialogPreviewfun(editData)">打印</el-button>-->
+        <el-button type="success" :disabled="!documentForm.id" @click="documentSubmit(true)">打 印</el-button>
         <el-button @click="printingCanceling">取 消</el-button>
       </span>
     </el-dialog>
@@ -477,7 +527,7 @@ export default {
             label: "报表编码",
             prop: "reportsCode",
             overHidden: true,
-            hide: true,
+            hide: true
           },
           {
             label: "单据类型",
@@ -536,7 +586,7 @@ export default {
   },
   methods: {
     // 打印预览按钮
-    async dialogPreviewfun(row) {
+    async dialogPreviewfun(row, type) {
       this.editData = row;
       if (row.printContent) {
         this.documentForm = JSON.parse(row.printContent).data;
@@ -549,9 +599,19 @@ export default {
         logId: row.id
       });
       this.$nextTick(() => {
-        if (data.length == 1) {
+        if (data.length === 1) {
           this.handleReportPreview(data[0], data[0].url, this.documentForm);
+          if (type) {
+            this.reportslogListfun(this.documentPage, { ...this.query, reportsCode: row.reportsCode });
+            this.editData = {};
+            this.documentForm = {};
+            this.documenturl = {};
+            this.documentVisible = false;
+          }
         } else {
+          if (type) {
+            this.reportslogListfun(this.documentPage, { ...this.query, reportsCode: row.reportsCode });
+          }
           this.previewDialog = true;
           this.documentVisible = false;
         }
@@ -658,6 +718,12 @@ export default {
     },
     // 新建单证按钮
     addbtnfun() {
+      let that = this;
+      this.$emit("editCustomer", undefined, function(){
+        that.addbtnfun2()
+      });
+    },
+    addbtnfun2 () {
       if (!this.assemblyForm.id) {
         this.$message.warning("请先保存数据");
         return;
@@ -677,7 +743,7 @@ export default {
         allowCreateCount: this.businesstypeData.allowCreateCount,
         params: this.businesstypeData.params
       }).then(res => {
-        this.editData={}
+        this.editData = {};
         this.editData.groupCode = this.businesstypeData.groupCode;
         this.documentForm = res.data.data.data;
         // 联系人
@@ -743,10 +809,17 @@ export default {
     },
     // 单证弹窗的确认按钮
     documentSubmit(type) {
+      let needSave = false;
+      let s1 = "",
+        s2 = "";
       let obj = {};
       if (this.editData.id) {
         obj = this.editData;
+        s1 = JSON.stringify(JSON.parse(obj.printContent).data);
+        s2 = JSON.stringify(this.documentForm);
+        needSave = s1 !== s2;
       } else {
+        needSave = true;
         // obj.remarks = this.assemblyForm.remarks
         obj.businessType = this.assemblyForm.businessType;
         obj.billId = this.assemblyForm.id;
@@ -759,30 +832,34 @@ export default {
         obj.allowPrintCount = 0;
         obj.printCount = 0;
       }
-      obj.printContent = JSON.stringify({
-        data: {
-          ...this.documentForm,
-          // to: this.documentForm.corpCnName,
-          // attn: this.documentForm.corpAttnName,
-          fm: this.documentForm.createUserName,
-          fax: this.documentForm.fax,
-          cc: this.documentForm.cc,
-          email: this.documentForm.email,
-          department: this.documentForm.corpAttnName,
-          operate: this.documentForm.operatorName,
-          mobilePhone: this.documentForm.mobilePhone,
-          // remarks: this.documentForm.remarks,
-          contacts: this.documentForm.cyContacts,
-          deliverylocation: this.documentForm.cyCnName,
-          shippingAgency: this.documentForm.bookingAgentCnName,
-          Telephone: this.documentForm.cyTel,
-          datetime: dateFormat(new Date(), "yyyy-MM-dd hh:mm:ss")
-        }
-        // url:this.documenturl
-      });
-      // 保存
-      reportslogSubmit(obj).then(res => {
-        if (type) {
+
+      if (needSave === true) {
+        obj.printContent = JSON.stringify({
+          data: {
+            ...this.documentForm,
+            // to: this.documentForm.corpCnName,
+            // attn: this.documentForm.corpAttnName,
+            fm: this.documentForm.createUserName,
+            fax: this.documentForm.fax,
+            cc: this.documentForm.cc,
+            email: this.documentForm.email,
+            department: this.documentForm.corpAttnName,
+            operate: this.documentForm.operatorName,
+            mobilePhone: this.documentForm.mobilePhone,
+            // remarks: this.documentForm.remarks,
+            contacts: this.documentForm.cyContacts,
+            deliverylocation: this.documentForm.cyCnName,
+            shippingAgency: this.documentForm.bookingAgentCnName,
+            Telephone: this.documentForm.cyTel,
+            datetime: dateFormat(new Date(), "yyyy-MM-dd hh:mm:ss")
+          }
+          // url:this.documenturl
+        });
+        // 保存
+        reportslogSubmit(obj).then(res => {
+          if (type) {
+            this.dialogPreviewfun(res.data.data, true);
+            /*
           let documentaa = null; // 暂存url数据
           reportsList(1, 20, {
             businessType: "HYCK",
@@ -840,15 +917,21 @@ export default {
                 // 取消操作。。。。
               });
           });
-        } else {
-          this.$message.success("操作成功");
-          this.reportslogListfun(this.documentPage, { ...this.query, reportsCode: res.data.data.reportsCode });
-          this.editData = {};
-          this.documentForm = {};
-          this.documenturl = {};
-          this.documentVisible = false;
+          */
+          } else {
+            this.$message.success("操作成功");
+            this.reportslogListfun(this.documentPage, { ...this.query, reportsCode: res.data.data.reportsCode });
+            this.editData = {};
+            this.documentForm = {};
+            this.documenturl = {};
+            this.documentVisible = false;
+          }
+        });
+      } else {
+        if (type) {
+          this.dialogPreviewfun(obj);
         }
-      });
+      }
     },
     // 打印取消
     printingCanceling() {

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -585,7 +585,7 @@ export default {
 
         // 获取箱型字典数据
         bcntrtypesListfun(cnName) {
-            bcntrtypesList(1, 10, { cnName }).then(res => {
+            bcntrtypesList(1, 10, { status: 0, cnName: cnName }).then(res => {
                 this.cntrTypeCodeData = res.data.data.records
             })
         },

src/views/iosBasicData/SeafreightExportF/bills/assembly/filescenter.vue

@@ -467,6 +467,13 @@ export default {
         this.$message.warning("请选择至少一条数据");
         return;
       }
+
+      let sendedIds = this.selectionList.filter(item => item.sendStatus==1);
+      if(sendedIds.length>0) {
+        this.$message.warning("将要删除的文件中，包含已发送成功的文件，已发送成功的文件不允许删除，请重新选择！");
+        return;
+      }
+
       // this.$confirm("确定将选择数据删除?", {
       //   confirmButtonText: "确定",
       //   cancelButtonText: "取消",

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -4,7 +4,7 @@
       <div class="customer-back">
         <!--        <i class="back-icon el-icon-arrow-left"></i><i style="font-style:normal">返回管理列表</i>-->
         <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left" @click="backToList">返回列表 </el-button>
-           <el-button v-if="form.id && pageIds.length" type="text" @click="lastPage">上一票</el-button>
+        <el-button v-if="form.id && pageIds.length" type="text" @click="lastPage">上一票</el-button>
         <el-button v-if="form.id && pageIds.length" type="text" @click="nextPage">下一票</el-button>
       </div>
       <div class="add-customer-btn">
@@ -347,7 +347,14 @@
                   <edicode :assemblyForm="form" :detailData="detailData" :disabled="showLock"> </edicode>
                 </el-tab-pane>
                 <el-tab-pane label="文件中心" name="seventh">
-                  <filescenter ref="filescenter" :assemblyForm="form" :pid="form.id" :detailData="detailData" :showLock="showLock"></filescenter>
+                  <filescenter
+                    ref="filescenter"
+                    :assemblyForm="form"
+                    :pid="form.id"
+                    :detailData="detailData"
+                    :showLock="showLock"
+                    @editCustomer="editCustomer"
+                  ></filescenter>
                 </el-tab-pane>
               </el-tabs>
             </basic-container>
@@ -382,7 +389,13 @@
           </feecenter>
         </el-tab-pane>
         <el-tab-pane label="单证中心" name="dz" class="scrollable-container">
-          <document-center ref="documentCenter" :detailData="detailData" :assemblyForm="form" :disabled="false"></document-center>
+          <document-center
+            ref="documentCenter"
+            :detailData="detailData"
+            :assemblyForm="form"
+            :disabled="false"
+            @editCustomer="editCustomer"
+          ></document-center>
         </el-tab-pane>
         <el-tab-pane label="分单列表" name="fd" v-if="form.billType == 'MM'" class="scrollable-container">
           <Split-list
@@ -486,6 +499,20 @@
         <el-button @click="showSftVerifyDlg = false">取消保存</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog
+      :title="ediTypeRow.cnName"
+      append-to-body
+      v-dialogDrag
+      :visible.sync="ediShowProgress"
+      class="avue-dialog avue-dialog--top"
+      width="30%"
+    >
+      <span>{{ ediTypeRow.progressText }}<br /><br /></span>
+      <div class="avue-dialog__footer">
+        <!--        <el-button @click="ediShowProgress = false">取消保存</el-button>-->
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -598,6 +625,7 @@ export default {
       ediFilesFunction: false,
       ediTypeRow: {},
       ediDontSend: false, // EDI 只生成，不发送
+      ediShowProgress: false, // EDI 发送进度条
       // SFT
       sftVerifyData: {},
       sftVerifyDataCallback: undefined,
@@ -1245,19 +1273,25 @@ export default {
         }
       });
     },
+    // 主要信息是否更改
+    mainDataChanged() {
+      let changed =
+        !this.form.id ||
+        contrastObj(this.form, this.oldForm) ||
+        contrastList(this.form.preContainersList, this.oldForm.preContainersList) ||
+        contrastList(this.form.containersList, this.oldForm.containersList) ||
+        contrastList(this.form.feeCenterListC, this.oldForm.feeCenterListC) ||
+        contrastList(this.form.feeCenterListD, this.oldForm.feeCenterListD) ||
+        contrastList(this.form.filesList, this.oldForm.filesList) ||
+        contrastList(this.form.waitingBoxList, this.oldForm.waitingBoxList);
+
+      return changed;
+    },
     addEdit() {
       if (this.form.billStatus >= 3) {
         this.$emit("toAddEdit");
       } else {
-        if (
-          contrastObj(this.form, this.oldForm) ||
-          contrastList(this.form.preContainersList, this.oldForm.preContainersList) ||
-          contrastList(this.form.containersList, this.oldForm.containersList) ||
-          contrastList(this.form.feeCenterListC, this.oldForm.feeCenterListC) ||
-          contrastList(this.form.feeCenterListD, this.oldForm.feeCenterListD) ||
-          contrastList(this.form.filesList, this.oldForm.filesList) ||
-          contrastList(this.form.waitingBoxList, this.oldForm.waitingBoxList)
-        ) {
+        if (this.mainDataChanged()) {
           this.$confirm("是否需要保存?", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
@@ -1610,9 +1644,11 @@ export default {
       this.ediTypeRow.filesFunction = this.ediTypeRow["func_" + func];
 
       this.saveLoading = true;
+      this.ediShowProgress = true;
       editypesSendingEdi(this.ediTypeRow)
         .then(res => {
           this.saveLoading = false;
+          this.ediShowProgress = false;
           // 判断data是否有值，没有值说明不成功给个弹窗返回
           if (!res.data.data) {
             let text = res.data.msg.replace("\r\n", "<br>");
@@ -1630,6 +1666,7 @@ export default {
         })
         .catch(err => {
           this.saveLoading = false;
+          this.ediShowProgress = false;
         });
     },
     async editypesSendingEdifun(row) {
@@ -1814,6 +1851,10 @@ export default {
         return;
       }
 
+      this.ediTypeRow = row;
+      this.$set(this.ediTypeRow, "progressText", `正在发送 ${row.cnName}，MblNo：${this.form.mblno}，Booking No：${this.form.bookingNo}，请稍候...`);
+      this.ediShowProgress = true;
+
       row.sendToRemote = 1;
       if (this.roleName.indexOf("admin") !== -1) {
         if (confirm("本次 EDI 是否只生成，不发送？")) {
@@ -1842,7 +1883,6 @@ export default {
           row.func_add = bfData.add;
           row.func_update = bfData.update;
           row.filesFunction = func;
-          this.ediTypeRow = row;
           let that = this;
           this.$nextTick(() => {
             setTimeout(() => {
@@ -1854,9 +1894,11 @@ export default {
       }
 
       this.saveLoading = true;
+      this.ediShowProgress = true;
       editypesSendingEdi(row)
         .then(res => {
           this.saveLoading = false;
+          this.ediShowProgress = false;
           // 判断data是否有值，没有值说明不成功给个弹窗返回
           if (!res.data.data) {
             let text = res.data.msg.replace("\r\n", "<br>");
@@ -1874,6 +1916,7 @@ export default {
         })
         .catch(err => {
           this.saveLoading = false;
+          this.ediShowProgress = false;
         });
     },
     // 报表弹窗
@@ -2508,15 +2551,7 @@ export default {
     },
     //返回列表
     backToList() {
-      if (
-        contrastObj(this.form, this.oldForm) ||
-        contrastList(this.form.preContainersList, this.oldForm.preContainersList) ||
-        contrastList(this.form.containersList, this.oldForm.containersList) ||
-        contrastList(this.form.feeCenterListC, this.oldForm.feeCenterListC) ||
-        contrastList(this.form.feeCenterListD, this.oldForm.feeCenterListD) ||
-        contrastList(this.form.filesList, this.oldForm.filesList) ||
-        contrastList(this.form.waitingBoxList, this.oldForm.waitingBoxList)
-      ) {
+      if (this.mainDataChanged()) {
         this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -2799,6 +2834,31 @@ export default {
     },
     // 大保存按钮
     async editCustomer(status, callback) {
+      if(!this.mainDataChanged()){
+        if(typeof callback == "function"){
+          callback()
+        }
+
+        if (status == "goBack") {
+          if (this.form.id) {
+            this.unLock({
+              moduleName: "SE",
+              tableName: "SE_order",
+              billId: this.form.id,
+              billNo: this.form.mblno
+            });
+          }
+          this.$emit("goBack");
+        }
+
+        if (status == "toAddEdit") {
+          this.$emit(status);
+        }
+
+        return
+        // 未更改，无需保存
+      }
+
       await this.$refs.form.validate(async valid => {
         if (valid) {
           if (this.business == 1) {
@@ -3151,8 +3211,6 @@ export default {
             await documentVerification(this.form).then(async res => {
               // 0 直接保存
               let rb = res.data;
-              console.log(rb.status);
-              console.log(rb);
               if (rb.status == 0) {
                 await this.billsSubmitfun(status, undefined, callback);
               }

src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -379,6 +379,20 @@
         <el-button @click="ediFilesFunction = false">取消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog
+      :title="ediTypeRow.cnName"
+      append-to-body
+      v-dialogDrag
+      :visible.sync="ediShowProgress"
+      class="avue-dialog avue-dialog--top"
+      width="30%"
+    >
+      <span>{{ediTypeRow.progressText}}<br /><br /></span>
+      <div class="avue-dialog__footer">
+        <!--        <el-button @click="ediShowProgress = false">取消保存</el-button>-->
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -462,6 +476,7 @@ export default {
       //EDI
       ediFilesFunction: false,
       ediTypeRow: {},
+      ediShowProgress: false, // EDI 发送进度条
       // 单据类型
       billTypeData: [
         {
@@ -709,7 +724,7 @@ export default {
             span: 6,
             searchOrder: 5,
             hide: true,
-            showColumn: false
+            // showColumn: false
           },
           {
             label: "船名",
@@ -803,7 +818,7 @@ export default {
             filterable: true,
             filters: true,
             sortable: true,
-            showColumn: false
+            // showColumn: false
           },
           {
             label: "船公司",
@@ -898,7 +913,7 @@ export default {
             span: 6,
             searchOrder: 14,
             hide: true,
-            showColumn: false
+            // showColumn: false
           },
           {
             label: "场站",
@@ -1513,7 +1528,7 @@ export default {
             label: "排序方式",
             prop: "billSort",
             hide: true,
-            showColumn: false,
+            // showColumn: false,
             search: true,
             searchValue: "3",
             overHidden: true
@@ -2007,8 +2022,10 @@ export default {
 
       this.ediTypeRow.filesFunction = this.ediTypeRow["func_" + func];
 
+      this.ediShowProgress = true
       editypesSendingEdi(this.ediTypeRow)
         .then(res => {
+          this.ediShowProgress = false
           // 判断data是否有值，没有值说明不成功给个弹窗返回
           if (!res.data.data) {
             let text = res.data.msg.replace("\r\n", "<br>");
@@ -2024,12 +2041,15 @@ export default {
             this.onLoad(this.page);
           }
         })
-        .catch(err => {});
+        .catch(err => {
+          this.ediShowProgress = false
+        });
     },
     async editypesSendingEdifun(row) {
       row.billId = this.ids;
       row.sendToRemote = 1;
       row.filesFunction = "";
+
       let roleName = localStorage.getItem("roleName").split(",");
       if (roleName.indexOf("admin") !== -1) {
         if (confirm("本次 EDI 是否只生成，不发送？")) {
@@ -2037,6 +2057,10 @@ export default {
         }
       }
 
+      this.ediTypeRow = row;
+      this.$set(this.ediTypeRow, 'progressText', `正在发送 ${row.cnName}，请稍候...`)
+      this.ediShowProgress = true
+
       if (this.ids.indexOf(",") < 0) {
         // 单选
         let bfEdi = await beforeSendingEdi(row);
@@ -2059,7 +2083,6 @@ export default {
             row.func_add = bfData.add;
             row.func_update = bfData.update;
             row.filesFunction = func;
-            this.ediTypeRow = row;
             let that = this;
             this.$nextTick(() => {
               setTimeout(() => {
@@ -2071,8 +2094,10 @@ export default {
         }
       }
 
+      this.ediShowProgress = true
       editypesSendingEdi(row)
         .then(res => {
+          this.ediShowProgress = false
           // 判断data是否有值，没有值说明不成功给个弹窗返回
           if (!res.data.data) {
             let text = res.data.msg.replace("\r\n", "<br>");
@@ -2088,7 +2113,9 @@ export default {
             this.onLoad(this.page);
           }
         })
-        .catch(err => {});
+        .catch(err => {
+          this.ediShowProgress = false
+        });
     },
     // 获取EDI列表数据
     editypesListfun() {
@@ -2401,6 +2428,7 @@ export default {
       this.detailData.billType = type;
       // this.detailData.copyId=this.selectionList[0].id
       this.isShow = false;
+      this.isShow = false;
       this.$store.commit("IN_SEAFE_DETAIL");
       if (this.selectionList.length == 1 && this.selectionList[0].billType == "MM" && type == "MH") {
         this.$nextTick(() => {
@@ -2804,7 +2832,7 @@ export default {
       const inSave = await this.saveColumnData(this.getColumnName(code), this[optionBack]);
       if (inSave) {
         this.$message.success("保存成功");
-        //关闭窗口
+        //关闭窗口  s
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
         this.searchReset();
       }

src/views/wel/index.vue

@@ -97,6 +97,7 @@ export default {
               localStorage.setItem('lockTermDays', res.data.data)
         })
         getLazyList().then(res => {
+          console.log("user-Information", res)
             localStorage.setItem('user-Information', res.data.data.length ? JSON.stringify(res.data.data[0]) : null)
         })
         if (!localStorage.getItem('areaTypeTree')) {