Jelajahi Sumber

EDI SO,SI 分开显示

wfg 4 bulan lalu
induk
melakukan
f83c485bba

+ 18 - 3
src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -34,14 +34,25 @@
                 <el-dropdown style="line-height: 0">
                     <el-button size="small" type="success" style="margin-right: 8px" :loading="saveLoading"
                         :disabled="!form.id || showLock">
-                        发送 EDI<i class="el-icon-arrow-down el-icon--right"></i>
+                        发送 SO EDI<i class="el-icon-arrow-down el-icon--right"></i>
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
-                        <el-dropdown-item v-for="item in ediData" :key="item.id" class="dropdown-max"
+                        <el-dropdown-item v-for="item in ediData_SO" :key="item.id" class="dropdown-max"
                             @click.native="editypesSendingEdifun(item)">{{ item.cnName }}
                         </el-dropdown-item>
                     </el-dropdown-menu>
                 </el-dropdown>
+                <el-dropdown style="line-height: 0">
+                    <el-button size="small" type="success" style="margin-right: 8px" :loading="saveLoading"
+                               :disabled="!form.id || showLock">
+                        发送 SI EDI<i class="el-icon-arrow-down el-icon--right"></i>
+                    </el-button>
+                    <el-dropdown-menu slot="dropdown">
+                        <el-dropdown-item v-for="item in ediData_SI" :key="item.id" class="dropdown-max"
+                                          @click.native="editypesSendingEdifun(item)">{{ item.cnName }}
+                        </el-dropdown-item>
+                    </el-dropdown-menu>
+                </el-dropdown>
 
                 <el-button size="small" style="margin-right: 8px" :loading="saveLoading" @click="previewDialogfun">预 览
                 </el-button>
@@ -362,6 +373,8 @@ export default {
             verifySymbolStatus: 0,
             showLock: false,
             ediData: [], // edi 列表数据
+            ediData_SO: [], // edi SO 列表数据
+            ediData_SI: [], // edi SI 列表数据
             previewDialog: false, // 预览报表弹窗开启
             generateBillsfalse: false, // 如果生成账单就禁用
             pleasereviewType: false, // 如果请核就禁用
@@ -987,8 +1000,10 @@ export default {
         },
         // 获取EDI列表数据
         editypesListfun() {
-            editypesList(1, 30).then(res => {
+            editypesList(1, 1000).then(res => {
                 this.ediData = res.data.data.records
+                this.ediData_SO = res.data.data.records.filter(r=>r.groupName=='SO')
+                this.ediData_SI = res.data.data.records.filter(r=>r.groupName=='SI')
             })
         },
         // 发送edi

+ 20 - 3
src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -329,14 +329,25 @@
                     <el-dropdown style="line-height: 0">
                         <el-button size="small" type="success" style="margin-right: 8px"
                             :disabled="selectionList.length == 0">
-                            发送 EDI<i class="el-icon-arrow-down el-icon--right"></i>
+                            发送 SO EDI<i class="el-icon-arrow-down el-icon--right"></i>
                         </el-button>
                         <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item v-for="item in ediData" :key="item.id"
+                            <el-dropdown-item v-for="item in ediData_SO" :key="item.id"
                                 @click.native="editypesSendingEdifun(item)">{{ item.cnName }}
                             </el-dropdown-item>
                         </el-dropdown-menu>
                     </el-dropdown>
+                    <el-dropdown style="line-height: 0">
+                        <el-button size="small" type="success" style="margin-right: 8px"
+                                   :disabled="selectionList.length == 0">
+                            发送 SI EDI<i class="el-icon-arrow-down el-icon--right"></i>
+                        </el-button>
+                        <el-dropdown-menu slot="dropdown">
+                            <el-dropdown-item v-for="item in ediData_SI" :key="item.id"
+                                              @click.native="editypesSendingEdifun(item)">{{ item.cnName }}
+                            </el-dropdown-item>
+                        </el-dropdown-menu>
+                    </el-dropdown>
                     <div style="margin-top: 10px">
                         <el-tabs type="card" v-model="query.billStatus" @tab-click="handleClick">
                             <el-tab-pane label="接单" name="0">
@@ -559,6 +570,8 @@ export default {
         return {
             datekey: Date.now(),
             ediData: [], // 获取的 edi 数据
+            ediData_SO: [], // 获取的 SO edi 数据
+            ediData_SI: [], // 获取的 SI edi 数据
             // 展开和收回
             fold: false,
             maxShow: 3,
@@ -1640,8 +1653,12 @@ export default {
         },
         // 获取EDI列表数据
         editypesListfun() {
-            editypesList(1, 30, { type: 'HYCK' }).then(res => {
+            editypesList(1, 1000, { type: 'HYCK' }).then(res => {
+                console.log('EDI', res.data.data.records)
                 this.ediData = res.data.data.records
+                this.ediData_SO = res.data.data.records.filter(r=>r.groupName=='SO')
+                this.ediData_SI = res.data.data.records.filter(r=>r.groupName=='SI')
+                console.log(this.ediData_SO, this.ediData_SI)
             })
         },
         // 展开和收起