项目成本折叠+明细

src/views/module_kzks/projectCostList/ProjectCostList.vue

@@ -104,7 +104,8 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
-      <a-button type="primary" icon="download" @click="handleExportXls('项目成本')">导出</a-button>
+      <a-button @click="handleExpand" type="primary" icon="column-height">折叠/展开</a-button>
+      <!-- <a-button type="primary" icon="download" @click="handleExportXls('项目成本')">导出</a-button> -->
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
@@ -149,7 +150,6 @@
       </div>
 
       <a-table
-        v-if="dataSource.length"
         ref="table"
         size="middle"
         :scroll="{x:true}"
@@ -160,7 +160,8 @@
         :pagination="ipagination"
         :loading="loading"
         class="j-table-force-nowrap"
-        defaultExpandAllRows
+        :expandedRowKeys="expandedRowKeys"
+        @expand="onExpand"
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange"
         :indentSize="12">
@@ -255,8 +256,9 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ProjectDetailModal from './modulesDetail/ProjectDetailModal'
-import AllList from '../projectContrastList/allList.vue'
-import WuliaoList from '../projectContrastList/wuliaoList.vue'
+  import AllList from '../projectContrastList/allList.vue'
+  import WuliaoList from '../projectContrastList/wuliaoList.vue'
+  import { getAction } from '@/api/manage'
 
   export default {
     name: 'ProjectCostList',
@@ -269,6 +271,10 @@ import WuliaoList from '../projectContrastList/wuliaoList.vue'
     data () {
       return {
         description: '项目成本管理页面',
+        // 一键折叠/展开
+        expandedRowKeys: [],
+        // 是否全部展开
+        isExpanded: true,
         // 获取到的对比数据
         duibiList: [],
         // 获取到的材料费对比数据
@@ -445,7 +451,8 @@ import WuliaoList from '../projectContrastList/wuliaoList.vue'
           {
             title:'工时(h)',
             align:"center",
-            dataIndex: 'workhour'
+            dataIndex: 'workhour',
+            customCell: this.getClickColumn,
           },
           {
             title:'责任部门',
@@ -555,6 +562,7 @@ import WuliaoList from '../projectContrastList/wuliaoList.vue'
     },
     created() {
       this.initColumns();
+      this.loadData()
       this.getSuperFieldList();
     },
     computed: {
@@ -563,6 +571,36 @@ import WuliaoList from '../projectContrastList/wuliaoList.vue'
       },
     },
     methods: {
+      loadData(arg) {
+        if(!this.url.list){
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        var params = this.getQueryParams();//查询条件
+        this.loading = true;
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+            this.dataSource = res.result.records||res.result;
+            if(res.result.total)
+            {
+              this.ipagination.total = res.result.total;
+            }else{
+              this.ipagination.total = 0;
+            }
+            //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+            this.setDefaultExpand()
+          }else{
+            this.$message.warning(res.message)
+          }
+        }).finally(() => {
+          this.loading = false
+        })
+      },
       initDictConfig(){
       },
       getSuperFieldList(){
@@ -664,6 +702,9 @@ import WuliaoList from '../projectContrastList/wuliaoList.vue'
         columnsEdit({checkedValues: checkedValues})
       },
       getClickColumn(record, index){
+        if(record.children){
+          return false
+        }
         return {
           style: {
             'color': '#1890ff',
@@ -671,6 +712,10 @@ import WuliaoList from '../projectContrastList/wuliaoList.vue'
           },
           on: {
             click: (event)=> {
+              // 没有值不弹窗
+              if(!event.target.textContent){
+                return
+              }
               // console.log(record, index, event, event.target.cellIndex)
               console.log(this.columns[event.target.cellIndex - 1])
               var clickColumn = this.columns[event.target.cellIndex - 1].dataIndex
@@ -709,7 +754,38 @@ import WuliaoList from '../projectContrastList/wuliaoList.vue'
         this.duiBi = false
         this.duibiList = []
         this.duibiclList = []
-      }
+      },
+      // 一键折叠展开
+      handleExpand(){
+        console.log(this.isExpanded)
+        if(this.isExpanded){
+          // 当前为展开，全部折叠
+          this.expandedRowKeys = []
+        } else {
+          // 当前为折叠，全部展开
+          this.setDefaultExpand()
+        }
+        this.isExpanded = !this.isExpanded
+      },
+      // 全部展开
+      setDefaultExpand(){
+        this.expandedRowKeys = this.dataSource.map(res => res.id)
+      },
+      onExpand (expanded, record) {
+        if (expanded) {
+          console.log(record.id)
+          // 设置展开窗Key，代表展开操作
+          this.expandedRowKeys.push(record.id)
+        } else {
+          // 代表折叠操作
+          if (this.expandedRowKeys.length) {
+            this.expandedRowKeys = this.expandedRowKeys.filter(v => {
+              return v !== record.id
+            })
+          }
+        }
+      },
+
     }
   }
 </script>

src/views/module_kzks/projectCostList/modulesDetail/CollectDetailList.vue

@@ -114,7 +114,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,
@@ -124,203 +124,70 @@
             }
           },
           {
-            title:'编号',
+            title:'任务号',
             align:"center",
-            dataIndex: 'bh'
+            dataIndex: 'rwbh'
           },
           {
-            title:'部门（合同付款）',
+            title:'任务名称',
             align:"center",
-            dataIndex: 'bm'
+            dataIndex: 'rwmc'
           },
           {
-            title:'产品型号',
+            title:'任务收款金额',
             align:"center",
-            dataIndex: 'cpxh'
+            dataIndex: 'rwskje'
           },
