Просмотр исходного кода

财务管理新增备注
客户订舱 客户托书 海运出口 新增字段

Qukatie 3 месяцев назад
Родитель
Сommit
c17907f29e

+ 4 - 0
.prettierrc

@@ -0,0 +1,4 @@
+{
+  "printWidth": 150,
+  "tabWidth": 2           
+}

+ 14 - 0
src/router/views/index.js

@@ -4316,6 +4316,20 @@ export default [{
   }]
 },
 {
+  path: '/iosBasicData/businessCenter/customerBooking/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/iosBasicData/businessCenter/customerBooking/index',
+    name: '客户订舱',
+    meta: {
+      i18n: '/iosBasicData/businessCenter/customerBooking/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/businessCenter/customerBooking/index')
+  }]
+},
+{
   path: '/iosBasicData/boxPlan/boxPlan/index',
   component: Layout,
   hidden: true,

+ 0 - 5
src/views/iosBasicData/OceanFreightImport/bills/index.vue

@@ -1317,11 +1317,6 @@ export default {
                         overHidden: true,
                         search: true,
                         searchOrder: 18.1
-                    },
-                    {
-                        label: "remarks",
-                        prop: "remarks",
-                        overHidden: true
                     }
                 ]
             },

Разница между файлами не показана из-за своего большого размера
+ 628 - 401
src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue


+ 7 - 31
src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -220,27 +220,27 @@
                             style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #67C23A;">
                             未结
                         </span>
-                        <span v-if="row.stlDrStatusDescr == '结'"
+                        <span v-if="row.stlDrStatusDescr == '结'"
                             style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #409EFF;">
-                            
+                            结
                         </span>
-                        <span v-if="row.stlDrStatusDescr == '部分'"
+                        <span v-if="row.stlDrStatusDescr == '部分'"
                             style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #F56C6C;">
-                            部分
+                            部分
                         </span>
                     </div>
                 </template>
                 <template slot="stlCrStatusDescr" slot-scope="{ row }">
                     <div>
-                        <span v-if="row.stlCrStatusDescr == '未结'"
+                                       <span v-if="row.stlDrStatusDescr == '未结'"
                             style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #67C23A;">
                             未结
                         </span>
-                        <span v-if="row.stlCrStatusDescr == '结清'"
+                        <span v-if="row.stlDrStatusDescr == '结清'"
                             style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #409EFF;">
                             结清
                         </span>
-                        <span v-if="row.stlCrStatusDescr == '部分'"
+                        <span v-if="row.stlDrStatusDescr == '部分'"
                             style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #F56C6C;">
                             部分
                         </span>
@@ -1170,12 +1170,6 @@ export default {
                         overHidden: true
                     },
                     {
-                        label: this.$t("sea118n.ttlDebit"),
-                        prop: "applyStatus",
-                        width: "160",
-                        overHidden: true
-                    },
-                    {
                         label:this.$t("sea118n.checkStatus"),
                         prop: "checkDrStatusDescr",
                         width: "160",
@@ -1304,24 +1298,6 @@ export default {
                         overHidden: true,
                         search: true,
                         searchOrder: 19
-                    },
-                    {
-                        label: this.$t("btn118n.costTemplate"),
-                        prop: "whetherExtractCost",
-                        type: "select",
-                        dicData: [{
-                            label: '否',
-                            value: 0
-                        }, {
-                            label: '是',
-                            value: 1
-                        }],
-                        overHidden: true,
-                    },
-                    {
-                        label: "remarks",
-                        prop: "remarks",
-                        overHidden: true
                     }
                 ]
             },

Разница между файлами не показана из-за своего большого размера
+ 659 - 207
src/views/iosBasicData/businessCenter/customerBooking/detailsPage.vue


Разница между файлами не показана из-за своего большого размера
+ 573 - 221
src/views/iosBasicData/businessCenter/customerLetter/detailsPage.vue


+ 8 - 2
src/views/iosBasicData/financialManagement/PaymentApplication/index.vue

@@ -442,6 +442,12 @@ export default {
               }
             ],
           },
+          {
+            label: "备注",
+            prop: "remarks",
+            search: true,
+            overHidden: true,
+          },
         ]
       },
       data: [],
