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

src/views/main/EDI/addForm.vue

@@ -1,7 +1,7 @@
 <template>
   <a-modal
     title="新增EDI参数设置"
-    :width="1100"
+    :width="1200"
     :visible="visible"
     :confirmLoading="confirmLoading"
     @ok="handleSubmit"
@@ -81,7 +81,16 @@
               <a-input placeholder="请输入发送方邮箱" v-decorator="['sendemail']" />
             </a-form-item>
           </a-col>
-
+          <a-col :span="8">
+            <a-form-item label="发送方公司代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input placeholder="请输入发送方公司代码" v-decorator="['sendcompanycode']" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="发送方部门代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input placeholder="请输入发送方部门代码" v-decorator="['sendsubcompanycode']" />
+            </a-form-item>
+          </a-col>
           <a-col :span="8">
             <a-form-item label="接收方代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input placeholder="请输入接收方代码" v-decorator="['receivecode']" />

src/views/main/EDI/editForm.vue

@@ -1,7 +1,7 @@
 <template>
   <a-modal
     title="编辑EDI参数设置"
-    :width="1100"
+    :width="1200"
     :visible="visible"
     :confirmLoading="confirmLoading"
     @ok="handleSubmit"
@@ -81,6 +81,16 @@
               <a-input placeholder="请输入发送方邮箱" v-decorator="['sendemail']" />
             </a-form-item>
           </a-col>
+          <a-col :span="8">
+            <a-form-item label="发送方公司代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input placeholder="请输入发送方公司代码" v-decorator="['sendcompanycode']" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="发送方部门代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input placeholder="请输入发送方部门代码" v-decorator="['sendsubcompanycode']" />
+            </a-form-item>
+          </a-col>
           <a-col :span="8">
             <a-form-item label="接收方代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input placeholder="请输入接收方代码" v-decorator="['receivecode']" />
@@ -237,7 +247,9 @@ export default {
           consigneetel: record.consigneetel,
           notifypartytel: record.notifypartytel,
           tenantName: record.tenantName,
-          carrierid: record.carrierid
+          carrierid: record.carrierid,
+          sendcompanycode: record.sendcompanycode,
+          sendsubcompanycode: record.sendsubcompanycode
         })
         console.log(this.form.getFieldsValue())
       }, 100)

src/views/main/EDI/index.vue

@@ -216,6 +216,18 @@ export default {
           width: '100',
           dataIndex: 'sendemail'
         },
+        {
+          title: '发送方公司代码',
+          align: 'center',
+          width: '120',
+          dataIndex: 'sendcompanycode'
+        },
+        {
+          title: '发送方部门代码',
+          align: 'center',
+          width: '120',
+          dataIndex: 'sendsubcompanycode'
+        },
         {
           title: '船公司',
           align: 'center',