合并分支

public/index.html

@@ -95,7 +95,7 @@
     <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %>
     <link rel="stylesheet" href="<%= htmlWebpackPlugin.options.cdn.css[i] %>" />
     <% } %>
-    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_tfuuuqzywo8.css" />
+    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_zq5v6ks4ruf.css" />
     <!-- 1.8K仔百度收录 -->
     <meta name="baidu-site-verification" content="code-QVfBYJ5laQ" />
   </head>

src/api/modular/main/BookingLedger.js

@@ -36,7 +36,17 @@ export function DjyCustomerpage(parameter) {
     params: parameter
   })
 }
-
+/**
+ * 获取分页查询客户
+ * @params keyword
+ */
+export function DjyCustomerSuggest(parameter) {
+  return axios({
+    url: '/DjyCustomer/Suggest',
+    method: 'get',
+    params: parameter
+  })
+}
 /**
  * 获取船公司
  * @params CnName
@@ -568,3 +578,11 @@ export function BookingOrderAddOrUpdate(parameter) {
     data: parameter
   })
 }
+export function BookingOrderPrintTemplateList(parameter) {
+  return axios({
+    url: '/BookingOrder/PrintTemplateList',
+    method: 'get',
+    params: parameter
+  })
+}
+//

src/api/modular/main/CompanySiteaccount.js

@@ -0,0 +1,53 @@
+import { axios } from '@/utils/request'
+
+/**
+ * 分页查询网站账号维护（租户公司）
+ *
+ * @author Myshipping
+ */
+export function DjyWebsiteAccountConfigPageTenant(parameter) {
+  return axios({
+    url: '/DjyWebsiteAccountConfig/PageTenant',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 增加网站账号维护（同一租户、同类型账号不允许重复）
+ *
+ * @author Myshipping
+ */
+export function DjyWebsiteAccountConfigAddTenant(parameter) {
+  return axios({
+    url: '/DjyWebsiteAccountConfig/AddTenant',
+    method: 'post',
+    data: parameter
+  })
+}
+
+/**
+ * 更新网站账号维护（租户公司）
+ *
+ * @author Myshipping
+ */
+export function DjyWebsiteAccountConfigEditTenant(parameter) {
+  return axios({
+    url: '/DjyWebsiteAccountConfig/EditTenant',
+    method: 'post',
+    data: parameter
+  })
+}
+
+/**
+ * 删除网站账号维护（租户公司）
+ *
+ * @author Myshipping
+ */
+export function DjyWebsiteAccountConfigDeleteTenant(parameter) {
+  return axios({
+    url: '/DjyWebsiteAccountConfig/DeleteTenant',
+    method: 'post',
+    data: parameter
+  })
+}

src/components/MultiTab/MultiTab.vue

@@ -42,20 +42,29 @@ export default {
   },
   methods: {
     onEdit(targetKey, action) {
-      // let _that = this
+      let _that = this
-      // if (targetKey.split('?')[0] == '/BookingDetail') {
+      let data = Object.fromEntries(new URLSearchParams(targetKey.split('?')[1]))
-      //   this.$confirm({
+      console.log(targetKey.split('?')[0] == '/BookingDetail')
-      //     title: '请确认无未保存数据！',
+      console.log(localStorage.getItem(data.id))
-      //     content: '当点击确定按钮时，此页面 将会关闭。',
+      console.log(localStorage.getItem(data.id) == 'true')
-      //     onOk() {
+      console.log(data.id != null)
-      //       _that[action](targetKey)
+      console.log(
-      //     },
+        targetKey.split('?')[0] == '/BookingDetail' && data.id != null && localStorage.getItem(data.id) == 'true'
-      //     onCancel() {}
+      )
-      //   })
+      if (targetKey.split('?')[0] == '/BookingDetail' && data.id != null && localStorage.getItem(data.id) == 'true') {
-      // } else {
+        this.$confirm({
-      //   this[action](targetKey)
+          title: '请确认无未保存数据！',
-      // }
+          content: '当点击确定按钮时，此页面 将会关闭。',
-      this[action](targetKey)
+          onOk() {
+            _that[action](targetKey)
+            localStorage.removeItem(data.id)
+          },
+          onCancel() {}
+        })
+      } else {
+        this[action](targetKey)
+        localStorage.removeItem(data.id)
+      }
       console.log('关闭？', targetKey, action)
     },
     remove(targetKey) {

src/views/main/BookingLedger/detail/index.vue

@@ -140,13 +140,11 @@ export default {
       moreStr: '',
       tabActiveKey: '1',
       historyData: {},
-      noSave: false
     }
   },
   computed: {
     ...mapGetters(['bookingList', 'needSavePages']),
     Showtabs() {
-      console.log(this.bookingDetails, 'bookingDetails')
       let Rdata = true
       if (this.bookingDetails.hbList && this.bookingDetails.hbList.length) {
         Rdata = false
@@ -159,8 +157,7 @@ export default {
   watch: {
     bookingDetails: {
       handler(nval, oval) {
-        this.noSave = true
+        localStorage.setItem(`${this.id}`, true)
-        // console.log('父级 -- 数据改变', nval)
       },
       deep: true
     }
@@ -168,6 +165,9 @@ export default {
   created() {
     this.init()
   },
+  updated() {
+    localStorage.setItem(`${this.id}`, false)
+  },
   beforeRouteUpdate(to, from, next) {
     if (!Object.keys(this.historyData).includes(this.$route.query.id)) {
       const hisData = {
@@ -202,11 +202,7 @@ export default {
     next()
   },
   beforeRouteEnter(to, from, next) {
-    console.log('进入  beforeRouteEnter: to', to.name)
-    console.log('进入  beforeRouteEnter: from', from.name)
     next(vm => {
-      console.log('vm', vm)
-      console.log('进入路由之后： ', vm.$route.query.id)
       vm.getRouterHis()
     })
   },
@@ -215,11 +211,6 @@ export default {
     getRouterHis() {
       const newId = this.$route.query.id
       if (Object.keys(this.historyData).includes(newId)) {
-        // const newType = this.$route.query.type
-        // const newIsCopy = this.$route.query.isCopy || false
-        // if (newType === this.historyData[newId].type && newIsCopy === this.historyData[newId].isCopy) {
-        // }
-        console.log('4. 获取到历史数据', this.historyData[newId].bookingDetails.mblno)
         const $data = this.historyData[newId]
         this.bookingDetails = $data.bookingDetails
         this.excuteRules = $data.excuteRules
@@ -400,7 +391,6 @@ export default {
               ediAttnMail: ''
             }
           }
-          this.noSave = false
           this.$set(this, 'bookingDetails', res.data)
           this.$forceUpdate()
         })
@@ -415,20 +405,17 @@ export default {
     },
 
     bookingOrderUpdate() {
-      console.log('保存', this.bookingDetails)
       if (!this.bookingDetails.mblno) {
         this.$message.error('请输入提单号')
         return false
       }
       const _data = JSON.parse(JSON.stringify(this.bookingDetails))
       delete _data.hbList
-      console.log(JSON.stringify(_data))
       BookingOrderAddOrUpdate(_data)
         .then(res => {
           if (res.success) {
             this.isCopy = false
             this.isAdd = false
-            this.noSave = false
             this.$message.success('保存成功')
             this.init()
             this.$forceUpdate()
@@ -442,7 +429,6 @@ export default {
     },
 
     bookingOrderAdd() {
-      console.log('新增', this.bookingDetails)
       if (!this.bookingDetails.mblno) {
         this.$message.error('请输入提单号')
         return false
@@ -454,7 +440,6 @@ export default {
           if (res.success) {
             this.isAdd = false
             this.id = res.data
-            this.noSave = false
             this.$message.success('保存成功')
             this.$router.replace({
               name: 'BookingDetail',
@@ -475,7 +460,6 @@ export default {
     },
 
     changeTab(e) {
-      console.log(e)
       this.tabActiveKey = e
     },
 
@@ -506,7 +490,11 @@ export default {
         }
         const prevId = arr[index - 1]
         const prevType = this.bookingList[prevId].carrierid
-        this.$router.replace({ name: 'BookingDetail', query: { id: prevId, type: prevType } })
+        this.$router.replace({
+          name: 'BookingDetail',
+          query: { id: prevId, type: prevType, mblno: this.bookingList[prevId].mblno }
+        })
+        // this.$route.query.id = 1123
       } else {
         if (index === arr.length - 1) {
           this.$message.error('当前已经是最后一票')
@@ -514,7 +502,10 @@ export default {
         }
         const nextId = arr[index + 1]
         const nextType = this.bookingList[nextId].carrierid
-        this.$router.replace({ name: 'BookingDetail', query: { id: nextId, type: nextType } })
+        this.$router.replace({
+          name: 'BookingDetail',
+          query: { id: nextId, type: nextType, mblno: this.bookingList[nextId].mblno }
+        })
       }
     },
     handleReload() {
@@ -537,9 +528,6 @@ export default {
       this.bookingDetails.hbList = [data]
       this.tabActiveKey = '2'
     }
-  },
-  deactivated () {
-    console.log('页面销毁', this.noSave)
   }
 }
 </script>

src/views/main/BookingLedger/detail/modules/basicInfo.vue

@@ -14,6 +14,7 @@
                     :data-source="customerDataArr"
                     @select="customerSelect"
                     @change="customerChange"
+                    @focus="customerChange"
                   />
                   <span
                     class="customer-btn iconfont icon-touxiang"
@@ -62,6 +63,7 @@
                   :data-source="forwarderDataArr"
                   @select="forwarderSelect"
                   @change="forwarderChange"
+                  @focus="forwarderChange"
                 />
                 <!-- <a-input  :allowClear="true"   v-model="details.forwarder" /> -->
               </a-form-item>
@@ -124,6 +126,7 @@
                     :data-source="vesselDataArr"
                     @select="vesselSelect"
                     @change="vesselChange"
+                    @focus="vesselChange"
                   />
                 </a-form-item>
               </a-col>
@@ -154,6 +157,7 @@
                       :data-source="voynoinnerDataArr"
                       @select="voynoinnerSelect"
                       @change="voynoinnerChange"
+                      @focus="voynoinnerChange"
                     />
                   </a-form-item>
                 </a-col>
@@ -213,6 +217,7 @@
                     :data-source="lanenameDataArr"
                     @select="lanenameSelect"
                     @change="lanenameChange"
+                    @focus="lanenameChange"
                   />
                 </a-form-item>
               </a-col>
@@ -225,6 +230,7 @@
                     :data-source="shipagencyDataArr"
                     @select="shipagencySelect"
                     @change="shipagencyChange"
+                    @focus="shipagencyChange"
                   />
                 </a-form-item>
               </a-col>
@@ -259,6 +265,7 @@
                   :data-source="saleUserListArr"
                   @select="saleSelect"
                   @change="saleChange"
+                  @focus="saleChange"
                 />
               </a-form-item>
             </a-col>
@@ -277,6 +284,7 @@
                   :data-source="opUserListArr"
                   @select="opSelect"
                   @change="opChange"
+                  @focus="opChange"
                 />
               </a-form-item>
             </a-col>
@@ -295,6 +303,7 @@
                   :data-source="docUserListArr"
                   @select="docSelect"
                   @change="docChange"
+                  @focus="docChange"
                 />
               </a-form-item>
             </a-col>
@@ -313,6 +322,7 @@
                   :data-source="custserviceUserListArr"
                   @select="custserviceSelect"
                   @change="custserviceChange"
+                  @focus="custserviceChange"
                 />
               </a-form-item>
             </a-col>
@@ -418,6 +428,7 @@ import { XCard } from '@/components'
 import { AutoComplete } from 'ant-design-vue'
 import {
   DjyCustomerpage,
+  DjyCustomerSuggest,
   GetCarrierlist,
   GetVessellist,
   GetSysUserPage,
@@ -825,10 +836,10 @@ export default {
     },
     // 客户 - start
     getDjyCustomerpage(name = '', type, key) {
-      DjyCustomerpage({
+      DjyCustomerSuggest({
         // SearchValue: name,
         // PropString: key,
-        ShortName: name
+        keyword: name
       })
         .then(res => {
           if (res.code === 200) {
@@ -848,6 +859,7 @@ export default {
       this.details.customerid = this.customerData[index].id
     },
     customerChange(value) {
+      console.log(value)
       // this.getCustomer(value)
       this.getDjyCustomerpage(value, 'customer', 'consignor')
     },
@@ -865,8 +877,7 @@ export default {
     // 船公司 - start
     getCarrier(name = '') {
       GetCarrierlist({
-        CnName: name,
+        KeyWord: name
-        keyword: ''
       })
         .then(res => {
           if (res.code === 200) {
@@ -914,7 +925,7 @@ export default {
     // 船代 - start
     getForwarderlist(name = '') {
       GetForwarderlist({
-        Name: name
+        KeyWord: name
       })
         .then(res => {
           if (res.code === 200) {
@@ -938,7 +949,7 @@ export default {
     // 船名 - start
     getVessel(name = '') {
       GetVessellist({
-        Name: name
+        KeyWord: name
       })
         .then(res => {
           if (res.code === 200) {

src/views/main/BookingLedger/detail/modules/billInfo.vue

@@ -58,10 +58,12 @@
               >
                 <auto-complete
                   :allowClear="true"
+                  :disabled="true"
                   v-model="details.issueplace"
                   :data-source="issueplaceDataArr"
                   @select="issueplaceSelect"
                   @change="issueplaceChange"
+                  @focus="issueplaceChange"
                 />
               </a-form-item>
             </a-col>
@@ -134,6 +136,7 @@
                   :data-source="prepardatDataArr"
                   @select="prepardatSelect"
                   @change="prepardatChange"
+                  @focus="prepardatChange"
                 />
               </a-form-item>
             </a-col>
@@ -151,6 +154,7 @@
                   :data-source="payableatDataArr"
                   @select="payableatSelect"
                   @change="payableatChange"
+                  @focus="payableatChange"
                 />
               </a-form-item>
             </a-col>
@@ -168,6 +172,7 @@
                   :data-source="blfrtDataArr"
                   @select="blfrtSelect"
                   @change="blfrtChange"
+                  @focus="blfrtChange"
                 />
               </a-form-item>
             </a-col>
@@ -196,6 +201,7 @@
                   :data-source="serviceDataArr"
                   @select="serviceSelect"
                   @change="serviceChange"
+                  @focus="serviceChange"
                 />
               </a-form-item>
             </a-col>
@@ -366,7 +372,6 @@ export default {
   watch: {
     details: {
       handler(nval, oval) {
-        // console.log('数据改变', nval)
         this.$emit('changeDetail', {
           detail: nval,
           type: 'billInfo'
@@ -471,7 +476,7 @@ export default {
     // 签单方式 - start
     getIssuetypeList(name = '') {
       Codeissuetypelist({
-        Name: name
+        KeyWord: name
       })
         .then(res => {
           if (res.code === 200) {
@@ -500,7 +505,6 @@ export default {
     },
     handleIssuetypeChange(index) {
       this.details.issuetype = this.issuetypeSelectData[index].enName
-      console.log(this.details.issuetype)
     },
     filterOption(input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
@@ -510,7 +514,7 @@ export default {
     // 签单地点 - start
     getPortloadlist(name = '', type) {
       GetPortloadlist({
-        Name: name
+        KeyWord: name
       })
         .then(res => {
           if (res.code === 200) {
@@ -547,7 +551,7 @@ export default {
     // 到付地点 - start
     getPortlist(name = '', type) {
       GetPortlist({
-        Name: name
+        KeyWord: name
       })
         .then(res => {
           if (res.code === 200) {
@@ -572,7 +576,7 @@ export default {
     // 付费方式 - start
     getFrt(name = '') {
       GetFrt({
-        Name: name
+        KeyWord: name
       })
         .then(res => {
           if (res.code === 200) {
@@ -595,7 +599,7 @@ export default {
     // 运输条款 - start
     getService(name = '') {
       GetService({
-        Name: name
+        KeyWord: name
       })
         .then(res => {
           if (res.code === 200) {

src/views/main/BookingLedger/detail/modules/goodsTable.vue

@@ -646,7 +646,6 @@ export default {
   watch: {
     details: {
       handler(nval, oval) {
-        // console.log('detail数据改变', nval)
         this.$emit('changeDetail', {
           detail: nval,
           type: 'goodsTable'
@@ -657,7 +656,6 @@ export default {
     tableData: {
       handler(nval, oval) {
         this.details.ctnInputs = nval
-        // console.log('table数据改变', nval)
       },
       deep: true
     }
@@ -669,7 +667,6 @@ export default {
 
   methods: {
     init() {
-      console.log('init', this.details.ctnInputs)
       if (Object.keys(this.details).length > 0) {
         const arr = []
         const totalCtnall = {}
@@ -702,7 +699,7 @@ export default {
     },
     getCtn() {
       GetCtn({
-        Name: ''
+        KeyWord: ''
       })
         .then(res => {
           this.ctnList = res.data
@@ -713,7 +710,7 @@ export default {
     },
     getPackage() {
       GetPackage({
-        Name: ''
+        KeyWord: ''
       })
         .then(res => {
           this.packageList = res.data
@@ -780,7 +777,6 @@ export default {
         this.$message.error('请选择数据')
         return false
       }
-      console.log(this.childModelSelect)
       let $pkgs = 0
       let $kgs = 0
       let $cbm = 0
@@ -1049,23 +1045,23 @@ export default {
     .btn-more-name,
     .btn-import-station,
     .btn-weight {
-      position:relative;
+      position: relative;
       border: 1px solid @primary-color;
       color: @primary-color;
       background: none;
-      &::after{
+      &::after {
-        content:'';
+        content: '';
-        position:absolute;
+        position: absolute;
         top: 0;
         left: 0;
         width: 100%;
         height: 100%;
         z-index: 0;
         background-color: @primary-color !important;
-        opacity: .04;
+        opacity: 0.04;
       }
-      &:hover{
+      &:hover {
-        opacity: .7;
+        opacity: 0.7;
       }
     }
   }

src/views/main/BookingLedger/detail/modules/mailingInfo.vue

@@ -17,10 +17,11 @@
                   :data-source="shipperDataArr"
                   @select="shipperSelect"
                   @change="shipperChange"
+                  @focus="shipperChange"
                 />
-                <a-button class="save-btn" type="link" size="small" icon="save" @click="saveModel('shipper')"
+                <a-button class="save-btn" type="link" size="small" icon="save" @click="saveModel('shipper')">
-                  >保存</a-button
+                  保存
-                >
+                </a-button>
                 <div class="right">
                   <span class="btn-circle" @click="spliceMore('shipper')" :style="{ fontSize: '14px' }">*</span>
                   <span class="btn" @click="changeCode(35, 'shipper')">35</span>
@@ -54,6 +55,7 @@
                   :data-source="consigneeDataArr"
                   @select="consigneeSelect"
                   @change="consigneeChange"
+                  @focus="consigneeChange"
                 />
                 <a-button class="save-btn" type="link" size="small" icon="save" @click="saveModel('consignee')"
                   >保存</a-button
@@ -91,6 +93,7 @@
                   :data-source="notifyDataArr"
                   @select="notifySelect"
                   @change="notifyChange"
+                  @focus="notifyChange"
                 />
                 <a-button class="save-btn" type="link" size="small" icon="save" @click="saveModel('notifyparty')"
                   >保存</a-button
@@ -177,6 +180,7 @@
                       :data-source="customserDataArr"
                       @select="customserSelect"
                       @change="customserChange"
+                      @focus="customserChange"
                     />
                   </a-form-item>
                 </a-col>
@@ -195,6 +199,7 @@
                       :data-source="truckerDataArr"
                       @select="truckerSelect"
                       @change="truckerChange"
+                      @focus="truckerChange"
                     />
                   </a-form-item>
                 </a-col>
@@ -213,6 +218,7 @@
                       :data-source="agentidDataArr"
                       @select="agentidSelect"
                       @change="agentidChange"
+                      @focus="agentidChange"
                     />
                   </a-form-item>
                 </a-col>
@@ -298,6 +304,7 @@
                       :data-source="portloadDataArr"
                       @select="portloadSelect"
                       @change="portloadChange"
+                      @focus="portloadChange"
                     />
                   </a-form-item>
                 </a-col>
@@ -327,6 +334,7 @@
                       :data-source="transportDataArr"
                       @select="transportSelect"
                       @change="transportChange"
+                      @focus="transportChange"
                     />
                   </a-form-item>
                 </a-col>
@@ -356,6 +364,7 @@
                       :data-source="portdischargeDataArr"
                       @select="portdischargeSelect"
                       @change="portdischargeChange"
+                      @focus="portdischargeChange"
                     />
                   </a-form-item>
                 </a-col>
@@ -385,6 +394,7 @@
                       :data-source="destinationDataArr"
                       @select="destinationSelect"
                       @change="destinationChange"
+                      @focus="destinationChange"
                     />
                   </a-form-item>
                 </a-col>
@@ -414,6 +424,7 @@
                       :data-source="placedeliveryDataArr"
                       @select="placedeliverySelect"
                       @change="placedeliveryChange"
+                      @focus="placedeliveryChange"
                     />
                   </a-form-item>
                 </a-col>
@@ -443,6 +454,7 @@
                       :data-source="placereceiptDataArr"
                       @select="placereceiptSelect"
                       @change="placereceiptChange"
+                      @focus="placereceiptChange"
                     />
                   </a-form-item>
                 </a-col>
@@ -483,6 +495,7 @@
                       :data-source="kindpkgsDataArr"
                       @select="kindpkgsSelect"
                       @change="kindpkgsChange"
+                      @focus="kindpkgsChange"
                     />
                   </a-form-item>
                 </a-col>
@@ -666,7 +679,6 @@ export default {
   watch: {
     details: {
       handler(nval, oval) {
-        // console.log('数据改变', nval)
         this.$emit('changeDetail', {
           detail: nval,
           type: 'mailingInfo'
@@ -864,9 +876,11 @@ export default {
   },
   mounted() {
     const shipperScroll = document.getElementById('shipper-scroll')
-    shipperScroll.addEventListener('scroll', () => {
+    if (shipperScroll) {
-      document.getElementById('shipper-scroll-right').scrollTop = shipperScroll.scrollTop
+      shipperScroll.addEventListener('scroll', () => {
-    })
+        document.getElementById('shipper-scroll-right').scrollTop = shipperScroll.scrollTop
+      })
+    }
     const consigneeScroll = document.getElementById('consignee-scroll')
     consigneeScroll.addEventListener('scroll', () => {
       document.getElementById('consignee-scroll-right').scrollTop = consigneeScroll.scrollTop
@@ -956,8 +970,7 @@ export default {
     // 场站 - start
     getYardlist(name = '') {
       GetYardlist({
-        Name: name,
+        keyword: name
-        keyword: ''
       })
         .then(res => {
           if (res.code === 200) {
@@ -990,7 +1003,6 @@ export default {
     handleYardChange(index) {
       this.details.yard = this.yardSelectData[index].name
       this.details.yardid = this.yardSelectData[index].code
-      console.log(this.details.yard, this.details.yardid)
     },
     filterOption(input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
@@ -1000,7 +1012,7 @@ export default {
     // 起始港 ( 装货港 / 收货地) - start
     getPortloadlist(name = '', type) {
       GetPortloadlist({
-        Name: name
+        KeyWord: name
       })
         .then(res => {
           if (res.code === 200) {
@@ -1014,6 +1026,10 @@ export default {
     },
     portloadSelect(value) {
       this.details.portload = value
+      this.details.issueplace = value
+      if (!this.details.prepardat) {
+        this.details.prepardat = value
+      }
       const index = this.portloadDataArr.indexOf(value)
       this.details.portloadid = this.portloadData[index].ediCode
     },
@@ -1033,7 +1049,7 @@ export default {
     // 目的港 ( 卸货港 / 中转港 / 目的地 / 交货地) - start
     getPortlist(name = '', type) {
       GetPortlist({
-        Name: name
+        KeyWord: name
       })
         .then(res => {
           if (res.code === 200) {
@@ -1048,6 +1064,9 @@ export default {
     // 卸货港
     portdischargeSelect(value) {
       this.details.portdischarge = value
+      if (!this.details.payableat) {
+        this.details.payableat = value
+      }
       const index = this.portdischargeDataArr.indexOf(value)
       this.details.portdischargeid = this.portdischargeData[index].ediCode
     },
@@ -1086,7 +1105,7 @@ export default {
     // 包装 - start
     getPackage(name = '') {
       GetPackage({
-        Name: name
+        KeyWord: name
       })
         .then(res => {
           if (res.code === 200) {
@@ -1115,7 +1134,6 @@ export default {
         .then(res => {
           if (res.code === 200) {
             this[`${type}Data`] = res.data.rows
-            console.log(this[`${type}DataArr`])
             this.$forceUpdate()
           }
         })
@@ -1194,7 +1212,6 @@ export default {
 
     changeCodeRemove(num, type) {
       const newStr = this.details[type].replace(/\n|\r/g, '')
-      console.log(newStr)
       const indexs = []
       let count = 0
       for (let i = 0; i < newStr.length - 1; i++) {
@@ -1208,9 +1225,7 @@ export default {
         let resStr = ``
         splitPosition.map((split, sindex) => {
           const start = sindex === 0 ? 0 : splitPosition[sindex - 1]
-          console.log(sindex, start, newStr.slice(start, split))
           if (sindex === splitPosition.length - 1) {
-            console.log('last', newStr.slice(start, split), newStr.slice(split))
             resStr += `${newStr.slice(start, split)}
   ${newStr.slice(split)}`
           } else {

src/views/main/BookingLedger/detail/modules/operationArea.vue

@@ -414,28 +414,30 @@
     <a-modal width="50vw" v-model="PrintModalVisible" title="打印">
       <template slot="footer"> <span></span> </template>
       <div class="PrintMain">
-        <div class="PrintRadio">
+        <div class="PrintTitle">
-          <a-radio-group default-value="1" button-style="solid" v-model="PrintType">
+          <p>默认打印格式为<span>pdf</span>,如需其他格式请选择</p>
-            <a-radio-button value="1">
+          <p>
-              pdf
+            打印格式：
-            </a-radio-button>
+            <a-radio-group v-model="PrintType" name="radioGroup">
-            <a-radio-button value="2">
+              <a-radio value="1">pdf</a-radio>
-              xlsx
+              <a-radio value="2">xlsx</a-radio>
-            </a-radio-button>
+              <a-radio value="3">docx</a-radio>
-            <a-radio-button value="3">
+            </a-radio-group>
-              docx
+          </p>
-            </a-radio-button>
-          </a-radio-group>
         </div>
-        <span v-for="item in templateType" :key="item.id" @click="FnCilckTemplateType(item.code)" class="items">
+        <a-row class="PrintMainBox">
-          {{ item.name }}
+          <a-col
-        </span>
+            v-for="(item, index) in templateType"
+            :key="item.id"
+            @click="FnCilckTemplateType(item.typeCode)"
+            class="items"
+            :span="11"
+            :offset="index % 2 == 0 ? 0 : 1"
+          >
+            <span>·</span>{{ item.typeName }}
+          </a-col>
+        </a-row>
       </div>
-      <!-- <a-row>
-        <a-col class="Citems" :span="6" v-for="item in templateType" :key="item.id">
-          <span @click="FnCilckTemplateType(item.code)" class="items">{{ item.name }}</span>
-        </a-col>
-      </a-row> -->
     </a-modal>
     <!-- 打印弹窗 end -->
 
@@ -499,7 +501,8 @@ import {
   BookingOrderDownloadPrint,
   BookingOrderOcrUpFile,
   BookingOrderOcrGetImg,
-  BookingOrderOcrGetText
+  BookingOrderOcrGetText,
+  BookingOrderPrintTemplateList
 } from '@/api/modular/main/BookingLedger'
 
 import axios from 'axios'
@@ -597,7 +600,10 @@ export default {
   },
   mounted() {
     this.BCvData = [...this.CvData]
-    this.templateType = this.$options.filters['dictData']('booking_template_type')
+    // this.templateType = this.$options.filters['dictData']('booking_template_type')
+    BookingOrderPrintTemplateList().then(res => {
+      this.templateType = res.data
+    })
     // if (this.id) {
     //   this.getLetterYard()
     // }
@@ -616,9 +622,7 @@ export default {
     FnClickCvBox(data) {
       this.details[data.code] = this.details[data.code] + this.Rdata
       this.CvBoxType = false
-      console.log(this.BCvData)
       this.BCvData.forEach((item, index) => {
-        console.log(item)
         if (item.code == data.code) {
           this.BCvData.splice(index, 1)
           this.BCvData.push(item)
@@ -705,28 +709,36 @@ export default {
       this.$message.success(`搜索文件中...`)
       BookingOrderPrint({ typeCode, bookingId: this.id, type: this.PrintType })
         .then(res => {
-          console.log(res)
           if (!res.success) {
             this.$message.error(res.message)
           } else {
             this.$message.success(`预览打印文件 ${res.data} 中...`)
-            console.log(res.data)
+            let PrintType = 'pdf'
+            switch (this.PrintType) {
+              case '1':
+                PrintType = 'pdf'
+                break
+              case '2':
+                PrintType = 'xlsx'
+                break
+              default:
+                PrintType = 'docx'
+                break
+            }
             BookingOrderDownloadPrint({ fileName: res.data }).then(res2 => {
-              const blob = new Blob([res2], { type: 'application/pdf;chartset=UTF-8' })
+              const blob = new Blob([res2], { type: `application/${PrintType};chartset=UTF-8` })
-
+              if (this.PrintType == '1') {
-              // const exportName = res.data
+                window.open(URL.createObjectURL(blob), '_blank')
-              // const link = document.createElement('a')
+              } else {
-              // link.download = exportName
+                const link = document.createElement('a')
-              // link.style.display = 'none'
+                link.style.display = 'none'
-              // link.href = URL.createObjectURL(blob)
+                link.href = URL.createObjectURL(blob)
-              // console.log(URL.createObjectURL(blob))
+                link.download = res.data
-              window.open(URL.createObjectURL(blob), '_blank')
+                document.body.appendChild(link)
-              // link.setAttribute('download', exportName)
+                link.click()
-              // document.body.appendChild(link)
+                URL.revokeObjectURL(link.href) // 释放URL对象
-              // console.log(link)
+                document.body.removeChild(link)
-              // link.click()
+              }
-              // URL.revokeObjectURL(link.href)
-              // document.body.removeChild(link)
             })
           }
         })
@@ -806,7 +818,6 @@ export default {
           this.EDIUloading = false
         })
         .catch(err => {
-          console.log(err)
           this.EDISloading = false
           this.EDIUloading = false
         })
@@ -838,7 +849,6 @@ export default {
         title: '温馨提示',
         content: content,
         onOk() {
-          console.log('OK')
           if (type === 'vgm') {
             _this.vgmSend()
           } else if (type === 'paper') {
@@ -887,7 +897,6 @@ export default {
     getLetterYard() {
       LetterYard(this.id)
         .then(res => {
-          console.log('== 放舱信息 ==', res.data)
           if (res.success) {
             this.initCabinFrom = { ...this.initCabinFrom, ...res.data }
           } else {
@@ -903,7 +912,6 @@ export default {
     getSampleBill() {
       SampleBill(this.id)
         .then(res => {
-          console.log('== 样单信息 ==', res.data)
           if (res.success) {
             this.initCabinFrom = res.data
           } else {
@@ -919,7 +927,6 @@ export default {
     getVgmLink() {
       VgmLink(this.id)
         .then(res => {
-          console.log('== VGM信息 ==', res.data)
           if (res.success) {
             // this.initCabinFrom = res.data
           } else {
@@ -968,7 +975,6 @@ export default {
     },
     bookingCheckChange(e) {
       this.bookingModelFrom.useForwarderCode = e.target.checked
-      console.log(e.target.checked)
     },
 
     // 放舱 vgm 等保存按钮
@@ -1034,7 +1040,6 @@ export default {
           this.SaveLoading = false
         })
         .catch(err => {
-          console.log(err)
           this.SaveLoading = false
         })
     },
@@ -1051,7 +1056,6 @@ export default {
           this.SaveLoading = false
         })
         .catch(err => {
-          console.log(err)
           this.SaveLoading = false
         })
     },
@@ -1068,7 +1072,6 @@ export default {
           this.SendLoading = false
         })
         .catch(err => {
-          console.log(err)
           this.SendLoading = false
         })
     },
@@ -1077,7 +1080,6 @@ export default {
       TxxpLink(this.id)
         .then(res => {
           if (res.success) {
-            console.log(res.data)
             this.copyFun(res.data)
           } else {
             this.$message.error(res.message)
@@ -1106,7 +1108,6 @@ export default {
         .catch(err => {
           this.$message.destroy()
           this.$message.success({ content: '校验失败' })
-          console.log(err)
         })
     },
 
@@ -1301,18 +1302,42 @@ export default {
 .PrintMain {
   display: flex;
   flex-wrap: wrap;
-  max-height: 50vh;
+
-  overflow-y: auto;
+  .PrintTitle {
-  .items {
+    width: 100%;
-    display: inline-block;
+    display: flex;
-    height: 28px;
+    padding: 20px;
-    line-height: 26px;
+    box-sizing: border-box;
-    border: 1px dashed #ccc;
+    background: #f7f8fe;
-    border-radius: 4px;
+    border: 1px dashed #cdcdcd;
-    padding: 0 10px;
+    p {
-    font-size: 13px;
+      margin: 0;
-    cursor: pointer;
+      &:nth-child(2) {
-    margin: 5px 10px;
+        margin-left: 35px;
+      }
+      span {
+        color: #ff6646;
+      }
+    }
+  }
+  .PrintMainBox {
+    max-height: 50vh;
+    overflow-y: auto;
+    margin-top: 5px;
+    .items {
+      padding-left: 1rem;
+      height: 2.5rem;
+      line-height: 2.5rem;
+      border-bottom: 1px solid #ebebeb;
+      cursor: pointer;
+      &:hover {
+        color: #2f54eb;
+      }
+      span {
+        font-weight: bolder;
+        margin-right: 0.6rem;
+      }
+    }
   }
 }
 /*订舱弹窗文件功能对齐 */
@@ -1330,19 +1355,19 @@ export default {
 /deep/ .ant-modal-body .ant-input-affix-wrapper {
   position: relative;
   z-index: 1;
-  &::after{
+  &::after {
-    content:'';
+    content: '';
-    position:absolute;
+    position: absolute;
     top: 0;
     left: 0;
     width: 100%;
     height: 100%;
     z-index: -1;
     background-color: @primary-color !important;
-    opacity: .04;
+    opacity: 0.04;
   }
 }
-/deep/ .ant-modal-body .ant-input{
+/deep/ .ant-modal-body .ant-input {
   background: none;
 }
 .PrintRadio {

src/views/main/BookingLedger/detail/modules/rightContent.vue

@@ -130,7 +130,7 @@
     <a-collapse class="collapse-box" :bordered="false" expandIconPosition="right" v-model="showKey">
       <a-collapse-panel key="1">
         <template slot="header">
-          <div class="title" :style="{ marginTop: '-10px' }"><i class="iconfont icon-rizhi"></i><span>日志</span></div>
+          <div class="title"><i class="iconfont icon-rizhi"></i><span>日志</span></div>
         </template>
         <div class="cargo-info">
           <div class="info-header">
@@ -428,7 +428,6 @@ export default {
         this.pdfUrl = window.URL.createObjectURL(new Blob([res], { type: 'application/pdf;charset=utf-8' }))
         const fname = data.fileName // 下载文件的名字
         const link = document.createElement('a')
-        console.log(this.pdfUrl)
         link.href = this.pdfUrl
         link.setAttribute('download', fname)
         document.body.appendChild(link)

src/views/main/BookingLedger/list/index.vue

@@ -256,7 +256,6 @@ export default {
       this.$message.success('复制成功!')
     },
     init(queryParam = {}) {
-      console.log(queryParam, 'queryParam')
       this.gridOptions.pagerConfig = {
         total: 0,
         currentPage: 1,
@@ -307,7 +306,6 @@ export default {
           this.$set(this.formRes, item.label, this.formRes[item.label] || '')
         })
         this.getList(this.formRes)
-        console.log('=== 当前数据 ===', this.formRes, this.formData, this.formMoreData)
         const len = this.formData.length % 4
         if (len > 2) {
           this.formBtnCol = 24
@@ -351,7 +349,6 @@ export default {
       console.log('表格自定义数据 - 更多： ', this.formMoreTableData)
     },
     handlePageChange({ currentPage, pageSize }) {
-      console.log(currentPage, pageSize)
       this.gridOptions.pagerConfig.currentPage = currentPage
       this.gridOptions.pagerConfig.pageSize = pageSize
       this.getList(this.formRes)
@@ -363,17 +360,14 @@ export default {
     },
     tableRefresh() {
       let data = { ...this.formRes }
-      console.log(data, 1)
       this.init(this.formRes)
-      console.log(data, 2)
       this.formRes = data
     },
     tableMoreRefresh() {
       const arr = this.formRes.MBLNO.split(/-|，|,|[.]/)
       let val = ``
       arr.map((item, index) => {
-        val += `${item}
+        val += `${item}`
-`
       })
       this.moreNumVal = val
       this.moreNumVisible = !this.moreNumVisible
@@ -435,7 +429,6 @@ export default {
       } else if (form.type === 'select') {
         // 根据逻辑填写内容
       }
-      console.log(this.formRes)
       this.$forceUpdate()
     },
 
@@ -476,14 +469,12 @@ export default {
       this.showColumns = []
       this.showColumns = arr
       this.gridOptions.columns = arr
-      console.log('=新的clomn=', this.columns)
       this.$forceUpdate()
     },
     handledbclick({ row }) {
       this.editColumns(row)
     },
     editColumns(row) {
-      console.log(row)
       this.$router.push({ name: 'BookingDetail', query: { id: row.id, type: row.carrierid, mblno: row.mblno } })
     },
     getList(queryParam = {}) {
@@ -511,10 +502,8 @@ export default {
             this.gridOptions.data.map(($item, $index) => {
               this.$set(bookingList, $item.id, $item)
             })
-            console.log(bookingList)
             this.setBookingList(bookingList)
             this.$forceUpdate()
-            console.log('======分页数据======', this.gridOptions.data)
           } else {
             this.$set(this.gridOptions, 'data', [...[]])
             this.$set(this.gridOptions, 'loading', false)
@@ -625,7 +614,7 @@ export default {
 <style lang="less" scoped>
 /*订舱表格内字体颜色 */
 .mblno {
-  color:  @primary-color;
+  color: @primary-color;
   span {
     margin-right: 0.5rem;
     cursor: pointer;

src/views/main/BookingLedger/list/modules/formLabel.vue

@@ -37,7 +37,7 @@ export default {
   watch: {
     formRes: {
       handler(nval, oval) {
-        console.log('编辑结果发生变化', nval, oval)
+        // console.log('编辑结果发生变化', nval, oval)
         // if (Object.keys(nval).length > 0 && nval && oval) {
         //   this.value = nval[this.labelData.type]
         // }

src/views/main/CompanySiteaccount/addForm.vue

@@ -0,0 +1,150 @@
+<template>
+  <a-modal
+    title="新增账号"
+    :width="1100"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row>
+          <a-col :span="8">
+            <a-form-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <!-- <a-input
+                placeholder="请选择类型"
+                v-decorator="['typeCode', { rules: [{ required: true, message: '请输入EDI类型！' }] }]"
+              /> -->
+              <a-select
+                placeholder="请选择类型"
+                v-decorator="['typeCode', { rules: [{ required: true, message: '请选择类型！' }] }]"
+              >
+                <a-select-option v-for="item in TypeData" :key="item.code" :value="item.code">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="账号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入账号"
+                v-decorator="['account', { rules: [{ required: true, message: '请输入账号！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="密码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入密码"
+                v-decorator="['password', { rules: [{ required: true, message: '请输入密码！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="19">
+            <a-form-item label="备注" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
+              <a-input placeholder="请输入备注" v-decorator="['remark']" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { DjyWebsiteAccountConfigAddTenant } from '@/api/modular/main/CompanySiteaccount'
+export default {
+  data() {
+    return {
+      TypeData: [],
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 7 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 15 }
+      },
+      labelCol2: {
+        xs: { span: 24 },
+        sm: { span: 3 }
+      },
+      wrapperCol2: {
+        xs: { span: 24 },
+        sm: { span: 21 }
+      },
+      typeData: [],
+      visible: false,
+      confirmLoading: false,
+      form: this.$form.createForm(this)
+    }
+  },
+  mounted() {
+    this.TypeData = this.$options.filters['dictData']('website_account_type')
+  },
+  methods: {
+    // 初始化方法
+    add(record) {
+      this.visible = true
+      this.typeData = [
+        {
+          code: 10,
+          name: '收货人'
+        },
+        {
+          code: 20,
+          name: '发货人'
+        },
+        {
+          code: 30,
+          name: '通知人'
+        },
+        {
+          code: 40,
+          name: '第二通知人'
+        }
+      ]
+    },
+    /**
+     * 提交表单
+     */
+    handleSubmit() {
+      const {
+        form: { validateFields }
+      } = this
+      this.confirmLoading = true
+      validateFields((errors, values) => {
+        if (!errors) {
+          for (const key in values) {
+            if (typeof values[key] === 'object' && !(values[key] === null)) {
+              values[key] = JSON.stringify(values[key])
+            }
+          }
+          DjyWebsiteAccountConfigAddTenant(values)
+            .then(res => {
+              if (res.success) {
+                this.$message.success('新增成功')
+                this.confirmLoading = false
+                this.$emit('ok', values)
+                this.handleCancel()
+              } else {
+                this.$message.error(`新增失败,${res.message}`)
+              }
+            })
+            .finally(res => {
+              this.confirmLoading = false
+            })
+        } else {
+          this.confirmLoading = false
+        }
+      })
+    },
+    handleCancel() {
+      this.form.resetFields()
+      this.visible = false
+    }
+  }
+}
+</script>

src/views/main/CompanySiteaccount/editForm.vue

@@ -0,0 +1,138 @@
+<template>
+  <a-modal
+    title="编辑账号"
+    :width="1100"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row>
+          <a-col :span="8">
+            <a-form-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-select
+                placeholder="请选择类型"
+                v-decorator="['typeCode', { rules: [{ required: true, message: '请选择类型！' }] }]"
+              >
+                <a-select-option v-for="item in TypeData" :key="item.code" :value="item.code">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="账号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入账号"
+                v-decorator="['account', { rules: [{ required: true, message: '请输入账号！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="密码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入密码"
+                v-decorator="['password', { rules: [{ required: true, message: '请输入密码！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="19">
+            <a-form-item label="备注" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
+              <a-input placeholder="请输入备注" v-decorator="['remark']" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { DjyWebsiteAccountConfigEditTenant } from '@/api/modular/main/CompanySiteaccount'
+export default {
+  data() {
+    return {
+      TypeData: [],
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 7 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 15 }
+      },
+      labelCol2: {
+        xs: { span: 24 },
+        sm: { span: 3 }
+      },
+      wrapperCol2: {
+        xs: { span: 24 },
+        sm: { span: 21 }
+      },
+      typeData: [],
+      visible: false,
+      confirmLoading: false,
+      form: this.$form.createForm(this),
+      data: {}
+    }
+  },
+  mounted() {
+    this.TypeData = this.$options.filters['dictData']('website_account_type')
+  },
+  methods: {
+    // 初始化方法
+    edit(record) {
+      this.data = record
+      this.visible = true
+      const typeOption = this.$options
+      this.typeData = typeOption.filters['dictData']('edi_type')
+      setTimeout(() => {
+        this.form.setFieldsValue({
+          typeCode: record.typeCode,
+          account: record.account,
+          password: record.password,
+          remark: record.remark
+        })
+      }, 100)
+    },
+    handleSubmit() {
+      const {
+        form: { validateFields }
+      } = this
+      this.confirmLoading = true
+      validateFields((errors, values) => {
+        if (!errors) {
+          for (const key in values) {
+            if (typeof values[key] === 'object' && !(values[key] === null)) {
+              values[key] = JSON.stringify(values[key])
+            }
+          }
+          values.id = this.data.id
+          DjyWebsiteAccountConfigEditTenant(values)
+            .then(res => {
+              if (res.success) {
+                this.$message.success('编辑成功')
+                this.confirmLoading = false
+                this.$emit('ok', values)
+                this.handleCancel()
+              } else {
+                this.$message.error(`编辑失败,${res.message}`)
+              }
+            })
+            .finally(res => {
+              this.confirmLoading = false
+            })
+        } else {
+          this.confirmLoading = false
+        }
+      })
+    },
+    handleCancel() {
+      this.form.resetFields()
+      this.visible = false
+    }
+  }
+}
+</script>

src/views/main/CompanySiteaccount/index.vue

@@ -0,0 +1,221 @@
+<template>
+  <div>
+    <a-card :bordered="false" :bodyStyle="tstyle">
+      <div class="table-page-search-wrapper" :class="advanced ? 'Open' : 'Close'">
+        <a-form layout="inline">
+          <a-row :gutter="48">
+            <a-col :md="18">
+              <a-row :gutter="48">
+                <a-col :md="8" :sm="24" v-for="item in ColumnsQuery" :key="`${item.dataIndex}1`">
+                  <a-form-item :label="item.title">
+                    <a-input v-model="queryParam[item.dataIndex]" allow-clear :placeholder="`请输入${item.title}`" />
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <span class="table-page-search-submitButtons">
+                <a-button type="primary" @click="FnGetData">查询</a-button>
+                <a-button style="margin-left: 8px" @click="init">重置</a-button>
+                <a @click="toggleAdvanced" style="margin-left: 8px">
+                  {{ advanced ? '收起' : '展开' }}
+                  <a-icon :type="advanced ? 'up' : 'down'" />
+                </a>
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
+    <a-card :bordered="false">
+      <vxe-toolbar>
+        <template #buttons>
+          <a-button type="primary" icon="plus" @click="$refs.addForm.add()">
+            新增账号
+          </a-button>
+        </template>
+      </vxe-toolbar>
+      <vxe-table :data="loadData" border :loading="loading" empty-text="没有更多数据了！">
+        <vxe-column type="seq" width="40" fixed="left"></vxe-column>
+        <vxe-column
+          v-for="item in columns"
+          :key="`${item.dataIndex}3`"
+          :field="item.dataIndex"
+          :min-width="item.width"
+          :title="item.title"
+          :align="item.align"
+        >
+          <template #default="{ row }" v-if="item.title == '类型'">
+            <span>{{ FnTurnD(row.typeCode) }}</span>
+          </template>
+        </vxe-column>
+        <vxe-column title="操作" fixed="right" width="200" align="center">
+          <template #default="{ row }">
+            <vxe-button type="text" @click="$refs.editForm.edit(row)">编辑</vxe-button>
+            <a-popconfirm
+              title="请确认删除?"
+              ok-text="是"
+              cancel-text="否"
+              @confirm="
+                e => {
+                  confirm(e, row)
+                }
+              "
+            >
+              <vxe-button type="text">删除</vxe-button>
+            </a-popconfirm>
+          </template>
+        </vxe-column>
+      </vxe-table>
+      <vxe-pager
+        :loading="loading"
+        :current-page="queryParam.currentPage"
+        :page-size="queryParam.pageSize"
+        :total="queryParam.totalResult"
+        :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+        @page-change="handlePageChange"
+      >
+      </vxe-pager>
+      <add-form ref="addForm" @ok="handleOk" />
+      <edit-form ref="editForm" @ok="handleOk" />
+    </a-card>
+  </div>
+</template>
+<script>
+import {
+  DjyWebsiteAccountConfigPageTenant,
+  DjyWebsiteAccountConfigDeleteTenant
+} from '@/api/modular/main/CompanySiteaccount'
+import addForm from './addForm.vue'
+import editForm from './editForm.vue'
+import columnSetting from '@/components/tableColumnSetting'
+export default {
+  components: {
+    addForm,
+    editForm,
+    columnSetting
+  },
+  data() {
+    return {
+      TypeData: [],
+      // 高级搜索 展开/关闭
+      advanced: false,
+      loading: false,
+      setVisible: false,
+      setVisible1: false,
+      queryParam: {
+        currentPage: 1,
+        pageSize: 10,
+        totalResult: 1
+      },
+      ColumnsQuery: [],
+      columns: [
+        {
+          title: '类型',
+          align: 'center',
+          width: '100',
+          dataIndex: 'typeCode'
+        },
+        {
+          title: '账号',
+          align: 'center',
+          width: '80',
+          dataIndex: 'account'
+        },
+        {
+          title: '密码',
+          align: 'center',
+          width: '80',
+          dataIndex: 'password'
+        },
+        {
+          title: '备注',
+          align: 'center',
+          width: '80',
+          dataIndex: 'remark'
+        }
+      ],
+      tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
+      // 加载数据方法 必须为 Promise 对象
+      loadData: []
+    }
+  },
+  created() {},
+  mounted() {
+    this.init()
+    this.TypeData = this.$options.filters['dictData']('website_account_type')
+  },
+  methods: {
+    FnTurnD(data) {
+      let Rdata = ''
+      this.TypeData.forEach(item => {
+        if (item.code == data) {
+          Rdata = item.name
+        }
+      })
+      return Rdata
+    },
+    toggleAdvanced() {
+      this.advanced = !this.advanced
+    },
+    init() {
+      Object.assign(this.$data, this.$options.data())
+      this.ColumnsQuery = this.columns
+      this.FnGetData()
+    },
+    handlePageChange({ currentPage, pageSize }) {
+      this.queryParam.pageNo = currentPage
+      this.queryParam.pageSize = pageSize
+      this.FnGetData()
+    },
+    FnGetData() {
+      this.loading = true
+      DjyWebsiteAccountConfigPageTenant(this.queryParam).then(res => {
+        this.loadData = res.data.rows
+        this.loading = false
+        this.queryParam.currentPage = res.data.pageNo
+        this.queryParam.pageSize = res.data.pageSize
+        this.queryParam.totalResult = res.data.totalRows
+      })
+    },
+    /**
+     * 查询参数组装
+     */
+    switchingDate() {
+      const obj = JSON.parse(JSON.stringify(this.queryParam))
+      return obj
+    },
+    confirm(e, data) {
+      this.DjyWebsiteAccountConfigDeleteTenant(data)
+    },
+    DjyWebsiteAccountConfigDeleteTenant(record) {
+      DjyWebsiteAccountConfigDeleteTenant(record).then(res => {
+        if (res.success) {
+          this.$message.success('删除成功')
+          this.FnGetData()
+        } else {
+          this.$message.error(`删除失败,${res.message}`)
+        }
+      })
+    },
+    handleOk() {
+      this.FnGetData()
+    }
+  }
+}
+</script>
+<style lang="less">
+.table-operator {
+  margin-bottom: 18px;
+}
+
+button {
+  margin-right: 8px;
+}
+.Open {
+}
+.Close {
+  height: 45px;
+  overflow: hidden;
+}
+</style>

src/views/main/Customer/addForm.vue

@@ -17,7 +17,7 @@
       </a-col>
     </a-row>
     <a-row>
-      <p class="CsFormTitle"><span>基本信息</span></p>
+      <p class="CsFormTitle"><span><i class="iconfont icon-shiyongwendang"></i>基本信息</span></p>
       <a-col :span="6">
         <a-form-item label="助记码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-input
@@ -109,7 +109,7 @@
         </a-form-item>
       </a-col>
     </a-row>
-    <p class="CsFormTitle"><span>联系人信息</span></p>
+    <p class="CsFormTitle"><span><i class="iconfont icon-tuandui"></i>联系人信息</span></p>
     <vxe-toolbar>
       <template #buttons>
         <vxe-button icon="vxe-icon-square-plus" @click="insertEvent()">新增</vxe-button>
@@ -162,7 +162,7 @@
         </template>
       </vxe-column>
     </vxe-table>
-    <p class="CsFormTitle" :style="{ marginTop: '10px' }"><span>财务信息</span></p>
+    <p class="CsFormTitle" :style="{ marginTop: '10px' }"><span><i class="iconfont icon-icon_xinyong_xianxing_jijin-217"></i>财务信息</span></p>
     <a-row>
       <a-col :span="12">
         <a-form-item label="发票抬头" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
@@ -376,11 +376,21 @@ export default {
   background: #fff;
   padding: 25px;
 }
+.CsForm .ant-form-item{
+  margin-bottom: 10px;
+}
 .CsFormTitle {
-  border-bottom: 1px solid #c9c9c9;
+  border-bottom: 1px solid #d9d9d9;
+  padding-bottom: 5px;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 25px;
 }
 .CsFormTitle > span {
   padding: 0.25rem 0.5rem 0 0.5rem;
-  /* border: 1px solid #c9c9c9; */
+  /* border: 1px solid #c9c9c9;  */
+}
+.CsFormTitle span i{
+  margin-right: 7px;
 }
 </style>

src/views/main/Customer/index.vue

@@ -58,6 +58,7 @@
         </template>
       </vxe-toolbar>
       <vxe-table
+        :column-config="{ resizable: true }"
         @cell-dblclick="cellDBLClickEvent"
         :data="loadData"
         border
@@ -134,13 +135,13 @@ const columns = [
   {
     title: '简称',
     align: 'center',
-    width: '60',
+    width: '120',
     dataIndex: 'shortName'
   },
   {
     title: '全称',
     align: 'center',
-    width: '60',
+    width: '90',
     dataIndex: 'fullName'
   },
   {
@@ -152,7 +153,7 @@ const columns = [
   {
     title: '电话',
     align: 'center',
-    width: '60',
+    width: '110',
     dataIndex: 'tel'
   },
   {