From 58fa53046b446475cc4a69cbb98ee35d9d4bf330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Tue, 9 May 2023 17:10:31 +0800
Subject: [PATCH] 5/9

---
 src/views/main/BookingLedger/detail/index.vue |  1 +
 .../detail/modules/goodsTable.vue             |  2 +-
 .../detail/modules/operationArea.vue          | 45 ++++++++++++++-----
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue
index 88bd380..0e55173 100644
--- a/src/views/main/BookingLedger/detail/index.vue
+++ b/src/views/main/BookingLedger/detail/index.vue
@@ -858,6 +858,7 @@ export default {
               } else if (typeArr2.includes(field[1]) || typeArr4.includes(field[1])) {
                 label = this.emnuDefaultLabel(field[1])
               }
+              console.log('新增走着？？？？？？', label, item.code)
               initDetail.bookingEDIExt[label] = item.code
               bookingEDIExt[label] = item.code
               this.bookingDetails.bookingEDIExt[label] =
diff --git a/src/views/main/BookingLedger/detail/modules/goodsTable.vue b/src/views/main/BookingLedger/detail/modules/goodsTable.vue
index 1e09a60..2c9d577 100644
--- a/src/views/main/BookingLedger/detail/modules/goodsTable.vue
+++ b/src/views/main/BookingLedger/detail/modules/goodsTable.vue
@@ -369,7 +369,7 @@ export default {
                 }}
               >
                 {this.packageList.map((item, index) => {
-                  return <a-select-option value={index}>{item.name}</a-select-option>
+                  return <a-select-option value={index}>{item.code}</a-select-option>
                 })}
               </a-select>
             )
diff --git a/src/views/main/BookingLedger/detail/modules/operationArea.vue b/src/views/main/BookingLedger/detail/modules/operationArea.vue
index b58c987..947d1ac 100644
--- a/src/views/main/BookingLedger/detail/modules/operationArea.vue
+++ b/src/views/main/BookingLedger/detail/modules/operationArea.vue
@@ -187,7 +187,7 @@
                   <a-input :allowClear="true" v-model="initCabinFrom.toName" />
                 </a-form-item>
               </a-col>
-              <a-col :span="8">
+              <a-col :span="6">
                 <a-form-item
                   label="ATTN"
                   :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
@@ -197,7 +197,7 @@
                   <a-input :allowClear="true" v-model="initCabinFrom.attn" />
                 </a-form-item>
               </a-col>
-              <a-col :span="8">
+              <a-col :span="6">
                 <a-form-item
                   label="电话"
                   :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
@@ -207,7 +207,7 @@
                   <a-input :allowClear="true" v-model="initCabinFrom.attnTel" />
                 </a-form-item>
               </a-col>
-              <a-col :span="8">
+              <a-col :span="6">
                 <a-form-item
                   label="邮箱"
                   :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
@@ -217,8 +217,18 @@
                   <a-input :allowClear="true" v-model="initCabinFrom.attnMail" />
                 </a-form-item>
               </a-col>
+              <a-col :span="6">
+                <a-form-item
+                  label="手机"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
+                  has-feedback
+                >
+                  <a-input :allowClear="true" v-model="initCabinFrom.attnPhone" />
+                </a-form-item>
+              </a-col>
               <!-- from -->
-              <a-col :span="8">
+              <a-col :span="6">
                 <a-form-item
                   label="FROM"
                   :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
@@ -228,7 +238,7 @@
                   <a-input :allowClear="true" v-model="initCabinFrom.fromName" />
                 </a-form-item>
               </a-col>
-              <a-col :span="8">
+              <a-col :span="6">
                 <a-form-item
                   label="电话"
                   :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
@@ -238,7 +248,7 @@
                   <a-input :allowClear="true" v-model="initCabinFrom.fromTel" />
                 </a-form-item>
               </a-col>
-              <a-col :span="8">
+              <a-col :span="6">
                 <a-form-item
                   label="邮箱"
                   :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
@@ -248,6 +258,16 @@
                   <a-input :allowClear="true" v-model="initCabinFrom.fromMail" />
                 </a-form-item>
               </a-col>
+              <a-col :span="6">
+                <a-form-item
+                  label="手机"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
+                  has-feedback
+                >
+                  <a-input :allowClear="true" v-model="initCabinFrom.fromPhone" />
+                </a-form-item>
+              </a-col>
             </div>
             <template v-if="modelType === 'initCabin'">
               <div class="item-box cabin-box" :style="{ paddingTop: '0px' }">
@@ -713,7 +733,7 @@
       </template>
     </a-modal>
     <!-- 运踪弹窗 end -->
-    <pre-order ref="preOrder" :details="details" @frompre="frompre"/>
+    <pre-order ref="preOrder" :details="details" @frompre="frompre" />
   </div>
 </template>
 <script>
@@ -783,9 +803,11 @@ export default {
         attn: '',
         attnTel: '',
         attnMail: '',
+        attnPhone: '',
         fromName: '',
         fromTel: '',
         fromMail: '',
+        fromPhone: '',
         orderUrl: {
           urlTxxp: '',
           urlVgm: '',
@@ -874,9 +896,8 @@ export default {
     }
   },
   methods: {
-    frompre(data){
+    frompre(data) {
       this.$emit('frompre', data)
-      
     },
     FnGoSendCar() {
       BookingTruckGetTruckListByBooking({ bookingId: this.id }).then(res => {
@@ -1095,9 +1116,11 @@ export default {
           attn: '',
           attnTel: '',
           attnMail: '',
+          attnPhone: '',
           fromName: '',
           fromTel: '',
           fromMail: '',
+          fromPhone: '',
           orderUrl: {
             urlTxxp: '',
             urlVgm: '',
@@ -1643,14 +1666,14 @@ export default {
     cancelRemove() {
       console.log('== 取消删除 ==')
     },
-    openPreOrderFun () {
+    openPreOrderFun() {
       if (!this.id) {
         this.$message.error('请先保存主单')
         return false
       }
       this.$refs.preOrder.init()
     },
-    closeOpenPreOrder () {
+    closeOpenPreOrder() {
       this.$refs.preOrder.close()
     }
   }