修改 发票类型 配置vuex 去掉校验 新加报单模块 修改数据 模块修改

src/api/serviceConfiguration/modifyData.js

@@ -0,0 +1,54 @@
+import request from '@/router/axios';
+//列表
+export const getList = (current, size, params) => {
+    return request({
+        url: '/api/blade-los/update/list',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size
+        }
+    })
+}
+//明细
+export const getDetail = (data) => {
+    return request({
+        url: '/api/blade-los/update/detail',
+        method: 'get',
+        params: data
+    })
+}
+
+//保存
+export const submit = (data) => {
+    return request({
+        url: '/api/blade-los/update/submit',
+        method: 'post',
+        data: data
+    })
+}
+//删除
+export const remove = (data) => {
+    return request({
+        url: '/api/blade-los/update/remove',
+        method: 'post',
+        params: data
+    })
+}
+// 获取配置信息
+export const getUpdate = (data) => {
+    return request({
+        url: '/api/blade-los/update/getUpdate',
+        method: 'get',
+        params: data
+    })
+}
+//提交
+export const checkUpdate = (data) => {
+    return request({
+        url: '/api/blade-los/update/checkUpdate',
+        method: 'post',
+        data: data
+    })
+}

src/page/index/tags.vue

@@ -484,6 +484,9 @@ export default {
         if (tag.label == "贸易代理(T)") {
           this.$store.commit("OUT_MYDLT_STATUS")
         }
+        if (tag.label == "发票申请(F)") {
+          this.$store.commit("OUT_FINAPP_DETAIL")
+        }
         this.$store.commit("DEL_TAG", tag);
         if (tag.value === this.tag.value) {
           tag = this.tagList[key === 0 ? key : key - 1]; //如果关闭本标签让前推一个

src/store/getters.js

@@ -93,6 +93,7 @@ const getters = {
   exchangePurStatus:state => state.ifdetail.exchangePurStatus,//货款付费(T)
   balanceStatus:state => state.ifdetail.balanceStatus,//余额充值(T)
   financingStatus:state => state.ifdetail.financingStatus,//融资采购(L)
-  mydlTStatus:state => state.ifdetail.mydlTStatus
+  mydlTStatus:state => state.ifdetail.mydlTStatus,
+  finappStatus:state => state.ifdetail.finappStatus//发票申请
 }
 export default getters

src/store/modules/ifdetail.js

@@ -71,9 +71,18 @@ const ifdetail = {
     balanceStatus: false,
     financingStatus: false,//融资采购(L)
     mydlTStatus: false,
+    finappStatus: false,
   },
   actions: {},
   mutations: {
+    //发票申请
+    IN_FINAPP_DETAIL(state) {
+      state.finappStatus = true;
+    },
+    //发票申请
+    OUT_FINAPP_DETAIL(state) {
+      state.finappStatus = false;
+    },
     //申请付费
     IN_PAYAPP_DETAIL(state) {
       state.payAppStatus = true;
@@ -796,6 +805,9 @@ const ifdetail = {
       if (tag.label == '贸易代理(T)') {
         state.mydlTStatus = true
       }
+      if (tag.label == '发票申请(F)') {
+        state.finappStatus = true
+      }
     }
   }
 

src/views/iosBasicData/AirtransportExport/bills/billsDetails.vue

@@ -1434,32 +1434,32 @@ export default {
                         })
                         return;
                     }
-                    let msgsList = []
-                    if (!verifyEnglish(this.form.hshipperDetails)) {
-                        msgsList.push('发货人')
-                    }
-                    if (!verifyEnglish(this.form.hconsigneeDetails)) {
-                        msgsList.push('收货人')
-                    }
-                    if (!verifyEnglish(this.form.hnotifyDetails)) {
-                        msgsList.push('通知人')
-                    }
-                    if (!verifyEnglish(this.form.marks)) {
-                        msgsList.push('唛头')
-                    }
-                    if (!verifyEnglish(this.form.commodityDescr)) {
-                        msgsList.push('货描')
-                    }
+                    // let msgsList = []
+                    // if (!verifyEnglish(this.form.hshipperDetails)) {
+                    //     msgsList.push('发货人')
+                    // }
+                    // if (!verifyEnglish(this.form.hconsigneeDetails)) {
+                    //     msgsList.push('收货人')
+                    // }
+                    // if (!verifyEnglish(this.form.hnotifyDetails)) {
+                    //     msgsList.push('通知人')
+                    // }
+                    // if (!verifyEnglish(this.form.marks)) {
+                    //     msgsList.push('唛头')
+                    // }
+                    // if (!verifyEnglish(this.form.commodityDescr)) {
+                    //     msgsList.push('货描')
+                    // }
                     // if (!verifyEnglish(this.form.remarks)) {
                     //     msgsList.push('备注')
                     // }
                     // if (!verifyEnglish(this.form.cyRemarks)) {
                     //     msgsList.push('场站备注')
                     // }
-                    if (msgsList.length > 0) {
-                        this.$message.error(`请正确输入${msgsList.join(",")}的英文和英文符号`);
-                        return;
-                    }
+                    // if (msgsList.length > 0) {
+                    //     this.$message.error(`请正确输入${msgsList.join(",")}的英文和英文符号`);
+                    //     return;
+                    // }
                     // 赋值 ETD 日期
                     this.form.billDate = this.form.etd ? this.form.etd.slice(0, 10) + ' 00:00:00' : null // 单据日期
                     // 调用保存接口

src/views/iosBasicData/AirtransportImport/bills/billsDetails.vue

@@ -1422,32 +1422,32 @@ export default {
                         })
                         return;
                     }
