Переглянути джерело

供应商页面问题修改

zhanglb 3 роки тому
батько
коміт
6fe83ba581

+ 2 - 1
front-vue/src/components/Paying/index.vue

@@ -88,9 +88,10 @@ export default {
 }
 
 .zap-paying-dialog__label {
-    width: 70px;
+    width: 80px;
     margin-right: 24px;
     text-align: right;
+    white-space: nowrap;
 }
 
 .zap-paying-dialog__value {}

+ 4 - 2
front-vue/src/views/home.vue

@@ -428,7 +428,7 @@
                             :page-sizes="[5]"
                             @pagination="getOldWorkList" />
                     </el-tab-pane>
-                    <el-tab-pane label="30天内待还款汇总" name="fourth" style="height:400px">
+                    <el-tab-pane label="30天内待还款" name="fourth" style="height:400px">
                         <el-table :data="expiredList" :show-header="true">
                             <el-table-column label="融资编号" align="center" prop="zfrNumber" :show-overflow-tooltip="true" />
                             <el-table-column label="金额" align="center" prop="zfrLoanAmount" :show-overflow-tooltip="true" />
@@ -565,7 +565,7 @@
                         :page-sizes="[5]"
                         @pagination="getOldWorkList" />
                 </el-tab-pane>
-                <el-tab-pane label="30天内到期融信汇总" name="fourth" style="height:400px">
+                <el-tab-pane label="30天内待还款" name="fourth" style="height:400px">
                     <el-table :data="expiredList" :show-header="true">
                         <el-table-column label="融信编号" align="center" prop="zfiNumber" :show-overflow-tooltip="true" />
                         <el-table-column label="金额" align="center" prop="zfiAmount" :show-overflow-tooltip="true" />