+
           {
-            title:'待付款（元）',
+            title:'编号',
             align:"center",
-            dataIndex: 'dfk'
+            dataIndex: 'bh'
           },
           {
-            title:'待开票（元）',
+            title:'产品型号',
             align:"center",
-            dataIndex: 'dkp'
+            dataIndex: 'cpxh'
           },
           {
-            title:'到款（元）',
+            title:'部门（合同付款）',
             align:"center",
-            dataIndex: 'dk'
+            dataIndex: 'bm'
           },
           {
             title:'到款日期/汇票到期日期',
             align:"center",
             dataIndex: 'dkhpdqrq',
             customRender:function (text) {
-              return !text?"":(textlength>10?textsubstr(0,10):text)
+              return !text?"":(text.length>10?textsubstr(0,10):text)
             }
           },
           {
-            title:'电话',
-            align:"center",
-            dataIndex: 'dh'
-          },
-          {
-            title:'发票编号（sn）',
-            align:"center",
-            dataIndex: 'fpbh'
-          },
-          {
-            title:'发票编码',
-            align:"center",
-            dataIndex: 'fpbm'
-          },
-          {
-            title:'发票开具额',
-            align:"center",
-            dataIndex: 'fpkje'
-          },
-          {
-            title:'发票类型',
-            align:"center",
-            dataIndex: 'fplx'
-          },
-          {
-            title:'发票内容',
-            align:"center",
-            dataIndex: 'fpnr'
-          },
-          {
             title:'付款方名称',
             align:"center",
             dataIndex: 'fkfmc'
           },
           {
-            title:'更新时间',
-            align:"center",
-            dataIndex: 'gxsj',
-            customRender:function (text) {
-              return !text?"":(textlength>10?textsubstr(0,10):text)
-            }
-          },
-          {
-            title:'归档编号',
-            align:"center",
-            dataIndex: 'gdbh'
-          },
-          {
-            title:'归档日期',
-            align:"center",
-            dataIndex: 'gdrq',
-            customRender:function (text) {
-              return !text?"":(textlength>10?textsubstr(0,10):text)
-            }
-          },
-          {
             title:'合同编号',
             align:"center",
             dataIndex: 'htbh'
           },
           {
-            title:'合同发票接收邮箱地址',
-            align:"center",
-            dataIndex: 'htfpjsyxdz'
-          },
-          {
-            title:'合同分配额',
-            align:"center",
-            dataIndex: 'htfpe'
-          },
-          {
-            title:'合同金额',
-            align:"center",
-            dataIndex: 'htje'
-          },
-          {
-            title:'合同款状态',
-            align:"center",
-            dataIndex: 'htkzt'
-          },
-          {
             title:'合同类型',
             align:"center",
             dataIndex: 'htlx'
           },
           {
-            title:'合同履行情况',
-            align:"center",
-            dataIndex: 'htlxqk'
-          },
-          {
-            title:'合同密级',
-            align:"center",
-            dataIndex: 'htmj'
-          },
-          {
             title:'合同名称',
             align:"center",
             dataIndex: 'htmc'
           },
           {
-            title:'合同起草人',
-            align:"center",
-            dataIndex: 'htqcr'
-          },
-          {
-            title:'合同签订日期',
-            align:"center",
-            dataIndex: 'htqdrq',
-            customRender:function (text) {
-              return !text?"":(textlength>10?textsubstr(0,10):text)
-            }
-          },
-          {
-            title:'合同任务id',
-            align:"center",
-            dataIndex: 'htrwid'
-          },
-          {
-            title:'合同数量',
-            align:"center",
-            dataIndex: 'htsl'
-          },
-          {
-            title:'合同页数',
-            align:"center",
-            dataIndex: 'htys'
-          },
-          {
             title:'合同主管部门',
             align:"center",
             dataIndex: 'htzgbm'
           },
           {
-            title:'合同状态',
-            align:"center",
-            dataIndex: 'htzt'
-          },
-          {
-            title:'合同状态说明',
-            align:"center",
-            dataIndex: 'htztsm'
-          },
-          {
-            title:'甲方（付款方）',
-            align:"center",
-            dataIndex: 'jf'
-          },
-          {
-            title:'甲方简称、用户简称',
-            align:"center",
-            dataIndex: 'jfyhjc'
-          },
-          {
-            title:'甲方签约人',
-            align:"center",
-            dataIndex: 'jfqyr'
-          },
-          {
             title:'阶段',
             align:"center",
             dataIndex: 'jd'
@@ -331,24 +198,6 @@
             dataIndex: 'jeskzkp'
           },
           {
-            title:'开户行',
-            align:"center",
-            dataIndex: 'khx'
-          },
-          {
-            title:'开票时间',
-            align:"center",
-            dataIndex: 'kpsj',
-            customRender:function (text) {
-              return !text?"":(textlength>10?textsubstr(0,10):text)
-            }
-          },
-          {
-            title:'开票状态',
-            align:"center",
-            dataIndex: 'kpzt'
-          },
-          {
             title:'客户id',
             align:"center",
             dataIndex: 'khid'
@@ -358,15 +207,20 @@
             align:"center",
             dataIndex: 'khlcbh'
           },
