3/7

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

@@ -82,7 +82,7 @@
       <template v-if="['bookingSpace', 'cutOff'].includes(modelType)">
         <a-form>
           <a-row :gutter="16">
-            <a-col :span="24" class="book-model-box">
+            <!-- <a-col :span="24" class="book-model-box">
               <a-checkbox class="book-check" @change="bookingCheckChange" />
               <a-form-item
                 label="使用货代代码"
@@ -102,7 +102,7 @@
               >
                 <a-input :allowClear="true" v-model="bookingModelFrom.forwarderName" />
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :span="24">
               <a-form-item
                 label="文件功能"
@@ -397,7 +397,6 @@
                     :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
                     has-feedback
                   >
-
                     <div class="box-flex">
                       <a-textarea
                         class="remark-input"
@@ -1912,7 +1911,7 @@ export default {
   }
 }
 
-.cabin-box{
+.cabin-box {
   /deep/ .ant-modal-body .ant-input-affix-wrapper {
     position: relative;
     z-index: 1;

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

@@ -83,7 +83,7 @@
       <template v-if="['bookingSpace', 'cutOff'].includes(modelType)">
         <a-form>
           <a-row :gutter="16">
-            <a-col :span="24" class="book-model-box">
+            <!-- <a-col :span="24" class="book-model-box">
               <a-checkbox class="book-check" @change="bookingCheckChange" />
               <a-form-item
                 label="使用货代代码"
@@ -103,7 +103,7 @@
               >
                 <a-input :allowClear="true" v-model="bookingModelFrom.forwarderName" />
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :span="24">
               <a-form-item
                 label="文件功能"

src/views/main/BookingTemplate/index.vue

@@ -57,7 +57,7 @@
         </vxe-column>
         <vxe-column title="操作" fixed="right" width="200" align="center">
           <template #default="{ row }">
-            <vxe-button type="text" @click="$refs.editForm.edit(row)">编辑</vxe-button>
+            <vxe-button type="text" @click="$refs.editForm.edit(row)"><a-icon type="form"/></vxe-button>
             <a-popconfirm
               title="请确认删除?"
               ok-text="是"
@@ -68,7 +68,7 @@
                 }
               "
             >
-              <vxe-button type="text">删除</vxe-button>
+              <vxe-button type="text"><a-icon type="delete"/></vxe-button>
             </a-popconfirm>
           </template>
         </vxe-column>

src/views/main/EDI/addForm.vue

@@ -92,6 +92,15 @@
               />
             </a-form-item>
           </a-col>
+          <a-col :span="8">
+            <a-form-item label="发送类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-select placeholder="请选择发送类型" v-decorator="['sendType']">
+                <a-select-option v-for="item in SendTypeData" :key="item.id" :value="item.code">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
           <a-divider orientation="left">发送方</a-divider>
           <a-col :span="8">
             <a-form-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
@@ -199,10 +208,12 @@ export default {
       confirmLoading: false,
       form: this.$form.createForm(this),
       EdiNameData: [],
-      carrierCodeData: []
+      carrierCodeData: [],
+      SendTypeData: []
     }
   },
   mounted() {
+    this.SendTypeData = this.$options.filters['dictData']('EdiSendType')
     this.EdiNameData = this.$options.filters['dictData']('edi_type')
     SysTenantPage().then(res => {
       this.SysTenantData = res.data.rows
@@ -271,7 +282,8 @@ export default {
           tenantName: record.tenantName,
           carrierid: record.carrierid,
           sendcompanycode: record.sendcompanycode,
-          sendsubcompanycode: record.sendsubcompanycode
+          sendsubcompanycode: record.sendsubcompanycode,
+          sendType: record.sendType
         })
       }, 100)
     },

src/views/main/EDI/editForm.vue

@@ -92,6 +92,15 @@
               />
             </a-form-item>
           </a-col>
+          <a-col :span="8">
+            <a-form-item label="发送类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-select placeholder="请选择发送类型" v-decorator="['sendType']">
+                <a-select-option v-for="item in SendTypeData" :key="item.id" :value="item.code">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
           <a-divider orientation="left">发送方</a-divider>
           <a-col :span="8">
             <a-form-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