@@ -1960,6 +1960,8 @@ export default {
     }
 
     .el-tabs__item {
+        width: auto;
+        padding: 0 28px;
         height: 54px;
         line-height: 54px;
         font-size: 16px;

+ 529 - 344
front-vue/src/views/service/bill/bill.vue

@@ -1,374 +1,559 @@
 <template>
-<div class="app-container zap-main">
-    <search-bar :checkList="checkList" :tableList="tableList" :selfDom="selfDom" :tableId="tableId" @query="handleQuery" @reset="resetQuery">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px">
-            <el-form-item prop="value" size="large">
-                <el-select v-model="queryParams.value" placeholder="请选择" clearable v-if="companyType !='00'" @change="change">
-                    <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-                    </el-option>
-                </el-select>
-                <el-select v-model="queryParams.value" placeholder="请选择" clearable v-if="companyType =='00'" @change="change">
-                    <el-option v-for="item in optionsPlus" :key="item.value" :label="item.label" :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item prop="queryValue" v-if="queryParams.value !='02'" size="large">
-                <el-input v-model="queryParams.queryValue" placeholder="请输入关键字模糊查询" clearable @keyup.enter.native="handleQuery" maxlength="30" />
-            </el-form-item>
-            <el-form-item prop="queryValue" v-if="queryParams.value =='02'" size="large">
-                <el-select v-model="queryParams.queryValue" placeholder="请选择账款类型" clearable>
-                    <el-option v-for="item in newOptions" :key="item.value" :label="item.label" :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="预计还款日" prop="expireDate" size="large">
-                <el-date-picker clearable unlink-panels v-model="queryParams.expireDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
-                </el-date-picker>
-            </el-form-item>
-
-        </el-form>
+  <div class="app-container zap-main">
+    <search-bar
+      :checkList="checkList"
+      :tableList="tableList"
+      :selfDom="selfDom"
+      :tableId="tableId"
+      @query="handleQuery"
+      @reset="resetQuery"
+    >
+      <el-form :model="queryParams" ref="queryForm" v-show="showSearch" label-width="80px">
+        <el-row type="flex" style="flex-wrap:wrap;">
+          <el-form-item class="zap-flex-1" prop="value" label="类型">
+            <el-select
+              class="zap-form-input--small"
+              v-model="queryParams.value"
+              placeholder="请选择"
+              clearable
+              v-if="companyType !='00'"
+              @change="change"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+            <el-select
+              v-model="queryParams.value"
+              placeholder="请选择"
+              clearable
+              v-if="companyType =='00'"
+              @change="change"
+            >
+              <el-option
+                v-for="item in optionsPlus"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            class="zap-flex-1"
+            prop="queryValue"
+            v-if="queryParams.value =='02'"
+            label="类型"
+          >
+            <el-select
+              class="zap-form-input--small"
+              v-model="queryParams.queryValue"
+              placeholder="请选择账款类型"
+              clearable
+            >
+              <el-option
+                v-for="item in newOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            class="zap-flex-1"
+            prop="queryValue"
+            v-if="queryParams.value !='02'"
+            label-width="0"
+          >
+            <el-input
+              class="zap-form-input--medium ml24"
+              v-model="queryParams.queryValue"
+              placeholder="请输入关键字模糊查询"
+              clearable
+              @keyup.enter.native="handleQuery"
+              maxlength="30"
+            />
+          </el-form-item>
+          <el-form-item class="zap-flex-1" label="到期日期" prop="expireDate">
+            <el-date-picker
+              class="zap-form-input--default"
+              clearable
+              unlink-panels
+              v-model="queryParams.expireDate"
+              value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+        </el-row>
+      </el-form>
     </search-bar>
     <div class="zap-content zap-margin-top">
-        <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['service:bill:add']">新增</el-button>
+      <el-button
+        type="primary"
+        icon="el-icon-plus"
+        @click="handleAdd"
+        v-hasPermi="['service:bill:add']"
+      >新增</el-button>
     </div>
 
     <el-row class="zap-content">
-        <el-table stripe v-loading="loading" :data="billList" row-key="categoryId" border default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-            <el-table-column label="序号" type="index" width="50" align="center">
-                <template slot-scope="scope">
-                    <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="账款编号" align="center" prop="zbiNumber" v-if="uncheckList.zbiNumber" :show-overflow-tooltip="true" />
-            <el-table-column label="账款名称" align="center" prop="zbiName" v-if="uncheckList.zbiName" :show-overflow-tooltip="true" />
-            <el-table-column label="账款类型" align="center" prop="zbiType" v-if="uncheckList.zbiType&&company.scyType!='00'" :show-overflow-tooltip="true" :formatter="typeFormat" />
-            <el-table-column label="关联融信" align="center" prop="zfiNumber" v-if="uncheckList.zfiNumber" :show-overflow-tooltip="true" />
-            <el-table-column label="应付方" align="center" prop="payerName" v-if="uncheckList.payerName" :show-overflow-tooltip="true" />
-            <el-table-column label="应收方" align="center" prop="payeeName" v-if="uncheckList.payeeName" :show-overflow-tooltip="true" />
-            <el-table-column label="账款金额" align="center" :formatter="moneyFormat" prop="zbiAmount" v-if="uncheckList.zbiAmount" :show-overflow-tooltip="true" />
-            <el-table-column label="贸易日期" align="center" prop="zbiDate" v-if="uncheckList.zbiDate" :show-overflow-tooltip="true">
-                <template slot-scope="scope">
-                    <span>{{ parseTime(new Date(scope.row.zbiDate),'{y}-{m}-{d}') }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="预计还款日" align="center" prop="zbiPayDate" v-if="uncheckList.zbiPayDate" :show-overflow-tooltip="true">
-                <template slot-scope="scope">
-                    <span>{{ parseTime(new Date(scope.row.zbiPayDate),'{y}-{m}-{d}') }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="账款状态" align="center" prop="zbiStatus" v-if="uncheckList.zbiStatus" :show-overflow-tooltip="true" :formatter="statusFormat" />
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
-                <template slot-scope="scope">
-                    <el-button class="zap-button-plain" size="mini" type="text" @click="handleDetail(scope.row)" v-show="scope.row.zfiNumber" v-hasPermi="['service:bill:detail']">详情</el-button>
-                    <el-button class="zap-button-primary" size="mini" type="text" @click="handleUpdate(scope.row)" v-show="!scope.row.zfiNumber" v-hasPermi="['service:bill:edit']">修改</el-button>
-                    <el-button class="zap-button-confirmation" size="mini" type="text" @click="handleDelete(scope.row)" v-show="!scope.row.zfiNumber" v-hasPermi="['service:bill:del']">删除</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
+      <el-table
+        stripe
+        v-loading="loading"
+        :data="billList"
+        row-key="categoryId"
+        border
+        default-expand-all
+        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      >
+        <el-table-column label="序号" type="index" width="50" align="center">
+          <template slot-scope="scope">
+            <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="账款编号"
+          align="center"
+          prop="zbiNumber"
+          v-if="uncheckList.zbiNumber"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="账款名称"
+          align="center"
+          prop="zbiName"
+          v-if="uncheckList.zbiName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="账款类型"
+          align="center"
+          prop="zbiType"
+          v-if="uncheckList.zbiType&&company.scyType!='00'"
+          :show-overflow-tooltip="true"
+          :formatter="typeFormat"
+        />
+        <el-table-column
+          label="关联融信"
+          align="center"
+          prop="zfiNumber"
+          v-if="uncheckList.zfiNumber"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="应付方"
+          align="center"
+          prop="payerName"
+          v-if="uncheckList.payerName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="应收方"
+          align="center"
+          prop="payeeName"
+          v-if="uncheckList.payeeName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="账款金额"
+          align="center"
+          :formatter="moneyFormat"
+          prop="zbiAmount"
+          v-if="uncheckList.zbiAmount"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="贸易日期"
+          align="center"
+          prop="zbiDate"
+          v-if="uncheckList.zbiDate"
+          :show-overflow-tooltip="true"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(new Date(scope.row.zbiDate),'{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="预计还款日"
+          align="center"
+          prop="zbiPayDate"
+          v-if="uncheckList.zbiPayDate"
+          :show-overflow-tooltip="true"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(new Date(scope.row.zbiPayDate),'{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="账款状态"
+          align="center"
+          prop="zbiStatus"
+          v-if="uncheckList.zbiStatus"
+          :show-overflow-tooltip="true"
+          :formatter="statusFormat"
+        />
+        <el-table-column
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
+          fixed="right"
+          width="200"
+        >
+          <template slot-scope="scope">
+            <el-button
+              class="zap-button-plain"
+              size="mini"
+              type="text"
+              @click="handleDetail(scope.row)"
+              v-show="scope.row.zfiNumber"
+              v-hasPermi="['service:bill:detail']"
+            >详情</el-button>
+            <el-button
+              class="zap-button-primary"
+              size="mini"
+              type="text"
+              @click="handleUpdate(scope.row)"
+              v-show="!scope.row.zfiNumber"
+              v-hasPermi="['service:bill:edit']"
+            >修改</el-button>
+            <el-button
+              class="zap-button-confirmation"
+              size="mini"
+              type="text"
+              @click="handleDelete(scope.row)"
+              v-show="!scope.row.zfiNumber"
+              v-hasPermi="['service:bill:del']"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
     </el-row>
 
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-
-</div>
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
 </template>
 
 <script>
-import {
-    listBill,
-    deleteBill
-} from "@/api/service/bill/bill";
-import {
-    getOwnCompany
-} from "@/api/common/company";
-import {
-    getUserProfile
-} from "@/api/system/user";
-import {
-    columnQuery,
-    columnfilter
-} from "@/api/common/columnSetting";
-import ColumnSetting from '../../../components/Table/columnSetting.vue';
-import Cookies from 'js-cookie'
-import SearchBar from '@/components/SearchBar/index.vue'
+import { listBill, deleteBill } from "@/api/service/bill/bill";
+import { getOwnCompany } from "@/api/common/company";
+import { getUserProfile } from "@/api/system/user";
+import { columnQuery, columnfilter } from "@/api/common/columnSetting";
+import ColumnSetting from "../../../components/Table/columnSetting.vue";
+import Cookies from "js-cookie";
+import SearchBar from "@/components/SearchBar/index.vue";
 export default {
-    name: "Bill",
-    components: {
-        ColumnSetting,
-        SearchBar
-    },
-    data() {
-        return {
-            options: [{
-                value: '00',
-                label: '按账款名称查询'
-            }, {
-                value: '01',
-                label: '按账款编号查询'
-            }, {
-                value: '02',
-                label: '按账款类型查询'
-            }, {
-                value: '03',
-                label: '按应收企业名称查询'
-            }, {
-                value: '04',
-                label: '按应付企业名称查询'
-            }],
-            optionsPlus: [{
-                value: '00',
-                label: '按账款名称查询'
-            }, {
-                value: '01',
-                label: '按账款编号查询'
-            }, {
-                value: '03',
-                label: '按应收企业名称查询'
-            }, {
-                value: '04',
-                label: '按应付企业名称查询'
-            }],
-            newOptions: [{
-                value: '00',
-                label: '应收账款'
-            }, {
-                value: '01',
-                label: '应付账款'
-            }],
-            value: null,
-            // 遮罩层
-            loading: false,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            //企业类型
-            companyType: null,
-            // 资料目录表格数据
-            billList: [],
-            //账款类型
-            typeOptions: [],
-            //账款状态
-            statusOptions: [],
-            // 查询参数
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
-                // zbiNumber: null,
-                // zbiName: null,
-                // zbiType: null,
-                // payeeName: null,
-                // payerName: null,
-                // zbiStatus:null,
-                value: null,
-                // queryType:null,
-                queryValue: null,
-                expireDate: null,
-            },
-            company: {},
-            //筛选按钮的数据列表,与table表头的数据一致 --显示隐藏列用
-            tableList: [{
-                    label: 'zbiNumber',
-                    value: '账款编号'
-                },
-                {
-                    label: 'zbiName',
-                    value: '账款名称'
-                },
-                {
-                    label: 'zbiType',
-                    value: '账款类型'
-                },
-                {
-                    label: 'zfiNumber',
-                    value: '关联融信'
-                },
-                {
-                    label: 'payerName',
-                    value: '应付方'
-                },
-                {
-                    label: 'payeeName',
-                    value: '应收方'
-                },
-                {
-                    label: 'zbiAmount',
-                    value: '账款金额'
-                },
-                {
-                    label: 'zbiDate',
-                    value: '贸易日期'
-                },
-                {
-                    label: 'zbiPayDate',
-                    value: '预计收/付款日期'
-                },
-                {
-                    label: 'zbiStatus',
-                    value: '账款状态'
-                }
-            ],
-            checkList: [], //筛选列选中的数据列表--显示隐藏列用
-            uncheckList: {}, //控制筛选列显示隐藏--显示隐藏列用
-            selfDom: this,
-            tableId: "/sc-service/ownBill/billList",
-        };
-    },
-    created() {
-        getUserProfile().then((response) => {
-            this.companyType = response.data.companyType
-            if ("00" == response.data.companyType) {
-                this.queryParams.value = "01"
-            } else if ("01" == response.data.companyType) {
-                this.queryParams.value = "03"
-            } else if ("02" == response.data.companyType) {
-                this.queryParams.value = "04"
-            }
-        });
-        getOwnCompany().then((response) => {
-            this.company = response.data;
-        });
-        this.getList();
-        this.getDicts("zc_bill_type").then(response => {
-            this.typeOptions = response.data;
-        });
-        this.getDicts("zc_bill_status").then(response => {
-            this.statusOptions = response.data;
-        });
-    },
-    activated() {
-        this.getList();
-        this.getDicts("zc_bill_type").then(response => {
-            this.typeOptions = response.data;
-        });
-        this.getDicts("zc_bill_status").then(response => {
-            this.statusOptions = response.data;
-        });
-    },
-    mounted() {
-        this.columnQuery();
-    },
-    methods: {
-        //列表格式化金额
-        moneyFormat(row, column, cellValue) {
-        if (cellValue == null || cellValue == undefined || cellValue == "") {
-            cellValue = "0.00";
-        }
-        cellValue += "";
-        if (!cellValue.includes(".")) {
-            cellValue += ".00";
+  name: "Bill",
+  components: {
+    ColumnSetting,
+    SearchBar
+  },
+  data() {
+    return {
+      options: [
+        {
+          value: "00",
+          label: "按账款名称查询"
+        },
+        {
+          value: "01",
+          label: "按账款编号查询"
+        },
+        {
+          value: "02",
+          label: "按账款类型查询"
+        },
+        {
+          value: "03",
+          label: "按应收企业名称查询"
+        },
+        {
+          value: "04",
+          label: "按应付企业名称查询"
         }
-        return cellValue
-            .replace(/(\d)(?=(\d{3})+\.)/g, function($0, $1) {
-            return $1 + ",";
-            })
-            .replace(/\.$/, "");
+      ],
+      optionsPlus: [
+        {
+          value: "00",
+          label: "按账款名称查询"
         },
-        //获取当前客户是否之前设置过列展示隐藏
-        columnQuery() {
-            //获取页面路径
-            var psfPagePath = window.location.pathname;
-            //用请求后台的url作为唯一标识
-            var psfTableName = this.tableId;
-            var columnForm = {};
-            columnForm.psfPagePath = psfPagePath;
-            columnForm.psfTableName = psfTableName;
-            columnQuery(columnForm).then(response => {
-                if (response.data && response.data.psfShowData) {
-                    this.checkList = response.data.psfShowData;
-                }
-                this.filter();
-            })
+        {
+          value: "01",
+          label: "按账款编号查询"
         },
-        //控制隐藏显示的函数
-        filter(checkList) {
-            if (!!checkList) {
-                this.checkList = checkList;
-            }
-            columnfilter(this.selfDom);
+        {
+          value: "03",
+          label: "按应收企业名称查询"
         },
-        /** 查询往来账款列表 */
-        getList() {
-            this.loading = true;
-            listBill(this.queryParams).then(response => {
-                this.billList = response.data.records;
-                this.total = response.data.total
-                this.loading = false;
-            });
+        {
+          value: "04",
+          label: "按应付企业名称查询"
+        }
+      ],
+      newOptions: [
+        {
+          value: "00",
+          label: "应收账款"
         },
-        // 账款类型字典翻译
-        typeFormat(row, column) {
-            return this.selectDictLabel(this.typeOptions, row.zbiType);
+        {
+          value: "01",
+          label: "应付账款"
+        }
+      ],
+      value: null,
+      // 遮罩层
+      loading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      //企业类型
+      companyType: null,
+      // 资料目录表格数据
+      billList: [],
+      //账款类型
+      typeOptions: [],
+      //账款状态
+      statusOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        // zbiNumber: null,
+        // zbiName: null,
+        // zbiType: null,
+        // payeeName: null,
+        // payerName: null,
+        // zbiStatus:null,
+        value: null,
+        // queryType:null,
+        queryValue: null,
+        expireDate: null
+      },
+      company: {},
+      //筛选按钮的数据列表,与table表头的数据一致 --显示隐藏列用
+      tableList: [
+        {
+          label: "zbiNumber",
+          value: "账款编号"
         },
-        //账款状态字典翻译
-        statusFormat(row, column) {
-            return this.selectDictLabel(this.statusOptions, row.zbiStatus);
+        {
+          label: "zbiName",
+          value: "账款名称"
         },
-        change() {
-            this.queryParams.queryValue = null
+        {
+          label: "zbiType",
+          value: "账款类型"
         },
-        // 表单重置
-        reset() {
-            this.form = {
-                dciDeptName: undefined
-            };
-            this.resetForm("form");
+        {
+          label: "zfiNumber",
+          value: "关联融信"
         },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.pageNum = 1;
-            this.getList();
+        {
+          label: "payerName",
+          value: "应付方"
         },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.resetForm("queryForm");
-            this.handleQuery();
+        {
+          label: "payeeName",
+          value: "应收方"
         },
-        /** 新增按钮操作 */
-        handleAdd(row) {
-            this.resetForm("queryForm");
-            Cookies.set("/bill/billAdd", this.$route.fullPath)
-            this.$router.push({
-                path: "/bill/billAdd"
-            });
+        {
+          label: "zbiAmount",
+          value: "账款金额"
         },
-        /** 修改按钮操作 */
-        handleUpdate(row) {
-            this.resetForm("queryForm");
-            Cookies.set("/bill/billEdit/" + row.zbiId, this.$route.fullPath)
-            this.$router.push({
-                path: "/bill/billEdit/" + row.zbiId
-            });
+        {
+          label: "zbiDate",
+          value: "贸易日期"
         },
-        /** 详情按钮操作 */
-        handleDetail(row) {
-            this.resetForm("queryForm");
-            Cookies.set("/bill/billDetail/" + row.zbiId, this.$route.fullPath)
-            this.$router.push({
-                path: "/bill/billDetail/" + row.zbiId
-            });
+        {
+          label: "zbiPayDate",
+          value: "预计收/付款日期"
         },
-        /** 删除按钮操作 */
-        handleDelete(row) {
-            var self = this
-            const zbiName = row.zbiName;
-            const zbiIds = row.zbiId;
-            this.$confirm('是否确认删除往来账款名称为"' + zbiName + '"的数据项?', "警告", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            }).then(function () {
-                self.loading = true
-                return deleteBill(zbiIds);
-            }).then(() => {
-                this.getList();
-                this.msgSuccess("删除成功");
-            }).catch(() => {
-                this.$message({
-                    type: "warning",
-                    message: "已取消删除",
-                });
-            });
+        {
+          label: "zbiStatus",
+          value: "账款状态"
+        }
+      ],
+      checkList: [], //筛选列选中的数据列表--显示隐藏列用
+      uncheckList: {}, //控制筛选列显示隐藏--显示隐藏列用
+      selfDom: this,
+      tableId: "/sc-service/ownBill/billList"
+    };
+  },
+  created() {
+    getUserProfile().then(response => {
+      this.companyType = response.data.companyType;
+      if ("00" == response.data.companyType) {
+        this.queryParams.value = "01";
+      } else if ("01" == response.data.companyType) {
+        this.queryParams.value = "03";
+      } else if ("02" == response.data.companyType) {
+        this.queryParams.value = "04";
+      }
+    });
+    getOwnCompany().then(response => {
+      this.company = response.data;
+    });
+    this.getList();
+    this.getDicts("zc_bill_type").then(response => {
+      this.typeOptions = response.data;
+    });
+    this.getDicts("zc_bill_status").then(response => {
+      this.statusOptions = response.data;
+    });
+  },
+  activated() {
+    this.getList();
+    this.getDicts("zc_bill_type").then(response => {
+      this.typeOptions = response.data;
+    });
+    this.getDicts("zc_bill_status").then(response => {
+      this.statusOptions = response.data;
+    });
+  },
+  mounted() {
+    this.columnQuery();
+  },
+  methods: {
+    //列表格式化金额
+    moneyFormat(row, column, cellValue) {
+      if (cellValue == null || cellValue == undefined || cellValue == "") {
+        cellValue = "0.00";
+      }
+      cellValue += "";
+      if (!cellValue.includes(".")) {
+        cellValue += ".00";
+      }
+      return cellValue
+        .replace(/(\d)(?=(\d{3})+\.)/g, function($0, $1) {
+          return $1 + ",";
+        })
+        .replace(/\.$/, "");
+    },
+    //获取当前客户是否之前设置过列展示隐藏
+    columnQuery() {
+      //获取页面路径
+      var psfPagePath = window.location.pathname;
+      //用请求后台的url作为唯一标识
+      var psfTableName = this.tableId;
+      var columnForm = {};
+      columnForm.psfPagePath = psfPagePath;
+      columnForm.psfTableName = psfTableName;
+      columnQuery(columnForm).then(response => {
+        if (response.data && response.data.psfShowData) {
+          this.checkList = response.data.psfShowData;
+        }
+        this.filter();
+      });
+    },
+    //控制隐藏显示的函数
+    filter(checkList) {
+      if (!!checkList) {
+        this.checkList = checkList;
+      }
+      columnfilter(this.selfDom);
+    },
+    /** 查询往来账款列表 */
+    getList() {
+      this.loading = true;
+      listBill(this.queryParams).then(response => {
+        this.billList = response.data.records;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 账款类型字典翻译
+    typeFormat(row, column) {
+      return this.selectDictLabel(this.typeOptions, row.zbiType);
+    },
+    //账款状态字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.zbiStatus);
+    },
+    change() {
+      this.queryParams.queryValue = null;
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        dciDeptName: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.resetForm("queryForm");
+      Cookies.set("/bill/billAdd", this.$route.fullPath);
+      this.$router.push({
+        path: "/bill/billAdd"
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.resetForm("queryForm");
+      Cookies.set("/bill/billEdit/" + row.zbiId, this.$route.fullPath);
+      this.$router.push({
+        path: "/bill/billEdit/" + row.zbiId
+      });
+    },
+    /** 详情按钮操作 */
+    handleDetail(row) {
+      this.resetForm("queryForm");
+      Cookies.set("/bill/billDetail/" + row.zbiId, this.$route.fullPath);
+      this.$router.push({
+        path: "/bill/billDetail/" + row.zbiId
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      var self = this;
+      const zbiName = row.zbiName;
+      const zbiIds = row.zbiId;
+      this.$confirm(
+        '是否确认删除往来账款名称为"' + zbiName + '"的数据项?',
+        "警告",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
         }
+      )
+        .then(function() {
+          self.loading = true;
+          return deleteBill(zbiIds);
+        })
+        .then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+        .catch(() => {
+          this.$message({
+            type: "warning",
+            message: "已取消删除"
+          });
+        });
     }
+  }
 };
 </script>

Різницю між файлами не показано, бо вона завелика
+ 799 - 658
front-vue/src/views/service/cost/userCostManage.vue


+ 1 - 1
front-vue/src/views/service/creditLine/creditLine.vue

@@ -76,7 +76,7 @@
             align="center"
             prop="zfsqAmount"
             show-overflow-tooltip
-            width="120" />
+            />
         <el-table-column label="利率(%)" align="center" prop="zfpcrRate" width="120" />
         <el-table-column label="已使用额度" :formatter="moneyFormat" align="center" prop="zfiAmount" width="120" />
         <el-table-column label="可用额度" :formatter="moneyFormat" align="center" prop="usableAmount" width="120" />

+ 2 - 2
front-vue/src/views/service/creditLine/detailCreditLine.vue

@@ -31,8 +31,8 @@
                 <text-item label="有效期" :value="dateTypeOptions | pickerFilter(form.zfpcrDateType, 'dictValue', 'dictLabel')"></text-item>
             </el-col>
             <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="8">
-                <el-form-item label="有效期范围:" prop="dateTime" v-if="this.form.zfpcrDateType == '1'" size="large">
-                    <el-date-picker v-model="form.dateTime" clearable disabled unlink-panels value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
+                <el-form-item label="有效期范围:" prop="dateTime" v-if="this.form.zfpcrDateType == '1'" label-width="176px">
+                    <el-date-picker style="width: 264px;" v-model="form.dateTime" clearable disabled unlink-panels value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
                     </el-date-picker>
                 </el-form-item>
             </el-col>

+ 5 - 0
front-vue/src/views/service/financeRecord/financeRecord.vue

@@ -1593,4 +1593,9 @@ export default {
     font-size: 12px;
     color: #999999;
 }
+::v-deep .el-step__description.is-process,
+::v-deep .el-step__head.is-process{
+  color: #999999;
+  border-color: #999999;
+}
 </style>

+ 2 - 0
front-vue/src/views/service/rel/companyRel.vue

@@ -164,6 +164,7 @@
                         class="zap-margin-top"
                         v-loading="loading"
                         :data="companyRelList"
+                        border
                         stripe>
                         <el-table-column
                             label="序号"
@@ -224,6 +225,7 @@
                         <el-table-column
                             label="操作"
                             align="center"
+                            fixed="right"
                             class-name="small-padding fixed-width"
                             width="150">
                             <template slot-scope="scope">

+ 1 - 1
front-vue/src/views/service/repayment/repayment.vue

@@ -197,7 +197,7 @@
                         :formatter="applyStatusFormat"
                         :show-overflow-tooltip="true"
                         v-if="uncheckList.zfrApplyStatus" />
-                    <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+                    <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200px">
                         <template slot-scope="scope">
                             <el-button class="zap-button-plain" size="mini" type="text" @click="handleInfo(scope.row)" v-hasPermi="['service:repayment:query']">详情</el-button>
                             <el-button class="zap-button-warning" size="mini" type="text" @click="handleDown(scope.row)" v-hasPermi="['service:repayment:down']">下载</el-button>

+ 5 - 23
front-vue/src/views/system/accInf/accInf.vue

@@ -1,24 +1,6 @@
 <template>
   <div class="app-container zap-main">
-    <el-row class="zap-table-search">
-      <div class="zap-padding-end">
-        <right-toolbar
-          class="zap-right-toolbar"
-          :showSearch.sync="showSearch"
-          @queryTable="getList"
-          >收起</right-toolbar
-        >
-        <span class="zap-padding-start zap-font-title">所选条件:</span>
-        <div style="float: right; margin-right: 1%">
-          <el-button type="cyan" icon="el-icon-search" @click="handleQuery"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh" @click="resetQuery" style="float: "
-            >重置</el-button
-          >
-        </div>
-      </div>
-      <hr style="margin-top: 16px" />
+    <search-bar :hiddenSetting="true" @query="handleQuery" @reset="resetQuery">
       <el-form
         :model="queryParams"
         ref="queryForm"
@@ -26,7 +8,7 @@
         v-show="showSearch"
         label-width="100px"
       >
-        <el-form-item label="账户卡号" prop="paiAccno" size="large">
+        <el-form-item label="账户卡号" prop="paiAccno">
           <el-input
             v-model="queryParams.paiAccno"
             placeholder="请输入账户卡号"
@@ -36,7 +18,7 @@
           />
         </el-form-item>
       </el-form>
-    </el-row>
+    </search-bar>
     <div class="zap-content zap-margin-top">
       <el-button
         type="primary"
@@ -830,7 +812,7 @@ export default {
           }
         })
       })
-    
+
     },
     //交易明细按钮
     handleDetail(row){
@@ -966,4 +948,4 @@ export default {
     .divider_left{
         margin-left: -40px;
     }
-  </style>
+  </style>

+ 6 - 14
front-vue/src/views/system/accInf/accInfDetail.vue

@@ -1,18 +1,10 @@
 <template>
   <div class="app-container zap-main">
-    <el-row class="zap-table-search">
-      <div class="zap-padding-end">
-        <right-toolbar class="zap-right-toolbar" :showSearch.sync="showSearch" @queryTable="handleQuery" >收起</right-toolbar>
-        <span class="zap-padding-start zap-font-title">所选条件:</span>
-        <div style="float: right; margin-right: 1%">
-          <el-button type="cyan" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" @click="resetQuery" style="float: ">重置</el-button>
-        </div>
-      </div>
-      <hr style="margin-top: 16px" />
-      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" >
-        <el-form-item label="交易时间" prop="queryTime" size="large">
+    <search-bar :hiddenSetting="true" @query="handleQuery" @reset="resetQuery">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px" >
+        <el-form-item label="交易时间" prop="queryTime">
           <el-date-picker
+            class="zap-form-input--default"
             v-model="queryParams.queryTime"
             type="daterange"
             value-format="yyyyMMdd"
@@ -23,7 +15,7 @@
           </el-date-picker>
         </el-form-item>
       </el-form>
-    </el-row>
+    </search-bar>
     <el-table class="zap-table" v-loading="loading" :data="detailList.slice((currentPage-1)*pageSize,currentPage*pageSize)" @selection-change="handleSelectionChange" stripe border>
       <el-table-column label="序号" type="index" width="55" align="center" />
       <el-table-column label="交易单号" align="center" prop="HOSTFLW" />
@@ -177,7 +169,7 @@ export default {
       m = m < 10 ? ('0' + m) : m;
       var d = date.getDate() + 1;
       d = d < 10 ? ('0' + d) : d;
-      const time = y+ m+ d 
+      const time = y+ m+ d
       return time;
     },
     //查询本企业电子账户

+ 180 - 147
front-vue/src/views/system/dept/index.vue

@@ -1,105 +1,85 @@
 <template>
-  <div class="app-container">
-     <el-card class="fiche">
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList">收起</right-toolbar>
-          <span style="margin-bottom: 10px;color:#333333;font:14px Helvetica Neue, Helvetica, PingFang SC, Tahoma, Arial,sans-serif">所选条件:</span>
-         <div  style="float: right;margin-right:1%">
-            <el-button type="cyan"  icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"  style="float: ;">重置</el-button>
-         </div>
-         <hr  style="margin-top: 16px;">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
-      <el-form-item label="部门名称" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入部门名称"
-          maxlength="50"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-<!--       <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="部门状态" clearable size="small">
-          <el-option
-            v-for="dict in statusOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
+  <div class="app-container zap-main">
+    <search-bar :hiddenSetting="true" @query="handleQuery" @reset="resetQuery">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+        <el-form-item label="部门名称" prop="deptName">
+          <el-input
+            v-model="queryParams.deptName"
+            placeholder="请输入部门名称"
+            maxlength="50"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
           />
-        </el-select>
-      </el-form-item> -->
-   
-    </el-form>
-</el-card>
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+        </el-form-item>
+      </el-form>
+    </search-bar>
+    <el-row :gutter="10" class="zap-form mt20 mb8">
+      <div class="mb20">
         <el-button
           type="primary"
           icon="el-icon-plus"
-          size="mini"
           @click="handleAdd"
           v-hasPermi="['system:dept:add']"
         >新增</el-button>
-      </el-col>
-      
-    </el-row>
+      </div>
 
-    <el-table
-      v-loading="loading"
-      :data="deptList"
-      row-key="deptId"
-      default-expand-all
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-      border
-    >
-      <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
-      <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" :formatter="stateFormat">
-        <!-- <template slot-scope="scope">
+      <el-table
+        v-loading="loading"
+        :data="deptList"
+        row-key="deptId"
+        default-expand-all
+        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+        border
+      >
+        <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
+        <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" align="center" :formatter="stateFormat">
+          <!-- <template slot-scope="scope">
           <el-switch
             v-model="scope.row.status"
             active-value="0"
             inactive-value="1"
             @change="handleStatusChange(scope.row)"
           ></el-switch>
-        </template> -->
-      </el-table-column>      
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button 
-            size="mini" 
-            type="text" 
-            icon="el-icon-edit" 
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dept:edit']"
-          >修改</el-button>
-          <el-button 
-            size="mini" 
-            type="text" 
-            icon="el-icon-plus" 
-            @click="handleAdd(scope.row)"
-            v-hasPermi="['system:dept:add']"
-          >新增</el-button>
-          <el-button
-            v-if="scope.row.parentId != 0"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dept:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+          </template>-->
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['system:dept:edit']"
+            >修改</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-plus"
+              @click="handleAdd(scope.row)"
+              v-hasPermi="['system:dept:add']"
+            >新增</el-button>
+            <el-button
+              v-if="scope.row.parentId != 0"
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['system:dept:remove']"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-row>
 
     <!-- 添加或修改部门对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="640px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <!-- <el-form-item label="公司名称" prop="payroll" v-show="companyId == '000000'">
@@ -111,38 +91,68 @@
                 :value="item.scyId"
               ></el-option>
             </el-select>
-          </el-form-item> -->
+          </el-form-item>-->
           <el-col :span="24" v-if="form.parentId !== 0">
             <el-form-item label="上级部门" prop="parentId">
-              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
+              <treeselect
+                v-model="form.parentId"
+                :options="deptOptions"
+                :normalizer="normalizer"
+                placeholder="选择上级部门"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="部门名称" prop="deptName">
-              <el-input v-model="form.deptName" placeholder="请输入部门名称" maxlength="50"/>
+              <el-input
+                class="zap-form-input--small"
+                v-model="form.deptName"
+                placeholder="请输入部门名称"
+                maxlength="50"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="显示排序" prop="orderNum">
-              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+            <el-form-item label="显示排序" prop="orderNum" label-width="100px">
+              <el-input-number
+                class="zap-form-input--small"
+                v-model="form.orderNum"
+                controls-position="right"
+                :min="0"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="负责人" prop="leader">
-              <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
+              <el-input
+                class="zap-form-input--small"
+                v-model="form.leader"
+                placeholder="请输入负责人"
+                maxlength="20"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="联系电话" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
+            <el-form-item label="联系电话" prop="phone" label-width="100px">
+              <el-input
+                class="zap-form-input--small"
+                v-model="form.phone"
+                placeholder="请输入联系电话"
+                maxlength="11"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+              <el-input
+                class="zap-form-input--small"
+                v-model="form.email"
+                placeholder="请输入邮箱"
+                maxlength="50"
+              />
             </el-form-item>
           </el-col>
-<!--           <el-col :span="12">
+          <!--           <el-col :span="12">
             <el-form-item label="部门状态" v-if="leave">
               <el-radio-group v-model="form.status">
                 <el-radio
@@ -152,7 +162,7 @@
                 >{{dict.dictLabel}}</el-radio>
               </el-radio-group>
             </el-form-item>
-          </el-col> -->
+          </el-col>-->
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -164,12 +174,18 @@
 </template>
 
 <script>
-import { listDept, getDept, delDept, addDept, updateDept, changeDeptStatus,listDeptExcludeChild } from "@/api/system/dept";
+import {
+  listDept,
+  getDept,
+  delDept,
+  addDept,
+  updateDept,
+  changeDeptStatus,
+  listDeptExcludeChild
+} from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {
-  companyList
-} from "@/api/system/company";
+import { companyList } from "@/api/system/company";
 import { getUserProfile } from "@/api/system/user";
 export default {
   name: "Dept",
@@ -178,8 +194,8 @@ export default {
     return {
       // 遮罩层
       loading: true,
-       companyId:'',
-       companyList: [],
+      companyId: "",
+      companyList: [],
       // 显示搜索条件
       showSearch: true,
       // 表格树数据
@@ -215,7 +231,7 @@ export default {
         email: [
           {
             // type: "email",
-            pattern:/^([a-z0-9A-Z]+[-|_|\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\.)+[a-zA-Z]{2,}$/,
+            pattern: /^([a-z0-9A-Z]+[-|_|\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\.)+[a-zA-Z]{2,}$/,
             message: "邮箱格式不正确",
             trigger: ["blur", "change"]
           }
@@ -228,7 +244,7 @@ export default {
           }
         ]
       },
-      statusOptions:[
+      statusOptions: [
         {
           value: "0",
           label: "正常"
@@ -236,7 +252,8 @@ export default {
         {
           value: "1",
           label: "停用"
-        },]
+        }
+      ]
     };
   },
   created() {
@@ -249,12 +266,12 @@ export default {
   },
   methods: {
     /** 查询部门列表 */
-     getCompanyList(){
+    getCompanyList() {
       companyList().then(response => {
-        this.companyList = response.data
+        this.companyList = response.data;
       });
     },
-    getUserProfile(){
+    getUserProfile() {
       getUserProfile().then(response => {
         this.companyId = response.data.companyId;
       });
@@ -319,7 +336,7 @@ export default {
       this.open = true;
       this.title = "添加部门";
       listDept().then(response => {
-	        this.deptOptions = this.handleTree(response.data, "deptId");
+        this.deptOptions = this.handleTree(response.data, "deptId");
       });
     },
     /** 修改按钮操作 */
@@ -332,7 +349,7 @@ export default {
         this.title = "修改部门";
       });
       listDeptExcludeChild(row.deptId).then(response => {
-	        this.deptOptions = this.handleTree(response.data, "deptId");
+        this.deptOptions = this.handleTree(response.data, "deptId");
       });
     },
     /** 提交按钮 */
@@ -341,34 +358,38 @@ export default {
         if (valid) {
           if (this.form.deptId != undefined) {
             const loading = this.$loading({
-                lock: true,
-                text: "Loading",
-                spinner: "el-icon-loading",
-                background: "rgba(0, 0, 0, 0.7)",
-            })
-            updateDept(this.form).then(response => {
-              loading.close();
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).catch((response)=>{
-              loading.close();
+              lock: true,
+              text: "Loading",
+              spinner: "el-icon-loading",
+              background: "rgba(0, 0, 0, 0.7)"
             });
+            updateDept(this.form)
+              .then(response => {
+                loading.close();
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              })
+              .catch(response => {
+                loading.close();
+              });
           } else {
             const loading = this.$loading({
-                lock: true,
-                text: "Loading",
-                spinner: "el-icon-loading",
-                background: "rgba(0, 0, 0, 0.7)",
-            })
-            addDept(this.form).then(response => {
-              loading.close();
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).catch((response)=>{
-              loading.close();
+              lock: true,
+              text: "Loading",
+              spinner: "el-icon-loading",
+              background: "rgba(0, 0, 0, 0.7)"
             });
+            addDept(this.form)
+              .then(response => {
+                loading.close();
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              })
+              .catch(response => {
+                loading.close();
+              });
           }
         }
       });
@@ -376,42 +397,54 @@ export default {
     // 部门状态修改
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用";
-      this.$confirm('确认要"' + text + '""' + row.deptName + '"用户吗?', "警告", {
+      this.$confirm(
+        '确认要"' + text + '""' + row.deptName + '"用户吗?',
+        "警告",
+        {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
-        }).then(function() {
+        }
+      )
+        .then(function() {
           return changeDeptStatus(row.deptId, row.status);
-        }).then(() => {
+        })
+        .then(() => {
           this.msgSuccess(text + "成功");
-        }).catch(function() {
+        })
+        .catch(function() {
           row.status = row.status === "0" ? "1" : "0";
         });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$confirm('是否确认删除名称为"' + row.deptName + '"的数据项?', "警告", {
+      this.$confirm(
+        '是否确认删除名称为"' + row.deptName + '"的数据项?',
+        "警告",
+        {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
-        }).then(function() {
+        }
+      )
+        .then(function() {
           return delDept(row.deptId);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.msgSuccess("删除成功");
         })
         .catch(() => {
           this.$message({
             type: "warning",
-            message: "已取消删除",
-           
+            message: "已取消删除"
           });
-        }); 
+        });
     },
     /** 状态字典 */
-    stateFormat(row, column){
+    stateFormat(row, column) {
       return this.selectDictLabel(this.statusOptions, row.status);
-    },
+    }
   }
 };
-</script>
+</script>

Різницю між файлами не показано, бо вона завелика
+ 1674 - 1517
front-vue/src/views/system/user/index.vue