同海

src/api/workManagement/mainProject.js

@@ -93,3 +93,47 @@ export function getUserList(params) {
     params:params
   })
 }
+
+//结算 取消结算
+export function settleAccounts(id,status,accountName,payTime) {
+  return request({
+    url: '/api/trade-project/project/settleAccounts',
+    method: 'post',
+    params:{
+      id:id,
+      status:status,
+      accountName:accountName,
+      payTime:payTime,
+    }
+  })
+}
+
+//请核
+export function masterCheck(id) {
+  return request({
+    url: '/api/trade-project/project/masterCheck',
+    method: 'post',
+    params:{
+      id:id,
+    }
+  })
+}
+//统计列表下载
+export function statisticalAnalysis() {
+  return request({
+    url: '/api/trade-project/project/statisticalAnalysis',
+    method: 'get',
+  })
+}
+
+//业绩分析
+export function performanceAnalysis(flag,year) {
+  return request({
+    url: '/api/trade-project/project/performanceAnalysis',
+    method: 'get',
+    params:{
+      flag:flag,
+      year: "2021"
+    }
+  })
+}

src/page/index/tags.vue

@@ -316,9 +316,12 @@ export default {
         if (tag.label == "收款结算") {
           this.$store.commit("RECE_OUT_DETAIL");
         }
-        if (tag.label == "结算") {
+        if (tag.label == "主营业务") {
           this.$store.commit("MAIN_OUT_DETAIL");
         }
+        if (tag.label == "结算") {
+          this.$store.commit("SE_OUT_DETAIL");
+        }
         this.$store.commit("DEL_TAG", tag);
         if (tag.value === this.tag.value) {
           tag = this.tagList[key === 0 ? key : key - 1]; //如果关闭本标签让前推一个

src/router/views/index.js

@@ -496,7 +496,7 @@ export default [{
     children: [
       {
         path: '/workManagement/main-items/list',
-        name:"主营项目",
+        name:"主营业务",
         meta: {
           keepAlive:true,
         },
@@ -512,6 +512,7 @@ export default [{
     children: [
       {
         path: '/workManagement/receipt/statisticalList',
+        name:"统计列表",
         meta: {
           keepAlive:true,
         },

src/store/getters.js

@@ -35,6 +35,7 @@ const getters = {
   pqStatus: state => state.ifdetail.pqStatus,
   paySettle: state => state.ifdetail.paySettle,
   receiptSettle: state => state.ifdetail.receiptSettle,
-  mainItemStatus: state => state.ifdetail.mainItemStatus
+  mainItemStatus: state => state.ifdetail.mainItemStatus,
+  settleStatus: state => state.ifdetail.settleStatus
 }
 export default getters

src/store/modules/ifdetail.js

@@ -9,7 +9,8 @@ const ifdetail = {
     pqStatus: false, //付款
     paySettle:false, //付款结算
     receiptSettle:false, //收款结算
-    mainItemStatus:false, //主营项目明细
+    mainItemStatus:false, //主营业务明细
+    settleStatus:false,//结算明细
   },
   actions: {},
   mutations: {
@@ -92,7 +93,7 @@ const ifdetail = {
     RECE_OUT_DETAIL(state) {
       state.receiptSettle = false;
     },
-    //进入事务管理结算明细
+    //进入事务管理主营业务明细
     MAIN_IN_DETAIL(state) {
       state.mainItemStatus = true;
     },
@@ -100,6 +101,14 @@ const ifdetail = {
     MAIN_OUT_DETAIL(state) {
       state.mainItemStatus = false;
     },
+    //进入事务管理结算明细
+    SE_IN_DETAIL(state) {
+      state.settleStatus = true;
+    },
+    //退出主营项目明细
+    SE_OUT_DETAIL(state) {
+      state.settleStatus = false;
+    },
     //关闭所有
     DEL_ALL_DETAIL(state) {
       for (let item in state) {
@@ -138,9 +147,12 @@ const ifdetail = {
       if (tag.label == '收款结算') {
         state.receiptSettle = true;
       }
-      if (tag.label == '结算') {
+      if (tag.label == '主营业务') {
         state.mainItemStatus = true;
       }
+      if (tag.label == '结算') {
+        state.settleStatus = true;
+      }
     }
   }
 

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

@@ -13,7 +13,7 @@
   "delBtn": false,
   "selection": true,
   "refreshBtn": false,
-  "menuWidth": 220,
+  "menuWidth": 180,
   "showSummary": true,
   "summaryText": "合计",
   "sumColumnList": [
@@ -38,18 +38,24 @@
     {
       "label": "服务项目",
       "prop": "pname",
-      "width": 120
+      "overHidden": true,
+      "index": 1,
+      "width": 100
     },
     {
       "label": "收费建议",
       "prop": "remarks",
-      "width": 150
+      "overHidden": true,
+      "index": 1,
+      "width": 100
     },
     {
       "label": "承做人",
       "prop": "userid",
       "slot": true,
-      "width": 180
+      "overHidden": true,
+      "index": 1,
+      "width": 130
     },
     {
       "label": "任务部门",
@@ -62,7 +68,45 @@
       },
       "cell": true,
       "slot": true,
-      "width": 150,
+      "overHidden": true,
+      "index": 1,
+      "width": 130,
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "开始日期",
+      "prop": "beginTime",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
+      "format": "yyyy-MM-dd",
+      "type": "date",
+      "overHidden": true,
+      "index": 1,
+      "width": 100,
+      "cell": true,
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "完成日期",
+      "prop": "actualDate",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
+      "format": "yyyy-MM-dd",
+      "type": "date",
+      "overHidden": true,
+      "index": 1,
+      "width": 100,
+      "cell": true,
       "rules": [
         {
           "required": true,
@@ -74,17 +118,23 @@
     {
       "label": "服务费",
       "prop": "serviceCharge",
-      "width": 120
+      "overHidden": true,
+      "index": 1,
+      "width": 100
     },
     {
       "label": "代垫费",
       "prop": "matMoney",
-      "width": 120
+      "overHidden": true,
+      "index": 1,
+      "width": 100
     },
     {
       "label": "合计金额",
       "prop": "amount",
-      "width": 120,
+      "overHidden": true,
+      "index": 1,
+      "width": 100,
       "rules": [
         {
           "required": true,
@@ -102,7 +152,9 @@
         "label": "dictValue",
         "value": "dictKey"
       },
-      "width": 120,
+      "overHidden": true,
+      "index": 1,
+      "width": 100,
       "cell": true
     },
     {
@@ -111,48 +163,40 @@
       "valueFormat": "yyyy-MM-dd HH:mm:ss",
       "format": "yyyy-MM-dd",
       "type": "date",
-      "width": 150,
-      "cell": true
-    },
-    {
-      "label": "需求开始日期",
-      "prop": "beginTime",
-      "valueFormat": "yyyy-MM-dd HH:mm:ss",
-      "format": "yyyy-MM-dd",
-      "type": "date",
-      "width": 150,
-      "cell": true
-    },
-    {
-      "label": "需求完成日期",
-      "prop": "actualDate",
-      "valueFormat": "yyyy-MM-dd HH:mm:ss",
-      "format": "yyyy-MM-dd",
-      "type": "date",
-      "width": 150,
+      "overHidden": true,
+      "index": 1,
+      "width": 100,
       "cell": true
     },
     {
       "label": "制单人",
       "prop": "createUserName",
       "disabled": true,
-      "width": 120
+      "overHidden": true,
+      "index": 1,
+      "width": 100
     },
     {
       "label": "制单日期",
       "prop": "createTime",
       "disabled": true,
-      "width": 150
+      "overHidden": true,
+      "index": 1,
+      "width": 100
     },
     {
       "label": "最新修改人",
       "prop": "updateUserName",
-      "width": 120
+      "overHidden": true,
+      "index": 1,
+      "width": 100
     },
     {
       "label": "最新修改时间",
       "prop": "updateTime",
-      "width": 150
+      "overHidden": true,
+      "index": 1,
+      "width": 100
     }
   ]
 }

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

@@ -120,12 +120,6 @@ export default {
     };
   },
   created() {
-    if(this.$route.query.itemId){
-      this.detailData={
-        itemId:this.$route.query.itemId
-      }
-      this.show = false;
-    }
     getUserList().then(res=>{
       res.data.data.map((item,index)=>{
         if(index <= 20){
@@ -134,6 +128,20 @@ export default {
       })
     })
   },
+  activated() {
+    if(!this.show && !this.$store.getters.mainItemStatus){
+      this.show = true;
+    }
+    setTimeout(() => {
+      if(this.$route.query.itemId &&  this.show){
+        this.detailData={
+          itemId:this.$route.query.itemId
+        }
+        this.show = false;
+        this.$store.commit("MAIN_IN_DETAIL");
+      }
+    }, 100);
+  },
   mounted() {
 
   },
@@ -202,6 +210,7 @@ export default {
         id: '',
       };
       this.show = false;
+      this.$store.commit("MAIN_IN_DETAIL");
     },
     //编辑打开
     editOpen(row, index){
@@ -209,6 +218,7 @@ export default {
         id: row.id
       };
       this.show = false;
+      this.$store.commit("MAIN_IN_DETAIL");
     },
     searchChange(params, done) {
       this.getList(this.page, params);

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

@@ -0,0 +1,188 @@
+{
+  "lazy": true,
+  "tip": false,
+  "simplePage": true,
+  "searchShow": true,
+  "searchMenuSpan": 8,
+  "dialogWidth": "60%",
+  "align": "center",
+  "searchSpan": 8,
+  "searchMenuPosition": "right",
+  "border": true,
+  "index": true,
+  "selection": false,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "menuWidth": 80,
+  "dialogClickModal": false,
+  "searchLabelWidth": 120,
+  "searchIcon": true,
+  "searchIndex": 2,
+  "addBtn":false,
+  "menu": true,
+  "headerAlign": "center",
+  "showSummary": true,
+  "summaryText": "合计",
+  "sumColumnList": [
+    {
+      "name": "amount",
+      "type": "sum"
+    },
+    {
+      "name": "settlementAmount",
+      "type": "sum"
+    }
+  ],
+  "column": [
+    {
+      "label": "年份",
+      "prop": "year",
+      "search": true,
+      "hide": true,
+      "type": "select",
+      "searchValue": "2021",
+      "dicData": [
+        {
+        "label": "2018",
+        "value": 2018
+      },
+        {
+        "label": "2019",
+        "value": 2019
+      },
+        {
+          "label": "2020",
+          "value": 2020
+        },
+        {
+          "label": "2021",
+          "value": 2021
+        },
+        {
+          "label": "2022",
+          "value": 2022
+        }
+      ]
+    },
+    {
+      "label": "类型",
+      "prop": "flag",
+      "searchValue": "1",
+      "search": true,
+      "hide": true
+    },
+    {
+      "label": "客户名称",
+      "prop": "corpNames",
+      "overHidden": true,
+      "width": 200,
+      "index": 2
+    },
+    {
+      "label": "制单人名称",
+      "prop": "createUserName",
+      "overHidden": true,
+      "width": 200,
+      "index": 3
+    },
+    {
+      "label": "客户数量",
+      "prop": "countCorp",
+      "overHidden": true,
+      "width": 200,
+      "index": 3
+    },
+    {
+      "label": "制单人数量",
+      "prop": "countCreateUser",
+      "overHidden": true,
+      "width": 200,
+      "index": 3
+    },
+    {
+      "label": "1",
+      "prop": "jan",
+      "width": 90,
+      "overHidden": true,
+      "index": 7
+    },
+    {
+      "label": "2",
+      "prop": "feb",
+      "width": 90,
+      "overHidden": true,
+      "index": 7
+    },
+    {
+      "label": "3",
+      "prop": "mar",
+      "width": 90,
+      "overHidden": true,
+      "index": 7
+    },
+    {
+      "label": "4",
+      "prop": "apr",
+      "width": 90,
+      "overHidden": true,
+      "index": 7
+    },
+    {
+      "label": "5",
+      "prop": "may",
+      "width": 90,
+      "overHidden": true,
+      "index": 7
+    },
+    {
+      "label": "6",
+      "prop": "june",
+      "width": 90,
+      "overHidden": true,
+      "index": 7
+    },
+    {
+      "label": "7",
+      "prop": "july",
+      "width": 90,
+      "overHidden": true,
+      "index": 7
+    },
+    {
+      "label": "8",
+      "prop": "aug",
+      "width": 90,
+      "overHidden": true,
+      "index": 7
+    },
+    {
+      "label": "9",
+      "prop": "sept",
+      "width": 90,
+      "overHidden": true,
+      "index": 7
+    },
+    {
+      "label": "10",
+      "prop": "oct",
+      "overHidden": true,
+      "width": 90,
+      "index": 8
+    },
+    {
+      "label": "11",
+      "prop": "nov",
+      "overHidden": true,
+      "width": 90,
+      "index": 8
+    },
+    {
+      "label": "12",
+      "prop": "dece",
+      "overHidden": true,
+      "width": 90,
+      "index": 8
+    }
+  ]
+}

src/views/workManagement/performanceAnalysis/index.vue

@@ -0,0 +1,177 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :data="dataList"
+               ref="crud"
+               v-model="form"
+               :page.sync="page"
+               :search.sync="search"
+               :table-loading="loading"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="flagSearch">
+        <el-select   v-model="search.flag"  placeholder="" >
+          <el-option
+            v-for="item in flagOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </template>
+      <template slot-scope="scope" slot="menu">
+        <el-button
+          type="text"
+          icon="el-icon-delete"
+          size="small"
+          :disabled="scope.row.billType === '申请' && scope.row.settlementAmount != 0"
+          @click.stop=""
+        >删除
+        </el-button>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import option from "./config/mainList.json";
+  import { performanceAnalysis } from "@/api/workManagement/mainProject";
+  import _ from "lodash";
+
+  export default {
+    data() {
+      return {
+        loading : false,
+        form: {},
+        search:{},
+        detailData:{},
+        option: option,
+        parentId:0,
+        dataList: [],
+        flagOptions:[{
+          value: '1',
+          label: '制单人'
+        }, {
+          value: '2',
+          label: '客户'
+        }],
+        page: {
+          pageSize: 10,
+          pagerCount: 5,
+          total: 0,
+        },
+        query:{},
+        configuration:{
+          multipleChoices:false,
+          multiple:false,
+          disabled:false,
+          searchShow:true,
+          collapseTags:false,
+          clearable:true,
+          placeholder:'请点击右边按钮选择',
+          dicData:[]
+        },
+        breakConfiguration:{
+          multipleChoices:false,
+          multiple:false,
+          disabled:false,
+          searchShow:true,
+          collapseTags:false,
+          clearable:true,
+          placeholder:'请点击右边按钮选择',
+          dicData:[]
+        },
+      }
+    },
+    created() {
+      this.option.column.forEach(item =>{
+        if(item.prop == "corpNames" || item.prop == "countCreateUser" ) {
+          item.hide = true
+        }
+      })
+    },
+    mounted() {
+      // option.height = window.innerHeight - 200 ;
+    },
+    methods: {
+      //新单打开
+      addReceipt(row){
+        console.log(1)
+      },
+      //编辑打开
+      editOpen(row){
+        console.log(1)
+      },
+      searchReset() {
+        console.log('1')
+      },
+      selectionChange() {
+        console.log('1')
+      },
+      sizeChange() {
+        console.log('1')
+      },
+      currentChange(val) {
+        this.page.currentPage = val
+      },
+      refreshChange(params) {
+        this.onLoad(this.page,params);
+      },
+      //点击搜索按钮触发
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done()
+      },
+
+      paramsAdjustment(params) {
+        params = Object.assign({}, this.search);
+        if(params.flag == 1){
+          this.option.column.forEach(item =>{
+            if(item.prop == "corpNames" || item.prop == "countCreateUser" ) {
+              item.hide = true
+            }
+          })
+          this.option.column.forEach(item =>{
+            if(item.prop == "createUserName" || item.prop == "countCorp" ) {
+              item.hide = false
+            }
+          })
+        }else{
+          this.option.column.forEach(item =>{
+            if(item.prop == "createUserName" || item.prop == "countCorp" ) {
+              item.hide = true
+            }
+          })
+          this.option.column.forEach(item =>{
+            if(item.prop == "corpNames" || item.prop == "countCreateUser" ) {
+              item.hide = false
+            }
+          })
+        }
+        return params
+      },
+
+      onLoad(page, params) {
+        this.loading = true;
+        params = this.paramsAdjustment(params)
+        performanceAnalysis(page.currentPage, page.pageSize,params).then(res=>{
+          this.dataList = res.data.data
+          // this.page.total = res.data.data
+        }).finally(()=>{
+          this.loading = false;
+        })
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -46,40 +46,53 @@
     {
       "label": "服务项目",
       "prop": "pname",
-      "width": 120
+      "overHidden": true,
+      "index": 1,
+      "width": 100
     },
     {
       "label": "收费建议",
       "prop": "remarks",
-      "width": 150
+      "overHidden": true,
+      "index": 2,
+      "width": 100
     },
     {
       "label": "服务费",
       "prop": "serviceCharge",
-      "width": 120
+      "overHidden": true,
+      "index": 3,
+      "width": 100
     },
     {
       "label": "代垫费",
       "prop": "matMoney",
-      "width": 120
+      "overHidden": true,
+      "index": 4,
+      "width": 100
     },
     {
       "label": "追加费",
       "prop": "superaddition",
       "hide": true,
-      "width": 120
+      "overHidden": true,
+      "index": 5,
+      "width": 100
     },
     {
       "label": "合计金额",
       "prop": "amount",
       "overHidden": true,
-      "width": 120
+      "index": 6,
+      "width": 100
     },
     {
       "label": "承做人",
       "prop": "userid",
       "slot": true,
-      "width": 180
+      "overHidden": true,
+      "index": 7,
+      "width": 130
     },
     {
       "label": "任务部门",
@@ -92,7 +105,45 @@
       },
       "slot": true,
       "cell": true,
-      "width": 150,
+      "overHidden": true,
+      "index": 8,
+      "width": 130,
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "开始日期",
+      "prop": "beginTime",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
+      "format": "yyyy-MM-dd",
+      "type": "date",
+      "overHidden": true,
+      "index": 9,
+      "width": 100,
+      "cell": true,
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "结束日期",
+      "prop": "actualDate",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
+      "format": "yyyy-MM-dd",
+      "type": "date",
+      "overHidden": true,
+      "index": 10,
+      "width": 100,
+      "cell": true,
       "rules": [
         {
           "required": true,
@@ -105,12 +156,14 @@
       "label": "账户名称",
       "prop": "accountName",
       "overHidden": true,
-      "width": 120
+      "index": 11,
+      "width": 100
     },
     {
       "label": "结算日期",
       "prop": "payTime",
-      "width": 120,
+      "index": 12,
+      "width": 100,
       "overHidden": true,
       "valueFormat": "yyyy-MM-dd",
       "format": "yyyy-MM-dd",
@@ -125,7 +178,9 @@
         "label": "dictValue",
         "value": "dictKey"
       },
-      "width": 120,
+      "overHidden": true,
+      "index": 13,
+      "width": 100,
       "cell": true
     },
     {
@@ -134,48 +189,40 @@
       "valueFormat": "yyyy-MM-dd HH:mm:ss",
       "format": "yyyy-MM-dd",
       "type": "date",
-      "width": 150,
-      "cell": true
-    },
-    {
-      "label": "需求开始日期",
-      "prop": "beginTime",
-      "valueFormat": "yyyy-MM-dd HH:mm:ss",
-      "format": "yyyy-MM-dd",
-      "type": "date",
-      "width": 150,
-      "cell": true
-    },
-    {
-      "label": "需求完成日期",
-      "prop": "actualDate",
-      "valueFormat": "yyyy-MM-dd HH:mm:ss",
-      "format": "yyyy-MM-dd",
-      "type": "date",
-      "width": 150,
+      "overHidden": true,
+      "index": 14,
+      "width": 100,
       "cell": true
     },
     {
       "label": "制单人",
       "prop": "createUserName",
       "disabled": true,
-      "width": 120
+      "overHidden": true,
+      "index": 15,
+      "width": 100
     },
     {
       "label": "制单日期",
       "prop": "createTime",
       "disabled": true,
-      "width": 150
+      "overHidden": true,
+      "index": 16,
+      "width": 100
     },
     {
       "label": "最新修改人",
       "prop": "updateUserName",
-      "width": 120
+      "overHidden": true,
+      "index": 17,
+      "width": 100
     },
     {
       "label": "最新修改时间",
       "prop": "updateTime",
-      "width": 150
+      "overHidden": true,
+      "index": 18,
+      "width": 100
     }
   ]
 }

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

@@ -38,40 +38,53 @@
     {
       "label": "服务项目",
       "prop": "pname",
-      "width": 120
+      "overHidden": true,
+      "index": 1,
+      "width": 100
     },
     {
       "label": "收费建议",
       "prop": "remarks",
-      "width": 150
+      "overHidden": true,
+      "index": 1,
+      "width": 100
     },
     {
       "label": "服务费",
       "prop": "serviceCharge",
-      "width": 120
+      "overHidden": true,
+      "index": 1,
+      "width": 100
     },
     {
       "label": "代垫费",
       "prop": "matMoney",
-      "width": 120
+      "overHidden": true,
+      "index": 1,
+      "width": 100
     },
     {
       "label": "退费",
       "prop": "costReturn",
       "hide": true,
-      "width": 120
+      "overHidden": true,
+      "index": 1,
+      "width": 100
     },
     {
       "label": "合计金额",
       "prop": "amount",
       "overHidden": true,
-      "width": 120
+      "index": 1,
+      "width": 100
     },
     {
       "label": "承做人",
       "prop": "userid",
       "slot": true,
-      "width": 180
+      "overHidden": true,
+      "index": 1,
+      "width": 130
     },
     {
       "label": "任务部门",
@@ -84,7 +97,45 @@
       },
       "slot": true,
       "cell": true,
-      "width": 150,
+      "overHidden": true,
+      "index": 1,
+      "width": 130,
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "开始日期",
+      "prop": "beginTime",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
+      "format": "yyyy-MM-dd",
+      "type": "date",
+      "overHidden": true,
+      "index": 1,
+      "width": 100,
+      "cell": true,
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "结束日期",
+      "prop": "actualDate",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
+      "format": "yyyy-MM-dd",
+      "type": "date",
+      "overHidden": true,
+      "index": 1,
+      "width": 100,
+      "cell": true,
       "rules": [
         {
           "required": true,
@@ -97,12 +148,14 @@
       "label": "账户名称",
       "prop": "accountName",
       "overHidden": true,
-      "width": 120
+      "index": 1,
+      "width": 100
     },
     {
       "label": "结算日期",
       "prop": "payTime",
-      "width": 120,
+      "index": 1,
+      "width": 100,
       "overHidden": true,
       "valueFormat": "yyyy-MM-dd",
       "format": "yyyy-MM-dd",
@@ -117,7 +170,9 @@
         "label": "dictValue",
         "value": "dictKey"
       },
-      "width": 120,
+      "overHidden": true,
+      "index": 1,
+      "width": 100,
       "cell": true
     },
     {
@@ -126,48 +181,40 @@
       "valueFormat": "yyyy-MM-dd HH:mm:ss",
       "format": "yyyy-MM-dd",
       "type": "date",
-      "width": 150,
-      "cell": true
-    },
-    {
-      "label": "需求开始日期",
-      "prop": "beginTime",
-      "valueFormat": "yyyy-MM-dd HH:mm:ss",
-      "format": "yyyy-MM-dd",
-      "type": "date",
-      "width": 150,
-      "cell": true
-    },
-    {
-      "label": "需求完成日期",
-      "prop": "actualDate",
-      "valueFormat": "yyyy-MM-dd HH:mm:ss",
-      "format": "yyyy-MM-dd",
-      "type": "date",
-      "width": 150,
+      "overHidden": true,
+      "index": 1,
+      "width": 100,
       "cell": true
     },
     {
       "label": "制单人",
       "prop": "createUserName",
       "disabled": true,
-      "width": 120
+      "overHidden": true,
+      "index": 1,
+      "width": 100
     },
     {
       "label": "制单日期",
       "prop": "createTime",
       "disabled": true,
-      "width": 150
+      "overHidden": true,
+      "index": 1,
+      "width": 100
     },
     {
       "label": "最新修改人",
       "prop": "updateUserName",
-      "width": 120
+      "overHidden": true,
+      "index": 1,
+      "width": 100
     },
     {
       "label": "最新修改时间",
       "prop": "updateTime",
-      "width": 150
+      "overHidden": true,
+      "index": 1,
+      "width": 100
     }
   ]
 }

src/views/workManagement/receipt/settleAccounts.vue

@@ -125,7 +125,7 @@
             itemId:this.$route.query.itemId
           }
           this.show = false;
-          this.$store.commit("MAIN_IN_DETAIL");
+          this.$store.commit("SE_IN_DETAIL");
         }
       }, 100);
     },
@@ -187,7 +187,7 @@
           id: row.id
         };
         this.show = false;
-        this.$store.commit("MAIN_IN_DETAIL");
+        this.$store.commit("SE_IN_DETAIL");
       },
       searchChange(params, done) {
         this.getList(this.page, params);

src/views/workManagement/receipt/settleAccountsDetailsPage.vue

@@ -268,8 +268,7 @@
         secondDisable:0,
         aaccount:{},
         form: {},
-        accountFormData:{
-        },
+        accountFormData:{},
         rules:[{
           required: true,
           message: ' ',

src/views/workManagement/receipt/statisticalList.vue

@@ -72,7 +72,7 @@
 <script>
   import option from "./configuration/statisticalList.json";
   import reportDialog from "@/components/report-dialog/main";
-  import { getFlowList,getUserList } from "@/api/workManagement/mainProject";
+  import { getFlowList,getUserList ,statisticalAnalysis} from "@/api/workManagement/mainProject";
 
   export default {
     name: "statisticalList",
@@ -175,7 +175,7 @@
       },
       check(row,index){
         if(this.$store.getters.mainItemStatus){
-          this.$alert("结算页面已存在,请关闭结算页面再进行操作", "温馨提示", {
+          this.$alert("主营业务页面已存在,请关闭页面再进行操作", "温馨提示", {
             confirmButtonText: "确定",
             type: 'warning',
             callback: action => {
@@ -183,10 +183,9 @@
           });
         }else{
           //关闭一下存在的列表页
-          ///workManagement/receipt/settleAccounts
-          this.$router.$avueRouter.closeTag('/workManagement/receipt/settleAccounts');
+          this.$router.$avueRouter.closeTag('/workManagement/main-items/list');
           this.$router.push({
-            path: "/workManagement/receipt/settleAccounts",
+            path: "/workManagement/main-items/list",
             query: {itemId: row.pid},
           });
         }