+          // {
+          //   title:'联系人（对方）',
+          //   align:"center",
+          //   dataIndex: 'lxr'
+          // },
           {
-            title:'联系人（对方）',
+            title:'录入人、申请人',
             align:"center",
-            dataIndex: 'lxr'
+            dataIndex: 'lrsqr'
           },
           {
-            title:'录入人、申请人',
+            title:'类型（无用）',
             align:"center",
-            dataIndex: 'lrsqr'
+            dataIndex: 'pici'
           },
           {
             title:'凭证号',
@@ -382,40 +236,7 @@
             }
           },
           {
-            title:'签署日期',
-            align:"center",
-            dataIndex: 'qsrq',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'确认外协',
-            align:"center",
-            dataIndex: 'qrwx'
-          },
-          {
-            title:'任务编号',
-            align:"center",
-            dataIndex: 'rwbh'
-          },
-          {
-            title:'任务名称',
-            align:"center",
-            dataIndex: 'rwmc'
-          },
-          {
-            title:'任务收款金额',
-            align:"center",
-            dataIndex: 'rwskje'
-          },
-          {
-            title:'申请人部门',
-            align:"center",
-            dataIndex: 'sqrbm'
-          },
-          {
-            title:'收款编号（sn）',
+            title:'收款编号',
             align:"center",
             dataIndex: 'skbh'
           },
@@ -429,99 +250,27 @@
             align:"center",
             dataIndex: 'sklx'
           },
-          {
-            title:'数据来源：10：合同管理，20：合同任务，30：任务合同，40：合同付款，50：合同发票，60：外协合同',
-            align:"center",
-            dataIndex: 'sjly'
-          },
+          // {
+          //   title:'数据来源',
+          //   // ：10：合同管理，20：合同任务，30：任务合同，40：合同付款，50：合同发票，60：外协合同
+          //   align:"center",
+          //   dataIndex: 'sjly'
+          // },
           {
             title:'数量（合同付款）',
             align:"center",
             dataIndex: 'sl'
           },
           {
-            title:'税号',
-            align:"center",
-            dataIndex: 'sh'
-          },
-          {
-            title:'所属型号',
-            align:"center",
-            dataIndex: 'ssxh'
-          },
-          {
-            title:'外协单号（sn）',
-            align:"center",
-            dataIndex: 'wxdh'
-          },
-          {
-            title:'外协合同编号',
-            align:"center",
-            dataIndex: 'wxhtbh'
-          },
-          {
-            title:'外协类型',
-            align:"center",
-            dataIndex: 'wxlx'
-          },
-          {
-            title:'项目密级',
-            align:"center",
-            dataIndex: 'xmmj'
-          },
-          {
-            title:'发票需求时间',
-            align:"center",
-            dataIndex: 'fpxqsj',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
             title:'序号',
             align:"center",
             dataIndex: 'xh'
           },
-          {
-            title:'研制部门',
-            align:"center",
-            dataIndex: 'yzbm'
-          },
-          {
-            title:'业务员',
-            align:"center",
-            dataIndex: 'ywy'
-          },
-          {
-            title:'业务员部门',
-            align:"center",
-            dataIndex: 'ywybm'
-          },
-          {
-            title:'乙方（收款方）',
-            align:"center",
-            dataIndex: 'yf'
-          },
-          {
-            title:'乙方签约人',
-            align:"center",
-            dataIndex: 'yfqyr'
-          },
-          {
-            title:'已开票（元）',
-            align:"center",
-            dataIndex: 'ykp'
-          },
-          {
-            title:'已收款',
-            align:"center",
-            dataIndex: 'ysk'
-          },
-          {
-            title:'用户id',
-            align:"center",
-            dataIndex: 'yhid'
-          },
+          // {
+          //   title:'用户id',
+          //   align:"center",
+          //   dataIndex: 'yhid'
+          // },
           {
             title:'用户简称',
             align:"center",
@@ -533,61 +282,16 @@
             dataIndex: 'yhmc'
           },
           {
-            title:'账号',
+            title:'业务员',
             align:"center",
-            dataIndex: 'zh'
+            dataIndex: 'ywy'
           },
           {
-            title:'执行状态（status）',
+            title:'执行状态',
             align:"center",
             dataIndex: 'zxzt'
           },