-                    let msgsList = []
-                    if (!verifyEnglish(this.form.hshipperDetails)) {
-                        msgsList.push('发货人')
-                    }
-                    if (!verifyEnglish(this.form.hconsigneeDetails)) {
-                        msgsList.push('收货人')
-                    }
-                    if (!verifyEnglish(this.form.hnotifyDetails)) {
-                        msgsList.push('通知人')
-                    }
-                    if (!verifyEnglish(this.form.marks)) {
-                        msgsList.push('唛头')
-                    }
-                    if (!verifyEnglish(this.form.commodityDescr)) {
-                        msgsList.push('货描')
-                    }
+                    // let msgsList = []
+                    // if (!verifyEnglish(this.form.hshipperDetails)) {
+                    //     msgsList.push('发货人')
+                    // }
+                    // if (!verifyEnglish(this.form.hconsigneeDetails)) {
+                    //     msgsList.push('收货人')
+                    // }
+                    // if (!verifyEnglish(this.form.hnotifyDetails)) {
+                    //     msgsList.push('通知人')
+                    // }
+                    // if (!verifyEnglish(this.form.marks)) {
+                    //     msgsList.push('唛头')
+                    // }
+                    // if (!verifyEnglish(this.form.commodityDescr)) {
+                    //     msgsList.push('货描')
+                    // }
                     // if (!verifyEnglish(this.form.remarks)) {
                     //     msgsList.push('备注')
                     // }
                     // if (!verifyEnglish(this.form.cyRemarks)) {
                     //     msgsList.push('场站备注')
                     // }
-                    if (msgsList.length > 0) {
-                        this.$message.error(`请正确输入${msgsList.join(",")}的英文和英文符号`);
-                        return;
-                    }
+                    // if (msgsList.length > 0) {
+                    //     this.$message.error(`请正确输入${msgsList.join(",")}的英文和英文符号`);
+                    //     return;
+                    // }
                     // 赋值 ETD 日期
                     this.form.billDate = this.form.eta ? this.form.eta.slice(0, 10) + ' 00:00:00' : null // 单据日期
                     // 调用保存接口

src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -1451,26 +1451,26 @@ export default {
                         })
                         return;
                     }
-                    let msgsList = []
-                    if (!verifyEnglish(this.form.hshipperDetails)) {
-                        msgsList.push('发货人')
-                    }
-                    if (!verifyEnglish(this.form.hconsigneeDetails)) {
-                        msgsList.push('收货人')
-                    }
-                    if (!verifyEnglish(this.form.hnotifyDetails)) {
-                        msgsList.push('通知人')
-                    }
-                    if (!verifyEnglish(this.form.marks)) {
-                        msgsList.push('唛头')
-                    }
-                    if (!verifyEnglish(this.form.commodityDescr)) {
-                        msgsList.push('货描')
-                    }
-                    if (msgsList.length > 0) {
-                        this.$message.error(`请正确输入${msgsList.join(",")}的英文和英文符号`);
-                        return;
-                    }
+                    // let msgsList = []
+                    // if (!verifyEnglish(this.form.hshipperDetails)) {
+                    //     msgsList.push('发货人')
+                    // }
+                    // if (!verifyEnglish(this.form.hconsigneeDetails)) {
+                    //     msgsList.push('收货人')
+                    // }
+                    // if (!verifyEnglish(this.form.hnotifyDetails)) {
+                    //     msgsList.push('通知人')
+                    // }
+                    // if (!verifyEnglish(this.form.marks)) {
+                    //     msgsList.push('唛头')
+                    // }
+                    // if (!verifyEnglish(this.form.commodityDescr)) {
+                    //     msgsList.push('货描')
+                    // }
+                    // if (msgsList.length > 0) {
+                    //     this.$message.error(`请正确输入${msgsList.join(",")}的英文和英文符号`);
+                    //     return;
+                    // }
                     // 赋值 ETA 日期
                     this.form.billDate = this.form.eta ? this.form.eta.slice(0, 10) + ' 00:00:00' : null // 单据日期
                     // 调用保存接口

src/views/iosBasicData/SeafreightExportF/bills/assembly/DocumentCenter.vue

@@ -36,7 +36,7 @@
 
 
         <!--添加编辑弹窗-->
-        <el-dialog title="单证操作"
+        <el-dialog :title="businesstypeData.cnName"
                    :close-on-click-modal="false"
                    :visible.sync="documentVisible"
                    append-to-body
@@ -44,7 +44,7 @@
                    :before-close="corpTypeClose">
             <Dispatch-Notice v-if="businesstypeData.reportsType == 'PCTZD'" :documentForm="documentForm"></Dispatch-Notice>
             <Purchase-Notice v-else-if="businesstypeData.reportsType == 'RHTZ'" :documentForm="documentForm"></Purchase-Notice>
-            <BillofLadingDetails v-else-if="businesstypeData.reportsType == 'TDXQ'" :documentForm="documentForm"></BillofLadingDetails>
+            <BillofLadingDetails v-else-if="businesstypeData.reportsType == 'TDXQ'||businesstypeData.reportsType == 'DCWTS'" :documentForm="documentForm"></BillofLadingDetails>
             <span slot="footer" class="dialog-footer">
                 <!--<el-button type="success" @click="documentSubmit(true)" >保存并打印</el-button>-->
                 <el-button v-if="addShow" type="success" :disabled="!documentForm.id" @click="dialogPreviewfun(editData)" >打印</el-button>
