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

src/components/setFormModel/index.vue

@@ -21,10 +21,12 @@
             @end="emitFromChange"
           >
             <transition-group>
-              <div class="label" v-for="(item, index) in fromLabel" :key="index">
+              <template v-for="(item, index) in fromLabel" >
-                <span>{{ item.title }}</span>
+                <div class="label" :key="index" v-if="!item.noDraggable">
-                <i class="iconfont icon-shanchu1" @click="removeFrom(item,index)"></i>
+                  <span>{{ item.title }}</span>
-              </div>
+                  <i class="iconfont icon-shanchu1" @click="removeFrom(item,index)"></i>
+                </div>
+              </template>
             </transition-group>
           </draggable>
           <div class="no-data" v-if="fromLabel.length == 0">

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

@@ -452,7 +452,9 @@ export default {
     }
   },
   mounted() {
-    this.getLetterYard()
+    // if (this.id) {
+    //   this.getLetterYard()
+    // }
   },
   methods: {
     refreshPage() {
@@ -508,11 +510,9 @@ export default {
       }
       this.bookingModelFrom.send = type === 'send'
       this.bookingModelFrom.orderNo = this.details.mblno
-      debugger
       SendBookingOrClosingEDI(this.bookingModelFrom)
         .then((res) => {
           // 未完成
-          debugger
           if (res.success) {
             this.$message.success(`${type === 'send' ? '发送' : '保存'}成功`)
             this.handleModelCancel()
@@ -552,7 +552,6 @@ export default {
         content: content,
         onOk() {
           console.log('OK')
-          debugger
           if (type === 'vgm') {
             _this.vgmSend()
           } else if (type === 'paper') {
@@ -571,7 +570,6 @@ export default {
         bookingId: this.id,
       })
         .then((res) => {
-          debugger
           if (res.success) {
             this.$message.success(`下货纸发送成功`)
           } else {
@@ -588,7 +586,6 @@ export default {
         bookingId: this.id,
       })
         .then((res) => {
-          debugger
           if (res.success) {
             this.$message.success(`VGM发送成功`)
           } else {
@@ -748,7 +745,6 @@ export default {
       }
       SaveBookingLetteryard(this.initCabinFrom)
       .then((res) => {
-        debugger
         if (res.success) {
           this.$message.success('保存成功')
           // this.initCabinFrom = res.data
@@ -782,7 +778,6 @@ export default {
         bookingId: this.id
       })
         .then((res) => {
-          debugger
           if (res.success) {
             this.$message.success('发送成功')
           } else {
@@ -816,7 +811,6 @@ export default {
         bookingId: this.id
       })
         .then((res) => {
-          debugger
           if (res.success) {
             this.$emit('rules', res.data.rows)
           } else {

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

@@ -18,7 +18,7 @@
                 <template v-for="(formLabel, findex) in formData">
                   <a-col :md="6" :sm="24" :key="findex" v-if="(findex<2 && !advanced) || advanced">
                     <a-form-item :label="formLabel.title">
-                      <formLabel :labelData="formLabel" @change="formChange" :formRes="formRes"></formLabel>
+                      <formLabel :ref="`fromlabel-${formLabel.label}`" :labelData="formLabel" @change="formChange" :formRes="formRes"></formLabel>
                     </a-form-item>
                   </a-col>
                 </template>
@@ -69,10 +69,14 @@
 
     <a-modal title="新增船公司" :width="300" :visible="addVisible" @ok="addSubmit" @cancel="addCancel">
       <a-radio-group v-model="carrierRadio">
-        <a-radio :style="radioStyle" value="CMA"> <img class="radio-logo" src="@/assets/cma.png" /> CMA </a-radio>
+        <a-radio :style="radioStyle" value="CMA"> <img class="radio-logo" src="@/assets/logo/CMA.png" /> CMA </a-radio>
-        <a-radio :style="radioStyle" value="ESL"> <img class="radio-logo" src="@/assets/cma.png" /> ESL </a-radio>
+        <a-radio :style="radioStyle" value="ESL"> <img class="radio-logo" src="@/assets/logo/ESL.jpg"/> ESL </a-radio>
-        <a-radio :style="radioStyle" value="MAC"> <img class="radio-logo" src="@/assets/cma.png" /> MSC </a-radio>
+        <a-radio :style="radioStyle" value="MAC"> <img class="radio-logo" src="@/assets/logo/MSC.png" /> MSC </a-radio>
-        <a-radio :style="radioStyle" value="ONE"> <img class="radio-logo" src="@/assets/cma.png" /> ONE </a-radio>
+        <a-radio :style="radioStyle" value="ONE"> <img class="radio-logo" src="@/assets/logo/ONE.jpg" /> ONE </a-radio>
+        <a-radio :style="radioStyle" value="PIL"> <img class="radio-logo" src="@/assets/logo/PIL.jpg" /> PIL </a-radio>
+        <a-radio :style="radioStyle" value="TSL"> <img class="radio-logo" src="@/assets/logo/TSL.jpg" /> TSL </a-radio>
+        <a-radio :style="radioStyle" value="YML"> <img class="radio-logo" src="@/assets/logo/YML.jpg" /> YML </a-radio>
+        <a-radio :style="radioStyle" value="waiyun"> <img class="radio-logo" src="@/assets/logo/waiyun.png" /> 外运 </a-radio>
       </a-radio-group>
     </a-modal>
 
@@ -95,7 +99,6 @@ import formLabel from './modules/formLabel'
 import initData from './modules/initData'
 import {
   DjyUserConfigGet,
-  // DjyUserConfigPage,
   DjyUserConfigAdd
 } from '@/api/modular/main/DjyUserConfig'
 
@@ -163,8 +166,8 @@ export default {
       carrierRadio: '',
       radioStyle: {
         display: 'block',
-        height: '30px',
+        height: '50px',
-        lineHeight: '30px'
+        lineHeight: '50px'
       },
       // 多单号弹窗
       moreNumVisible: false,
@@ -198,10 +201,15 @@ export default {
           const arr = JSON.parse(res.data.configJson)
           const nowData = []
           const moreData = []
+          arr.map((item, index) => {
+            this.formAllData.map((fitem, findex) => {
+              if (fitem.label === item) {
+                nowData.push(fitem)
+              }
+            })
+          })
           this.formAllData.map((item, index) => {
-            if (arr.includes(item.label)) {
+            if (!arr.includes(item.label)) {
-              nowData.push(item)
-            } else {
               moreData.push(item)
             }
           })
@@ -331,12 +339,17 @@ export default {
       this.$refs.setTableForm.open()
     },
     submitTableForm (data) {
-      this.formTableData = data
+      const newColumns = [
+        // ...[{ type: 'checkbox', width: 60, noDraggable: true }],
+        ...JSON.parse(JSON.stringify(data))
+        // ...[{ title: '操作', width: 80, noDraggable: true, slots: { default: 'operate' }, fixed: 'right' }]
+      ]
+      this.gridOptions.columns = newColumns
       const arr = data.map((item, index) => {
         return item.label
       })
-      console.log(arr)
+      this.$refs.setTableForm.handleCancel()
-      debugger
+      console.log(data, arr)
     },
 
     columnChange(data) {
@@ -399,7 +412,6 @@ export default {
     },
     addSubmit() {
       this.addVisible = false
-      debugger
       this.$router.push({ name: 'BookingDetail', query: { type: this.carrierRadio } })
     },
     addCancel() {
@@ -414,6 +426,7 @@ export default {
     // 多表单
     moreNumSubmit() {
       this.formRes.MBLNO = this.moreNumVal.replace(/\n|\r/g, ',')
+      this.$refs['fromlabel-MBLNO'][0].$data.value = this.formRes.MBLNO
       this.$forceUpdate()
       this.moreNumCancel()
     },
@@ -538,8 +551,8 @@ export default {
 }
 
 .radio-logo{
-  width: 16px;
+  width: 60px;
-  height: 16px;
+  height: 40px;
   display: inline-block;
 }
 </style>

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

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