@@ -473,7 +479,7 @@ export default {
     this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
     this.option = await this.getColumnData(this.getColumnName(316.1), this.optionBack);
     if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-      this.option.searchMenuSpan = 18
+      this.option.searchMenuSpan = 12
       this.option.column.forEach(item => {
         if (item.prop == 'branchId') {
           item.search = true
@@ -783,7 +789,7 @@ export default {
       this[option] = this[optionBack];
       const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
       if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-        this.option.searchMenuSpan = 18
+        this.option.searchMenuSpan = 12
         this.option.column.forEach(item => {
           if (item.prop == 'branchId') {
             item.search = true

+ 1050 - 991
src/views/iosBasicData/financialManagement/computationCenter/index.vue

@@ -1,79 +1,112 @@
 <template>
-    <div>
-        <basic-container v-show="isShow">
-            <div style="margin-top: 10px">
-                <el-tabs type="card" v-model="tabsValue" @tab-click="handleClick">
-                    <el-tab-pane label="待付" name="C">
-                        <span slot="label">待付</span>
-                    </el-tab-pane>
-                    <el-tab-pane label="待收" name="D">
-                        <span slot="label">待收</span>
-                    </el-tab-pane>
-                    <el-tab-pane label="业务单据" name="业务单据">
-                        <span slot="label" style="color: #4c9e44">财务单据</span>
-                    </el-tab-pane>
-                    <el-tab-pane label="已完成" name="已完成"></el-tab-pane>
-                </el-tabs>
-            </div>
-            <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" id="out-table"
-                :header-cell-class-name="headerClassName" :before-open="beforeOpen" v-model="form" ref="crud"
-                :search.sync="query" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
-                @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-                @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
-                @on-load="onLoad" @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 324)"
-                @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 324)">
-                <template slot="menuLeft">
-                    <el-button v-if="tabsValue == 'C' || tabsValue == 'D'" type="primary" size="small" plain
-                        @click="chooseSettlement()">选择结算
-                    </el-button>
-                    <el-button v-if="tabsValue == 'D'" type="success" size="small" plain @click="allClick('已开已收')">已开已收
-                    </el-button>
-                    <el-button v-if="tabsValue == '业务单据'" type="primary" size="small" plain @click="addfun()">添加单据
-                    </el-button>
-                    <el-button v-if="tabsValue == '业务单据'" type="danger" size="small" plain @click="handleDelete()">一键删除
-                    </el-button>
-                    <span style="font-size: 24px;font-weight: 600;">
-                        <span style="color: #67C23A;margin-right: 10px;">
-                            本币:{{ amountSubSum.toFixed(2) }}元
-                        </span>
-                        <span style="color: #E6A23C;">
-                            外币:{{ amountSubUsdSum.toFixed(2) }}元
-                        </span>
-                    </span>
-                </template>
-                <tempalte slot="feeCnNameSearch">
-                    <dic-select v-model="query.feeCnName" placeholder="费用名称" key="id" label="cnName" res="records"
-                        url="/blade-los/bfees/list" :filterable="true" :remote="true" dataName="cnName"></dic-select>
-                </tempalte>
-                <template slot="menu" slot-scope="{row}">
-                    <el-button v-if="tabsValue == 'C' || tabsValue == 'D'" type="text" size="small"
-                        :disabled="saberUserInfo.role_name.indexOf('admin') == -1 ? saberUserInfo.role_name.indexOf('允许修改他人业务') == -1 ? saberUserInfo.user_id != row.createUser : false : false"
-                        @click="settlementfun(row)">结算
-                    </el-button>
-                    <el-button v-if="tabsValue == '业务单据' || tabsValue == '已完成'" type="text" size="small"
-                        @click="rowEdit(row)">编辑
-                    </el-button>
-                    <!--:disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false"-->
-                    <el-button v-if="tabsValue == '业务单据'" type="text" size="small"
-                        :disabled="saberUserInfo.role_name.indexOf('admin') == -1 ? saberUserInfo.role_name.indexOf('允许修改他人业务') == -1 ? saberUserInfo.user_id != row.createUser : false : false"
-                        @click="rowDel(row)">删除
-                    </el-button>
-                </template>
-                <template slot="billNo" slot-scope="{row}">
-                    <span class="pointerClick" @click="rowEdit(row)">{{ row.billNo }}
-                    </span>
-                </template>
-                <!-- <template slot="requestNo" slot-scope="{row}">
+  <div>
+    <basic-container v-show="isShow">
+      <div style="margin-top: 10px">
+        <el-tabs type="card" v-model="tabsValue" @tab-click="handleClick">
+          <el-tab-pane label="待付" name="C">
+            <span slot="label">待付</span>
+          </el-tab-pane>
+          <el-tab-pane label="待收" name="D">
+            <span slot="label">待收</span>
+          </el-tab-pane>
+          <el-tab-pane label="业务单据" name="业务单据">
+            <span slot="label" style="color: #4c9e44">财务单据</span>
+          </el-tab-pane>
+          <el-tab-pane label="已完成" name="已完成"></el-tab-pane>
+        </el-tabs>
+      </div>
+      <avue-crud
+        :option="option"
+        :table-loading="loading"
+        :data="data"
+        :page.sync="page"
+        id="out-table"
+        :header-cell-class-name="headerClassName"
+        :before-open="beforeOpen"
+        v-model="form"
+        ref="crud"
+        :search.sync="query"
+        @row-update="rowUpdate"
+        @row-save="rowSave"
+        @row-del="rowDel"
+        @search-change="searchChange"
+        @search-reset="searchReset"
+        @selection-change="selectionChange"
+        @current-change="currentChange"
+        @size-change="sizeChange"
+        @refresh-change="refreshChange"
+        @on-load="onLoad"
+        @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 324)"
+        @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 324)"
+      >
+        <template slot="menuLeft">
+          <el-button v-if="tabsValue == 'C' || tabsValue == 'D'" type="primary" size="small" plain @click="chooseSettlement()">选择结算 </el-button>
+          <el-button v-if="tabsValue == 'D'" type="success" size="small" plain @click="allClick('已开已收')">已开已收 </el-button>
+          <el-button v-if="tabsValue == '业务单据'" type="primary" size="small" plain @click="addfun()">添加单据 </el-button>
+          <el-button v-if="tabsValue == '业务单据'" type="danger" size="small" plain @click="handleDelete()">一键删除 </el-button>
+          <span style="font-size: 24px;font-weight: 600;">
+            <span style="color: #67C23A;margin-right: 10px;"> 本币:{{ amountSubSum.toFixed(2) }}元 </span>
+            <span style="color: #E6A23C;"> 外币:{{ amountSubUsdSum.toFixed(2) }}元 </span>
+          </span>
+        </template>
+        <tempalte slot="feeCnNameSearch">
+          <dic-select
+            v-model="query.feeCnName"
+            placeholder="费用名称"
+            key="id"
+            label="cnName"
+            res="records"
+            url="/blade-los/bfees/list"
+            :filterable="true"
+            :remote="true"
+            dataName="cnName"
+          ></dic-select>
+        </tempalte>
+        <template slot="menu" slot-scope="{ row }">
+          <el-button
+            v-if="tabsValue == 'C' || tabsValue == 'D'"
+            type="text"
+            size="small"
+            :disabled="
+              saberUserInfo.role_name.indexOf('admin') == -1
+                ? saberUserInfo.role_name.indexOf('允许修改他人业务') == -1
+                  ? saberUserInfo.user_id != row.createUser
+                  : false
+                : false
+            "
+            @click="settlementfun(row)"
+            >结算
+          </el-button>
+          <el-button v-if="tabsValue == '业务单据' || tabsValue == '已完成'" type="text" size="small" @click="rowEdit(row)">编辑 </el-button>
+          <!--:disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false"-->
+          <el-button
+            v-if="tabsValue == '业务单据'"
+            type="text"
+            size="small"
+            :disabled="
+              saberUserInfo.role_name.indexOf('admin') == -1
+                ? saberUserInfo.role_name.indexOf('允许修改他人业务') == -1
+                  ? saberUserInfo.user_id != row.createUser
+                  : false
+                : false
+            "
+            @click="rowDel(row)"
+            >删除
+          </el-button>
+        </template>
+        <template slot="billNo" slot-scope="{ row }">
+          <span class="pointerClick" @click="rowEdit(row)">{{ row.billNo }} </span>
+        </template>
+        <!-- <template slot="requestNo" slot-scope="{row}">
                     <span class="pointerClick" @click="editfun2(row)">{{ row.requestNo }}
                     </span>
                 </template> -->
-            </avue-crud>
-        </basic-container>
+      </avue-crud>
+    </basic-container>
 
-        <detailsPage ref="details" v-if="!isShow" :detailData="detailData" @goBack="goBack" @toAddEdit="toAddEdit"
-            :pageIds="pageIds" :key="datekey">
-        </detailsPage>
-    </div>
+    <detailsPage ref="details" v-if="!isShow" :detailData="detailData" @goBack="goBack" @toAddEdit="toAddEdit" :pageIds="pageIds" :key="datekey">
+    </detailsPage>
+  </div>
 </template>
 
 <script>
@@ -87,963 +120,989 @@ import dicSelect from "@/components/dicSelect/main";
 import { dateFormat } from "@/util/date";
 import detailsPage from "./detailsPage";
 export default {
-    components: { detailsPage, dicSelect },
-    data() {
-        return {
-            pageIds: [],
-            amountSubSum: 0,
-            amountSubUsdSum: 0,
-            datekey: Date.now(),
-            selectionList: [], // 多选的数据
-            isShow: true,
-            editSave: false, // 详情是否禁用
-            tabsValue: 'C', // tabs切换
-            // 动画
-            loading: false,
-            // 分页
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0
+  components: { detailsPage, dicSelect },
+  data() {
+    return {
+      pageIds: [],
+      amountSubSum: 0,
+      amountSubUsdSum: 0,
+      datekey: Date.now(),
+      selectionList: [], // 多选的数据
+      isShow: true,
+      editSave: false, // 详情是否禁用
+      tabsValue: "C", // tabs切换
+      // 动画
+      loading: false,
+      // 分页
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      query: {}, // 检索条件
+      data: [], // 数据
+      form: {},
+      option: {},
+      optionBack: {
+        height: "auto",
+        calcHeight: 30,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 24,
+        searchLabelWidth: "100",
+        border: true,
+        index: true,
+        selection: true,
+        dialogClickModal: false,
+        stripe: true,
+        addBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: false,
+        searchIcon: true,
+        searchIndex: 3,
+        menuWidth: "100",
+        column: [
+          {
+            label: "所属公司",
+            prop: "branchId",
+            width: "120",
+            overHidden: true,
+            hide: true,
+            showColumn: false,
+            type: "select",
+            filterable: true,
+            dicUrl: "/api/blade-system/dept/lazy-list",
+            props: {
+              label: "deptName",
+              value: "id"
             },
-            query: {}, // 检索条件
-            data: [], // 数据
-            form: {},
-            option: {},
-            optionBack: {
-                height: 'auto',
-                calcHeight: 30,
-                tip: false,
-                searchShow: true,
-                searchMenuSpan: 24,
-                searchLabelWidth: '100',
-                border: true,
-                index: true,
-                selection: true,
-                dialogClickModal: false,
-                stripe: true,
-                addBtn: false,
-                viewBtn: false,
-                delBtn: false,
-                editBtn: false,
-                searchIcon: true,
-                searchIndex: 3,
-                menuWidth: '100',
-                column: [
-                    {
-                        label: "所属公司",
-                        prop: "branchId",
-                        width: "120",
-                        overHidden: true,
-                        hide: true,
-                        showColumn: false,
-                        type: "select",
-                        filterable: true,
-                        dicUrl: "/api/blade-system/dept/lazy-list",
-                        props: {
-                            label: "deptName",
-                            value: "id",
-                        },
-                        search: false,
-                        searchOrder: 1
-                    },
-                    {
-                        label: "所属公司",
-                        prop: "branchName",
-                        width: "120",
-                        overHidden: true,
-                        hide: true,
-                        showColumn: false,
-                    },
-                    {
-                        label: "往来单位",
-                        prop: "corpCnName",
-                        search: true,
-                        overHidden: true,
-                        type: 'select',
-                        filterable: true,
-                        remote: true,
-                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
-                        dicData: [],
-                        searchOrder: 1.1,
-                        props: {
-                            label: 'cnName',
-                            value: 'cnName',
-                            res: 'data.records'
-                        },
-                    },
-                    {
-                        label: "MB/L NO",
-                        prop: "mblno",
-                        search: true,
-                        searchOrder: 2,
-                        overHidden: true
-                    },
-                    {
-                        label: "HB/L NO",
-                        prop: "hblno",
-                        search: true,
-                        searchOrder: 2.2,
-                        overHidden: true
-                    },
-                    {
-                        label: "业务类型",
-                        prop: "businessType",
-                        hide: false,
-                        overHidden: true,
-                        type: 'select',
-                        dicData: [],
-                        props: {
-                            label: "cnName",
-                            value: "code"
-                        },
-                    },
-                    {
-                        label: "业务类型",
-                        prop: "type",
-                        hide: true,
-                        overHidden: true,
-                    },
-                    {
-                        label: "JOB NO",
-                        prop: "billNo",
-                        search: true,
-                        overHidden: true,
-                    },
-                    {
-                        label: "来源单号",
-                        prop: "requestNo",
-                        search: true,
-                        overHidden: true,
-                    },
+            search: false,
+            searchOrder: 1
+          },
+          {
+            label: "所属公司",
+            prop: "branchName",
+            width: "120",
+            overHidden: true,
+            hide: true,
+            showColumn: false
+          },
+          {
+            label: "往来单位",
+            prop: "corpCnName",
+            search: true,
+            overHidden: true,
+            type: "select",
+            filterable: true,
+            remote: true,
+            dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+            dicData: [],
+            searchOrder: 1.1,
+            props: {
+              label: "cnName",
+              value: "cnName",
+              res: "data.records"
+            }
+          },
+          {
+            label: "MB/L NO",
+            prop: "mblno",
+            search: true,
+            searchOrder: 2,
+            overHidden: true
+          },
+          {
+            label: "HB/L NO",
+            prop: "hblno",
+            search: true,
+            searchOrder: 2.2,
+            overHidden: true
+          },
+          {
+            label: "业务类型",
+            prop: "businessType",
+            hide: false,
+            overHidden: true,
+            type: "select",
+            dicData: [],
+            props: {
+              label: "cnName",
+              value: "code"
+            }
+          },
+          {
+            label: "业务类型",
+            prop: "type",
+            hide: true,
+            overHidden: true
+          },
+          {
+            label: "JOB NO",
+            prop: "billNo",
+            search: true,
+            overHidden: true
+          },
+          {
+            label: "来源单号",
+            prop: "requestNo",
+            search: true,
+            overHidden: true
+          },
 
-                    {
-                        label: "发票抬头",
-                        prop: "invCorpCnName",
-                        hide: true,
-                        overHidden: true,
-                    },
-                    {
-                        label: "备注",
-                        prop: "elecRemarks",
-                        overHidden: true,
-                    },
-                    {
-                        label: "费用名称",
-                        prop: "feeCnName",
-                        search: true,
-                        overHidden: true,
-                    },
+          {
+            label: "发票抬头",
+            prop: "invCorpCnName",
+            hide: true,
+            overHidden: true
+          },
+          {
+            label: "费用名称",
+            prop: "feeCnName",
+            search: true,
+            overHidden: true
+          },
 
-                    {
-                        label: "币别",
-                        prop: "curCode",
-                        width: 60,
-                        search: true,
-                        type: 'select',
-                        filterable: true,
-                        remote: true,
-                        dicUrl: "/api/blade-los/bcurrency/page?current=1&size=5&corpTypeName=箱东&shortName={{key}}",
-                        props: {
-                            label: 'code',
-                            value: 'code',
-                            res: 'data.records'
-                        },
-                        overHidden: true
-                    },
-                    // {
-                    //     label: "申请人",
-                    //     prop: "createUserName",
-                    //     overHidden: true,
-                    // },
-                    {
-                        label: "结算日期",
-                        prop: "billDate",
-                        overHidden: true,
-                        width: "150",
-                    },
-                    {
-                        label: "结算日期起",
-                        prop: "billDateStart",
-                        search: true,
-                        overHidden: true,
-                        hide: true,
-                        searchLabelWidth: '100',
-                        type: "date",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                    },
-                    {
-                        label: "结算日期止",
-                        prop: "billDateEnd",
-                        search: true,
-                        overHidden: true,
-                        hide: true,
-                        searchLabelWidth: '100',
-                        type: "date",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                    },
-                    {
-                        label: "开票日期起",
-                        prop: "invoiceDateStart",
-                        search: false,
-                        overHidden: true,
-                        hide: true,
-                        searchLabelWidth: '100',
-                        type: "date",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                    },
-                    {
-                        label: "开票日期止",
-                        prop: "invoiceDateEnd",
-                        search: false,
-                        overHidden: true,
-                        hide: true,
-                        searchLabelWidth: '100',
-                        type: "date",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                    },
-                    {
-                        label: "单据开始日期",
-                        prop: "businessDateStart",
-                        search: true,
-                        overHidden: true,
-                        hide: true,
-                        searchLabelWidth: '100',
-                        type: "date",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                    },
-                    {
-                        label: "单据结束日期",
-                        prop: "businessDateEnd",
-                        search: true,
-                        overHidden: true,
-                        hide: true,
-                        searchLabelWidth: '100',
-                        type: "date",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                    },
-                    // {
-                    //     label: "单据日期",
-                    //     prop: "billDate",
-                    //     search:true,
-                    //     overHidden:true,
-                    //     searchProp: 'billDateList',
-                    //     type: "daterange",
-                    //     searchRange: true,
-                    //     searchDefaultTime: ["00:00:00", "23:59:59"],
-                    //     format: "yyyy-MM-dd",
-                    //     valueFormat: "yyyy-MM-dd HH:mm:ss"
-                    // },
-                    {
-                        label: "提交日期",
-                        prop: "auditDateFrom",
-                        width: "140",
-                        overHidden: true,
-                    },
-                    {
-                        label: "审核日期",
-                        prop: "auditDateTo",
-                        width: "140",
-                        overHidden: true,
-                    },
-                    {
-                        label: "收/付",
-                        prop: "dc",
-                        width: "140",
-                        search: true,
-                        type: "select",
-                        dicData: [{
-                            id: 'C',
-                            name: "付款",
-                        }, {
-                            id: 'D',
-                            name: "收款",
-                        }],
-                        props: {
-                            label: "name",
-                            value: "id",
-                        },
-                        overHidden: true,
-                    },
-                    {
-                        label: "结算人",
-                        prop: "createUserName",
-                        width: "100",
-                        search: false,
-                        hide: true,
-                        overHidden: true,
-                    },
-                    {
-                        label: "核销人",
-                        prop: "createUserNames",
-                        width: "100",
-                        search: true,
-                        hide: false,
-                        overHidden: true,
-                    },
-                    {
-                        label: "业务编号",
-                        prop: "businessNo",
-                        width: "120",
-                        // search: true,
-                        // searchOrder: 3,
-                        overHidden: true
-                    },
-                    {
-                        label: "ACCT NO",
-                        prop: "accountNo",
-                        width: "100",
-                        search: true,
-                        searchOrder: 5,
-                        overHidden: true
-                    },
-                    {
-                        label: "对账单号",
-                        prop: "checkNo",
-                        search: true,
-                        width: "100",
-                        searchOrder: 6,
-                        overHidden: true
-                    },
-                    {
-                        label: "船名",
-                        prop: "vesselCnName",
-                        search: true,
-                        searchOrder: 7,
-                        overHidden: true
-                    },
-                    {
-                        label: "航次",
-                        prop: "voyageNo",
-                        search: true,
-                        searchOrder: 8,
-                        overHidden: true
-                    },
-                    {
-                        label: "发票汇率",
-                        prop: "exrate",
-                        overHidden: true,
-                        // hide: true,
-                    },
-                    {
-                        label: "是否转人民币",
-                        prop: "isExchangeToCny",
-                        overHidden: true,
-                        hide: true,
-                        width: "100",
-                        dicData: [{
-                            label: '否',
-                            value: '0'
-                        }, {
-                            label: '是',
-                            value: '1'
-                        }]
-                    },
-                    {
-                        label: "本币",
-                        prop: "amountSub",
-                        overHidden: true,
-                    },
-                    {
-                        label: "外币",
-                        prop: "amountSubUsd",
-                        overHidden: true,
-                    },
-                ]
+          {
+            label: "币别",
+            prop: "curCode",
+            width: 60,
+            search: true,
+            type: "select",
+            filterable: true,
+            remote: true,
+            dicUrl: "/api/blade-los/bcurrency/page?current=1&size=5&corpTypeName=箱东&shortName={{key}}",
+            props: {
+              label: "code",
+              value: "code",
+              res: "data.records"
+            },
+            overHidden: true
+          },
+          // {
+          //     label: "申请人",
+          //     prop: "createUserName",
+          //     overHidden: true,
+          // },
+          {
+            label: "结算日期",
+            prop: "billDate",
+            overHidden: true,
+            width: "150"
+          },
+          {
+            label: "结算日期起",
+            prop: "billDateStart",
+            search: true,
+            overHidden: true,
+            hide: true,
+            searchLabelWidth: "100",
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
+          },
+          {
+            label: "结算日期止",
+            prop: "billDateEnd",
+            search: true,
+            overHidden: true,
+            hide: true,
+            searchLabelWidth: "100",
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
+          },
+          {
+            label: "开票日期起",
+            prop: "invoiceDateStart",
+            search: false,
+            overHidden: true,
+            hide: true,
+            searchLabelWidth: "100",
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
+          },
+          {
+            label: "开票日期止",
+            prop: "invoiceDateEnd",
+            search: false,
+            overHidden: true,
+            hide: true,
+            searchLabelWidth: "100",
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
+          },
+          {
+            label: "单据开始日期",
+            prop: "businessDateStart",
+            search: true,
+            overHidden: true,
+            hide: true,
+            searchLabelWidth: "100",
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
+          },
+          {
+            label: "单据结束日期",
+            prop: "businessDateEnd",
+            search: true,
+            overHidden: true,
+            hide: true,
+            searchLabelWidth: "100",
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
+          },
+          // {
+          //     label: "单据日期",
+          //     prop: "billDate",
+          //     search:true,
+          //     overHidden:true,
+          //     searchProp: 'billDateList',
+          //     type: "daterange",
+          //     searchRange: true,
+          //     searchDefaultTime: ["00:00:00", "23:59:59"],
+          //     format: "yyyy-MM-dd",
+          //     valueFormat: "yyyy-MM-dd HH:mm:ss"
+          // },
+          {
+            label: "提交日期",
+            prop: "auditDateFrom",
+            width: "140",
+            overHidden: true
+          },
+          {
+            label: "审核日期",
+            prop: "auditDateTo",
+            width: "140",
+            overHidden: true
+          },
+          {
+            label: "收/付",
+            prop: "dc",
+            width: "140",
+            search: true,
+            type: "select",
+            dicData: [
+              {
+                id: "C",
+                name: "付款"
+              },
+              {
+                id: "D",
+                name: "收款"
+              }
+            ],
+            props: {
+              label: "name",
+              value: "id"
             },
-            saberUserInfo: {}, // 当前登录人个人信息
-            detailData: {},
+            overHidden: true
+          },
+          {
+            label: "结算人",
+            prop: "createUserName",
+            width: "100",
+            search: false,
+            hide: true,
+            overHidden: true
+          },
+          {
+            label: "核销人",
+            prop: "createUserNames",
+            width: "100",
+            search: true,
+            hide: false,
+            overHidden: true
+          },
+          {
+            label: "业务编号",
+            prop: "businessNo",
+            width: "120",
+            // search: true,
+            // searchOrder: 3,
+            overHidden: true
+          },
+          {
+            label: "ACCT NO",
+            prop: "accountNo",
+            width: "100",
+            search: true,
+            searchOrder: 5,
+            overHidden: true
+          },
+          {
+            label: "对账单号",
+            prop: "checkNo",
+            search: true,
+            width: "100",
+            searchOrder: 6,
+            overHidden: true
+          },
+          {
+            label: "船名",
+            prop: "vesselCnName",
+            search: true,
+            searchOrder: 7,
+            overHidden: true
+          },
+          {
+            label: "航次",
+            prop: "voyageNo",
+            search: true,
+            searchOrder: 8,
+            overHidden: true
+          },
+          {
+            label: "发票汇率",
+            prop: "exrate",
+            overHidden: true
+            // hide: true,
+          },
+          {
+            label: "是否转人民币",
+            prop: "isExchangeToCny",
+            overHidden: true,
+            hide: true,
+            width: "100",
+            dicData: [
+              {
+                label: "否",
+                value: "0"
+              },
+              {
+                label: "是",
+                value: "1"
+              }
+            ]
+          },
+          {
+            label: "本币",
+            prop: "amountSub",
+            overHidden: true
+          },
+          {
+            label: "外币",
+            prop: "amountSubUsd",
+            overHidden: true
+          },
+          {
+            label: "备注",
+            prop: "remarks",
+            search: true,
+            hide: false,
+            overHidden: true
+          },
+          {
+            label: "备注",
+            prop: "elecRemarks",
+            search: false,
+            hide: true,
+            overHidden: true
+          }
+        ]
+      },
+      saberUserInfo: {}, // 当前登录人个人信息
+      detailData: {}
+    };
+  },
+  async created() {
+    // 获取当前登录人个人信息
+    this.saberUserInfo = JSON.parse(localStorage.getItem("saber-userInfo")).content;
+    this.option = await this.getColumnData(this.getColumnName(324), this.optionBack);
+    if (this.saberUserInfo.role_name.indexOf("admin") != -1 || this.saberUserInfo.role_name.indexOf("总部") != -1) {
+      this.option.searchMenuSpan = 24;
+      this.option.column.forEach(item => {
+        if (item.prop == "branchId") {
+          item.search = true;
         }
-    },
-    async created() {
-        // 获取当前登录人个人信息
-        this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
-        this.option = await this.getColumnData(this.getColumnName(324), this.optionBack);
-        if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-            this.option.searchMenuSpan = 24
-            this.option.column.forEach(item => {
-                if (item.prop == 'branchId') {
-                    item.search = true
-                }
-                if (item.prop == 'branchName') {
-                    item.hide = false
-                    item.showColumn = true
-                }
-            })
+        if (item.prop == "branchName") {
+          item.hide = false;
+          item.showColumn = true;
         }
-        if (this.$route.query.billId) {
-            // 从审批里查看跳进来的
-            this.rowEdit({ id: this.$route.query.billId })
+      });
+    }
+    if (this.$route.query.billId) {
+      // 从审批里查看跳进来的
+      this.rowEdit({ id: this.$route.query.billId });
+    }
+    this.$store.commit("JSZX_IN_DETAIL");
+    this.getBcorpslistByTypefun();
+    this.bbusinesstypeListfun();
+  },
+  activated() {
+    setTimeout(() => {
+      if (this.$route.query.billNo) {
+        this.isShow = false;
+        this.$nextTick(() => {
+          this.$refs.settlementDetailsRef.finstlbillsDetailfun(this.$route.query.billNo);
+        });
+        this.$store.commit("JSZX_IN_DETAIL");
+      }
+    }, 100);
+  },
+  methods: {
+    allClick(name) {
+      if (name == "已开已收") {
+        let ids = [];
+        for (let item of this.selectionList) {
+          ids.push(item.id);
         }
-        this.$store.commit('JSZX_IN_DETAIL')
-        this.getBcorpslistByTypefun()
-        this.bbusinesstypeListfun()
+        this.$confirm("是否确认处理?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          openedReceived({ billId: ids.join(",") }).then(res => {
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.refreshChange();
+          });
+        });
+      }
     },
-    activated() {
-        setTimeout(() => {
-            if (this.$route.query.billNo) {
-                this.isShow = false
-                this.$nextTick(() => {
-                    this.$refs.settlementDetailsRef.finstlbillsDetailfun(this.$route.query.billNo)
-                })
-                this.$store.commit('JSZX_IN_DETAIL')
-            }
-        }, 100);
+    // 获取业务类型
+    bbusinesstypeListfun() {
+      bbusinesstypeList(1, 50).then(res => {
+        this.findObject(this.option.column, "businessType").dicData = res.data.data.records;
+      });
     },
-    methods: {
-        allClick(name) {
-            if (name == '已开已收') {
-                let ids = []
-                for (let item of this.selectionList) {
-                    ids.push(item.id)
-                }
-                this.$confirm('是否确认处理?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    openedReceived({ billId: ids.join(',') }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: '操作成功!'
-                        });
-                        this.refreshChange()
-                    })
-                })
-
-            }
-        },
-        // 获取业务类型
-        bbusinesstypeListfun() {
-            bbusinesstypeList(1, 50).then(res => {
-                this.findObject(this.option.column, "businessType").dicData = res.data.data.records
-            })
-        },
-        // 获取往来单位数据
-        getBcorpslistByTypefun() {
-            getBcorpslistByType(1, 10).then(res => {
-                this.findObject(this.option.column, "corpCnName").dicData = res.data.data.records
-            })
-        },
-        // 选择结算
-        chooseSettlement() {
-            if (this.selectionList.length === 0) {
-                this.$message.warning("请选择要结算的数据");
-                return;
-            }
-            for (let item of this.selectionList) {
-                if (item.branchName != this.selectionList[0].branchName) {
-                    return this.$message.error('请选择相同的所属公司')
-                }
-                if (item.corpId != this.selectionList[0].corpId) {
-                    return this.$message.error('请选择相同的往来单位')
-                }
-            }
-            // this.$confirm("确定将选择数据结算?", {
-            //     confirmButtonText: "确定",
-            //     cancelButtonText: "取消",
-            //     type: "warning"
-            // }).then(() => {
-            //     let arrId = this.selectionList.map(item => {
-            //         return item.id
-            //     })
-            //     this.isShow = false
-            //     this.$nextTick(() => {
-            //         this.$refs.settlementDetailsRef.generateFinStlBillsfun(arrId.join(','), this.tabsValue)
-            //     })
-            // })
-            this.$DialogForm.show({
-                title: '生成结算单',
-                width: '30%',
-                menuPosition: 'right',
-                data: {
-                    date: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00',
-                },
-                option: {
-                    submitText: '确定',
-                    emptyText: '取消',
-                    column: [
-                        {
-                            label: '结算日期',
-                            prop: 'date',
-                            span: 24,
-                            type: "date",
-                            format: "yyyy-MM-dd",
-                            valueFormat: "yyyy-MM-dd 00:00:00",
-                            rules: [{
-                                required: true,
-                                message: "请选择日期",
-                                trigger: "blur",
-                            }],
-                        },
-                    ]
-                },
-                beforeClose: (done) => {
-                    done()
-                },
-                callback: (res) => {
-                    res.done()
-                    let arrId = this.selectionList.map(item => {
-                        return item.id
-                    })
-                    this.isShow = false
-                    this.$nextTick(() => {
-                        this.$refs.details.generateFinStlBills(arrId.join(","), res.data, this.tabsValue)
-                    })
-                    res.close()
-                }
-            })
-        },
-        // 结算
-        settlementfun(row) {
-            this.$DialogForm.show({
-                title: '生成结算单',
-                width: '30%',
-                menuPosition: 'right',
-                data: {
-                    date: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00',
-                },
-                option: {
-                    submitText: '确定',
-                    emptyText: '取消',
-                    column: [
-                        {
-                            label: '结算日期',
-                            prop: 'date',
-                            span: 24,
-                            type: "date",
-                            format: "yyyy-MM-dd",
-                            valueFormat: "yyyy-MM-dd 00:00:00",
-                            rules: [{
-                                required: true,
-                                message: "请选择日期",
-                                trigger: "blur",
-                            }],
-                        },
-                    ]
-                },
-                beforeClose: (done) => {
-                    done()
-                },
-                callback: (res) => {
-                    res.done()
-                    console.log(res.data)
-                    this.isShow = false
-                    this.$nextTick(() => {
-                        this.$refs.details.generateFinStlBills(row.id, res.data, this.tabsValue)
-                    })
-                    res.close()
-                }
-            })
-        },
-        // 添加
-        addfun() {
-            this.pageIds = []
-            this.isShow = false
-        },
-        toAddEdit() {
-            this.detailData = {}
-            this.datekey = Date.now()
-            this.isShow = false
-        },
-        // 编辑
-        rowEdit(row) {
-            if (this.tabsValue == 'C') {
-                if (this.$store.getters.payAppStatus) {
-                    this.$alert("付费申请页面已存在,请关闭付费申请再进行操作", "温馨提示", {
-                        confirmButtonText: "确定",
-                        type: 'warning',
-                        callback: action => {
-                        }
-                    });
-                } else {
-                    this.$router.push({
-                        path: `/iosBasicData/financialManagement/PaymentApplication/index`,
-                        query: {
-                            id: row.id
-                        }
-                    })
-                }
-
-            } else if (this.tabsValue == 'D') {
-                if (this.$store.getters.finOutStatus) {
-                    this.$alert("销项发票页面已存在,请关闭销项发票再进行操作", "温馨提示", {
-                        confirmButtonText: "确定",
-                        type: 'warning',
-                        callback: action => {
-                        }
-                    });
-                } else {
-                    this.$router.push({
-                        path: `/iosBasicData/financialManagement/fininvoicesOutput/index`,
-                        query: {
-                            id: row.id
-                        }
-                    })
-                }
-
-            } else {
-                this.pageIds = []
-                this.data.forEach(item => {
-                    this.pageIds.push(item.id)
-                })
-                this.detailData = {
-                    id: row.id
-                };
-                this.isShow = false
-            }
-
+    // 获取往来单位数据
+    getBcorpslistByTypefun() {
+      getBcorpslistByType(1, 10).then(res => {
+        this.findObject(this.option.column, "corpCnName").dicData = res.data.data.records;
+      });
+    },
+    // 选择结算
+    chooseSettlement() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择要结算的数据");
+        return;
+      }
+      for (let item of this.selectionList) {
+        if (item.branchName != this.selectionList[0].branchName) {
+          return this.$message.error("请选择相同的所属公司");
+        }
+        if (item.corpId != this.selectionList[0].corpId) {
+          return this.$message.error("请选择相同的往来单位");
+        }
+      }
+      // this.$confirm("确定将选择数据结算?", {
+      //     confirmButtonText: "确定",
+      //     cancelButtonText: "取消",
+      //     type: "warning"
+      // }).then(() => {
+      //     let arrId = this.selectionList.map(item => {
+      //         return item.id
+      //     })
+      //     this.isShow = false
+      //     this.$nextTick(() => {
+      //         this.$refs.settlementDetailsRef.generateFinStlBillsfun(arrId.join(','), this.tabsValue)
+      //     })
+      // })
+      this.$DialogForm.show({
+        title: "生成结算单",
+        width: "30%",
+        menuPosition: "right",
+        data: {
+          date: dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00"
         },
-        // 编辑
-        editfun2(row) {
-            if (row.dc == 'C') {
-                if (this.$store.getters.payAppStatus) {
-                    this.$alert("付费申请页面已存在,请关闭付费申请再进行操作", "温馨提示", {
-                        confirmButtonText: "确定",
-                        type: 'warning',
-                        callback: action => {
-                        }
-                    });
-                } else {
-                    this.$router.push({
-                        path: `/iosBasicData/financialManagement/PaymentApplication/index`,
-                        query: {
-                            id: row.id
-                        }
-                    })
-                }
-            } else {
-                if (this.$store.getters.finOutStatus) {
-                    this.$alert("销项发票页面已存在,请关闭销项发票再进行操作", "温馨提示", {
-                        confirmButtonText: "确定",
-                        type: 'warning',
-                        callback: action => {
-                        }
-                    });
-                } else {
-                    this.$router.push({
-                        path: `/iosBasicData/financialManagement/fininvoicesOutput/index`,
-                        query: {
-                            id: row.id
-                        }
-                    })
+        option: {
+          submitText: "确定",
+          emptyText: "取消",
+          column: [
+            {
+              label: "结算日期",
+              prop: "date",
+              span: 24,
+              type: "date",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd 00:00:00",
+              rules: [
+                {
+                  required: true,
+                  message: "请选择日期",
+                  trigger: "blur"
                 }
+              ]
             }
+          ]
         },
-        // 详情的返回列表
-        goBack() {
-            // 初始化数据
-            this.pageIds = []
-            // this.detailData = this.$options.data().detailData;
-            if (JSON.stringify(this.$route.query) != "{}") {
-                this.$router.$avueRouter.closeTag();
-                this.$router.push({
-                    path: "/iosBasicData/financialManagement/computationCenter/index"
-                });
-            }
-            this.detailData = {}
-            this.isShow = true;
-            this.onLoad(this.page, this.search);
-        },
-        // tabs 切换
-        handleClick() {
-            if (this.tabsValue == 'C') {
-                this.findObject(this.option.column, "createUserName").hide = true
-                this.findObject(this.option.column, "createUserName").search = false
-                this.findObject(this.option.column, "createUserNames").hide = false
-                this.findObject(this.option.column, "createUserNames").search = true
-                // this.findObject(this.option.column, "exrate").hide = true
-                this.findObject(this.option.column, "isExchangeToCny").hide = true
-                this.findObject(this.option.column, "invCorpCnName").hide = true
-                this.findObject(this.option.column, "type").hide = true
-                this.findObject(this.option.column, "businessType").hide = false
-                this.findObject(this.option.column, "billDateStart").search = true
-                this.findObject(this.option.column, "billDateEnd").search = true
-                this.findObject(this.option.column, "businessDateStart").search = true
-                this.findObject(this.option.column, "businessDateEnd").search = true
-                this.findObject(this.option.column, "invoiceDateStart").search = false
-                this.findObject(this.option.column, "invoiceDateEnd").search = false
-            } else if (this.tabsValue == 'D') {
-                this.findObject(this.option.column, "createUserName").hide = false
-                this.findObject(this.option.column, "createUserName").search = true
-                this.findObject(this.option.column, "createUserNames").hide = true
-                this.findObject(this.option.column, "createUserNames").search = false
-                // this.findObject(this.option.column, "exrate").hide = false
-                this.findObject(this.option.column, "isExchangeToCny").hide = false
-                this.findObject(this.option.column, "invCorpCnName").hide = false
-                this.findObject(this.option.column, "type").hide = false
-                this.findObject(this.option.column, "businessType").hide = true
-                this.findObject(this.option.column, "billDateStart").search = false
-                this.findObject(this.option.column, "billDateEnd").search = false
-                this.findObject(this.option.column, "businessDateStart").search = false
-                this.findObject(this.option.column, "businessDateEnd").search = false
-                this.findObject(this.option.column, "invoiceDateStart").search = true
-                this.findObject(this.option.column, "invoiceDateEnd").search = true
-            } else {
-                this.findObject(this.option.column, "createUserName").hide = false
-                this.findObject(this.option.column, "createUserName").search = true
-                this.findObject(this.option.column, "createUserNames").hide = false
-                this.findObject(this.option.column, "createUserNames").search = true
-                this.findObject(this.option.column, "invCorpCnName").hide = true
-                this.findObject(this.option.column, "type").hide = true
-                this.findObject(this.option.column, "businessType").hide = false
-                this.findObject(this.option.column, "billDateStart").search = true
-                this.findObject(this.option.column, "billDateEnd").search = true
-                this.findObject(this.option.column, "businessDateStart").search = true
-                this.findObject(this.option.column, "businessDateEnd").search = true
-                this.findObject(this.option.column, "invoiceDateStart").search = false
-                this.findObject(this.option.column, "invoiceDateEnd").search = false
-            }
-            this.amountSubSum = 0
-            this.amountSubUsdSum = 0
-            // this.query = {};
-            this.page.currentPage = 1
-            this.selectionList = []
-            this.$set(this.query, 'billNo', '')
-            this.$set(this.query, 'corpCnName', '')
-            this.$set(this.query, 'businessDateStart', '')
-            this.$set(this.query, 'businessDateEnd', '')
-            this.onLoad(this.page)
-        },
-        // 刷新回调
-        refreshChange() {
-            console.log('刷新回调')
-            this.onLoad(this.page)
-        },
-        // 分页回调
-        currentChange(currentPage) {
-            console.log(currentPage, '分页回调')
-            this.page.currentPage = currentPage;
-        },
-        sizeChange(pageSize) {
-            console.log(pageSize, '分条回调')
-            this.page.pageSize = pageSize;
-        },
-        // 多选回调
-        selectionChange(list) {
-            this.amountSubSum = 0
-            this.amountSubUsdSum = 0
-            if (list.length) {
-                list.forEach(e => {
-                    this.amountSubSum += Number(e.amountSub)
-                    this.amountSubUsdSum += Number(e.amountSubUsd)
-                })
-            }
-            this.selectionList = list;
-        },
-        // 清空回调
-        searchReset() {
-            console.log('清空回调')
-            this.query = {};
-            this.onLoad(this.page);
+        beforeClose: done => {
+          done();
         },
-        // 搜索回调
-        searchChange(params, done) {
-            console.log(params, '搜索回调')
-            this.query = params;
-            this.page.currentPage = 1;
-            this.onLoad(this.page, params);
-            done();
-        },
-        // 一键删除
-        handleDelete() {
-            if (this.selectionList.length === 0) {
-                this.$message.warning("请选择至少一条数据");
-                return;
-            }
-            // 判断是否可以编辑别人业务 true 就没有权限
-            if (this.ModifyOthersfun()) return;
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            }).then(() => {
-                let arrId = this.selectionList.map(item => {
-                    return item.id
-                })
-                finstlbillsRemove(arrId.join(',')).then(res => {
-                    this.onLoad(this.page);
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!"
-                    });
-                })
-            })
-        },
-        // 行删除回调
-        rowDel(row) {
-            console.log('行删除回调')
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            }).then(() => {
-                finstlbillsRemove(row.id).then(res => {
-                    this.onLoad(this.page);
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!"
-                    });
-                })
-            })
+        callback: res => {
+          res.done();
+          let arrId = this.selectionList.map(item => {
+            return item.id;
+          });
+          this.isShow = false;
+          this.$nextTick(() => {
+            this.$refs.details.generateFinStlBills(arrId.join(","), res.data, this.tabsValue);
+          });
+          res.close();
+        }
+      });
+    },
+    // 结算
+    settlementfun(row) {
+      this.$DialogForm.show({
+        title: "生成结算单",
+        width: "30%",
+        menuPosition: "right",
+        data: {
+          date: dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00"
         },
-        // 判断是否可以编辑别人业务
-        ModifyOthersfun() {
-            let sumArr = []
-            const h = this.$createElement
-            // 判断是否有权限
-            if (this.saberUserInfo.role_name.indexOf('允许修改他人业务') != -1) return false
-            // 当前登录人和选择的创建人对比是不是一个人
-            for (let item of this.selectionList) {
-                if (this.saberUserInfo.user_id != item.createUser) {
-                    sumArr.push(h('p', `你没有"允许修改他人业务"权限,请重新选择数据`))
+        option: {
+          submitText: "确定",
+          emptyText: "取消",
+          column: [
+            {
+              label: "结算日期",
+              prop: "date",
+              span: 24,
+              type: "date",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd 00:00:00",
+              rules: [
+                {
+                  required: true,
+                  message: "请选择日期",
+                  trigger: "blur"
                 }
+              ]
             }
-            if (sumArr.length != 0) {
-                this.$confirm('提示', {
-                    message: h('div', sumArr),
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning"
-                }).catch(err => { })
-                return true
-            }
+          ]
         },
-        // 新增弹窗确认回调
-        rowSave(row, done, loading) {
-            console.log('新增弹窗确认回调')
+        beforeClose: done => {
+          done();
         },
-        // 编辑弹窗确认回调
-        rowUpdate(row, index, done, loading) {
-            console.log('编辑弹窗确认回调')
-            done();
-            loading();
-        },
-        // 打开弹窗的回调
-        beforeOpen(done, type) {
-            console.log(type, '打开弹窗的回调')
-            done();
-        },
-        // 列表获取数据
-        async onLoad(page, params = {}) {
-            this.loading = true;
-            let res = {}
-            if (this.tabsValue == 'C') {
-                // 调用 付费申请数据
-                res = await finstlbillsList(page.currentPage, page.pageSize, {
-                    ...Object.assign(params, this.query),
-                    businessType: 'FFSQ',
-                    status: 3,
-                    billStatus: 0,
-                })
-            } else if (this.tabsValue == 'D') {
-                // 调用 销项发票业务数据
-                res = await fininvoicesList(page.currentPage, page.pageSize, {
-                    ...Object.assign(params, this.query),
-                    type: '销项',
-                    status: 3,
-                    billStatus: 0,
-                })
-            } else if (this.tabsValue == '业务单据') {
-                // 应收应付 业务数据
-                res = await finstlbillsList(page.currentPage, page.pageSize, {
-                    ...Object.assign(params, this.query),
-                    businessType: 'STL',
-                    status: 0,
-                })
-            } else {
-                // 应收应付 业务数据 已完成
-                res = await finstlbillsList(page.currentPage, page.pageSize, {
-                    ...Object.assign(params, this.query),
-                    businessType: 'STL',
-                    status: 3,
-                })
+        callback: res => {
+          res.done();
+          console.log(res.data);
+          this.isShow = false;
+          this.$nextTick(() => {
+            this.$refs.details.generateFinStlBills(row.id, res.data, this.tabsValue);
+          });
+          res.close();
+        }
+      });
+    },
+    // 添加
+    addfun() {
+      this.pageIds = [];
+      this.isShow = false;
+    },
+    toAddEdit() {
+      this.detailData = {};
+      this.datekey = Date.now();
+      this.isShow = false;
+    },
+    // 编辑
+    rowEdit(row) {
+      if (this.tabsValue == "C") {
+        if (this.$store.getters.payAppStatus) {
+          this.$alert("付费申请页面已存在,请关闭付费申请再进行操作", "温馨提示", {
+            confirmButtonText: "确定",
+            type: "warning",
+            callback: action => {}
+          });
+        } else {
+          this.$router.push({
+            path: `/iosBasicData/financialManagement/PaymentApplication/index`,
+            query: {
+              id: row.id
             }
-            const data = res.data.data;
-            this.page.total = data.total;
-            this.data = data.records;
-            this.loading = false;
-            this.$nextTick(() => {
-                this.$refs.crud.dicInit();
-            });
-            this.$refs.crud.refreshTable();
-        },
-        //自定义列保存
-        async saveColumnTwo(ref, option, optionBack, code) {
-            /**
-             * 已定义全局方法,直接使用,saveColumnData保存列数据方法,参数传值(表格名称,当前表格的option数据)
-             * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
-             * 一定要执行异步操作,要等接口成功返回,才能执行下一行代码
-             */
-            const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
-            if (inSave) {
-                this.$message.success("保存成功");
-                //关闭窗口
-                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+          });
+        }
+      } else if (this.tabsValue == "D") {
+        if (this.$store.getters.finOutStatus) {
+          this.$alert("销项发票页面已存在,请关闭销项发票再进行操作", "温馨提示", {
+            confirmButtonText: "确定",
+            type: "warning",
+            callback: action => {}
+          });
+        } else {
+          this.$router.push({
+            path: `/iosBasicData/financialManagement/fininvoicesOutput/index`,
+            query: {
+              id: row.id
             }
-        },
-        //自定义列重置
-        async resetColumnTwo(ref, option, optionBack, code) {
-            this[option] = this[optionBack];
-            const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
-            if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-                this.option.searchMenuSpan = 24
-                this.option.column.forEach(item => {
-                    if (item.prop == 'branchId') {
-                        item.search = true
-                    }
-                    if (item.prop == 'branchName') {
-                        item.hide = false
-                        item.showColumn = true
-                    }
-                })
+          });
+        }
+      } else {
+        this.pageIds = [];
+        this.data.forEach(item => {
+          this.pageIds.push(item.id);
+        });
+        this.detailData = {
+          id: row.id
+        };
+        this.isShow = false;
+      }
+    },
+    // 编辑
+    editfun2(row) {
+      if (row.dc == "C") {
+        if (this.$store.getters.payAppStatus) {
+          this.$alert("付费申请页面已存在,请关闭付费申请再进行操作", "温馨提示", {
+            confirmButtonText: "确定",
+            type: "warning",
+            callback: action => {}
+          });
+        } else {
+          this.$router.push({
+            path: `/iosBasicData/financialManagement/PaymentApplication/index`,
+            query: {
+              id: row.id
             }
-            if (inSave) {
-                this.$message.success("重置成功");
-                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+          });
+        }
+      } else {
+        if (this.$store.getters.finOutStatus) {
+          this.$alert("销项发票页面已存在,请关闭销项发票再进行操作", "温馨提示", {
+            confirmButtonText: "确定",
+            type: "warning",
+            callback: action => {}
+          });
+        } else {
+          this.$router.push({
+            path: `/iosBasicData/financialManagement/fininvoicesOutput/index`,
+            query: {
+              id: row.id
             }
-        },
+          });
+        }
+      }
+    },
+    // 详情的返回列表
+    goBack() {
+      // 初始化数据
+      this.pageIds = [];
+      // this.detailData = this.$options.data().detailData;
+      if (JSON.stringify(this.$route.query) != "{}") {
+        this.$router.$avueRouter.closeTag();
+        this.$router.push({
+          path: "/iosBasicData/financialManagement/computationCenter/index"
+        });
+      }
+      this.detailData = {};
+      this.isShow = true;
+      this.onLoad(this.page, this.search);
+    },
+    // tabs 切换
+    handleClick() {
+      if (this.tabsValue == "C") {
+        this.findObject(this.option.column, "createUserName").hide = true;
+        this.findObject(this.option.column, "createUserName").search = false;
+        this.findObject(this.option.column, "createUserNames").hide = false;
+        this.findObject(this.option.column, "createUserNames").search = true;
+        // this.findObject(this.option.column, "exrate").hide = true
+        this.findObject(this.option.column, "isExchangeToCny").hide = true;
+        this.findObject(this.option.column, "invCorpCnName").hide = true;
+        this.findObject(this.option.column, "type").hide = true;
+        this.findObject(this.option.column, "businessType").hide = false;
+        this.findObject(this.option.column, "billDateStart").search = true;
+        this.findObject(this.option.column, "billDateEnd").search = true;
+        this.findObject(this.option.column, "businessDateStart").search = true;
+        this.findObject(this.option.column, "businessDateEnd").search = true;
+        this.findObject(this.option.column, "invoiceDateStart").search = false;
+        this.findObject(this.option.column, "invoiceDateEnd").search = false;
+        this.findObject(this.option.column, "remarks").search = true;
+        this.findObject(this.option.column, "remarks").hide = false;
+        this.findObject(this.option.column, "elecRemarks").search = false;
+        this.findObject(this.option.column, "elecRemarks").hide = true;
+      } else if (this.tabsValue == "D") {
+        this.findObject(this.option.column, "createUserName").hide = false;
+        this.findObject(this.option.column, "createUserName").search = true;
+        this.findObject(this.option.column, "createUserNames").hide = true;
+        this.findObject(this.option.column, "createUserNames").search = false;
+        // this.findObject(this.option.column, "exrate").hide = false
+        this.findObject(this.option.column, "isExchangeToCny").hide = false;
+        this.findObject(this.option.column, "invCorpCnName").hide = false;
+        this.findObject(this.option.column, "type").hide = false;
+        this.findObject(this.option.column, "businessType").hide = true;
+        this.findObject(this.option.column, "billDateStart").search = false;
+        this.findObject(this.option.column, "billDateEnd").search = false;
+        this.findObject(this.option.column, "businessDateStart").search = false;
+        this.findObject(this.option.column, "businessDateEnd").search = false;
+        this.findObject(this.option.column, "invoiceDateStart").search = true;
+        this.findObject(this.option.column, "invoiceDateEnd").search = true;
+        this.findObject(this.option.column, "remarks").search = false;
+        this.findObject(this.option.column, "remarks").hide = true;
+        this.findObject(this.option.column, "elecRemarks").search = true;
+        this.findObject(this.option.column, "elecRemarks").hide = false;
+      } else {
+        this.findObject(this.option.column, "createUserName").hide = false;
+        this.findObject(this.option.column, "createUserName").search = true;
+        this.findObject(this.option.column, "createUserNames").hide = false;
+        this.findObject(this.option.column, "createUserNames").search = true;
+        this.findObject(this.option.column, "invCorpCnName").hide = true;
+        this.findObject(this.option.column, "type").hide = true;
+        this.findObject(this.option.column, "businessType").hide = false;
+        this.findObject(this.option.column, "billDateStart").search = true;
+        this.findObject(this.option.column, "billDateEnd").search = true;
+        this.findObject(this.option.column, "businessDateStart").search = true;
+        this.findObject(this.option.column, "businessDateEnd").search = true;
+        this.findObject(this.option.column, "invoiceDateStart").search = false;
+        this.findObject(this.option.column, "invoiceDateEnd").search = false;
+        this.findObject(this.option.column, "remarks").search = true;
+        this.findObject(this.option.column, "remarks").hide = false;
+        this.findObject(this.option.column, "elecRemarks").search = false;
+        this.findObject(this.option.column, "elecRemarks").hide = true;
+      }
+      this.amountSubSum = 0;
+      this.amountSubUsdSum = 0;
+      // this.query = {};
+      this.page.currentPage = 1;
+      this.selectionList = [];
+      this.$set(this.query, "billNo", "");
+      this.$set(this.query, "corpCnName", "");
+      this.$set(this.query, "businessDateStart", "");
+      this.$set(this.query, "businessDateEnd", "");
+      this.$set(this.query, "remarks", "");
+      this.$set(this.query, "elecRemarks", "");
 
-        // 更改表格颜色
-        headerClassName(tab) {
-            //颜色间隔
-            let back = ""
-            if (tab.columnIndex >= 0 && tab.column.level === 1) {
-                if (tab.columnIndex % 2 === 0) {
-                    back = "back-one"
-                } else if (tab.columnIndex % 2 === 1) {
-                    back = "back-two"
-                }
-            }
-            return back;
-        },
+      this.onLoad(this.page);
+    },
+    // 刷新回调
+    refreshChange() {
+      console.log("刷新回调");
+      this.onLoad(this.page);
+    },
+    // 分页回调
+    currentChange(currentPage) {
+      console.log(currentPage, "分页回调");
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      console.log(pageSize, "分条回调");
+      this.page.pageSize = pageSize;
+    },
+    // 多选回调
+    selectionChange(list) {
+      this.amountSubSum = 0;
+      this.amountSubUsdSum = 0;
+      if (list.length) {
+        list.forEach(e => {
+          this.amountSubSum += Number(e.amountSub);
+          this.amountSubUsdSum += Number(e.amountSubUsd);
+        });
+      }
+      this.selectionList = list;
+    },
+    // 清空回调
+    searchReset() {
+      console.log("清空回调");
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    // 搜索回调
+    searchChange(params, done) {
+      console.log(params, "搜索回调");
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    // 一键删除
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      // 判断是否可以编辑别人业务 true 就没有权限
+      if (this.ModifyOthersfun()) return;
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        let arrId = this.selectionList.map(item => {
+          return item.id;
+        });
+        finstlbillsRemove(arrId.join(",")).then(res => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+      });
+    },
+    // 行删除回调
+    rowDel(row) {
+      console.log("行删除回调");
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        finstlbillsRemove(row.id).then(res => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+      });
+    },
+    // 判断是否可以编辑别人业务
+    ModifyOthersfun() {
+      let sumArr = [];
+      const h = this.$createElement;
+      // 判断是否有权限
+      if (this.saberUserInfo.role_name.indexOf("允许修改他人业务") != -1) return false;
+      // 当前登录人和选择的创建人对比是不是一个人
+      for (let item of this.selectionList) {
+        if (this.saberUserInfo.user_id != item.createUser) {
+          sumArr.push(h("p", `你没有"允许修改他人业务"权限,请重新选择数据`));
+        }
+      }
+      if (sumArr.length != 0) {
+        this.$confirm("提示", {
+          message: h("div", sumArr),
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).catch(err => {});
+        return true;
+      }
+    },
+    // 新增弹窗确认回调
+    rowSave(row, done, loading) {
+      console.log("新增弹窗确认回调");
+    },
+    // 编辑弹窗确认回调
+    rowUpdate(row, index, done, loading) {
+      console.log("编辑弹窗确认回调");
+      done();
+      loading();
+    },
+    // 打开弹窗的回调
+    beforeOpen(done, type) {
+      console.log(type, "打开弹窗的回调");
+      done();
+    },
+    // 列表获取数据
+    async onLoad(page, params = {}) {
+      this.loading = true;
+      let res = {};
+      if (this.tabsValue == "C") {
+        // 调用 付费申请数据
+        res = await finstlbillsList(page.currentPage, page.pageSize, {
+          ...Object.assign(params, this.query),
+          businessType: "FFSQ",
+          status: 3,
+          billStatus: 0
+        });
+      } else if (this.tabsValue == "D") {
+        // 调用 销项发票业务数据
+        res = await fininvoicesList(page.currentPage, page.pageSize, {
+          ...Object.assign(params, this.query),
+          type: "销项",
+          status: 3,
+          billStatus: 0
+        });
+      } else if (this.tabsValue == "业务单据") {
+        // 应收应付 业务数据
+        res = await finstlbillsList(page.currentPage, page.pageSize, {
+          ...Object.assign(params, this.query),
+          businessType: "STL",
+          status: 0
+        });
+      } else {
+        // 应收应付 业务数据 已完成
+        res = await finstlbillsList(page.currentPage, page.pageSize, {
+          ...Object.assign(params, this.query),
+          businessType: "STL",
+          status: 3
+        });
+      }
+      const data = res.data.data;
+      this.page.total = data.total;
+      this.data = data.records;
+      this.loading = false;
+      this.$nextTick(() => {
+        this.$refs.crud.dicInit();
+      });
+      this.$refs.crud.refreshTable();
+    },
+    //自定义列保存
+    async saveColumnTwo(ref, option, optionBack, code) {
+      /**
+       * 已定义全局方法,直接使用,saveColumnData保存列数据方法,参数传值(表格名称,当前表格的option数据)
+       * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
+       * 一定要执行异步操作,要等接口成功返回,才能执行下一行代码
+       */
+      const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
+    },
+    //自定义列重置
+    async resetColumnTwo(ref, option, optionBack, code) {
+      this[option] = this[optionBack];
+      const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+      if (this.saberUserInfo.role_name.indexOf("admin") != -1 || this.saberUserInfo.role_name.indexOf("总部") != -1) {
+        this.option.searchMenuSpan = 24;
+        this.option.column.forEach(item => {
+          if (item.prop == "branchId") {
+            item.search = true;
+          }
+          if (item.prop == "branchName") {
+            item.hide = false;
+            item.showColumn = true;
+          }
+        });
+      }
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
+    },
+
+    // 更改表格颜色
+    headerClassName(tab) {
+      //颜色间隔
+      let back = "";
+      if (tab.columnIndex >= 0 && tab.column.level === 1) {
+        if (tab.columnIndex % 2 === 0) {
+          back = "back-one";
+        } else if (tab.columnIndex % 2 === 1) {
+          back = "back-two";
+        }
+      }
+      return back;
     }
-}
+  }
+};
 </script>
 
 <style scoped>
 ::v-deep#out-table .back-one {
-    background: #ecf5ff !important;
-    text-align: center;
+  background: #ecf5ff !important;
+  text-align: center;
 }
 
 ::v-deep#out-table .back-two {
-    background: #ecf5ff !important;
-    text-align: center;
+  background: #ecf5ff !important;
+  text-align: center;
 }
 
 /deep/ .el-col-md-8 {
-    width: 24.33333%;
+  width: 24.33333%;
 }
 
 .pointerClick {
-    cursor: pointer;
-    color: #1e9fff;
+  cursor: pointer;
+  color: #1e9fff;
 }
 </style>

+ 6 - 9
src/views/iosBasicData/financialManagement/fininvoicesApplyfor/index.vue

@@ -90,7 +90,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 12,
+        searchMenuSpan: 24,
         searchIcon: true,
         searchIndex: 3,
         border: true,
@@ -630,14 +630,11 @@ export default {
                       overHidden: true,
                     },
           */
+       
           {
             label: "备注",
-            prop: "remarks",
-            rules: [{
-              required: true,
-              message: "请输入备注",
-              trigger: "blur"
-            }],
+            prop: "elecRemarks",
+            search: true,
             overHidden: true,
           },
         ]
@@ -673,7 +670,7 @@ export default {
     this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
     this.option = await this.getColumnData(this.getColumnName(320), this.optionBack);
     if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-      this.option.searchMenuSpan = 6
+      this.option.searchMenuSpan = 24
       this.option.column.forEach(item => {
         if (item.prop == 'branchId') {
           item.search = true
@@ -924,7 +921,7 @@ export default {
       this[option] = this[optionBack];
       const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
       if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-        this.option.searchMenuSpan = 6
+        this.option.searchMenuSpan =24
         this.option.column.forEach(item => {
           if (item.prop == 'branchId') {
             item.search = true

Разница между файлами не показана из-за своего большого размера
+ 654 - 604
src/views/iosBasicData/financialManagement/fininvoicesOutput/index.vue


+ 3 - 2
src/views/iosBasicData/financialManagement/finstlbills/index.vue

@@ -573,6 +573,7 @@ export default {
           {
             label: "备注",
             prop: "remarks",
+            search: true,
             overHidden: true,
           },
         ]
@@ -606,7 +607,7 @@ export default {
     this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
     this.option = await this.getColumnData(this.getColumnName(314), this.optionBack);
     if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-      this.option.searchMenuSpan = 18
+      this.option.searchMenuSpan = 12
       this.option.column.forEach(item => {
         if (item.prop == 'branchId') {
           item.search = true
@@ -904,7 +905,7 @@ export default {
       this[option] = this[optionBack];
       const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
       if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-        this.option.searchMenuSpan = 18
+        this.option.searchMenuSpan = 12
         this.option.column.forEach(item => {
           if (item.prop == 'branchId') {
             item.search = true

+ 2 - 2
vue.config.js

@@ -51,9 +51,9 @@ module.exports = {
         //本地服务接口地址
         // target: 'http://192.168.168.73:1080',
         // target: 'http://192.168.8.114:1080',
-         target: 'http://127.0.0.1:1080',
+        //  target: 'http://127.0.0.1:1080',
         // 打包地址
-       // target: 'http://113.44.105.66:10004',//服务器ip
+       target: 'http://113.44.105.66:10004',//服务器ip
         // target: 'http://192.168.161.11:10004',//服务器ip
         //  target: 'http://127.0.0.1:10004',
         // target: 'http://trade.tubaosoft.com:10004',//服务器域名

Некоторые файлы не были показаны из-за большого количества измененных файлов