@@ -222,6 +222,13 @@ import {dateFormat} from "@/util/date";
                         groupCode:'提单详情',
                         reportsType:'TDXQ',
                         businessType:'HYCK'
+                    },
+                    {
+                        cnName: '订舱委托书',
+                        classifyCode:'单证',
+                        groupCode:'提单详情',
+                        reportsType:'DCWTS',
+                        businessType:'HYCK' 
                     }
                 ], // 左侧获取的数据
                 documentOption:{},

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -2606,14 +2606,24 @@ export default {
             if (name == '发票申请') {
                 if (this.selectionDList.length == 0) return this.$message.error("请选择费用");
                 if (this.selectionDList.length != this.selectionDList.filter(e => e.corpCnName == this.selectionDList[0].corpCnName).length) return this.$message.error("请选择相同的往来单位");
-                this.$router.push({
-                    path: `/iosBasicData/fininvoicesApplyfor/index`,
-                    query: {
-                        mblno: this.assemblyForm.mblno,
-                        corpCnName: this.selectionDList[0].corpCnName,
-                        corpId: this.selectionDList[0].corpId
-                    }
-                })
+                if (this.$store.getters.finappStatus) {
+                    this.$alert("发票申请(F)页面已存在,请关闭发票申请(F)再进行操作", "温馨提示", {
+                        confirmButtonText: "确定",
+                        type: 'warning',
+                        callback: action => {
+                        }
+                    });
+                } else {
+                    this.$router.push({
+                        path: `/iosBasicData/fininvoicesApplyfor/index`,
+                        query: {
+                            mblno: this.assemblyForm.mblno,
+                            corpCnName: this.selectionDList[0].corpCnName,
+                            corpId: this.selectionDList[0].corpId
+                        }
+                    })
+                }
+
             }
         },
         // 预览报表

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -1660,29 +1660,29 @@ export default {
                         })
                         return;
                     }
-                    let msgsList = []
-                    if (!verifyEnglish(this.form.hshipperDetails)) {
-                        msgsList.push('发货人')
-                    }
-                    if (!verifyEnglish(this.form.hconsigneeDetails)) {
-                        msgsList.push('收货人')
-                    }
-                    if (!verifyEnglish(this.form.hnotifyDetails)) {
-                        msgsList.push('通知人')
-                    }
-                    if (!verifyEnglish(this.form.marks)) {
-                        msgsList.push('唛头')
-                    }
-                    if (!verifyEnglish(this.form.commodityDescr)) {
-                        msgsList.push('货描')
-                    }
-                    if (!verifyEnglish(this.form.forwarding)) {
-                        msgsList.push('FORWARDING')
-                    }
-                    if (msgsList.length > 0) {
-                        this.$message.error(`请正确输入${msgsList.join(",")}的英文和英文符号`);
-                        return;
-                    }
+                    // let msgsList = []
+                    // if (!verifyEnglish(this.form.hshipperDetails)) {
+                    //     msgsList.push('发货人')
+                    // }
+                    // if (!verifyEnglish(this.form.hconsigneeDetails)) {
+                    //     msgsList.push('收货人')
+                    // }
+                    // if (!verifyEnglish(this.form.hnotifyDetails)) {
+                    //     msgsList.push('通知人')
+                    // }
+                    // if (!verifyEnglish(this.form.marks)) {
+                    //     msgsList.push('唛头')
+                    // }
+                    // if (!verifyEnglish(this.form.commodityDescr)) {
+                    //     msgsList.push('货描')
+                    // }
+                    // if (!verifyEnglish(this.form.forwarding)) {
+                    //     msgsList.push('FORWARDING')
+                    // }
+                    // if (msgsList.length > 0) {
+                    //     this.$message.error(`请正确输入${msgsList.join(",")}的英文和英文符号`);
+                    //     return;
+                    // }
                     // 赋值 ETD 日期
                     this.form.billDate = this.form.etd ? this.form.etd.slice(0, 10) + ' 00:00:00' : null // 单据日期
                     // 调用保存接口

src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -290,7 +290,7 @@
                                                 :clearable="true" :disabled="editSave" :buttonIf="false"
                                                 placeholder="请输入发票类型"
                                                 :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictKey' }"
-                                                @corpChange="corpChange($event, 'isInvoice')"
+                                                @corpChange="corpChange($event, 'invType')"
                                                 @corpFocus="invTypeWorkDictsfun">
                                             </search-query>
                                         </el-form-item>

src/views/iosBasicData/fininvoicesApplyfor/index.vue

