Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuanFront

src/api/modular/main/BookingLedger.js

@@ -67,7 +67,7 @@ export function GetVessellist(parameter) {
  */
 export function GetSysUserPage(parameter) {
   return axios({
-    url: '/sysUser/page',
+    url: '/sysUser/GetTenantUser',
     method: 'get',
     params: parameter
   })

src/views/main/BookingLedger/detail/components/ediMore.vue

@@ -11,7 +11,7 @@
           >
             <a-textarea
               placeholder="请输入委托方"
-              v-model="details.weituo"
+              v-model="details.bookingEDIExt.weiTuoFang"
             />
           </a-form-item>
         </a-col>
@@ -37,6 +37,7 @@
           >
             <a-input
               placeholder="请输入EDI联系人名称"
+              v-model="details.bookingEDIExt.ediAttn"
             />
           </a-form-item>
         </a-col>
@@ -49,6 +50,7 @@
           >
             <a-input
               placeholder="请输入EDI联系人电话"
+              v-model="details.bookingEDIExt.ediAttnTel"
             />
           </a-form-item>
         </a-col>
@@ -61,6 +63,7 @@
           >
             <a-input
               placeholder="请输入EDI联系人邮箱"
+              v-model="details.bookingEDIExt.ediAttnMail"
             />
           </a-form-item>
         </a-col>

src/views/main/BookingLedger/detail/components/sedOrder.vue

@@ -139,6 +139,7 @@ export default {
           isNoSave: true,
           // 基本信息
           customername: '',
+          customerid: '',
           carrier: '',
           carrierid: this.type,
           forwarder: '',
@@ -226,7 +227,13 @@ export default {
           freightpayer: '',
           scaccode: '',
           itncode: '',
-          iscontainersoc: 0
+          iscontainersoc: 0,
+          bookingEDIExt: {
+            weiTuoFang: '',
+            ediAttn: '',
+            ediAttnTel: '',
+            ediAttnMail: ''
+          },
       }
       this.editDetails = data
       this.editIndex = this.sedOrderList.length
@@ -246,7 +253,6 @@ export default {
       // this.init()
     },
     saveFun () {
-      debugger
       if (this.editDetails.id !== 0) {
         this.bookingOrderUpdate()
       } else {
@@ -262,7 +268,6 @@ export default {
       }
       let data = JSON.parse(JSON.stringify(this.editDetails))
       delete data.isNoSave
-      debugger
       BookingOrderUpdate(data)
       .then((res) => {
         if (res.success) {

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

@@ -74,6 +74,7 @@ export default {
     return {
       type: this.$route.query.type,
       id: this.$route.query.id,
+      isCopy: this.$route.query.isCopy || false,
       inPageLoading: false,
       bookingDetails: {},
       tabBarStyle: {
@@ -82,22 +83,29 @@ export default {
       },
       excuteRules: [],
       isAdd: false,
-      moreStr: ''
+      moreStr: '',
     }
   },
   watch: {
     bookingDetails: {
       handler (nval, oval) {
-        console.log('父级 -- 数据改变', nval)
+        // console.log('父级 -- 数据改变', nval)
       },
       deep: true
     },
-    '$route': 'init'
+    '$route': 'routerChange'
   },
   created() {
     this.init()
   },
   methods: {
+    routerChange () {
+      console.log('路由变化')
+      this.id = this.$route.query.id
+      this.type = this.$route.query.type
+      this.isCopy = this.$route.query.isCopy || false
+      this.init()
+    },
     init() {
       this.bookingDetails = {}
       if (this.id) {
@@ -109,6 +117,7 @@ export default {
           parentId: 0,
           // 基本信息
           customername: '',
+          customerid: '',
           carrier: '',
           carrierid: this.type,
           forwarder: '',
@@ -169,7 +178,7 @@ export default {
           issueplace: '',
           issueplaceid: '',
           nobill: 'THREE',
-          copynobilll: 'ONE',
+          copynobilll: 'THREE',
           prepardat: '',
           payableat: '',
           blfrt: '',
@@ -197,6 +206,12 @@ export default {
           scaccode: '',
           itncode: '',
           iscontainersoc: 0,
+          bookingEDIExt: {
+            weiTuoFang: '',
+            ediAttn: '',
+            ediAttnTel: '',
+            ediAttnMail: ''
+          },
           // 分单信息未添加
           hbList: []
         }
@@ -228,6 +243,9 @@ export default {
     },
 
     getDetail() {
+      if (this.inPageLoading) {
+        return false
+      }
       this.inPageLoading = true
       this.$message.loading({ content: '加载中...' });
       BookingOrderGet({
@@ -237,6 +255,10 @@ export default {
         this.inPageLoading = false
         this.$message.destroy()
         this.$message.success({ content: '加载完成' })
+        if (this.isCopy) {
+          res.data.mblno = ''
+          this.isAdd = true
+        }
         this.$set(this, 'bookingDetails', res.data)
         this.$forceUpdate()
       })
@@ -258,9 +280,12 @@ export default {
       }
       const _data = JSON.parse(JSON.stringify(this.bookingDetails))
       delete _data.hbList
+      console.log(JSON.stringify(_data))
       BookingOrderUpdate(_data)
       .then((res) => {
         if (res.success) {
+          this.isCopy = false
+          this.isAdd = false
           this.$message.success('保存成功')
           this.init()
           this.$forceUpdate()
@@ -285,7 +310,6 @@ export default {
       .then((res) => {
         if (res.success) {
           this.isAdd = false
-          debugger
           this.id = res.data
           this.$message.success('保存成功')
           this.init()

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

@@ -760,10 +760,12 @@ export default {
     },
     customerSelect(value) {
       this.details.customername = value
+      const index = this['customerDataArr'].indexOf(value)
+      this.details.customerid = this.customerData[index].id
     },
     customerChange(value) {
       // this.getCustomer(value)
-      this.getDjyCustomerpage(value, 'customer', 'djy_cust_prop')
+      this.getDjyCustomerpage(value, 'customer', 'consignor')
     },
     // 客户 - end
 
@@ -881,18 +883,18 @@ export default {
     // 团队成员 - start
     getUserList(name = '', type) {
       GetSysUserPage({
-        SearchValue: name
+        name: name
       })
         .then(res => {
-          if (res.code === 200) {
+          if (res.success) {
             if (type === 'sale') {
-              this.saleUserList = res.data.rows
+              this.saleUserList = res.data
             } else if (type === 'op') {
-              this.opUserList = res.data.rows
+              this.opUserList = res.data
             } else if (type === 'doc') {
-              this.docUserList = res.data.rows
+              this.docUserList = res.data
             } else if (type === 'custservice') {
-              this.custserviceUserList = res.data.rows
+              this.custserviceUserList = res.data
             }
           }
         })

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

@@ -90,7 +90,7 @@
             </a-col>
             <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
               <a-form-item class="from-label" label="副本份数" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-                <a-select :default-value="details.copynobilll || 'ONE'" style="width: 120px" @change="handleChange">
+                <a-select :default-value="details.copynobilll || 'THREE'" style="width: 120px" @change="handleChange">
                   <a-select-option value="ONE">
                     ONE
                   </a-select-option>

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

@@ -64,8 +64,7 @@ export default {
   },
   data() {
     return {
-      showKey: ['1'],
+      showKey: ['1']
-      moreIndex: 0
     }
   },
   watch: {

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

@@ -7,7 +7,7 @@
           <a-button class="btn" @click="removeLine">删除</a-button>
           <a-button class="btn" type="primary" @click="openDialog" :disabled="tableData.length===0">多品名</a-button>
           <a-button class="btn" type="primary" @click="importYarn">引入场站数据</a-button>
-          <a-button class="btn" type="primary">引入箱皮重</a-button>
+          <a-button class="btn" type="primary" @click="importWeight">引入箱皮重</a-button>
         </div>
         <div class="table-right">
           <span>合计: {{ totalCtnall }}</span>
@@ -851,6 +851,10 @@ export default {
         console.log(err)
       })
     },
+
+    importWeight () {
+      
+    },
     log({ data, selectionRangeIndexes, selectionRangeKeys }) {
       console.log('data::', data);
       console.log('selectionRangeIndexes::', selectionRangeIndexes);

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

@@ -617,7 +617,8 @@ export default {
       modelType: '',
       modelName: '',
       yardType: '',
-      yardVisible: false
+      yardVisible: false,
+      customerModelconfirm: false
     }
   },
   watch: {
@@ -1117,7 +1118,7 @@ export default {
       this.modelName = ''
     },
 
-    changeCode(num, type) {
+    changeCodeRemove(num, type) {
       const newStr = this.details[type].replace(/\n|\r/g, '')
       console.log(newStr)
       const indexs = []
@@ -1232,6 +1233,39 @@ export default {
         this.details[field] = str1
         this.$emit('spliceMore', strStar + str2)
       }
+    },
+
+    changeCode (len, type) {
+      const value = this.details[type]
+      var textArr = value.match(/.+[\n]*/g); // 按行匹配
+      var subValue = "";
+
+      for (var j = 0; j < textArr.length; j++) {
+          var subArr = textArr[j].match(/[\w]+[ ]*[\n]*|[\d]+[ ]*[\n]*|[^\w\d]+[ ]*[\n]*/g);
+          var count = 0;
+          for (var i = 0; i < subArr.length; i++) {
+              count += subArr[i].replace(/\n/g, "").length;
+              while (count > len) {
+                  subValue += "\n";
+                  count = subArr[i].replace(/\n/g, "").length;
+                  if (count > len) {
+                      subValue += subArr[i].substring(0, len);
+                      subValue += "\n";
+                      subArr[i] = subArr[i].substring(len);
+                      count = subArr[i].replace(/\n/g, "").length;
+                  }
+              }
+              subValue += subArr[i];
+          }
+          if (j + 1 < textArr.length)
+              {subValue += "\n";}
+      }
+      subValue = subValue.replace(/[\n]+/g, "\n"); // 多个换行变为一个换行
+      subValue = subValue.replace(/[ ]+[\n]+/g, '\n'); // 去除每行末尾空格
+      subValue = subValue.replace(/[ ]+$/g, ''); // 去除末行空格
+
+      this.details[type] = subValue
+      this.$forceUpdate()
     }
   }
 }

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

@@ -4,8 +4,8 @@
       <a-col :md="24" :sm="24" style="padding: 0 0 0 0">
         <div class="nav-box">
           <div class="nav" @click="addBooking"><i class="iconfont icon-jiahao2fill"></i>新建</div>
-          <div class="nav" @click="addBooking1"><i class="iconfont icon-fuzhi"></i>复制</div>
+          <div class="nav" @click="copyBooking"><i class="iconfont icon-fuzhi"></i>复制</div>
-          <div class="nav"><i class="iconfont icon-fuzhi1"></i>复制多票</div>
+          <div class="nav" @click="copyBookingMore"><i class="iconfont icon-fuzhi1"></i>复制多票</div>
           <div class="nav"><i class="iconfont icon-bianjiwenjian"></i>批量编辑</div>
           <div class="nav"><i class="iconfont icon-shujushangchuan-shixin"></i>批量VGM</div>
           <div class="nav"><i class="iconfont icon-shishijifei"></i>定时订舱</div>
@@ -57,7 +57,7 @@
                 </div>
               </template>
             </vxe-toolbar>
-            <vxe-grid ref="xGrid" v-bind="gridOptions" @page-change="handlePageChange" @cell-dblclick="editColumns">
+            <vxe-grid ref="xGrid" v-bind="gridOptions" @page-change="handlePageChange" @cell-dblclick="handledbclick">
               <template #operate="{ row }">
                 <vxe-button type="text" icon="vxe-icon-edit" @click="editColumns(row)"></vxe-button>
               </template>
@@ -371,6 +371,9 @@ export default {
       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 } })
@@ -413,8 +416,33 @@ export default {
     addBooking() {
       this.addVisible = !this.addVisible
     },
-    addBooking1() {
+    copyBooking() {
-      this.$router.push({ name: 'BookingDetail', query: { id: 22 } })
+      const select = this.$refs.xGrid.getCheckboxRecords()
+      const pkIdArr = select.map((item, index) => {
+        return item.id
+      })
+      if (pkIdArr.length > 1) {
+        this.$message.error('请选择一条数据')
+        return false
+      } else if (pkIdArr.length === 0) {
+        this.$message.error('请至少选择一条数据')
+        return false
+      }
+      this.$router.push({ name: 'BookingDetail', query: { id: pkIdArr[0], isCopy: true } })
+    },
+    copyBookingMore() {
+      const select = this.$refs.xGrid.getCheckboxRecords()
+      const pkIdArr = select.map((item, index) => {
+        return item.id
+      })
+      if (pkIdArr.length === 0) {
+        this.$message.error('请至少选择一条数据')
+        return false
+      }
+      // 有问题
+      // pkIdArr.map((item, index) => {
+      //   this.$router.push({ name: 'BookingDetail', query: { id: item, isCopy: true } })
+      // })
     },
     addSubmit() {
       this.addVisible = false