费用明细 同海列设置

src/components/fee-info/main.vue

@@ -13,7 +13,7 @@
       >
         <template slot="menuLeft">
           <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane label="应收" name="first" :key="'first'">
+            <el-tab-pane label="应收"  name="first" :key="'first'">
             </el-tab-pane>
             <el-tab-pane label="应付" name="second" :key="'second'">
             </el-tab-pane>
@@ -103,7 +103,7 @@
             v-model="row.quantity"
             size="small"
             placeholder="请输入"
-            oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
+            oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
             @input="countChange(row)"
           ></el-input>
           <span v-else>{{ row.quantity }}</span>
@@ -226,11 +226,11 @@ import option from "./config/feeList.json";
 import { getDeptLazyTree, customerList } from "@/api/basicData/basicFeesDesc";
 import { delItem } from "@/api/feeInfo/fee-info";
 import { isPercentage, micrometerFormat } from "@/util/validate";
-// import customerDialog from "@/components/customer-dialog/main";
 import cropDialog from "@/components/crop-dialog/main";
 import _ from "lodash";
 import ApplyPayment from "../finance/applyPayment";
 import {applyLoan,paymentApply} from "@/api/financialManagement/paymentRequest";
+import { contrastList } from "@/util/contrastData";
 
 export default {
   name: "feeInfo",
@@ -291,7 +291,6 @@ export default {
         placeholder:'请点击右边按钮选择',
         dicData:[]
       },
-      isUpdata:true,//是否需要触发监听
       allData:[],
       data_one:[],
       data_two:[],
@@ -346,17 +345,15 @@ export default {
     ApplyPayment
   },
   watch: {
-    orderFeesList: function(rows) {
-      this.allData = rows ? rows : [];
-      if(this.allData.length !=0){
-        this.data_one=this.allData.filter(item=>item.feesType === 1)  //应收
-        this.data_two=this.allData.filter(item=>item.feesType === 2)  //应付
-        if(this.isUpdata){
-          if(this.selectTab == 1){
-            this.feeData = this.data_one
-          }else{
-            this.feeData = this.data_two
-          }
+    'orderFeesList'(newVla,oldVal){
+      if(newVla !==  oldVal){
+        this.allData = newVla
+        this.data_one = newVla.filter(item => item.feesType === 1)  //应收
+        this.data_two = newVla.filter(item => item.feesType === 2)  //应付
+        if (this.selectTab === 1) {
+          this.feeData = this.data_one
+        } else {
+          this.feeData = this.data_two
         }
       }
     },
@@ -369,26 +366,22 @@ export default {
     },
     //选择应收应付
     handleClick(tab){
-      if(tab.name == "first") {
+      if(tab.name === "first"){
         this.tab1 = true;
         this.tab2 = false;
 
-        //将上一个tab页数据放到 对应data上
         this.data_two = this.feeData
 
         this.selectTab = 1
-        this.feeData = this.data_one  //切换数据
-        // this.selectionList = [];
-
-      } else if(tab.name == "second") {
+        this.feeData = this.data_one
+      }else{
         this.tab1 = false;
         this.tab2 = true;
-        if(this.selectTab === 1){
-          this.data_one = this.feeData
-        }
+
+        this.data_one = this.feeData
+
         this.selectTab = 2
         this.feeData = this.data_two
-        // this.selectionList = [];
       }
     },
     cellStyle() {
@@ -492,8 +485,10 @@ export default {
     },
     //新增
     rowAdd() {
-      this.$refs.feeCrud.rowCellAdd();
-      // this.$refs.cropDialog.init();
+      const params = {
+        feesType:this.selectTab
+      }
+      this.$refs.feeCrud.rowCellAdd(params);
     },
     onLoad(page) {
       this.loading = true;
@@ -571,23 +566,15 @@ export default {
       this.feeDialog = false;
     },
     submitData() {
-      this.allData = []
+      let list = []
       //保存时  将所出的tab页数据赋值到相应 data上
-      if(this.selectTab == 1){
-        this.data_one = this.feeData
-        this.data_one.map(item =>{
-          delete item.$cellEdit
-          delete  item.$index
-        })
+      if(this.selectTab === 1){
+        this.data_one =  this.feeData
       }else{
-        this.data_two = this.feeData
-        this.data_two.map(item =>{
-          delete item.$cellEdit
-          delete  item.$index
-        })
+        this.data_two =  this.feeData
       }
-      this.allData.push(...this.data_one,...this.data_two)
-      return this.allData;
+      list.push(...this.data_one,...this.data_two)
+      return list
     },
 
     billingDetails(type){
@@ -599,11 +586,10 @@ export default {
               return this.$message.error('批量操作结算单位必须一致')
             }
             if(this.selectionList[i].isCheck == 1){
-              return this.$message.error('批量操作结算单位必须一致b')
+              return this.$message.error("选中的数据已"+type+",请勿重复操作!")
             }
           }
 
-          this.isUpdata = false
           this.selectionList.map(item =>{
             // item.url = this.billUrl
             item.srcOrderno = params.srcOrderno
@@ -630,6 +616,7 @@ export default {
               applyLoan(data).then(res=>{
                 if(res.data.success){
                   this.$message.success("操作成功!")
+                  this.$emit("afterFinance")
                   //跳转付费申请页面
                   if(this.$store.getters.pqStatus){
                     this.$alert("无法自动跳,因为付费申请页面已存在!", "温馨提示", {
@@ -648,7 +635,6 @@ export default {
                   }
                 }
               }).finally(()=>{
-                this.isUpdata = true
                 this.buttonLoading = false
               })
             })
@@ -662,9 +648,9 @@ export default {
               paymentApply(data).then(res=>{
                 if(res.data.success){
                   this.$message.success("操作成功!")
+                  this.$emit("afterFinance")
                 }
               }).finally(()=>{
-                this.isUpdata = true
                 this.buttonLoading = false
               })
             })

src/enums/column-name.js

@@ -171,7 +171,26 @@ const columnName = [{
     code: 54,
     name: '积分主表'
   },
-
+  {
+    code: 55,
+    name: '主营业务主表'
+  },
+  {
+    code: 56,
+    name: '主营业务明细'
+  },
+  {
+    code: 57,
+    name: '统计列表'
+  },
+  {
+    code: 58,
+    name: '业绩分析'
+  },
+  {
+    code: 59,
+    name: '服务项目'
+  },
 ]
 export const getColumnName = (key) => {
   for (let index = 0; index < columnName.length; index++) {

src/views/importTrade/invoice/config/customerContact.json

@@ -43,16 +43,19 @@
     {
       "label": "提单号",
       "prop": "billNo",
+      "overHidden": true,
       "index": 1,
       "width":150
     },{
       "label": "合同号",
       "prop": "contractNumber",
+      "overHidden": true,
       "index": 2,
       "width":150
     },{
       "label": "货物品种",
       "prop": "priceCategory",
+      "overHidden": true,
       "index": 3,
       "width":200,
       "rules": [
@@ -66,30 +69,35 @@
     {
       "label": "箱号",
       "prop": "cntrNo",
+      "overHidden": true,
       "index": 4,
       "width":120
     },
     {
       "label": "库存件数",
       "prop": "inventoryNumber",
+      "overHidden": true,
       "index": 5,
       "width":120
     },
     {
       "label": "库存重量",
       "prop": "inWeight",
+      "overHidden": true,
       "index": 5,
       "width":120
     },
     {
       "label": "件数",
       "prop": "actualQuantity",
+      "overHidden": true,
       "index": 6,
       "width":120
     },
     {
       "label": "发票重量(吨)",
       "prop": "invoiceWeight",
+      "overHidden": true,
       "index": 7,
       "width":120,
       "rules": [
@@ -103,6 +111,7 @@
     {
       "label": "码单重量(吨)",
       "prop": "billWeight",
+      "overHidden": true,
       "index": 8,
       "width":120,
       "rules": [
@@ -116,17 +125,20 @@
     {
       "label": "单价",
       "prop": "price",
+      "overHidden": true,
       "index": 9,
       "width":100
     },{
       "label": "销售金额",
       "prop": "contractAmount",
+      "overHidden": true,
       "index": 10,
       "width":120
     },
     {
       "label": "备注",
       "prop": "remarks",
+      "overHidden": true,
       "index": 14,
       "width":120,
       "cell": true,

src/views/importTrade/receipt/config/customerContact.json

@@ -43,6 +43,7 @@
     {
       "label": "提单号",
       "prop": "billNo",
+      "overHidden": true,
       "index": 1,
       "width":150,
       "rules": [
@@ -55,6 +56,7 @@
     },{
       "label": "合同号",
       "prop": "contractNumber",
+      "overHidden": true,
       "index": 2,
       "width":150,
       "rules": [
@@ -67,6 +69,7 @@
     },{
       "label": "货物品种",
       "prop": "priceCategory",
+      "overHidden": true,
       "index": 3,
       "width":200,
       "rules": [
@@ -80,12 +83,14 @@
     {
       "label": "箱号",
       "prop": "cntrNo",
+      "overHidden": true,
       "index": 4,
       "width":120
     },
     {
       "label": "库存件数",
       "prop": "inventoryNumber",
+      "overHidden": true,
       "hide": true,
       "index": 5,
       "width":120
@@ -93,6 +98,7 @@
     {
       "label": "库存重量(吨)",
       "prop": "inWeight",
+      "overHidden": true,
       "hide": true,
       "index": 5,
       "width":120
@@ -100,12 +106,14 @@
    {
       "label": "件数",
       "prop": "actualQuantity",
+     "overHidden": true,
       "index": 6,
       "width":120
     },
     {
       "label": "发票重量(吨)",
       "prop": "invoiceWeight",
+      "overHidden": true,
       "index": 7,
       "width":120,
       "rules": [
@@ -119,6 +127,7 @@
     {
       "label": "码单重量(吨)",
       "prop": "billWeight",
+      "overHidden": true,
       "index": 8,
       "width":120,
       "rules": [
@@ -132,6 +141,7 @@
     {
       "label": "单价",
       "prop": "price",
+      "overHidden": true,
       "index": 9,
       "width":120,
       "rules": [
@@ -145,6 +155,7 @@
     {
       "label": "销售金额",
       "prop": "contractAmount",
+      "overHidden": true,
       "index": 10,
       "width":120,
       "rules": [
@@ -158,6 +169,7 @@
     {
       "label": "备注",
       "prop": "remarks",
+      "overHidden": true,
       "index": 14,
       "width":280,
       "cell": true,

src/views/purchase/contract/config/customerContact.json

@@ -45,6 +45,7 @@
       "prop": "billNo",
       "index": 1,
       "width":180,
+      "overHidden": true,
       "cell": true,
       "rules": [
         {
@@ -56,6 +57,7 @@
     },{
       "label": "货物品种",
       "prop": "priceCategory",
+      "overHidden": true,
       "index": 2,
       "width":200,
       "rules": [
@@ -68,12 +70,14 @@
     },{
       "label": "规格型号",
       "prop": "itemType",
+      "overHidden": true,
       "index": 3,
       "width":150
     },
     {
       "label": "箱号",
       "prop": "cntrNo",
+      "overHidden": true,
       "cell": true,
       "index": 4,
       "width":130,
@@ -88,12 +92,14 @@
     {
       "label": "件数",
       "prop": "orderQuantity",
+      "overHidden": true,
       "index": 4,
       "width":120
     },
     {
       "label": "发票重量(吨)",
       "prop": "invoiceWeight",
+      "overHidden": true,
       "index": 5,
       "width":120,
       "rules": [
@@ -107,18 +113,21 @@
     {
       "label": "码单重量(吨)",
       "prop": "billWeight",
+      "overHidden": true,
       "index": 6,
       "width":120
     },
     {
       "label": "单价",
       "prop": "price",
+      "overHidden": true,
       "index": 7,
       "width":120
     },
     {
       "label": "销售金额",
       "prop": "amount",
+      "overHidden": true,
       "index": 8,
       "width":120,
       "rules": [
@@ -132,6 +141,7 @@
     {
       "label": "已收件数",
       "prop": "actualQuantity",
+      "overHidden": true,
       "index": 9,
       "width":100,
       "rules": [
@@ -145,6 +155,7 @@
     {
       "label": "已收发票重量(吨)",
       "prop": "actualWeight",
+      "overHidden": true,
       "index": 9,
       "width":120,
       "rules": [
@@ -158,6 +169,7 @@
     {
       "label": "税率",
       "prop": "taxRate",
+      "overHidden": true,
       "index": 10,
       "width":120,
       "rules": [
@@ -171,6 +183,7 @@
     {
       "label": "备注",
       "prop": "remarks",
+      "overHidden": true,
       "index": 11,
       "width":200,
       "cell": true,

src/views/purchase/contract/detailsPage.vue

@@ -299,6 +299,7 @@
           :itemType="'采购'"
           :optionType="'JK'"
           @beforeFinance="beforeFinance"
+          @afterFinance="afterFinance"
           feeUrl=""
         />
         <upload-file
@@ -776,7 +777,6 @@ export default {
       this.buttonLoading = true;
       let id = this.detailData.id.replace(/\"/g, "")
       detailListData(id).then(res => {
-        this.form = res.data.data;
         this.afterEcho(res.data.data)
       }).finally(()=>{
         this.buttonLoading = false;
@@ -844,34 +844,32 @@ export default {
 
     //费用明细回调
     beforeFinance(feesData,callback){
-      this.orderFeesList = feesData;
       let params = {}
-      //暂时默认通过  之后优化
-      params.valid = true
-      params.parentId = this.form.id
-      params.srcOrderno = this.form.orderNo
-      callback(params)
-
-      //传过来的数据  会根据应收应付的顺序放到 orderFeesList   这个时候与旧值对比  会对比失败  后端查费用明细时  按照应收应付顺序 进行排序
-      // if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
-      //   || contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
-      // ){
-      //   this.$confirm("数据发生变化，请先提交保存？", {
-      //     confirmButtonText: "保存",
-      //     cancelButtonText: "取消",
-      //     type: "warning"
-      //   }).then(() => {
-      //     this.editCustomer();
-      //   }).finally(()=>{
-      //     params.valid = false
-      //     callback(params)
-      //   })
-      // }else{
-      //   params.valid = true
-      //   params.parentId = this.form.id
-      //   params.srcOrderno = this.form.orderNo
-      //   callback(params)
-      // }
+      if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
+        || contrastList(feesData,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
+      ){
+        this.$confirm("数据发生变化，请先提交保存？", {
+          confirmButtonText: "保存",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.editCustomer();
+        }).finally(()=>{
+          params.valid = false
+          callback(params)
+        })
+      }else{
+        params.valid = true
+        params.parentId = this.form.id
+        params.srcOrderno = this.form.orderNo
+        callback(params)
+      }
+    },
+    //生成账单之后需要更新明细列表的属性
+    afterFinance(){
+      detailListData(this.form.id).then(res => {
+        this.afterEcho(res.data.data)
+      })
     },
     //修改提交触发
     editCustomer(status) {
@@ -930,7 +928,6 @@ export default {
               this.form.id = res.data.data
               this.$message.success("操作成功！")
               detailListData(this.form.id).then(res => {
-                this.form = res.data.data;
                 this.afterEcho(res.data.data)
               })
             }
@@ -947,6 +944,7 @@ export default {
     },
     //回调
     afterEcho(form){
+      this.form = form;
       this.oldForm = Object.assign({},form);
       if(form.itemsVOList){
         this.contactsData = form.itemsVOList
@@ -1093,6 +1091,7 @@ export default {
     handleRowClick(row, event, column) {
     },
     verificationData(){
+      this.orderFeesList = this.$refs.feeInfo.submitData();
       if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
         || contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
       ) {
@@ -1162,6 +1161,7 @@ export default {
       }
     },
     backToList() {
+      this.orderFeesList = this.$refs.feeInfo.submitData();
       if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
         || contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
       ){

src/views/salesManagement/salesContract/config/importInventory.json

@@ -43,6 +43,7 @@
     {
       "label": "提单号",
       "prop": "billNo",
+      "overHidden": true,
       "index": 1,
       "width":150,
       "rules": [
@@ -55,6 +56,7 @@
     },{
       "label": "合同号",
       "prop": "orgOrderNo",
+      "overHidden": true,
       "index": 2,
       "width":150,
       "rules": [
@@ -67,12 +69,14 @@
     },{
       "label": "货物品种",
       "prop": "priceCategory",
+      "overHidden": true,
       "index": 3,
       "width":200
     },
     {
       "label": "箱号",
       "prop": "cntrNo",
+      "overHidden": true,
       "cell": true,
       "index": 4,
       "width":100,
@@ -87,6 +91,7 @@
     {
       "label": "件数",
       "prop": "orderQuantity",
+      "overHidden": true,
       "index": 4,
       "width":120,
       "rules": [
@@ -100,6 +105,7 @@
     {
       "label": "发票重量(吨)",
       "prop": "invoiceWeight",
+      "overHidden": true,
       "index": 5,
       "width":120,
       "rules": [
@@ -113,6 +119,7 @@
     {
       "label": "码单重量(吨)",
       "prop": "billWeight",
+      "overHidden": true,
       "index": 6,
       "width":120,
       "rules": [
@@ -126,6 +133,7 @@
     {
       "label": "单价",
       "prop": "price",
+      "overHidden": true,
       "index": 7,
       "width":120,
       "rules": [
@@ -138,6 +146,7 @@
     },{
       "label": "销售金额",
       "prop": "amount",
+      "overHidden": true,
       "index": 8,
       "width":120,
       "rules": [
@@ -151,18 +160,21 @@
     {
       "label": "已发件数",
       "prop": "actualQuantity",
+      "overHidden": true,
       "index": 9,
       "width":120
     },
     {
       "label": "已发发票重量(吨)",
       "prop": "actualWeight",
+      "overHidden": true,
       "index": 9,
       "width":120
     },
     {
       "label": "税率",
       "prop": "taxRate",
+      "overHidden": true,
       "index": 10,
       "width":120,
       "cell": true,
@@ -177,6 +189,7 @@
     {
       "label": "备注",
       "prop": "remarks",
+      "overHidden": true,
       "index": 11,
       "width":200,
       "cell": true,
@@ -191,6 +204,7 @@
     {
       "label": "itemId",
       "prop": "itemId",
+      "overHidden": true,
       "index": 11,
       "width":200,
       "hide": true

src/views/salesManagement/salesContract/detailsPage.vue

@@ -294,6 +294,7 @@
         <fee-info
           ref="feeInfo"
           @beforeFinance="beforeFinance"
+          @afterFinance="afterFinance"
           :disabled=" viewDisabled"
           :orderFeesList="orderFeesList"
           :itemType="'采购'"
@@ -872,34 +873,33 @@ export default {
       }
     },
     //费用明细回调验证
-    beforeFinance(feesData,callback) {
-      this.orderFeesList = feesData;
+    beforeFinance(feesData,callback){
       let params = {}
-      params.valid = true
-      params.parentId = this.form.id
-      params.srcOrderno = this.form.orderNo
-      callback(params)
-
-      //传过来的数据  会根据应收应付的顺序放到 orderFeesList   这个时候与旧值对比  会对比失败  后端查费用明细时  按照应收应付顺序 进行排序
-      // if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
-      //   || contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
-      // ){
-      //   this.$confirm("数据发生变化，请先提交保存？", {
-      //     confirmButtonText: "保存",
-      //     cancelButtonText: "取消",
-      //     type: "warning"
-      //   }).then(() => {
-      //     this.editCustomer();
-      //   }).finally(()=>{
-      //     params.valid = false
-      //     callback(params)
-      //   })
-      // }else{
-      //   params.valid = true
-      //   params.parentId = this.form.id
-      //   params.srcOrderno = this.form.orderNo
-      //   callback(params)
-      // }
+      if(contrastObj(this.form,this.oldForm) ||  contrastList(this.importInventoryData,this.oldInventoryData)
+        || contrastList(feesData,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
+      ){
+        this.$confirm("数据发生变化，请先提交保存？", {
+          confirmButtonText: "保存",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.editCustomer();
+        }).finally(()=>{
+          params.valid = false
+          callback(params)
+        })
+      }else{
+        params.valid = true
+        params.parentId = this.form.id
+        params.srcOrderno = this.form.orderNo
+        callback(params)
+      }
+    },
+    //生成账单之后需要更新明细列表的属性
+    afterFinance(){
+      detailSaleList(this.form.id).then(res => {
+        this.afterEcho(res.data.data)
+      })
     },
     //财务操作
     applySettlement(type){
@@ -1099,6 +1099,7 @@ export default {
     },
     //验证数据
     verificationData(){
+      this.orderFeesList = this.$refs.feeInfo.submitData();
       if(contrastObj(this.form,this.oldForm) || contrastList(this.importInventoryData,this.oldInventoryData)
         || contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
       ){
@@ -1169,6 +1170,7 @@ export default {
       }
     },
     backToList() {
+      this.orderFeesList = this.$refs.feeInfo.submitData();
       if(contrastObj(this.form,this.oldForm) || contrastList(this.importInventoryData,this.oldInventoryData)
         || contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
       ){

src/views/workManagement/main-items/configuration/detailsPage.json

@@ -40,14 +40,14 @@
       "label": "服务项目",
       "prop": "pname",
       "overHidden": true,
-      "index": 1,
+      "index": 2,
       "width": 100
     },
     {
       "label": "收费建议",
       "prop": "remarks",
       "overHidden": true,
-      "index": 1,
+      "index": 3,
       "width": 100
     },
     {
@@ -55,7 +55,7 @@
       "prop": "userid",
       "slot": true,
       "overHidden": true,
-      "index": 1,
+      "index": 4,
       "width": 130
     },
     {
@@ -70,7 +70,7 @@
       "cell": true,
       "slot": true,
       "overHidden": true,
-      "index": 1,
+      "index": 5,
       "width": 130,
       "rules": [
         {
@@ -87,7 +87,7 @@
       "format": "yyyy-MM-dd",
       "type": "date",
       "overHidden": true,
-      "index": 1,
+      "index": 6,
       "width": 100,
       "cell": true,
       "rules": [
@@ -105,7 +105,7 @@
       "format": "yyyy-MM-dd",
       "type": "date",
       "overHidden": true,
-      "index": 1,
+      "index": 7,
       "width": 100,
       "cell": true,
       "rules": [
@@ -120,21 +120,21 @@
       "label": "服务费",
       "prop": "serviceCharge",
       "overHidden": true,
-      "index": 1,
+      "index": 8,
       "width": 100
     },
     {
       "label": "代垫费",
       "prop": "matMoney",
       "overHidden": true,
-      "index": 1,
+      "index": 9,
       "width": 100
     },
     {
       "label": "合计金额",
       "prop": "amount",
       "overHidden": true,
-      "index": 1,
+      "index": 10,
       "width": 100,
       "rules": [
         {
@@ -148,7 +148,7 @@
       "label": "账户名称",
       "prop": "accountName",
       "overHidden": true,
-      "index": 1,
+      "index": 11,
       "width": 120
     },
     {
@@ -156,7 +156,7 @@
       "prop": "payTime",
       "width": 120,
       "overHidden": true,
-      "index": 1,
+      "index": 12,
       "valueFormat": "yyyy-MM-dd",
       "format": "yyyy-MM-dd",
       "type": "date"
@@ -171,7 +171,7 @@
         "value": "dictKey"
       },
       "overHidden": true,
-      "index": 1,
+      "index": 13,
       "width": 100,
       "cell": true
     },
@@ -182,7 +182,7 @@
       "format": "yyyy-MM-dd",
       "type": "date",
       "overHidden": true,
-      "index": 1,
+      "index": 14,
       "width": 100,
       "cell": true
     },
@@ -191,7 +191,7 @@
       "prop": "createUserName",
       "disabled": true,
       "overHidden": true,
-      "index": 1,
+      "index": 15,
       "width": 100
     },
     {
@@ -199,21 +199,21 @@
       "prop": "createTime",
       "disabled": true,
       "overHidden": true,
-      "index": 1,
+      "index": 16,
       "width": 100
     },
     {
       "label": "最新修改人",
       "prop": "updateUserName",
       "overHidden": true,
-      "index": 1,
+      "index": 17,
       "width": 100
     },
     {
       "label": "最新修改时间",
       "prop": "updateTime",
       "overHidden": true,
-      "index": 1,
+      "index": 18,
       "width": 100
     }
   ]

src/views/workManagement/main-items/configuration/mainList.json

@@ -24,7 +24,7 @@
       "label": "项目名称",
       "prop": "cname",
       "search": true,
-      "index": 3,
+      "index": 1,
       "width": 120,
       "overHidden": true
     },
@@ -32,21 +32,21 @@
       "label": "客户名称",
       "prop": "corpId",
       "search": true,
-      "index": 4,
+      "index": 2,
       "width": 180,
       "overHidden": true
     },
     {
       "label": "应收金额",
       "prop": "debitAmount",
-      "index": 5,
+      "index": 3,
       "width": 120,
       "overHidden": true
     },
     {
       "label": "实收金额",
       "prop": "settlmentAmount",
-      "index": 6,
+      "index": 4,
       "width": 120,
       "overHidden": true
     },
@@ -54,42 +54,42 @@
       "label": "责任人",
       "prop": "corpAttn",
       "search": true,
-      "index": 7,
+      "index": 5,
       "width": 120,
       "overHidden": true
     },
     {
       "label": "电话",
       "prop": "corpTel",
-      "index": 8,
+      "index": 6,
       "width": 150,
       "overHidden": true
     },
     {
       "label": "备注",
       "prop": "remark",
-      "index": 10,
+      "index": 7,
       "width": 150,
       "overHidden": true
     },
     {
       "label": "账户名称",
       "prop": "accountName",
-      "index": 10,
+      "index": 8,
       "width": 150,
       "overHidden": true
     },
     {
       "label": "结算日期",
       "prop": "payTime",
-      "index": 10,
+      "index": 9,
       "width": 150,
       "overHidden": true
     },
     {
       "label": "制单人",
       "prop": "createUserName",
-      "index": 11,
+      "index": 10,
       "width": 130,
       "overHidden": true
     },
@@ -103,20 +103,20 @@
       "unlinkPanels": true,
       "searchRange": true,
       "overHidden": true,
-      "index": 12,
+      "index": 11,
       "width": 150
     },
     {
       "label": "最新修改人",
       "prop": "updateUserName",
-      "index": 13,
+      "index": 12,
       "overHidden": true,
       "width": 130
     },
     {
       "label": "最新修改时间",
       "prop": "updateTime",
-      "index": 14,
+      "index": 13,
       "overHidden": true,
       "width": 150
     }

src/views/workManagement/main-items/detailsPage.vue

@@ -137,6 +137,7 @@
           @selection-change="selectionChange"
           @search-change="searchChange"
           @saveColumn="saveColumn"
+          @resetColumn="resetColumn"
         >
           <template slot="menuLeft">
             <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -636,7 +637,7 @@
             }
           ],
         },
-        optionTable: option,
+        optionTable: {},
         //结算
         accountFormData:{},
         rules:[{
@@ -750,7 +751,8 @@
         oldFormTwo:{},
       };
     },
-    created() {
+    async created() {
+      this.optionTable = await this.getColumnData(this.getColumnName(56), option);
 
       //承揽人 责任人 默认20条数据
       getUserList().then(res=>{
@@ -1193,9 +1195,6 @@
         this.page.currentPage = val;
         this.getList();
       },
-      saveColumn(row, column) {
-        console.log(row, column);
-      },
       //上传文件保存
       upLoadSave(row, done, loading){
         this.upLoadData.push(row)
@@ -1339,7 +1338,30 @@
           this.$emit("goBack");
         }
       },
-
+     //列保存触发
+      async saveColumn() {
+        const inSave = await this.saveColumnData(
+          this.getColumnName(56),
+          this.optionTable
+        );
+        if (inSave) {
+          this.$message.success("保存成功");
+          //关闭窗口
+          this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        }
+      },
+      async resetColumn() {
+        const inSave = await this.delColumnData(
+          this.getColumnName(56),
+          option
+        );
+        if (inSave) {
+          this.$message.success("重置成功");
+          this.optionTable = option;
+          //关闭窗口
+          this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        }
+      },
 
 
       //1.0版本注释内容

src/views/workManagement/main-items/list.vue

@@ -15,6 +15,7 @@
       @refresh-change="refreshChange"
       @on-load="getList"
       @saveColumn="saveColumn"
+      @resetColumn="resetColumn"
     >
       <template slot="corpIdSearch">
         <select-component
@@ -111,7 +112,7 @@ export default {
         placeholder:'请点击右边按钮选择',
         dicData:[]
       },
-      optionTable: option,
+      optionTable: {},
       page: {
         currentPage: 1,
         total: 0,
@@ -119,7 +120,8 @@ export default {
       }
     };
   },
-  created() {
+  async created() {
+    this.optionTable = await this.getColumnData(this.getColumnName(55), option);
     getUserList().then(res=>{
       res.data.data.map((item,index)=>{
         if(index <= 20){
@@ -255,9 +257,6 @@ export default {
         });
       }
     },
-    saveColumn(row, column) {
-      console.log(row, column);
-    },
     summaryMethod({ columns, data }) {
       const sums = [];
       if (columns.length > 0) {
@@ -296,6 +295,30 @@ export default {
       this.show = true;
       this.getList(this.page, this.search)
     },
+    //列保存触发
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(55),
+        this.optionTable
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    async resetColumn() {
+      const inSave = await this.delColumnData(
+        this.getColumnName(55),
+        option
+      );
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.optionTable = option;
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
   }
 };
 </script>

src/views/workManagement/performanceAnalysis/config/clientList.json

@@ -122,42 +122,42 @@
       "search": true,
       "overHidden": true,
       "width": 120,
-      "index": 2
+      "index": 1
     },
     {
       "label": "承做人数量",
       "prop": "countUserName",
       "overHidden": true,
       "width": 120,
-      "index": 3
+      "index": 2
     },
     {
       "label": "1",
       "prop": "jan",
       "width": 90,
       "overHidden": true,
-      "index": 7
+      "index": 3
     },
     {
       "label": "2",
       "prop": "feb",
       "width": 90,
       "overHidden": true,
-      "index": 7
+      "index": 4
     },
     {
       "label": "3",
       "prop": "mar",
       "width": 90,
       "overHidden": true,
-      "index": 7
+      "index": 5
     },
     {
       "label": "4",
       "prop": "apr",
       "width": 90,
       "overHidden": true,
-      "index": 7
+      "index": 6
     },
     {
       "label": "5",
@@ -171,56 +171,56 @@
       "prop": "june",
       "width": 90,
       "overHidden": true,
-      "index": 7
+      "index": 8
     },
     {
       "label": "7",
       "prop": "july",
       "width": 90,
       "overHidden": true,
-      "index": 7
+      "index": 9
     },
     {
       "label": "8",
       "prop": "aug",
       "width": 90,
       "overHidden": true,
-      "index": 7
+      "index": 10
     },
     {
       "label": "9",
       "prop": "sept",
       "width": 90,
       "overHidden": true,
-      "index": 7
+      "index": 11
     },
     {
       "label": "10",
       "prop": "oct",
       "overHidden": true,
       "width": 90,
-      "index": 8
+      "index": 12
     },
     {
       "label": "11",
       "prop": "nov",
       "overHidden": true,
       "width": 90,
-      "index": 8
+      "index": 13
     },
     {
       "label": "12",
       "prop": "dece",
       "overHidden": true,
       "width": 90,
-      "index": 8
+      "index": 14
     },
     {
       "label": "合计",
       "prop": "total",
       "overHidden": true,
       "width": 90,
-      "index": 8
+      "index": 15
     }
   ]
 }

src/views/workManagement/performanceAnalysis/config/mainList.json

@@ -122,42 +122,42 @@
       "overHidden": true,
       "search": true,
       "width": 120,
-      "index": 3
+      "index": 1
     },
     {
       "label": "客户数量",
       "prop": "countCorp",
       "overHidden": true,
       "width": 120,
-      "index": 3
+      "index": 2
     },
     {
       "label": "1",
       "prop": "jan",
       "width": 90,
       "overHidden": true,
-      "index": 7
+      "index": 3
     },
     {
       "label": "2",
       "prop": "feb",
       "width": 90,
       "overHidden": true,
-      "index": 7
+      "index": 4
     },
     {
       "label": "3",
       "prop": "mar",
       "width": 90,
       "overHidden": true,
-      "index": 7
+      "index": 5
     },
     {
       "label": "4",
       "prop": "apr",
       "width": 90,
       "overHidden": true,
-      "index": 7
+      "index": 6
     },
     {
       "label": "5",
@@ -171,55 +171,55 @@
       "prop": "june",
       "width": 90,
       "overHidden": true,
-      "index": 7
+      "index": 8
     },
     {
       "label": "7",
       "prop": "july",
       "width": 90,
       "overHidden": true,
-      "index": 7
+      "index": 9
     },
     {
       "label": "8",
       "prop": "aug",
       "width": 90,
       "overHidden": true,
-      "index": 7
+      "index": 10
     },
     {
       "label": "9",
       "prop": "sept",
       "width": 90,
       "overHidden": true,
-      "index": 7
+      "index": 11
     },
     {
       "label": "10",
       "prop": "oct",
       "overHidden": true,
       "width": 90,
-      "index": 8
+      "index": 12
     },
     {
       "label": "11",
       "prop": "nov",
       "overHidden": true,
       "width": 90,
-      "index": 8
+      "index": 13
     },
     {
       "label": "12",
       "prop": "dece",
       "overHidden": true,
       "width": 90,
-      "index": 8
+      "index": 14
     }, {
       "label": "合计",
       "prop": "total",
       "overHidden": true,
       "width": 90,
-      "index": 8
+      "index": 15
     }
   ]
 }

src/views/workManagement/performanceAnalysis/index.vue

@@ -13,7 +13,10 @@
                @current-change="currentChange"
                @size-change="sizeChange"
                @refresh-change="refreshChange"
-               @on-load="onLoad">
+               @on-load="onLoad"
+               @saveColumn="saveColumn"
+               @resetColumn="resetColumn"
+    >
       <template slot="menuLeft">
         <el-button
           icon="el-icon-printer"
@@ -76,7 +79,7 @@
       return {
         form: {},
         search:{},
-        option: option,
+        option: {},
         exportLoading:false,
         loading:false,
         dataList: [],
@@ -95,7 +98,10 @@
         },
       }
     },
-    created() {
+    async created() {
+
+      this.option = await this.getColumnData(this.getColumnName(58), option);
+
       getUserList().then(res=>{
         res.data.data.map((item,index)=>{
           if(index <= 20){
@@ -190,7 +196,31 @@
           this.loading = false;
         })
       },
-    }
+      //列保存触发
+      async saveColumn() {
+        const inSave = await this.saveColumnData(
+          this.getColumnName(58),
+          this.option
+        );
+        if (inSave) {
+          this.$message.success("保存成功");
+          //关闭窗口
+          this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        }
+      },
+      async resetColumn() {
+        const inSave = await this.delColumnData(
+          this.getColumnName(58),
+          option
+        );
+        if (inSave) {
+          this.$message.success("重置成功");
+          this.option = option;
+          //关闭窗口
+          this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        }
+      },
+    },
   }
 </script>
 

src/views/workManagement/receipt/configuration/statisticalList.json

@@ -43,7 +43,7 @@
       "label": "服务项目",
       "prop": "pname",
       "search": true,
-      "index": 3,
+      "index": 4,
       "overHidden": true,
       "width": 120
     },
@@ -113,34 +113,34 @@
       "search": true,
       "overHidden": true,
       "prop": "cornId",
-      "index": 2,
+      "index": 3,
       "width": 180
     },
     {
       "label": "毛收入",
       "prop": "grossIncome",
-      "index": 4,
+      "index": 5,
       "overHidden": true,
       "width": 120
     },
     {
       "label": "服务费",
       "prop": "serviceCharge",
-      "index": 5,
+      "index": 6,
       "overHidden": true,
       "width": 120
     },
     {
       "label": "代垫费",
       "prop": "matMoney",
-      "index": 6,
+      "index": 7,
       "overHidden": true,
       "width": 120
     },
     {
       "label": "合计金额",
       "prop": "amount",
-      "index": 7,
+      "index": 8,
       "overHidden": true,
       "width": 120
     },
@@ -181,7 +181,7 @@
     {
       "label": "承做人",
       "prop": "userName",
-      "index": 8,
+      "index": 12,
       "search": true,
       "overHidden": true,
       "width": 120
@@ -189,14 +189,14 @@
     {
       "label": "频率",
       "prop": "frequency",
-      "index": 12,
+      "index": 13,
       "overHidden": true,
       "width": 120
     },
     {
       "label": "提醒日",
       "prop": "reminderDay",
-      "index": 13,
+      "index": 14,
       "valueFormat": "yyyy-MM-dd HH:mm:ss",
       "format": "yyyy-MM-dd",
       "overHidden": true,
@@ -206,7 +206,7 @@
     {
       "label": "需求开始日期",
       "prop": "beginTime",
-      "index": 14,
+      "index": 15,
       "valueFormat": "yyyy-MM-dd HH:mm:ss",
       "format": "yyyy-MM-dd",
       "overHidden": true,
@@ -216,7 +216,7 @@
     {
       "label": "需求完成日期",
       "prop": "actualDate",
-      "index": 15,
+      "index": 16,
       "valueFormat": "yyyy-MM-dd HH:mm:ss",
       "format": "yyyy-MM-dd",
       "overHidden": true,
@@ -226,7 +226,7 @@
     {
       "label": "制单人",
       "prop": "createUserName",
-      "index": 16,
+      "index": 17,
       "overHidden": true,
       "width": 120
     },
@@ -234,13 +234,13 @@
       "label": "制单日期",
       "prop": "createTime",
       "type": "date",
-      "index": 17,
+      "index": 18,
       "overHidden": true,
       "width": 150
     },
     {
       "label": "最新修改人",
-      "index": 18,
+      "index": 19,
       "prop": "updateUserName",
       "overHidden": true,
       "width": 120
@@ -248,14 +248,14 @@
     {
       "label": "最新修改时间",
       "prop": "updateTime",
-      "index": 19,
+      "index": 20,
       "overHidden": true,
       "width": 150
     },
     {
       "label": "备注",
       "prop": "remarks",
-      "index": 20,
+      "index": 21,
       "overHidden": true,
       "width": 180
     }

src/views/workManagement/receipt/statisticalList.vue

@@ -13,7 +13,10 @@
                @current-change="currentChange"
                @size-change="sizeChange"
                @refresh-change="refreshChange"
-               @on-load="onLoad">
+               @on-load="onLoad"
+               @saveColumn="saveColumn"
+               @resetColumn="resetColumn"
+    >
       <template slot="menuLeft">
         <el-button
           icon="el-icon-printer"
@@ -85,7 +88,7 @@
         form: {},
         search:{},
         exportLoading:false,
-        option: option,
+        option: {},
         parentId:0,
         dataList: [],
         options:[],
@@ -108,7 +111,10 @@
         query:{}
       }
     },
-    created() {
+    async created() {
+
+      this.option = await this.getColumnData(this.getColumnName(57), option);
+
       getUserList().then(res=>{
         res.data.data.map((item,index)=>{
           if(index <= 20){
@@ -235,7 +241,31 @@
           this.loading = false
         })
       },
-    }
+      //列保存触发
+      async saveColumn() {
+        const inSave = await this.saveColumnData(
+          this.getColumnName(57),
+          this.option
+        );
+        if (inSave) {
+          this.$message.success("保存成功");
+          //关闭窗口
+          this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        }
+      },
+      async resetColumn() {
+        const inSave = await this.delColumnData(
+          this.getColumnName(57),
+          option
+        );
+        if (inSave) {
+          this.$message.success("重置成功");
+          this.option = option;
+          //关闭窗口
+          this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        }
+      },
+    },
   }
 </script>
 

src/views/workManagement/service-items/configuration/projectOption.json

@@ -33,7 +33,7 @@
       "label": "项目名称",
       "prop": "cname",
       "search": true,
-      "index": 1,
+      "index": 2,
       "width": 150,
       "rules": [
         {
@@ -62,19 +62,19 @@
     {
       "label": "收费建议",
       "prop": "remarks",
-      "index": 2,
+      "index": 3,
       "width": 150
     },
     {
       "label": "单价",
       "prop": "price",
-      "index": 3,
+      "index": 4,
       "width": 120
     },
     {
       "label": "计价单位",
       "prop": "unit",
-      "index": 3,
+      "index": 5,
       "width": 120
     },
     {
@@ -86,7 +86,7 @@
         "label": "dictValue",
         "value": "dictKey"
       },
-      "index": 5,
+      "index": 6,
       "width": 120
     },
     {
@@ -95,13 +95,13 @@
       "prop": "warrantyPeriod",
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd HH:dd:ss",
-      "index": 6,
+      "index": 7,
       "width": 150
     },
     {
       "label": "标准工时",
       "prop": "workingHours",
-      "index": 7,
+      "index": 8,
       "width": 80
     },
     {
@@ -109,7 +109,7 @@
       "prop": "createUserName",
       "addDisplay": false,
       "editDisplay": false,
-      "index": 8,
+      "index": 9,
       "width": 150
     },
     {
@@ -117,7 +117,7 @@
       "prop": "createTime",
       "editDisplay": false,
       "addDisplay": false,
-      "index": 9,
+      "index": 10,
       "width": 150
     }
   ]

src/views/workManagement/service-items/project.vue

@@ -34,6 +34,7 @@
           @cell-dblclick="cellDblclick"
           @on-load="getList"
           @saveColumn="saveColumn"
+          @resetColumn="resetColumn"
         >
           <template slot="menuLeft">
             <el-button
@@ -64,7 +65,7 @@ export default {
       switchDialog:false,//报表
       loading: true,
       data: [],
-      tableOption: option,
+      tableOption: {},
       form:{},
       search:{},
       treeDeptId:"",
@@ -103,8 +104,8 @@ export default {
       }
     };
   },
-  created() {
-
+  async created() {
+    this.tableOption = await this.getColumnData(this.getColumnName(59), option);
   },
   components: {
     reportDialog
@@ -215,9 +216,6 @@ export default {
     cellDblclick(row, column, cell, event) {
       this.$refs.crud.rowEdit(row);
     },
-    saveColumn(row, column) {
-      console.log(row, column);
-    },
     //展开主页左边类型
     nodeClick(data) {
       this.treeDeptName = data.cname;
@@ -225,13 +223,30 @@ export default {
       this.page.currentPage = 1;
       this.getList(this.page);
     },
-    //列表内展开树节点
-    // treeLoad(tree, treeNode, resolve) {
-    //   const parentId = tree.id;
-    //   getServiceProjectList({parentId:parentId}).then(res => {
-    //     resolve(res.data.data.records);
-    //   });
-    // },
+    //列保存触发
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(59),
+        this.tableOption
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    async resetColumn() {
+      const inSave = await this.delColumnData(
+        this.getColumnName(59),
+        option
+      );
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.tableOption = option;
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
   }
 };
 </script>