@@ -593,6 +593,7 @@ export default {
     newbillFun() {
       this.isShow = false;
       this.editSave = false
+      this.$store.commit("IN_FINAPP_DETAIL");
     },
     toAddEdit() {
       this.datekey = Date.now()
@@ -606,6 +607,7 @@ export default {
       this.$nextTick(() => {
         this.$refs.fininvoicesDetails.fininvoicesDetailfun(row.id)
       })
+      this.$store.commit("IN_FINAPP_DETAIL");
     },
     // 详情的返回列表
     goBack() {
@@ -619,6 +621,7 @@ export default {
       }
       this.isShow = true;
       this.onLoad(this.page, this.search);
+      this.$store.commit("OUT_FINAPP_DETAIL");
     },
 
 

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -290,7 +290,7 @@
                                                 :clearable="true" :disabled="editSave" :buttonIf="false"
                                                 placeholder="请输入发票类型"
                                                 :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictKey' }"
-                                                @corpChange="corpChange($event, 'isInvoice')"
+                                                @corpChange="corpChange($event, 'invType')"
                                                 @corpFocus="invTypeWorkDictsfun">
                                             </search-query>
                                         </el-form-item>

src/views/serviceConfiguration/configurationModification/index.vue

@@ -5,151 +5,37 @@
                 v-model="form" id="out-table" :header-cell-class-name="headerClassName" ref="crud" @row-del="rowDel"
                 @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
                 @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
-                @resetColumn="resetColumn('crud', 'option', 'optionBack', 375)"
-                @saveColumn="saveColumn('crud', 'option', 'optionBack', 375)" @on-load="onLoad">
-                <template slot="checkboxSearch">
-                    <el-checkbox-group v-model="query.checkbox" @change="handleCheckedChange">
-                        <el-checkbox v-for="item in statusList" :label="item.value" :key="item.value">{{ item.label
-                        }}</el-checkbox>
-                    </el-checkbox-group>
-                </template>
-                <tempalte slot="operatorNameSearch">
-                    <dic-select v-model="query.operatorName" placeholder="操作员" key="id" label="realName"
-                    res="records" url="/blade-user/page" :filterable="true" :remote="true" dataName="realName"></dic-select>
-                </tempalte>
+                @resetColumn="resetColumn('crud', 'option', 'optionBack', 416)"
+                @saveColumn="saveColumn('crud', 'option', 'optionBack', 416)" @on-load="onLoad">
                 <template slot="menuLeft">
                     <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">新 增
                     </el-button>
-                    <el-button type="success" size="small" :disabled="selectionList.length != 1" @click="copyButton">复制订单
-                    </el-button>
-                    <el-button type="warning" size="small" @click="outExport">导 出
-                    </el-button>
-                    <el-button type="success" size="small" :disabled="selectionList.length == 0"
-                        @click="allClick('生成申请收款')">生成货款收款
+                </template>
+                <template slot-scope="{row}" slot="menu">
+                    <el-button type="text" icon="el-icon-edit" @click.stop="rowEdit(row)">编 辑
                     </el-button>
-                    <el-button type="warning" size="small" :disabled="selectionList.length == 0"
-                        @click="allClick('生成申请付款')">生成货款付款
+                    <el-button type="text" icon="el-icon-edit" @click.stop="rowDel(row)">删 除
                     </el-button>
                 </template>
-                <temolate slot="orderStatus" slot-scope="{row}">
-                    <div>
-                        <span v-if="row.orderStatus == item.dictKey" v-for="(item, index) in orderStatusData" :key="index"
-                            :style="{ 'background-color': item.colour }"
-                            style="color: #fff;border-radius: 30px;padding: 2px 8px;text-align: center;">
-                            {{ item.dictValue }}
-                        </span>
-                    </div>
-                </temolate>
-                <temolate slot="businessStatus" slot-scope="{row}">
-                    <div>
-                        <span v-if="row.businessStatus == item.dictKey" v-for="(item, index) in auditStatusData"
-                            :key="index" :style="{ 'background-color': item.colour }"
-                            style="color: #fff;border-radius: 30px;padding: 2px 8px;text-align: center;">
-                            {{ item.dictValue }}
-                        </span>
-                    </div>
-                </temolate>
-                <template slot="menu" slot-scope="{ row, index }">
-                    <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
-                    <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
-                        :disabled="row.orderStatus != '录入'">删 除</el-button>
-                </template>
-                <template slot="contractNo" slot-scope="{ row }">
-                    <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.contractNo }}</span>
-                </template>
             </avue-crud>
         </basic-container>
         <detailsPage v-if="!isShow" :detailData="detailData" @goBack="goBack"></detailsPage>
-        <el-dialog append-to-body title="申请费用" class="el-dialogDeep" :visible.sync="applyDialog" width="70%"
-            :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" @closed="applyClosed"
-            v-dialog-drag>
-            <avue-crud ref="applyCrud" :data="applyData" :option="applyOptionList" @selection-change="applySelectionChange"
-                @select="applySelectHandle">
-                <tempalte slot="thisSettlementAmount" slot-scope="{ row }">
-                    <el-input-number v-if="row.$cellEdit" v-model="row.thisSettlementAmount" @change="applyChange(row)"
-                        :controls="false" placeholder="请输入 本次金额" size="small" style="width: 100%;"></el-input-number>
-                </tempalte>
-            </avue-crud>
-            <span slot="footer" class="dialog-footer">
-                <el-button size="mini" @click="applyDialog = false">取 消</el-button>
-                <el-button size="mini" :disabled="applySelectList.length == 0" type="primary" @click="applySubmit">提
-                    交</el-button>
-            </span>
-        </el-dialog>
     </div>
 </template>
-  
+
 <script>
-import { getList, remove, copyAgent, applyForPaymentList, generate } from "@/api/tradeAgency/tradeAgency";
-import { getWorkDicts } from "@/api/system/dictbiz";
+import { getList, remove } from "@/api/serviceConfiguration/modifyData";
 import detailsPage from "./detailsPage";
