3/29

src/views/main/Customer/editForm.vue

@@ -358,9 +358,8 @@ export default {
             }
           })
           this.ContactsData = res.data.contacts
-          console.log(WserviceItem.length)
+
           if (WserviceItem.length) {
-            console.log('进来了')
             this.form.setFieldsValue({
               ...res.data,
               WserviceItem
@@ -468,6 +467,7 @@ export default {
               values[key] = JSON.stringify(values[key])
             }
           }
+
           let propString = ''
           if (values.WpropString) {
             values.WpropString.split('["')[1]
@@ -478,7 +478,7 @@ export default {
               })
           }
           let serviceItem = ''
-          if (values.WserviceItem) {
+          if (values.WserviceItem && values.WserviceItem != '[]') {
             values.WserviceItem.split('["')[1]
               .split('"]')[0]
               .split('","')
@@ -486,7 +486,6 @@ export default {
                 serviceItem == '' ? (serviceItem = `[${item2}]`) : (serviceItem = `${serviceItem}[${item2}]`)
               })
           }
-
           let Arr = ['sale', 'op', 'doc', 'custservice']
           GetSysUserPage()
             .then(res => {

src/views/main/vesselinfo/addForm.vue

@@ -115,11 +115,11 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="实际离港时间" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
+            <a-form-item label="实际开船" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-date-picker
                 show-time
                 :style="{ width: '100%' }"
-                placeholder="请选择实际离港时间"
+                placeholder="请选择实际开船时间"
                 v-decorator="['atd']"
                 valueFormat="YYYY-MM-DD HH:mm:ss"
               />

src/views/main/vesselinfo/editForm.vue

@@ -115,11 +115,11 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="实际离港时间" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
+            <a-form-item label="实际开船" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-date-picker
                 show-time
                 :style="{ width: '100%' }"
-                placeholder="请选择实际离港时间"
+                placeholder="请选择实际开船时间"
                 v-decorator="['atd']"
                 valueFormat="YYYY-MM-DD HH:mm:ss"
               />

src/views/main/vesselinfo/index.vue

@@ -108,29 +108,29 @@ export default {
           dataIndex: 'vessel'
         },
         {
-          title: '航次',
+          title: '船公司',
           align: 'center',
-          dataIndex: 'voyno'
+          dataIndex: 'carrier'
         },
         {
-          title: '装货港',
+          title: '海关航次',
           align: 'center',
-          dataIndex: 'portLoading'
+          dataIndex: 'voyno'
         },
         {
-          title: '中转港',
+          title: '内部航次',
           align: 'center',
-          dataIndex: 'portTransit'
+          dataIndex: 'voynoInside'
         },
         {
-          title: '卸货港',
+          title: '开船日期',
           align: 'center',
-          dataIndex: 'portDischarge'
+          dataIndex: 'etd'
         },
         {
-          title: '开船日期',
+          title: '实际开船',
           align: 'center',
-          dataIndex: 'etd'
+          dataIndex: 'atd'
         },
         {
           title: '截港日期',
@@ -143,24 +143,24 @@ export default {
           dataIndex: 'eta'
         },
         {
-          title: '默认场站',
+          title: '装货港',
           align: 'center',
-          dataIndex: 'yard'
+          dataIndex: 'portLoading'
         },
         {
-          title: '实际离港日期',
+          title: '中转港',
           align: 'center',
-          dataIndex: 'atd'
+          dataIndex: 'portTransit'
         },
         {
-          title: '船公司',
+          title: '卸货港',
           align: 'center',
-          dataIndex: 'carrier'
+          dataIndex: 'portDischarge'
         },
         {
-          title: '内部航次',
+          title: '默认场站',
           align: 'center',
-          dataIndex: 'voynoInside'
+          dataIndex: 'yard'
         }
       ],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },