财务列设置

src/views/finance/charge/index.vue

@@ -201,6 +201,7 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="showSetting = false">取 消</el-button>
+        <el-button @click="delRow" type="danger">重 置</el-button>
         <el-button type="primary" @click="save()">确 定</el-button>
       </span>
     </el-dialog>
@@ -220,88 +221,18 @@
         align="center"
         fixed
       />
-      <el-table-column label="制单人" align="center" prop="createBy" fixed />
-      <!--      <el-table-column-->
-      <!--        v-for="(item, index) in getRowList"-->
-      <!--        :key="index"-->
-      <!--        :label="item.name"-->
-      <!--        :width="item.width"-->
-      <!--        :prop="item.label"-->
-      <!--        align="center"-->
-      <!--        :fixed="item.fixed"-->
-      <!--      />-->
       <el-table-column
-        label="系统编号"
-        :show-overflow-tooltip="true"
+        v-for="(item, index) in getRowList"
+        :key="index"
+        :label="item.name"
+        :width="item.width"
+        :prop="item.label"
         align="center"
-        prop="fBillno"
-        width="120"
-      />
-      <el-table-column
-        label="货权方"
-        sortable
         :show-overflow-tooltip="true"
-        align="center"
-        prop="fCtrlcorpid"
-        width="220"
-      />
-      <el-table-column
-        label="制单日期"
-        align="center"
-        prop="createTime"
-        width="120"
-      >
-      </el-table-column>
-      <el-table-column
-        label="收费日期"
         sortable
-        align="center"
-        prop="fAccbilldate"
-        width="120"
+        :fixed="item.fixed"
       />
       <el-table-column
-        label="提单号"
-        sortable
-        align="center"
-        prop="tMblno"
-        width="120"
-      />
-      <el-table-column
-        label="收费方式"
-        align="center"
-        prop="chargingMethod"
-        :formatter="methodTypeFormat"
-      />
-      <el-table-column label="发票号" align="center" prop="invoiceNo" />
-      <el-table-column label="收款银行" align="center" prop="bank" />
-      <el-table-column label="水单号" align="center" prop="waterBillNo" />
-      <el-table-column
-        label="应收合计"
-        align="center"
-        prop="fAmtdr"
-        width="120"
-      />
-      <el-table-column
-        label="实收合计"
-        align="center"
-        prop="fAmtcr"
-        width="120"
-      />
-      <el-table-column label="未收金额" align="center" prop="" width="120" />
-      <el-table-column
-        label="备注"
-        align="center"
-        prop="fRemarks"
-        width="120"
-      />
-      <el-table-column
-        label="状态"
-        align="center"
-        prop="fBillstatus"
-        width="120"
-      >
-      </el-table-column>
-      <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -1066,7 +997,7 @@ import Global from "@/layout/components/global";
 import draggable from "vuedraggable";
 import Vue from "vue";
 import Cookies from "js-cookie";
-import { addSet, select } from "@/api/system/set";
+import { addSet, select ,} from "@/api/system/set";
 Vue.directive("dialogDrag", {
   bind(el, binding, vnode, oldVnode) {
     const dialogHeaderEl = el.querySelector(".el-dialog__header");
@@ -1131,196 +1062,110 @@ export default {
       //全屏放大
       dialogFull: false,
       drag: false,
-      setRowList: [
+      tableDate:[
         {
           surface: "1",
-          label: "fBillno",
-          name: "系统编号",
+          label: "createBy",
+          name: "制单人",
           checked: 0,
-          fixed: "fixed",
-          width: null,
+          fixed: "left",
+          width:100,
         },
         {
           surface: "2",
-          label: "fCtrlcorpid",
-          name: "货权方",
-          checked: 0,
-          width: null,
-        },
-        {
-          surface: "3",
-          label: "createTime",
-          name: "制单日期",
-          checked: 0,
-          fixed: "fixed",
-          width: null,
-        },
-        {
-          surface: "4",
-          label: "fAccbilldate",
-          name: "收费日期",
-          checked: 0,
-          width: null,
-        },
-        {
-          surface: "5",
-          label: "tMblno",
-          name: "提单号",
-          checked: 0,
-          width: null,
-        },
-        {
-          surface: "6",
-          label: "chargingMethod",
-          name: "收费方式",
-          checked: 0,
-          width: null,
-        },
-        {
-          surface: "7",
-          label: "invoiceNo",
-          name: "发票号",
-          checked: 0,
-          width: null,
-        },
-        {
-          surface: "8",
-          label: "bank",
-          name: "收款银行",
-          checked: 0,
-          width: null,
-        },
-        {
-          surface: "9",
-          label: "waterBillNo",
-          name: "水单号",
-          checked: 0,
-          width: null,
-        },
-        {
-          surface: "10",
-          label: "fAmtdr",
-          name: "应收合计",
-          checked: 0,
-          width: null,
-        },
-        {
-          surface: "11",
-          label: "fAmtcr",
-          name: "实收合计",
-          checked: 0,
-          width: null,
-        },
-        {
-          surface: "12",
-          label: "fRemarks",
-          name: "备注",
-          checked: 0,
-          width: null,
-        },
-        {
-          surface: "13",
-          label: "fBillstatus",
-          name: "状态",
-          checked: 0,
-          width: null,
-        },
-      ],
-      getRowList: [
-        {
-          surface: "1",
           label: "fBillno",
           name: "系统编号",
           checked: 0,
-          fixed: "fixed",
-          width: null,
+          fixed: "left",
+          width:100,
         },
         {
-          surface: "2",
+          surface: "3",
           label: "fCtrlcorpid",
           name: "货权方",
           checked: 0,
-          width: null,
+          width:100,
         },
         {
-          surface: "3",
+          surface: "4",
           label: "createTime",
           name: "制单日期",
           checked: 0,
-          fixed: "fixed",
-          width: null,
+          width:100,
         },
         {
-          surface: "4",
+          surface: "5",
           label: "fAccbilldate",
           name: "收费日期",
           checked: 0,
-          width: null,
+          width:100,
         },
         {
-          surface: "5",
+          surface: "6",
           label: "tMblno",
           name: "提单号",
           checked: 0,
-          width: null,
+          width:100,
         },
         {
-          surface: "6",
+          surface: "7",
           label: "chargingMethod",
           name: "收费方式",
           checked: 0,
-          width: null,
+          width:100,
         },
         {
-          surface: "7",
+          surface: "8",
           label: "invoiceNo",
           name: "发票号",
           checked: 0,
-          width: null,
+          width:100,
         },
         {
-          surface: "8",
+          surface: "9",
           label: "bank",
           name: "收款银行",
           checked: 0,
-          width: null,
+          width:100,
         },
         {
-          surface: "9",
+          surface: "10",
           label: "waterBillNo",
           name: "水单号",
           checked: 0,
-          width: null,
+          width:100,
         },
         {
-          surface: "10",
+          surface: "11",
           label: "fAmtdr",
           name: "应收合计",
           checked: 0,
-          width: null,
+          width:100,
         },
         {
-          surface: "11",
+          surface: "12",
           label: "fAmtcr",
           name: "实收合计",
           checked: 0,
-          width: null,
+          width:100,
         },
         {
-          surface: "12",
+          surface: "13",
           label: "fRemarks",
           name: "备注",
           checked: 0,
-          width: null,
+          width:100,
         },
         {
-          surface: "13",
+          surface: "14",
           label: "fBillstatus",
           name: "状态",
           checked: 0,
-          width: null,
+          width:100,
         },
       ],
+      setRowList: [],
+      getRowList:[],
       typevalue: "",
       typeoptions: [
         {
@@ -1469,6 +1314,8 @@ export default {
     ApprovalComments,
   },
   created() {
+    this.setRowList = this.tableDate;
+    this.getRowList = this.tableDate;
     this.typevalue = Cookies.get("sysType");
     this.getList();
     this.register();
@@ -1555,6 +1402,20 @@ export default {
         this.getRowList = this.setRowList.filter((e) => e.checked == 0);
       });
     },
+        //重置列表
+    delRow() {
+      this.data = {
+        tableName: "收费",
+        userId: Cookies.get("userName"),
+      };
+      resetModule(this.data).then((res) => {
+        if (res.code == 200) {
+          this.showSetting = false;
+          this.setRowList = this.tableDate;
+          this.getRowList = this.tableDate;
+        }
+      });
+    },
     //开始拖拽事件
     onStart() {
       this.drag = true;

src/views/finance/contrast/index.vue

@@ -196,6 +196,7 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="showSetting = false">取 消</el-button>
+        <el-button @click="delRow" type="danger">重 置</el-button>
         <el-button type="primary" @click="save()">确 定</el-button>
       </span>
     </el-dialog>
@@ -1015,7 +1016,7 @@ import print from "print-js";
 import ApprovalComments from "@/views/startApproval";
 import Global from "@/layout/components/global";
 import Cookies from "js-cookie";
-import { addSet, select } from "@/api/system/set";
+import { addSet, select ,resetModule} from "@/api/system/set";
 import draggable from "vuedraggable";
 import Vue from "vue";
 Vue.directive("dialogDrag", {
@@ -1093,140 +1094,73 @@ export default {
         },
       ],
       typevalue: "",
-      setRowList: [
+      tableDate:[
         {
           surface: "1",
           label: "fBillno",
           name: "系统编号",
           checked: 0,
-          fixed: "fixed",
-          width: null,
+          width: 100,
         },
         {
           surface: "2",
           label: "fCtrlcorpid",
           name: "货权方",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "3",
           label: "fCorpidName",
           name: "结算单位",
           checked: 0,
-          fixed: "fixed",
-          width: null,
+          width: 100,
         },
         {
           surface: "4",
           label: "fAccbilldate",
           name: "账单日期",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "5",
           label: "tMblno",
           name: "提单号",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "6",
           label: "fAmtdr",
           name: "金额",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "7",
           label: "fAmtcr",
           name: "对账金额",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "8",
           label: "fRemarks",
           name: "备注",
           checked: 0,
-          width: null,
+          width: 100,
         },
         {
           surface: "9",
           label: "fBillstatus",
           name: "状态",
           checked: 0,
-          width: null,
-        },
-      ],
-      getRowList: [
-        {
-          surface: "1",
-          label: "fBillno",
-          name: "系统编号",
-          checked: 0,
-          fixed: "fixed",
-          width: null,
-        },
-        {
-          surface: "2",
-          label: "fCtrlcorpid",
-          name: "货权方",
-          checked: 0,
-          width: null,
-        },
-        {
-          surface: "3",
-          label: "fCorpidName",
-          name: "结算单位",
-          checked: 0,
-          fixed: "fixed",
-          width: null,
-        },
-        {
-          surface: "4",
-          label: "fAccbilldate",
-          name: "账单日期",
-          checked: 0,
-          width: null,
-        },
-        {
-          surface: "5",
-          label: "tMblno",
-          name: "提单号",
-          checked: 0,
-          width: null,
-        },
-        {
-          surface: "6",
-          label: "fAmtdr",
-          name: "金额",
-          checked: 0,
-          width: null,
-        },
-        {
-          surface: "7",
-          label: "fAmtcr",
-          name: "对账金额",
-          checked: 0,
-          width: null,
-        },
-        {
-          surface: "8",
-          label: "fRemarks",
-          name: "备注",
-          checked: 0,
-          width: null,
-        },
-        {
-          surface: "9",
-          label: "fBillstatus",
-          name: "状态",
-          checked: 0,
-          width: null,
+          width: 100,
         },
       ],
+      setRowList: [],
+      getRowList: [],
       allCheck: false,
       showSetting: false,
       //控制结算单位是否可操作
@@ -1376,6 +1310,8 @@ export default {
     ApprovalComments,
   },
   created() {
+    this.setRowList = this.tableDate;
+    this.getRowList = this.tableDate;
     this.typevalue = Cookies.get("sysType");
     this.getList();
     this.register();
@@ -1443,6 +1379,20 @@ export default {
         this.getRowList = this.setRowList.filter((e) => e.checked == 0);
       });
     },
+    //重置列表
+    delRow() {
+      this.data = {
+        tableName: "对账",
+        userId: Cookies.get("userName"),
+      };
+      resetModule(this.data).then((res) => {
+        if (res.code == 200) {
+          this.showSetting = false;
+          this.setRowList = this.tableDate;
+          this.getRowList = this.tableDate;
+        }
+      });
+    },
     //开始拖拽事件
     onStart() {
       this.drag = true;

src/views/finance/payment/index.vue

@@ -117,12 +117,94 @@
           >导出
         </el-button>
       </el-col>
-      <right-toolbar
+      <div class="tabSetting">
+          <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
       ></right-toolbar>
+        <div style="margin: 0 12px">
+          <el-button
+            icon="el-icon-setting"
+            size="mini"
+            circle
+            @click="showSetting = !showSetting"
+          ></el-button>
+        </div>
+      </div>
     </el-row>
-
+        <el-dialog
+      title="自定义列显示"
+      :visible.sync="showSetting"
+      width="700px"
+      v-dialogDrag
+    >
+      <template slot="title">
+        <div class="avue-crud__dialog__header">
+          <span class="el-dialog__title">
+            <span
+              style="
+                display: inline-block;
+                width: 3px;
+                height: 20px;
+                margin-right: 5px;
+                float: left;
+                margin-top: 2px;
+              "
+            ></span>
+          </span>
+        </div>
+      </template>
+      <div>配置排序列数据（拖动调整顺序）</div>
+      <div style="margin-left: 17px">
+        <el-checkbox
+          v-model="allCheck"
+          label="全选"
+          @change="allChecked"
+        ></el-checkbox>
+      </div>
+      <div style="padding: 4px; display: flex; justify-content: center">
+        <draggable
+          v-model="setRowList"
+          group="site"
+          animation="300"
+          @start="onStart"
+          @end="onEnd"
+          handle=".indraggable"
+        >
+          <transition-group>
+            <div
+              v-for="item in setRowList"
+              :key="item.surface"
+              class="listStyle"
+            >
+              <div style="width: 500px" class="indraggable">
+                <div class="progress" :style="{ width: item.width + 'px' }">
+                  <el-checkbox
+                    :label="item.name"
+                    v-model="item.checked"
+                    :true-label="0"
+                    :false-label="1"
+                    >{{ item.name }}
+                  </el-checkbox>
+                </div>
+              </div>
+              <el-input-number
+                v-model.number="item.width"
+                controls-position="right"
+                :min="1"
+                :max="500"
+                size="mini"
+              ></el-input-number>
+            </div>
+          </transition-group>
+        </draggable>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="showSetting = false">取 消</el-button>
+        <el-button @click="delRow" type="danger">重 置</el-button>
+        <el-button type="primary" @click="save()">确 定</el-button>
+      </span>
+    </el-dialog>
     <el-table
       v-loading="loading"
       :data="chargeList"
@@ -138,91 +220,18 @@
         align="center"
         fixed
       />
-      <el-table-column label="制单人" align="center" prop="createBy" fixed />
-      <el-table-column
-        label="系统编号"
-        :show-overflow-tooltip="true"
+       <el-table-column
+        v-for="(item, index) in getRowList"
+        :key="index"
+        :label="item.name"
+        :width="item.width"
+        :prop="item.label"
         align="center"
-        prop="fBillno"
-        width="120"
-      />
-      <el-table-column
-        label="货权方"
         :show-overflow-tooltip="true"
         sortable
-        align="center"
-        prop="fCtrlcorpid"
-        width="220"
-      />
-      <!--      <el-table-column label="账单日期" align="center" prop="fAccbilldate" width="180">-->
-      <!--        <template slot-scope="scope">-->
-      <!--          <span>{{ parseTime(scope.row.fAccbilldate, '{y}-{m}-{d}') }}</span>-->
-      <!--        </template>-->
-      <!--      </el-table-column>-->
-      <!--      <el-table-column label="制单部门" align="center" prop="fId"/>-->
-      <el-table-column
-        label="制单日期"
-        align="center"
-        prop="createTime"
-        width="120"
-      >
-      </el-table-column>
-      <el-table-column label="付费日期" align="center" sortable width="120">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.fAccbilldate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="提单号"
-        align="center"
-        sortable
-        prop="tMblno"
-        width="216"
-      />
-      <el-table-column
-        label="收费方式"
-        align="center"
-        prop="chargingMethod"
-        :formatter="methodTypeFormat"
-      />
-      <el-table-column label="发票号" align="center" prop="invoiceNo" />
-      <el-table-column label="收款银行" align="center" prop="bank" />
-      <el-table-column label="水单号" align="center" prop="waterBillNo" />
-      <el-table-column
-        label="应付合计"
-        align="center"
-        prop="fAmtdr"
-        width="120"
+        :fixed="item.fixed"
       />
       <el-table-column
-        label="实付合计"
-        align="center"
-        prop="fAmtcr"
-        width="120"
-      />
-      <el-table-column label="未付金额" align="center" prop="" width="120" />
-      <el-table-column
-        label="备注"
-        align="center"
-        prop="fRemarks"
-        width="120"
-      />
-      <el-table-column
-        label="状态"
-        align="center"
-        prop="fBillstatus"
-        width="120"
-      >
-        <!-- <template slot-scope="scope">
-          <span v-if="scope.row.fBillstatus == '1'">保存</span>
-          <span v-else-if="scope.row.fBillstatus == '2'">暂存</span>
-          <span v-else-if="scope.row.fBillstatus == '3'">审批驳回</span>
-          <span v-else-if="scope.row.fBillstatus == '4'">提交审核</span>
-          <span v-else-if="scope.row.fBillstatus == '5'">审核中</span>
-          <span v-else-if="scope.row.fBillstatus == '6'">审核完成</span>
-        </template> -->
-      </el-table-column>
-      <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -1006,9 +1015,11 @@ import print from "print-js";
 import AddOrUpdate from "@/views/viewApproval";
 import ApprovalComments from "@/views/startApproval";
 import { queryUserVal } from "@/api/warehouseBusiness/agreement";
+import draggable from "vuedraggable";
 import Global from "@/layout/components/global";
 import Cookies from "js-cookie";
 import Vue from "vue";
+import { addSet, select ,resetModule} from "@/api/system/set";
 Vue.directive("dialogDrag", {
   bind(el, binding, vnode, oldVnode) {
     const dialogHeaderEl = el.querySelector(".el-dialog__header");
@@ -1070,6 +1081,113 @@ export default {
   name: "Charge",
   data() {
     return {
+      drag: false,
+      tableDate:[
+        {
+          surface: "1",
+          label: "createBy",
+          name: "制单人",
+          checked: 0,
+          fixed: "left",
+          width:100,
+        },
+        {
+          surface: "2",
+          label: "fBillno",
+          name: "系统编号",
+          checked: 0,
+          fixed: "left",
+          width:100,
+        },
+        {
+          surface: "3",
+          label: "fCtrlcorpid",
+          name: "货权方",
+          checked: 0,
+          width:100,
+        },
+        {
+          surface: "4",
+          label: "createTime",
+          name: "制单日期",
+          checked: 0,
+          width:100,
+        },
+        {
+          surface: "5",
+          label: "fAccbilldate",
+          name: "收费日期",
+          checked: 0,
+          width:100,
+        },
+        {
+          surface: "6",
+          label: "tMblno",
+          name: "提单号",
+          checked: 0,
+          width:100,
+        },
+        {
+          surface: "7",
+          label: "chargingMethod",
+          name: "收费方式",
+          checked: 0,
+          width:100,
+        },
+        {
+          surface: "8",
+          label: "invoiceNo",
+          name: "发票号",
+          checked: 0,
+          width:100,
+        },
+        {
+          surface: "9",
+          label: "bank",
+          name: "收款银行",
+          checked: 0,
+          width:100,
+        },
+        {
+          surface: "10",
+          label: "waterBillNo",
+          name: "水单号",
+          checked: 0,
+          width:100,
+        },
+        {
+          surface: "11",
+          label: "fAmtdr",
+          name: "应收合计",
+          checked: 0,
+          width:100,
+        },
+        {
+          surface: "12",
+          label: "fAmtcr",
+          name: "实收合计",
+          checked: 0,
+          width:100,
+        },
+        {
+          surface: "13",
+          label: "fRemarks",
+          name: "备注",
+          checked: 0,
+          width:100,
+        },
+        {
+          surface: "14",
+          label: "fBillstatus",
+          name: "状态",
+          checked: 0,
+          width:100,
+        },
+      ],
+      setRowList: [],
+      getRowList: [],
+      allCheck: false,
+      showSetting: false,
       typevalue: "",
       typeoptions: [
         {
@@ -1211,10 +1329,13 @@ export default {
     };
   },
   components: {
+    draggable,
     AddOrUpdate,
     ApprovalComments,
   },
   created() {
+    this.setRowList = this.tableDate;
+    this.getRowList = this.tableDate;
     this.typevalue = Cookies.get("sysType");
     this.getList();
     this.register();
@@ -1225,6 +1346,7 @@ export default {
       console.log(response);
       this.methodOptions = response.data;
     });
+    this.getRow();
   },
   activated() {
     this.adoPt();
@@ -1253,6 +1375,77 @@ export default {
     full() {
       this.dialogFull = !this.dialogFull;
     },
+        //列设置全选
+    allChecked() {
+      if (this.allCheck == true) {
+        this.setRowList.map((e) => {
+          return (e.checked = 0);
+        });
+      } else {
+        this.setRowList.map((e) => {
+          return (e.checked = 1);
+        });
+      }
+    },
+    //查询列数据
+    getRow() {
+      let that = this;
+      this.data = {
+        tableName: "付费",
+        userId: Cookies.get("userName"),
+      };
+      select(this.data).then((res) => {
+        if (res.data.length != 0) {
+          this.getRowList = res.data.filter((e) => e.checked == 0);
+          this.setRowList = res.data;
+          this.setRowList = this.setRowList.reduce((res, item) => {
+            res.push({
+              surface: item.surface,
+              label: item.label,
+              name: item.name,
+              checked: item.checked,
+              width: item.width,
+              fixed: item.fixed,
+            });
+            return res;
+          }, []);
+        }
+      });
+    },
+    //保存列设置
+    save() {
+      this.showSetting = false;
+      this.data = {
+        tableName: "付费",
+        userId: Cookies.get("userName"),
+        sysTableSetList: this.setRowList,
+      };
+      addSet(this.data).then((res) => {
+        this.getRowList = this.setRowList.filter((e) => e.checked == 0);
+      });
+    },
+        //重置列表
+    delRow() {
+      this.data = {
+        tableName: "付费",
+        userId: Cookies.get("userName"),
+      };
+      resetModule(this.data).then((res) => {
+        if (res.code == 200) {
+          this.showSetting = false;
+          this.setRowList = this.tableDate;
+          this.getRowList = this.tableDate;
+        }
+      });
+    },
+    //开始拖拽事件
+    onStart() {
+      this.drag = true;
+    },
+    //拖拽结束事件
+    onEnd() {
+      this.drag = false;
+    },
     //财务主取消
     signOut() {
       if (this.increase_s == 0) {
@@ -2190,6 +2383,26 @@ export default {
 };
 </script>
 <style lang="scss">
+.tabSetting {
+  display: flex;
+  justify-content: flex-end;
+}
+.listStyle {
+  display: flex;
+  border-top: 1px solid #dcdfe6;
+  border-left: 1px solid #dcdfe6;
+  border-right: 1px solid #dcdfe6;
+}
+.listStyle:last-child {
+  border-bottom: 1px solid #dcdfe6;
+}
+.progress {
+  display: flex;
+  align-items: center;
+  padding: 2px;
+  background-color: rgba(0, 0, 0, 0.05);
+  height: 100%;
+}
 .avue-crud__dialog__header {
   display: -webkit-box;
   display: -ms-flexbox;