-import { getToken } from "@/util/auth";
 import dicSelect from "@/components/dicSelect/main";
 import _ from "lodash";
 export default {
     data() {
         return {
-            applyDialog: false,
-            applyData: [],
-            applySelectList: [],
-            detailData: {},
-            applyOptionList: {
-                header: false,
-                tip: false,
-                border: true,
-                index: true,
-                menu: false,
-                selection: true,
-                align: 'center',
-                height: '450',
-                column: [
-                    {
-                        label: "往来单位",
-                        prop: "corpCnName",
-                        overHidden: true,
-                    },
-                    {
-                        label: "合同号",
-                        prop: "billNo",
-                        overHidden: true,
-                    },
-                    {
-                        label: "提单号",
-                        prop: "mblno",
-                        overHidden: true,
-                    },
-                    {
-                        label: "费用名称",
-                        prop: "feeCnName",
-                        overHidden: true,
-                    },
-                    {
-                        label: "收费标准",
-                        prop: "unitNo",
-                        overHidden: true,
-                    },
-                    {
-                        label: "单价",
-                        prop: "price",
-                        overHidden: true,
-                    },
-                    {
-                        label: "数量",
-                        prop: "quantity",
-                        overHidden: true,
-                    },
-                    {
-                        label: "金额",
-                        prop: "amount",
-                        overHidden: true,
-                    },
-                ]
-            },
             isShow: true,
-            form: {},
+            form: {
+            },
             query: {
-                checkbox: [],
-                businessType: 'MYDL',
+                type: 1
             },
             loading: false,
             page: {
@@ -158,32 +44,6 @@ export default {
                 total: 0
             },
             selectionList: [],
-            statusList: [
-                {
-                    label: '已开船',
-                    value: 'whetherSail'
-                },
-                {
-                    label: '已到港',
-                    value: 'whetherReachHarbor'
-                },
-                {
-                    label: '已通关',
-                    value: 'whetherClearance'
-                },
-                {
-                    label: '已派车',
-                    value: 'whetherDispatchCar'
-                },
-                {
-                    label: '已完成',
-                    value: 'whetherComplete'
-                },
-                {
-                    label: '已取消',
-                    value: 'whetherCancel'
-                }
-            ],
             option: {},
             optionBack: {
                 height: 'auto',
@@ -191,7 +51,7 @@ export default {
                 menuWidth: 140,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 6,
+                searchMenuSpan: 12,
                 border: true,
                 index: true,
                 addBtn: false,
@@ -204,382 +64,50 @@ export default {
                 searchIndex: 3,
                 column: [
                     {
-                        label: "客户名称",
-                        prop: "corpId",
-                        overHidden: true,
-                        search: true,
-                        type: 'select',
-                        filterable: true,
-                        remote: true,
-                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
-                        props: {
-                            label: 'cnName',
-                            value: 'id',
-                            res: 'data.records'
-                        },
-                        hide: true,
-                        showColumn: false,
-                        searchOrder: 1,
-                    },
-                    {
-                        label: "客户名称",
-                        prop: "corpName",
-                        width: "120",
-                        overHidden: true,
-                    },
-                    {
-                        label: "合同号",
-                        prop: "contractNo",
-                        width: "140",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 2,
-                    },
-                    {
-                        label: "提单号",
-                        prop: "billNo",
-                        width: "100",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 3,
-                    },
-                    {
-                        label: "放单方式",
-                        prop: "orderReleaseMethod",
-                        width: "120",
-                        overHidden: true,
-                    },
-                    {
-                        label: "订单号",
-                        prop: "orderNo",
-                        width: "80",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 9,
-                    },
-                    {
-                        label: "箱号",
-                        prop: "boxNo",
-                        width: "80",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 4,
-                    },
-                    {
-                        label: "订单状态",
-                        prop: "orderStatus",
-                        width: "150",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 14,
-                        type: "select",
-                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=order_Status",
-                        props: {
-                            label: "dictValue",
-                            value: "dictValue"
-                        }
-                    },
-                    {
-                        label: "审核状态",
-                        prop: "businessStatus",
-                        width: "100",
-                        overHidden: true,
-                    },
-                    // {
-                    //     label: "收货款",
-                    //     prop: "whetherReceivedDownPayments",
-                    //     width: "120",
-                    //     overHidden: true,
-                    // },
-                    // {
-                    //     label: "付汇",
-                    //     prop: "whetherReceivedBalancePayment",
-                    //     width: "120",
-                    //     overHidden: true,
-                    // },
-                    {
-                        label: "审单状态",
-                        prop: "reviewStatus",
-                        width: "100",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 15,
-                        type: "select",
-                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=audit_status",
-                        props: {
-                            label: "dictValue",
-                            value: "dictValue"
-                        },
-                        hide: true,
-                        showColumn: false,
-                    },
-                    {
-                        label: '操作员',
-                        prop: 'operatorName',
-                        search: true,
-                        searchOrder: 16,
-                        overHidden: true
-                    },
-                    {
-                        label: "合同日期",
-                        prop: "contractDate",
-                        width: "120",
-                        search: true,
-                        searchOrder: 5,
-                        searchProp: "contractDateList",
-                        type: "date",
-                        unlinkPanels: true,
-                        searchRange: true,
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                        searchDefaultTime: ["00:00:00", "23:59:59"],
-                    },
-                    {
-                        label: "国家",
-                        prop: "country",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
-                        label: "通关进度",
-                        prop: "clearanceSpeedOfProgress",
-                        width: "120",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 11,
-                    },
-                    {
-                        label: '国外发货人',
-                        prop: "abroadConsignorId",
-                        width: "120",
+                        label: "业务类型",
+                        prop: "businessType",
                         search: true,
-                        type: 'select',
-                        filterable: true,
-                        remote: true,
-                        searchOrder: 12,
-                        dicUrl: "/api/blade-los/bcorps/listByType?corpTypeName=国外工厂&cnName={{key}}",
-                        props: {
-                            label: 'cnName',
-                            value: 'id',
-                            res: 'data.records'
-                        },
-                        hide: true,
-                        showColumn: false,
-                    },
-                    {
-                        label: "国外发货人",
-                        prop: "abroadConsignorCname",
-                        width: "120",
                         overHidden: true,
-                    },
-                    {
-                        label: '国内收货人',
-                        prop: "domesticConsigneeId",
-                        width: "120",
-                        search: true,
                         type: 'select',
-                        filterable: true,
-                        remote: true,
-                        searchOrder: 13,
-                        dicUrl: "/api/blade-los/bcorps/listByType?corpTypeName=国内贸易商&cnName={{key}}",
-                        props: {
-                            label: 'cnName',
-                            value: 'id',
-                            res: 'data.records'
-                        },
-                        hide: true,
-                        showColumn: false,
-                    },
-                    {
-                        label: "国内收货人",
-                        prop: "domesticConsigneeCname",
-                        width: "120",
-                        overHidden: true,
-                    },
-                    {
-                        label: '资金方',
-                        prop: "fundingParty",
-                        width: "100",
-                        overHidden: true,
-                    },
-                    {
-                        label: "付汇记录",
-                        prop: "paymentRecord",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "运输方式",
-                        prop: "typeOfShipping",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "起运港",
-                        prop: "polCnName",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
-                        label: "目的港",
-                        prop: "podCnName",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
-                        label: "开船日期",
-                        prop: "etd",
-                        width: "120",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 6,
-                        searchProp: "etdList",
-                        type: "date",
-                        unlinkPanels: true,
-                        searchRange: true,
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                        searchDefaultTime: ["00:00:00", "23:59:59"],
-                    },
-                    {
-                        label: "预计到港",
-                        prop: "estimateReachHarbor",
-                        width: "120",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 7,
-                        searchProp: "estimateReachHarborList",
-                        type: "date",
-                        unlinkPanels: true,
-                        searchRange: true,
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                        searchDefaultTime: ["00:00:00", "23:59:59"],
-                    },
-                    {
-                        label: "实际到港",
-                        prop: "actualReachHarbor",
-                        width: "120",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 8,
-                        searchProp: "actualReachHarborList",
-                        type: "date",
-                        unlinkPanels: true,
-                        searchRange: true,
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                        searchDefaultTime: ["00:00:00", "23:59:59"],
-                    },
-                    {
-                        label: "PI发票号",
-                        prop: "InvoiceNo",
-                        width: "120",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 10,
-                        hide: true,
-                        showColumn: false,
-                    },
-                    {
-                        label: "币别",
-                        prop: "currency",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
-                        label: "付款方式",
-                        prop: "advanceRatio",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "预付金额(USD)",
-                        prop: "prepaidAmount",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "总金额(USD)",
-                        prop: "goodsValue",
-                        width: "100",
-                        overHidden: true
-                    },
-                    {
-                        label: "利润",
-                        prop: "profit",
-                        width: "100",
-                        overHidden: true
-                    },
-                    {
-                        label: "首款实收(USD)",
-                        prop: "firstPaidInPayment",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "尾款实收(USD)",
-                        prop: "finalPaymentReceived",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: '贸易方式',
-                        prop: "tradeMode",
-                        width: "100",
-                        overHidden: true
-                    },
-                    {
-                        label: '成交方式',
-                        prop: "transactionMethod",
-                        width: "100",
-                        overHidden: true
-                    },
-                    {
-                        label: "创建人",
-                        prop: "createUserName",
-                        width: "80",
-                        overHidden: true
+                        dicData: [{
+                            value: 'SE',
+                            label: '海运出口'
+                        }, {
+                            value: 'SI',
+                            label: '海运进口'
+                        }, {
+                            value: 'AE',
+                            label: '空运出口'
+                        }, {
+                            value: 'AI',
+                            label: '空运进口'
+                        }, {
+                            value: 'BGSE',
+                            label: '海运报关出口'
+                        }, {
+                            value: 'BGSI',
+                            label: '海运报关进口'
+                        }, {
+                            value: 'BGAE',
+                            label: '空运报关出口'
+                        }, {
+                            value: 'BGAI',
+                            label: '空运报关进口'
+                        }],
                     },
                     {
                         label: "创建日期",
                         prop: "createTime",
-                        width: "100",
-                        overHidden: true
-                    },
-                    {
-                        label: "修改人",
-                        prop: "updateUserName",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
-                        label: "修改日期",
-                        prop: "updateTime",
-                        width: "100",
-                        overHidden: true
+                        overHidden: true,
                     },
                     {
                         label: "备注",
                         prop: "remarks",
-                        width: "80",
                         overHidden: true
-                    },
-                    {
-                        label: "多选",
-                        prop: "checkbox",
-                        overHidden: true,
-                        search: true,
-                        searchSpan: 18,
-                        searchOrder: 16,
-                        hide: true,
-                        showColumn: false,
                     }
                 ]
             },
-            data: [],
-            orderStatusData: [],
-            auditStatusData: []
+            data: []
         };
     },
     components: {
@@ -587,149 +115,20 @@ export default {
         dicSelect
     },
     async created() {
-        this.option = await this.getColumnData(this.getColumnName(375), this.optionBack);
-        getWorkDicts('order_Status').then(res => {
-            this.orderStatusData = res.data.data
-        })
-        getWorkDicts('Auditstatus(T)').then(res => {
-            this.auditStatusData = res.data.data
-        })
+        this.option = await this.getColumnData(this.getColumnName(416), this.optionBack)
     },
     activated() {
-        setTimeout(() => {
-            if (this.$route.query.params || this.$route.query.home) {
-                this.isShow = false
-                this.$store.commit("IN_MYDLT_STATUS")
-            }
-        }, 100);
     },
     methods: {
-        handleCheckedChange() {
-            delete this.query.whetherSail
-            delete this.query.whetherReachHarbor
-            delete this.query.whetherClearance
-            delete this.query.whetherDispatchCar
-            delete this.query.whetherComplete
-            delete this.query.whetherCancel
-            if (this.query.checkbox) {
-                this.query.checkbox.forEach(e => {
-                    this.query[e] = 1
-                })
-            }
-        },
-        applySelectionChange(list) {
-            this.applySelectList = list;
-        },
-        applySelectHandle(selection, row) {
-            if (row.feeType) {
-                // 取消其中一个选中的时候 默认取消同单号的选中
-                if (!selection.includes(row)) {
-                    this.pickUp(false, row.feeType);
-                } else {
-                    this.pickUp(true, row.feeType);
-                }
-            }
-
-        },
-        // 需要默认勾选/取消的数据
-        pickUp(bool, feeType) {
-            let arr = [];
-            this.applyData.forEach(e => {
-                if (feeType == e.feeType) {
-                    arr.push(e)
-                }
-            })
-            this.toggleSelection(arr, bool);
-        },
-        // 默认选择/取消中的行
-        toggleSelection(rows, bool) {
-            if (rows) {
-                this.$nextTick(() => {
-                    rows.forEach(row => {
-                        this.$refs.applyCrud.toggleRowSelection(row, bool);
-                    });
-                });
-            } else {
-                this.$refs.applyCrud.clearSelection();
-            }
-        },
-        applyClosed() {
-            this.applyData = []
-        },
-        applySubmit() {
-            const loading = this.$loading({
-                lock: true,
-                text: '加载中',
-                spinner: 'el-icon-loading',
-                background: 'rgba(255,255,255,0.7)'
-            });
-            generate(this.applySelectList).then(res => {
-                this.$message.success("生成成功");
-                this.applyDialog = false;
-                this.onLoad(this.page);
-            }).finally(() => {
-                loading.close();
-            })
-        },
         addButton() {
             this.isShow = false
-            this.detailData = {
-                new: true
-            };
-            this.$store.commit("IN_MYDLT_STATUS")
-        },
-        copyButton() {
-            this.isShow = false
-            this.detailData = {
-                copyId: this.selectionList[0].itemId
-            };
-            this.$store.commit("IN_MYDLT_STATUS")
-        },
-        allClick(name) {
-            if (name == '生成申请付款') {
-                let ids = []
-                this.selectionList.forEach(item => {
-                    ids.push(item.itemId)
-                })
-                applyForPaymentList({ ids: ids.join(','), dc: 'C' }).then(res => {
-                    this.applyDialog = true
-                    this.applyData = res.data.data
-                })
-            }
-            if (name == '生成申请收款') {
-                let ids = []
-                this.selectionList.forEach(item => {
-                    ids.push(item.itemId)
-                })
-                applyForPaymentList({ ids: ids.join(','), dc: 'D' }).then(res => {
-                    this.applyDialog = true
-                    this.applyData = res.data.data
-                })
-            }
+            this.detailData = {};
         },
         rowEdit(row) {
             this.detailData = {
-                id: row.itemId
+                id: row.id
             };
             this.isShow = false
-            this.$store.commit("IN_MYDLT_STATUS")
-        },
-        // 删除
-        rowDel(row, index) {
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            }).then(() => {
-                remove({ ids: row.itemId }).then(res => {
-                    this.onLoad(this.page, this.query);
-                    this.$message.success("成功删除");
-                })
-            })
-
-        },
-        // 编辑
-        inEdit(row) {
         },
         searchReset() {
             this.query = this.$options.data().query;
@@ -770,45 +169,32 @@ export default {
                 this.loading = false;
             })
         },
+        // 删除
+        rowDel(row) {
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                remove({ ids: row.id }).then(res => {
+                    this.onLoad(this.page, this.query);
+                    this.$message.success("成功删除");
+                })
+            })
+        },
         // 详情的返回列表
         goBack() {
             // 初始化数据
             if (JSON.stringify(this.$route.query) != "{}") {
                 this.$router.$avueRouter.closeTag();
                 this.$router.push({
-                    path: "/tradeAgency/tradeAgency/index"
+                    path: "/serviceConfiguration/modifyData/index"
                 });
             }
             this.detailData = {}
             this.isShow = true;
-            this.$store.commit("OUT_MYDLT_STATUS")
             this.onLoad(this.page, this.query);
         },
-        outExport() {
-            let config = { params: { ...this.query } }
-            if (config.params) {
-                for (const propName of Object.keys(config.params)) {
-                    const value = config.params[propName];
-                    if (value !== null && typeof (value) !== "undefined") {
-                        if (value instanceof Array) {
-                            for (const key of Object.keys(value)) {
-                                let params = propName + '[' + key + ']';
-                                config.params[params] = value[key]
-                            }
-                            delete config.params[propName]
-                        }
-                    }
-                }
-            }
-            const routeData = this.$router.resolve({
-                path: '/api/blade-los/agentview/export',      //跳转目标窗口的地址
-                query: {
-                    ...config.params,    //括号内是要传递给新窗口的参数
-                    identification: this.url
-                }
-            })
-            window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
-        },
         //自定义列保存
         async saveColumn(ref, option, optionBack, code) {
             /**
@@ -852,7 +238,7 @@ export default {
 }
 
 </script>
-  
+
 <style scoped>
 ::v-deep#out-table .back-one {
     background: #ecf5ff !important;
@@ -872,5 +258,4 @@ export default {
 ::v-deep .el-col-md-8 {
     width: 24.33333%;
 }
-</style>
-  
+</style>

src/views/serviceConfiguration/modifyData/index.vue

@@ -15,9 +15,14 @@
                         </el-tabs>
                     </div>
                 </template>
+                <template slot="menuLeft">
+                    <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">新 增
+                    </el-button>
+                </template>
                 <template slot-scope="{row}" slot="menu">
-                    <el-button type="text"  icon="el-icon-edit"
-                        @click.stop="rowEdit(row)">编辑
+                    <el-button type="text" icon="el-icon-edit" @click.stop="rowEdit(row)">编 辑
+                    </el-button>
+                    <el-button type="text" icon="el-icon-edit" @click.stop="rowDel(row)">删 除
                     </el-button>
                 </template>
             </avue-crud>
@@ -27,10 +32,8 @@
 </template>
 
 <script>
-import { getList, remove, copyAgent, applyForPaymentList, generate } from "@/api/tradeAgency/tradeAgency";
-import { getWorkDicts } from "@/api/system/dictbiz";
+import { getList, remove } from "@/api/serviceConfiguration/modifyData";
 import detailsPage from "./detailsPage";
-import { getToken } from "@/util/auth";
 import dicSelect from "@/components/dicSelect/main";
 import _ from "lodash";
 export default {
@@ -39,7 +42,8 @@ export default {
             isShow: true,
             form: {},
             query: {
-                billStatus: '处理中'
+                billStatus: '处理中',
+                type: 2
             },
             loading: false,
             page: {
@@ -68,25 +72,46 @@ export default {
                 searchIndex: 3,
                 column: [
                     {
-                        label: "业务编号",
-                        prop: "orderNo",
+                        label: "源单据单号",
+                        prop: "retrievalValue",
                         search: true,
                         overHidden: true,
                     },
                     {
-                        label: "业务日期",
-                        prop: "orderDate",
-                        overHidden: true,
-                    },
-                    {
-                        label: "源单号",
-                        prop: "oldOrderNo",
+                        label: "业务类型",
+                        prop: "businessType",
+                        search: true,
                         overHidden: true,
+                        type: 'select',
+                        dicData: [{
+                            value: 'SE',
+                            label: '海运出口'
+                        }, {
+                            value: 'SI',
+                            label: '海运进口'
+                        }, {
+                            value: 'AE',
+                            label: '空运出口'
+                        }, {
+                            value: 'AI',
+                            label: '空运进口'
+                        }, {
+                            value: 'BGSE',
+                            label: '海运报关出口'
+                        }, {
+                            value: 'BGSI',
+                            label: '海运报关进口'
+                        }, {
+                            value: 'BGAE',
+                            label: '空运报关出口'
+                        }, {
+                            value: 'BGAI',
+                            label: '空运报关进口'
+                        }],
                     },
                     {
-                        label: "业务活动",
-                        prop: "orderType",
-                        search: true,
+                        label: "创建日期",
+                        prop: "createTime",
                         overHidden: true,
                     },
                     {
@@ -96,9 +121,7 @@ export default {
                     }
                 ]
             },
-            data: [
-                { orderNo: 123455 }
-            ]
+            data: []
         };
     },
     components: {
@@ -114,9 +137,13 @@ export default {
         handleClick(tab, event) {
             this.onLoad(this.page, this.query);
         },
+        addButton() {
+            this.isShow = false
+            this.detailData = {};
+        },
         rowEdit(row) {
             this.detailData = {
-                id: row.itemId
+                id: row.id
             };
             this.isShow = false
         },
@@ -149,7 +176,7 @@ export default {
             }
             this.loading = true;
             getList(page.currentPage, page.pageSize, obj).then(res => {
-                // this.data = res.data.data.records;
+                this.data = res.data.data.records;
                 this.page.total = res.data.data.total;
                 this.$nextTick(() => {
                     this.$refs.crud.doLayout();
@@ -159,6 +186,19 @@ export default {
                 this.loading = false;
             })
         },
+        // 删除
+        rowDel(row) {
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                remove({ ids: row.id }).then(res => {
+                    this.onLoad(this.page, this.query);
+                    this.$message.success("成功删除");
+                })
+            })
+        },
         // 详情的返回列表
         goBack() {
             // 初始化数据