-          {
-            title:'主管设计师',
-            align:"center",
-            dataIndex: 'zgsjs'
-          },
-          {
-            title:'抓总部门',
-            align:"center",
-            dataIndex: 'zzbm'
-          },
-          {
-            title:'自筹（元）',
-            align:"center",
-            dataIndex: 'zc'
-          },
-          {
-            title:'类型（无用）',
-            align:"center",
-            dataIndex: 'pici'
-          },
-          {
-            title:'作废发票申请时间',
-            align:"center",
-            dataIndex: 'sqsj',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'作废单号',
-            align:"center",
-            dataIndex: 'zfdh'
-          },
-          {
-            title:'备注',
-            align:"center",
-            dataIndex: 'bz'
-          },
-          // {
-          //   title: '操作',
-          //   dataIndex: 'action',
-          //   align:"center",
-          //   fixed:"right",
-          //   width:147,
-          //   scopedSlots: { customRender: 'action' }
-          // }
+          
         ],
         url: {
           list: "/xmcbDetail/comContractInfoExchange/getCrmYskDetail",
@@ -595,7 +299,7 @@
           // deleteBatch: "/xmcbDetail/comContractInfoExchange/deleteBatch",
           // exportXlsUrl: "/xmcbDetail/comContractInfoExchange/exportXls",
           // importExcelUrl: "xmcbDetail/comContractInfoExchange/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -627,88 +331,35 @@
         fieldList.push({type:'string',value:'bh',text:'编号.',dictCode:''})
         fieldList.push({type:'string',value:'bm',text:'部门（合同付款）.',dictCode:''})
         fieldList.push({type:'string',value:'cpxh',text:'产品型号.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'dfk',text:'待付款（元）.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'dkp',text:'待开票（元）.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'dk',text:'到款（元）.',dictCode:''})
         fieldList.push({type:'date',value:'dkhpdqrq',text:'到款日期/汇票到期日期.'})
-        fieldList.push({type:'string',value:'dh',text:'电话.',dictCode:''})
-        fieldList.push({type:'string',value:'fpbh',text:'发票编号（sn）.',dictCode:''})
-        fieldList.push({type:'string',value:'fpbm',text:'发票编码.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'fpkje',text:'发票开具额.',dictCode:''})
-        fieldList.push({type:'string',value:'fplx',text:'发票类型.',dictCode:''})
-        fieldList.push({type:'string',value:'fpnr',text:'发票内容.',dictCode:''})
         fieldList.push({type:'string',value:'fkfmc',text:'付款方名称.',dictCode:''})
-        fieldList.push({type:'date',value:'gxsj',text:'更新时间.'})
-        fieldList.push({type:'string',value:'gdbh',text:'归档编号.',dictCode:''})
-        fieldList.push({type:'date',value:'gdrq',text:'归档日期.'})
         fieldList.push({type:'string',value:'htbh',text:'合同编号.',dictCode:''})
-        fieldList.push({type:'string',value:'htfpjsyxdz',text:'合同发票接收邮箱地址.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'htfpe',text:'合同分配额.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'htje',text:'合同金额.',dictCode:''})
-        fieldList.push({type:'string',value:'htkzt',text:'合同款状态.',dictCode:''})
         fieldList.push({type:'string',value:'htlx',text:'合同类型.',dictCode:''})
-        fieldList.push({type:'string',value:'htlxqk',text:'合同履行情况.',dictCode:''})
-        fieldList.push({type:'string',value:'htmj',text:'合同密级.',dictCode:''})
         fieldList.push({type:'string',value:'htmc',text:'合同名称.',dictCode:''})
-        fieldList.push({type:'string',value:'htqcr',text:'合同起草人.',dictCode:''})
-        fieldList.push({type:'date',value:'htqdrq',text:'合同签订日期.'})
-        fieldList.push({type:'string',value:'htrwid',text:'合同任务id.',dictCode:''})
-        fieldList.push({type:'int',value:'htsl',text:'合同数量.',dictCode:''})
-        fieldList.push({type:'int',value:'htys',text:'合同页数.',dictCode:''})
         fieldList.push({type:'string',value:'htzgbm',text:'合同主管部门.',dictCode:''})
-        fieldList.push({type:'string',value:'htzt',text:'合同状态.',dictCode:''})
-        fieldList.push({type:'string',value:'htztsm',text:'合同状态说明.',dictCode:''})
-        fieldList.push({type:'string',value:'jf',text:'甲方（付款方）.',dictCode:''})
-        fieldList.push({type:'string',value:'jfyhjc',text:'甲方简称、用户简称.',dictCode:''})
-        fieldList.push({type:'string',value:'jfqyr',text:'甲方签约人.',dictCode:''})
         fieldList.push({type:'string',value:'jd',text:'阶段.',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'jeskzkp',text:'金额（元）、收款总金额、开票金额.',dictCode:''})
-        fieldList.push({type:'string',value:'khx',text:'开户行.',dictCode:''})
-        fieldList.push({type:'date',value:'kpsj',text:'开票时间.'})
-        fieldList.push({type:'string',value:'kpzt',text:'开票状态.',dictCode:''})
         fieldList.push({type:'string',value:'khid',text:'客户id.',dictCode:''})
         fieldList.push({type:'string',value:'khlcbh',text:'客户流程编号.',dictCode:''})
         fieldList.push({type:'string',value:'lxr',text:'联系人（对方）.',dictCode:''})
         fieldList.push({type:'string',value:'lrsqr',text:'录入人、申请人.',dictCode:''})
         fieldList.push({type:'string',value:'pzh',text:'凭证号.',dictCode:''})
         fieldList.push({type:'date',value:'qclrsqrq',text:'起草日期、录入日期、申请日期.'})
-        fieldList.push({type:'date',value:'qsrq',text:'签署日期.'})
-        fieldList.push({type:'string',value:'qrwx',text:'确认外协.',dictCode:''})
         fieldList.push({type:'string',value:'rwbh',text:'任务编号.',dictCode:''})
         fieldList.push({type:'string',value:'rwmc',text:'任务名称.',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'rwskje',text:'任务收款金额.',dictCode:''})
-        fieldList.push({type:'string',value:'sqrbm',text:'申请人部门.',dictCode:''})
         fieldList.push({type:'string',value:'skbh',text:'收款编号（sn）.',dictCode:''})
         fieldList.push({type:'string',value:'skkmdm',text:'收款科目代码.',dictCode:''})
         fieldList.push({type:'string',value:'sklx',text:'收款类型.',dictCode:''})
         fieldList.push({type:'int',value:'sjly',text:'数据来源：10：合同管理，20：合同任务，30：任务合同，40：合同付款，50：合同发票，60：外协合同.',dictCode:''})
         fieldList.push({type:'int',value:'sl',text:'数量（合同付款）.',dictCode:''})
-        fieldList.push({type:'string',value:'sh',text:'税号.',dictCode:''})
-        fieldList.push({type:'string',value:'ssxh',text:'所属型号.',dictCode:''})
-        fieldList.push({type:'string',value:'wxdh',text:'外协单号（sn）.',dictCode:''})
-        fieldList.push({type:'string',value:'wxhtbh',text:'外协合同编号.',dictCode:''})
-        fieldList.push({type:'string',value:'wxlx',text:'外协类型.',dictCode:''})
-        fieldList.push({type:'string',value:'xmmj',text:'项目密级.',dictCode:''})
-        fieldList.push({type:'date',value:'fpxqsj',text:'发票需求时间.'})
         fieldList.push({type:'string',value:'xh',text:'序号.',dictCode:''})
-        fieldList.push({type:'string',value:'yzbm',text:'研制部门.',dictCode:''})
         fieldList.push({type:'string',value:'ywy',text:'业务员.',dictCode:''})
-        fieldList.push({type:'string',value:'ywybm',text:'业务员部门.',dictCode:''})
-        fieldList.push({type:'string',value:'yf',text:'乙方（收款方）.',dictCode:''})
-        fieldList.push({type:'string',value:'yfqyr',text:'乙方签约人.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'ykp',text:'已开票（元）.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'ysk',text:'已收款.',dictCode:''})
         fieldList.push({type:'string',value:'yhid',text:'用户id.',dictCode:''})
         fieldList.push({type:'string',value:'yhjc',text:'用户简称.',dictCode:''})
         fieldList.push({type:'string',value:'yhmc',text:'用户名称.',dictCode:''})
-        fieldList.push({type:'string',value:'zh',text:'账号.',dictCode:''})
         fieldList.push({type:'string',value:'zxzt',text:'执行状态（status）.',dictCode:''})
-        fieldList.push({type:'string',value:'zgsjs',text:'主管设计师.',dictCode:''})
-        fieldList.push({type:'string',value:'zzbm',text:'抓总部门.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'zc',text:'自筹（元）.',dictCode:''})
         fieldList.push({type:'string',value:'pici',text:'类型（无用）.',dictCode:''})
-        fieldList.push({type:'date',value:'sqsj',text:'作废发票申请时间'})
-        fieldList.push({type:'string',value:'zfdh',text:'作废单号',dictCode:''})
         this.superFieldList = fieldList
       }
     }

src/views/module_kzks/projectCostList/modulesDetail/ContractDetailList.vue

@@ -114,7 +114,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,
@@ -124,98 +124,37 @@
             }
           },
           {
-            title:'备注.',
-            align:"center",
-            dataIndex: 'bz'
-          },
-          {
-            title:'编号.',
-            align:"center",
-            dataIndex: 'bh'
-          },
-          {
-            title:'部门（合同付款）.',
-            align:"center",
-            dataIndex: 'bm'
-          },
-          {
-            title:'产品型号.',
+            title:'产品型号',
             align:"center",
             dataIndex: 'cpxh'
           },
           {
-            title:'待付款（元）.',
+            title:'待付款（元）',
             align:"center",
             dataIndex: 'dfk'
           },
           {
-            title:'待开票（元）.',
+            title:'待开票（元）',
             align:"center",
             dataIndex: 'dkp'
           },
           {
-            title:'到款（元）.',
+            title:'到款（元）',
             align:"center",
             dataIndex: 'dk'
           },
           {
-            title:'到款日期/汇票到期日期.',
-            align:"center",
-            dataIndex: 'dkhpdqrq',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'电话.',
+            title:'电话',
             align:"center",
             dataIndex: 'dh'
           },
           {
-            title:'发票编号（sn）.',
-            align:"center",
-            dataIndex: 'fpbh'
-          },
-          {
-            title:'发票编码.',
-            align:"center",
-            dataIndex: 'fpbm'
-          },
-          {
-            title:'发票开具额.',
-            align:"center",
-            dataIndex: 'fpkje'
-          },
-          {
-            title:'发票类型.',
-            align:"center",
-            dataIndex: 'fplx'
-          },
-          {
-            title:'发票内容.',
-            align:"center",
-            dataIndex: 'fpnr'
-          },
-          {
-            title:'付款方名称.',
-            align:"center",
-            dataIndex: 'fkfmc'
-          },
-          {
-            title:'更新时间.',
-            align:"center",
-            dataIndex: 'gxsj',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'归档编号.',
+            title:'归档编号',
             align:"center",
             dataIndex: 'gdbh'
           },
           {
-            title:'归档日期.',
+            title:'归档日期',
             align:"center",
             dataIndex: 'gdrq',
             customRender:function (text) {
@@ -223,163 +162,120 @@
             }
           },
           {
-            title:'合同编号.',
+            title:'合同编号',
             align:"center",
             dataIndex: 'htbh'
           },
           {
-            title:'合同发票接收邮箱地址.',
-            align:"center",
-            dataIndex: 'htfpjsyxdz'
-          },
-          {
-            title:'合同分配额.',
+            title:'合同分配额',
             align:"center",
             dataIndex: 'htfpe'
           },
           {
-            title:'合同金额.',
-            align:"center",
-            dataIndex: 'htje'
-          },
-          {
-            title:'合同款状态.',
+            title:'合同款状态',
             align:"center",
             dataIndex: 'htkzt'
           },
           {
-            title:'合同类型.',
+            title:'合同类型',
             align:"center",
             dataIndex: 'htlx'
           },
           {
-            title:'合同履行情况.',
+            title:'合同履行情况',
             align:"center",
             dataIndex: 'htlxqk'
           },
           {
-            title:'合同密级.',
+            title:'合同密级',
             align:"center",
             dataIndex: 'htmj'
           },
           {
-            title:'合同名称.',
+            title:'合同名称',
             align:"center",
             dataIndex: 'htmc'
           },
           {
-            title:'合同起草人.',
+            title:'合同起草人',
             align:"center",
             dataIndex: 'htqcr'
           },
           {
-            title:'合同签订日期.',
-            align:"center",
-            dataIndex: 'htqdrq',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'合同任务id.',
-            align:"center",
-            dataIndex: 'htrwid'
-          },
-          {
-            title:'合同数量.',
+            title:'合同数量',
             align:"center",
             dataIndex: 'htsl'
           },
           {
-            title:'合同页数.',
+            title:'合同页数',
             align:"center",
             dataIndex: 'htys'
           },
           {
-            title:'合同主管部门.',
+            title:'合同主管部门',
             align:"center",
             dataIndex: 'htzgbm'
           },
           {
-            title:'合同状态.',
+            title:'合同状态',
             align:"center",
             dataIndex: 'htzt'
           },
           {
-            title:'合同状态说明.',
+            title:'合同状态说明',
             align:"center",
             dataIndex: 'htztsm'
           },
+          // {
+          //   title:'id',
+          //   align:"center",
+          //   dataIndex: 'id'
+          // },
           {
-            title:'甲方（付款方）.',
-            align:"center",
-            dataIndex: 'jf'
-          },
-          {
-            title:'甲方简称、用户简称.',
-            align:"center",
-            dataIndex: 'jfyhjc'
-          },
-          {
-            title:'甲方签约人.',
-            align:"center",
-            dataIndex: 'jfqyr'
-          },
-          {
-            title:'阶段.',
+            title:'阶段',
             align:"center",
             dataIndex: 'jd'
           },
           {
-            title:'金额（元）、收款总金额、开票金额.',
+            title:'金额（元）、收款总金额、开票金额',
             align:"center",
             dataIndex: 'jeskzkp'
           },
           {
-            title:'开户行.',
+            title:'甲方（付款方）',
             align:"center",
-            dataIndex: 'khx'
+            dataIndex: 'jf'
           },
           {
-            title:'开票时间.',
+            title:'甲方简称、用户简称',
             align:"center",
-            dataIndex: 'kpsj',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
+            dataIndex: 'jfyhjc'
           },
+          // {
+          //   title:'开票时间',
+          //   align:"center",
+          //   dataIndex: 'kpsj',
+          //   customRender:function (text) {
+          //     return !text?"":(text.length>10?text.substr(0,10):text)
+          //   }
+          // },
           {
-            title:'开票状态.',
+            title:'开票状态',
             align:"center",
             dataIndex: 'kpzt'
           },
+          // {
+          //   title:'客户id',
+          //   align:"center",
+          //   dataIndex: 'khid'
+          // },
           {
-            title:'客户id.',
-            align:"center",
-            dataIndex: 'khid'
-          },
-          {
-            title:'客户流程编号.',
-            align:"center",
-            dataIndex: 'khlcbh'
-          },
-          {
-            title:'联系人（对方）.',
+            title:'联系人（对方）',
             align:"center",
             dataIndex: 'lxr'
           },
           {
-            title:'录入人、申请人.',
-            align:"center",
-            dataIndex: 'lrsqr'
-          },
-          {
-            title:'凭证号.',
-            align:"center",
-            dataIndex: 'pzh'
-          },
-          {
-            title:'起草日期、录入日期、申请日期.',
+            title:'起草日期、录入日期、申请日期',
             align:"center",
             dataIndex: 'qclrsqrq',
             customRender:function (text) {
@@ -387,207 +283,85 @@
             }
           },
           {
-            title:'签署日期.',
-            align:"center",
-            dataIndex: 'qsrq',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'确认外协.',
-            align:"center",
-            dataIndex: 'qrwx'
-          },
-          {
-            title:'任务编号.',
+            title:'任务编号',
             align:"center",
             dataIndex: 'rwbh'
           },
           {
-            title:'任务名称.',
+            title:'任务名称',
             align:"center",
             dataIndex: 'rwmc'
           },
+          // {
+          //   title:'数据来源：10：合同管理，20：合同任务，30：任务合同，40：合同付款，50：合同发票，60：外协合同',
+          //   align:"center",
+          //   dataIndex: 'sjly'
+          // },
           {
-            title:'任务收款金额.',
-            align:"center",
-            dataIndex: 'rwskje'
-          },
-          {
-            title:'申请人部门.',
-            align:"center",
-            dataIndex: 'sqrbm'
-          },
-          {
-            title:'收款编号（sn）.',
-            align:"center",
-            dataIndex: 'skbh'
-          },
-          {
-            title:'收款科目代码.',
-            align:"center",
-            dataIndex: 'skkmdm'
-          },
-          {
-            title:'收款类型.',
-            align:"center",
-            dataIndex: 'sklx'
-          },
-          {
-            title:'数据来源：10：合同管理，20：合同任务，30：任务合同，40：合同付款，50：合同发票，60：外协合同.',
-            align:"center",
-            dataIndex: 'sjly'
-          },
-          {
-            title:'数量（合同付款）.',
-            align:"center",
-            dataIndex: 'sl'
-          },
-          {
-            title:'税号.',
-            align:"center",
-            dataIndex: 'sh'
-          },
-          {
-            title:'所属型号.',
+            title:'所属型号',
             align:"center",
             dataIndex: 'ssxh'
           },
           {
-            title:'外协单号（sn）.',
-            align:"center",
-            dataIndex: 'wxdh'
-          },
-          {
-            title:'外协合同编号.',
-            align:"center",
-            dataIndex: 'wxhtbh'
-          },
-          {
-            title:'外协类型.',
-            align:"center",
-            dataIndex: 'wxlx'
-          },
-          {
-            title:'项目密级.',
-            align:"center",
-            dataIndex: 'xmmj'
-          },
-          {
-            title:'发票需求时间.',
-            align:"center",
-            dataIndex: 'fpxqsj',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'序号.',
+            title:'序号',
             align:"center",
             dataIndex: 'xh'
           },
           {
-            title:'研制部门.',
+            title:'项目密级',
             align:"center",
-            dataIndex: 'yzbm'
-          },
-          {
-            title:'业务员.',
-            align:"center",
-            dataIndex: 'ywy'
-          },
-          {
-            title:'业务员部门.',
-            align:"center",
-            dataIndex: 'ywybm'
+            dataIndex: 'xmmj'
           },
           {
-            title:'乙方（收款方）.',
+            title:'乙方（收款方）',
             align:"center",
             dataIndex: 'yf'
           },
           {
-            title:'乙方签约人.',
+            title:'用户id',
             align:"center",
-            dataIndex: 'yfqyr'
+            dataIndex: 'yhid'
           },
           {
-            title:'已开票（元）.',
+            title:'已开票（元）',
             align:"center",
             dataIndex: 'ykp'
           },
           {
-            title:'已收款.',
+            title:'已收款',
             align:"center",
             dataIndex: 'ysk'
           },
           {
-            title:'用户id.',
-            align:"center",
-            dataIndex: 'yhid'
-          },
-          {
-            title:'用户简称.',
-            align:"center",
-            dataIndex: 'yhjc'
-          },
-          {
-            title:'用户名称.',
+            title:'业务员',
             align:"center",
-            dataIndex: 'yhmc'
-          },
-          {
-            title:'账号.',
-            align:"center",
-            dataIndex: 'zh'
+            dataIndex: 'ywy'
           },
           {
-            title:'执行状态（status）.',
+            title:'研制部门',
             align:"center",
-            dataIndex: 'zxzt'
+            dataIndex: 'yzbm'
           },
           {
-            title:'主管设计师.',
+            title:'主管设计师',
             align:"center",
             dataIndex: 'zgsjs'
           },
           {
-            title:'抓总部门.',
+            title:'抓总部门',
             align:"center",
             dataIndex: 'zzbm'
           },
           {
-            title:'自筹（元）.',
+            title:'自筹（元）',
             align:"center",
             dataIndex: 'zc'
           },
           {
-            title:'类型（无用）.',
+            title:'类型（无用）',
             align:"center",
             dataIndex: 'pici'
           },
-          {
-            title:'作废发票申请时间',
-            align:"center",
-            dataIndex: 'sqsj',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'作废单号',
-            align:"center",
-            dataIndex: 'zfdh'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
         ],
         url: {
           list: "/xmcbDetail/comContractInfoExchange/getCrmHteDetail",
@@ -595,7 +369,7 @@
           // deleteBatch: "/xmcbDetail/comContractInfoExchange/deleteBatch",
           // exportXlsUrl: "/xmcbDetail/comContractInfoExchange/exportXls",
           // importExcelUrl: "xmcbDetail/comContractInfoExchange/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -624,36 +398,21 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'bz',text:'备注.',dictCode:''})
-        fieldList.push({type:'string',value:'bh',text:'编号.',dictCode:''})
-        fieldList.push({type:'string',value:'bm',text:'部门（合同付款）.',dictCode:''})
         fieldList.push({type:'string',value:'cpxh',text:'产品型号.',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'dfk',text:'待付款（元）.',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'dkp',text:'待开票（元）.',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'dk',text:'到款（元）.',dictCode:''})
-        fieldList.push({type:'date',value:'dkhpdqrq',text:'到款日期/汇票到期日期.'})
         fieldList.push({type:'string',value:'dh',text:'电话.',dictCode:''})
-        fieldList.push({type:'string',value:'fpbh',text:'发票编号（sn）.',dictCode:''})
-        fieldList.push({type:'string',value:'fpbm',text:'发票编码.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'fpkje',text:'发票开具额.',dictCode:''})
-        fieldList.push({type:'string',value:'fplx',text:'发票类型.',dictCode:''})
-        fieldList.push({type:'string',value:'fpnr',text:'发票内容.',dictCode:''})
-        fieldList.push({type:'string',value:'fkfmc',text:'付款方名称.',dictCode:''})
-        fieldList.push({type:'date',value:'gxsj',text:'更新时间.'})
         fieldList.push({type:'string',value:'gdbh',text:'归档编号.',dictCode:''})
         fieldList.push({type:'date',value:'gdrq',text:'归档日期.'})
         fieldList.push({type:'string',value:'htbh',text:'合同编号.',dictCode:''})
-        fieldList.push({type:'string',value:'htfpjsyxdz',text:'合同发票接收邮箱地址.',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'htfpe',text:'合同分配额.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'htje',text:'合同金额.',dictCode:''})
         fieldList.push({type:'string',value:'htkzt',text:'合同款状态.',dictCode:''})
         fieldList.push({type:'string',value:'htlx',text:'合同类型.',dictCode:''})
         fieldList.push({type:'string',value:'htlxqk',text:'合同履行情况.',dictCode:''})
         fieldList.push({type:'string',value:'htmj',text:'合同密级.',dictCode:''})
         fieldList.push({type:'string',value:'htmc',text:'合同名称.',dictCode:''})
         fieldList.push({type:'string',value:'htqcr',text:'合同起草人.',dictCode:''})
-        fieldList.push({type:'date',value:'htqdrq',text:'合同签订日期.'})
-        fieldList.push({type:'string',value:'htrwid',text:'合同任务id.',dictCode:''})
         fieldList.push({type:'int',value:'htsl',text:'合同数量.',dictCode:''})
         fieldList.push({type:'int',value:'htys',text:'合同页数.',dictCode:''})
         fieldList.push({type:'string',value:'htzgbm',text:'合同主管部门.',dictCode:''})
@@ -661,55 +420,29 @@
         fieldList.push({type:'string',value:'htztsm',text:'合同状态说明.',dictCode:''})
         fieldList.push({type:'string',value:'jf',text:'甲方（付款方）.',dictCode:''})
         fieldList.push({type:'string',value:'jfyhjc',text:'甲方简称、用户简称.',dictCode:''})
-        fieldList.push({type:'string',value:'jfqyr',text:'甲方签约人.',dictCode:''})
         fieldList.push({type:'string',value:'jd',text:'阶段.',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'jeskzkp',text:'金额（元）、收款总金额、开票金额.',dictCode:''})
-        fieldList.push({type:'string',value:'khx',text:'开户行.',dictCode:''})
         fieldList.push({type:'date',value:'kpsj',text:'开票时间.'})
         fieldList.push({type:'string',value:'kpzt',text:'开票状态.',dictCode:''})
         fieldList.push({type:'string',value:'khid',text:'客户id.',dictCode:''})
-        fieldList.push({type:'string',value:'khlcbh',text:'客户流程编号.',dictCode:''})
         fieldList.push({type:'string',value:'lxr',text:'联系人（对方）.',dictCode:''})
-        fieldList.push({type:'string',value:'lrsqr',text:'录入人、申请人.',dictCode:''})
-        fieldList.push({type:'string',value:'pzh',text:'凭证号.',dictCode:''})
         fieldList.push({type:'date',value:'qclrsqrq',text:'起草日期、录入日期、申请日期.'})
-        fieldList.push({type:'date',value:'qsrq',text:'签署日期.'})
-        fieldList.push({type:'string',value:'qrwx',text:'确认外协.',dictCode:''})
         fieldList.push({type:'string',value:'rwbh',text:'任务编号.',dictCode:''})
         fieldList.push({type:'string',value:'rwmc',text:'任务名称.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'rwskje',text:'任务收款金额.',dictCode:''})
-        fieldList.push({type:'string',value:'sqrbm',text:'申请人部门.',dictCode:''})
-        fieldList.push({type:'string',value:'skbh',text:'收款编号（sn）.',dictCode:''})
-        fieldList.push({type:'string',value:'skkmdm',text:'收款科目代码.',dictCode:''})
-        fieldList.push({type:'string',value:'sklx',text:'收款类型.',dictCode:''})
         fieldList.push({type:'int',value:'sjly',text:'数据来源：10：合同管理，20：合同任务，30：任务合同，40：合同付款，50：合同发票，60：外协合同.',dictCode:''})
-        fieldList.push({type:'int',value:'sl',text:'数量（合同付款）.',dictCode:''})
-        fieldList.push({type:'string',value:'sh',text:'税号.',dictCode:''})
         fieldList.push({type:'string',value:'ssxh',text:'所属型号.',dictCode:''})
-        fieldList.push({type:'string',value:'wxdh',text:'外协单号（sn）.',dictCode:''})
-        fieldList.push({type:'string',value:'wxhtbh',text:'外协合同编号.',dictCode:''})
-        fieldList.push({type:'string',value:'wxlx',text:'外协类型.',dictCode:''})
         fieldList.push({type:'string',value:'xmmj',text:'项目密级.',dictCode:''})
-        fieldList.push({type:'date',value:'fpxqsj',text:'发票需求时间.'})
         fieldList.push({type:'string',value:'xh',text:'序号.',dictCode:''})
         fieldList.push({type:'string',value:'yzbm',text:'研制部门.',dictCode:''})
         fieldList.push({type:'string',value:'ywy',text:'业务员.',dictCode:''})
-        fieldList.push({type:'string',value:'ywybm',text:'业务员部门.',dictCode:''})
         fieldList.push({type:'string',value:'yf',text:'乙方（收款方）.',dictCode:''})
-        fieldList.push({type:'string',value:'yfqyr',text:'乙方签约人.',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'ykp',text:'已开票（元）.',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'ysk',text:'已收款.',dictCode:''})
         fieldList.push({type:'string',value:'yhid',text:'用户id.',dictCode:''})
-        fieldList.push({type:'string',value:'yhjc',text:'用户简称.',dictCode:''})
-        fieldList.push({type:'string',value:'yhmc',text:'用户名称.',dictCode:''})
-        fieldList.push({type:'string',value:'zh',text:'账号.',dictCode:''})
-        fieldList.push({type:'string',value:'zxzt',text:'执行状态（status）.',dictCode:''})
         fieldList.push({type:'string',value:'zgsjs',text:'主管设计师.',dictCode:''})
         fieldList.push({type:'string',value:'zzbm',text:'抓总部门.',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'zc',text:'自筹（元）.',dictCode:''})
         fieldList.push({type:'string',value:'pici',text:'类型（无用）.',dictCode:''})
-        fieldList.push({type:'date',value:'sqsj',text:'作废发票申请时间'})
-        fieldList.push({type:'string',value:'zfdh',text:'作废单号',dictCode:''})
         this.superFieldList = fieldList
       }
     }

src/views/module_kzks/projectCostList/modulesDetail/KyBgDetailList.vue

@@ -97,10 +97,17 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { getAction } from '@/api/manage'
 
   export default {
     name: 'KyBgInfoList',
     mixins:[JeecgListMixin, mixinDevice],
+    props: {
+      taskno: {
+        type: String,
+        default: ''
+      }
+    },
     data () {
       return {
         description: '科研报工管理页面',
@@ -116,11 +123,11 @@
               return parseInt(index)+1;
             }
           },
-          {
-            title:'key',
-            align:"center",
-            dataIndex: 'key'
-          },
+          // {
+          //   title:'key',
+          //   align:"center",
+          //   dataIndex: 'key'
+          // },
           {
             title:'报工任务号',
             align:"center",