@@ -200,10 +209,12 @@ export default {
       form: this.$form.createForm(this),
       EdiNameData: [],
       data: {},
-      carrierCodeData: []
+      carrierCodeData: [],
+      SendTypeData: []
     }
   },
   mounted() {
+    this.SendTypeData = this.$options.filters['dictData']('EdiSendType')
     this.EdiNameData = this.$options.filters['dictData']('edi_type')
     SysTenantPage().then(res => {
       this.SysTenantData = res.data.rows
@@ -252,7 +263,8 @@ export default {
           tenantName: record.tenantName,
           carrierid: record.carrierid,
           sendcompanycode: record.sendcompanycode,
-          sendsubcompanycode: record.sendsubcompanycode
+          sendsubcompanycode: record.sendsubcompanycode,
+          sendType: record.sendType
         })
         console.log(this.form.getFieldsValue())
       }, 100)

src/views/main/EDI/index.vue

@@ -86,13 +86,14 @@
             <span v-if="item.title == 'EDI类型'">{{ FnREdiName(row[item.dataIndex]) }}</span>
             <span v-else-if="item.title == '租户'">{{ FnRName(row[item.dataIndex]) }}</span>
             <span v-else-if="item.title == '船公司'">{{ FnRCarrier(row[item.dataIndex]) }}</span>
+            <span v-else-if="item.title == '发送类型'">{{ FnRSendType(row[item.dataIndex]) }}</span>
             <span v-else>{{ row[item.dataIndex] }}</span>
           </template>
         </vxe-column>
         <vxe-column title="操作" fixed="right" width="200" align="center">
           <template #default="{ row }">
-            <vxe-button type="text" @click="$refs.addForm.copy(row)">复制</vxe-button>
+            <vxe-button type="text" @click="$refs.addForm.copy(row)"><a-icon type="copy"/></vxe-button>
-            <vxe-button type="text" @click="$refs.editForm.edit(row)">编辑</vxe-button>
+            <vxe-button type="text" @click="$refs.editForm.edit(row)"><a-icon type="form"/></vxe-button>
             <a-popconfirm
               title="请确认删除?"
               ok-text="是"
@@ -103,7 +104,7 @@
                 }
               "
             >
-              <vxe-button type="text">删除</vxe-button>
+              <vxe-button type="text"><a-icon type="delete"/></vxe-button>
             </a-popconfirm>
           </template>
         </vxe-column>
@@ -192,6 +193,12 @@ export default {
           width: '100',
           dataIndex: 'password'
         },
+        {
+          title: '发送类型',
+          align: 'center',
+          width: '100',
+          dataIndex: 'sendType'
+        },
         {
           title: '发送方代码',
           align: 'center',
@@ -289,6 +296,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: [],
       EdiNameData: [],
+      SendTypeData: [],
       CodeData: []
     }
   },
@@ -298,6 +306,7 @@ export default {
     SysTenantPage().then(res => {
       this.SysTenantData = res.data.rows
     })
+    this.SendTypeData = this.$options.filters['dictData']('EdiSendType')
     this.EdiNameData = this.$options.filters['dictData']('edi_type')
     commondbCarrierlist().then(res => {
       this.CodeData = res.data
@@ -336,6 +345,15 @@ export default {
       })
       return RData
     },
+    FnRSendType(data) {
+      let RData = ''
+      this.SendTypeData.forEach(item => {
+        if (data == item.code) {
+          RData = item.name
+        }
+      })
+      return RData
+    },
     toggleAdvanced() {
       this.advanced = !this.advanced
     },

src/views/main/Printing/index.vue

@@ -134,10 +134,10 @@
             {{ RMain(row) }}
           </template>
         </vxe-column>
-        <vxe-column title="操作" fixed="right" width="250" align="center">
+        <vxe-column title="操作" fixed="right" width="150" align="center">
           <template #default="{ row }">
             <vxe-button type="text" v-if="row.type == 'ExcelTemplate'" @click="FnExcel(row)">详细设置</vxe-button>
-            <vxe-button type="text" @click="$refs.editForm.edit(row)">编辑</vxe-button>
+            <vxe-button type="text" @click="$refs.editForm.edit(row)"><a-icon type="form"/></vxe-button>
             <a-popconfirm
               title="请确认删除?"
               ok-text="是"
@@ -148,7 +148,7 @@
                 }
               "
             >
-              <vxe-button type="text">删除</vxe-button>
+              <vxe-button type="text"><a-icon type="delete"/></vxe-button>
             </a-popconfirm>
           </template>
         </vxe-column>