项目成本添加汇总级详情

src/views/module_kzks/projectCostList/ProjectCostList.vue

@@ -162,7 +162,7 @@
           </a-popover>
         </span>
       </div>
- 
+
       <a-table
         ref="table"
         size="middle"
@@ -254,7 +254,7 @@
         <span slot="workhour" slot-scope="text, record">
           <a-button type="link" @click="detailClick(text,record,'workhour','工时')" :style="{color: (record.children || record.id === 'amount') ? 'rgba(0,0,0,.65)' : ''}">{{text}}</a-button>
         </span> -->
-        
+
 
         <span slot="action" slot-scope="text, record">
           <!-- <a @click="handleEdit(record)">编辑</a> -->
@@ -1065,26 +1065,39 @@ import { number } from 'echarts';
         columnsEdit({checkedValues: checkedValues})
       },
       customCellDetail(record, index, columnValue, columnTitle){
-        if(record.children || record.id === 'amount'){
+        // if(record.children || record.id === 'amount'){
+        //   return false
+        // }
+        // 改成汇集层也需要弹窗
+        if(record.id === 'amount'){
           return false
         }
-        console.log(record, index, columnValue, columnTitle)
         return {
           style: {
             'color': "#1890ff !important",
             'cursor': "pointer",
           },
-          on: { 
+          on: {
             // 点击事件
             click: (event) => {
               
             },
             dblclick: (event) => {
+              console.log(record, index, columnValue, columnTitle)
               // 没有值不弹窗--也弹窗
               // if(!event.target.textContent){
               //   return
               // }
-              this.$refs.proCostDetail.taskno = record.taskno
+              if(record.ji === 1){
+                // 汇集层传所有子级任务号
+                var tasknos = record.children.map(item=>item.taskno)
+                this.$refs.proCostDetail.taskno = tasknos.join(',')
+                // this.$refs.proCostDetail.taskno = tasknos.toString()
+              }
+              if(record.ji === 2){
+                this.$refs.proCostDetail.taskno = record.taskno
+              }
+              this.$refs.proCostDetail.ji = record.ji
               if(record.status === '1' && columnValue === 'clf'){
                 // 批产参数
                 this.$refs.proCostDetail.pichanInfo = {
@@ -1494,8 +1507,19 @@ import { number } from 'echarts';
 </script>
 <style scoped>
   @import '~@assets/less/common.less';
+  /*表格thead*/
+  ::v-deep .ant-table-thead > tr > th {
+    font-size: 14px;
+    /* color: #000; */
+  }
+
+  /*表格tbody*/
+  ::v-deep .ant-table-tbody > tr > td {
+    font-size: 13px;
+    padding: 6px 4px !important;
+  }
 </style>
-<style scoped>
+<style>
   .table-kuisun-color{
     color: red !important;
     /* user-select: 'none'; */
@@ -1508,15 +1532,4 @@ import { number } from 'echarts';
     color: #29d59f !important;
     /* color: #438bf7 !important; */
   }
-  /*表格thead*/
-  ::v-deep .ant-table-thead > tr > th {
-    font-size: 14px;
-    /* color: #000; */
-  }
-
-  /*表格tbody*/
-  ::v-deep .ant-table-tbody > tr > td {
-    font-size: 13px;
-    padding: 6px 4px !important;
-  }
 </style>

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

@@ -125,7 +125,7 @@
             fixed: 'left',
           },
           {
-            title:'任务编号',
+            title:'任务号',
             align:"center",
             dataIndex: 'rwbh',
             width: 120,
@@ -134,15 +134,45 @@
           {
             title:'任务名称',
             align:"center",
-            dataIndex: 'rwname',
+            dataIndex: 'rwmc',
             width: 120,
             fixed: 'left',
           },
           // 所属型号
           {
-            title:'收款单号',
+            title:'阶段',
+            align:"center",
+            dataIndex: 'jd'
+          },
+          {
+            title:'数量', // （合同付款）
+            align:"center",
+            dataIndex: 'sl'
+          },
+          {
+            title:'类型', // （无用）
+            align:"center",
+            dataIndex: 'pici'
+          },
+          {
+            title:'客户ID',
+            align:"center",
+            dataIndex: 'khid'
+          },
+          {
+            title:'客户流程编号',
+            align:"center",
+            dataIndex: 'khlcbh'
+          },
+          {
+            title:'编号',
             align:"center",
-            dataIndex: 'skdh'
+            dataIndex: 'bh'
+          },
+          {
+            title:'收款编号',
+            align:"center",
+            dataIndex: 'skbh'
           },
           {
             title:'执行状态',
@@ -167,45 +197,31 @@
           {
             title:'合同名称',
             align:"center",
-            dataIndex: 'htname'
+            dataIndex: 'htmc'
           },
           {
             title:'合同类型',
             align:"center",
-            dataIndex: 'httype'
+            dataIndex: 'htlx'
           },
           {
-            title:'型号',
-            align:"center",
-            dataIndex: 'xh'
-          },
-          {
-            title:'阶段',
-            align:"center",
-            dataIndex: 'jd'
-          },
-          {
-            title:'数量',
-            align:"center",
-            dataIndex: 'sl'
-          },
-          {
-            title:'部门',
+            title:'部门', // （合同付款）
             align:"center",
             dataIndex: 'bm'
           },
+          // 业务员部门
           {
             title:'到款日期', // /汇票到期日期
             align:"center",
             dataIndex: 'dkhpdqrq',
             customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
+              return !text?"":(text.length>10?textsubstr(0,10):text)
             }
           },
           {
             title:'收款类型',
             align:"center",
-            dataIndex: 'sktype'
+            dataIndex: 'sklx'
           },
           {
             title:'收款科目代码',
@@ -223,52 +239,22 @@
             dataIndex: 'ywy'
           },
           {
-            title:'业务部门',
-            align:"center",
-            dataIndex: 'ywbm'
-          },
-          {
             title:'录入人', // 、申请人
             align:"center",
-            dataIndex: 'lrr'
+            dataIndex: 'lrsqr'
           },
           {
             title:'录入日期', // 起草日期、 、申请日期
             align:"center",
-            dataIndex: 'lrrq',
+            dataIndex: 'qclrsqrq',
             customRender:function (text) {
               return !text?"":(text.length>10?text.substr(0,10):text)
             }
           },
           {
-            title:'交易流水号',
-            align:"center",
-            dataIndex: 'jylsh'
-          },
-          {
-            title:'交易ID',
-            align:"center",
-            dataIndex: 'jyid'
-          },
-          {
-            title:'汇票号',
-            align:"center",
-            dataIndex: 'hph'
-          },
-          {
-            title:'汇票ID',
-            align:"center",
-            dataIndex: 'hpid'
-          },
-          {
-            title:'收款单位',
-            align:"center",
-            dataIndex: 'skdw'
-          },
-          {
             title:'收款总金额（元）', // 金额（元）、  、开票金额
             align:"center",
-            dataIndex: 'skzje',
+            dataIndex: 'jeskzkp',
             width: 120,
             fixed: 'right',
           },
@@ -279,12 +265,57 @@
             width: 120,
             fixed: 'right',
           },
+
+
+
+
+
+
+
+          // {
+          //   title:'产品型号',
+          //   align:"center",
+          //   dataIndex: 'cpxh'
+          // },
+          // {
+          //   title:'合同主管部门',
+          //   align:"center",
+          //   dataIndex: 'htzgbm'
+          // },
+          // {
+          //   title:'联系人（对方）',
+          //   align:"center",
+          //   dataIndex: 'lxr'
+          // },
+
+          // {
+          //   title:'数据来源',
+          //   // ：10：合同管理，20：合同任务，30：任务合同，40：合同付款，50：合同发票，60：外协合同
+          //   align:"center",
+          //   dataIndex: 'sjly'
+          // },
+          // {
+          //   title:'序号',
+          //   align:"center",
+          //   dataIndex: 'xh'
+          // },
+          // {
+          //   title:'用户id',
+          //   align:"center",
+          //   dataIndex: 'yhid'
+          // },
+          // {
+          //   title:'用户名称',
+          //   align:"center",
+          //   dataIndex: 'yhmc'
+          // },
+
         ],
         url: {
-          list: "/comContractInfoExchangeNew/comContractInfoExchangeNew/getNewCrmYskDetail",
+          list: "/xmcbDetail/comContractInfoExchange/getCrmYskDetail",
           // delete: "/xmcbDetail/comContractInfoExchange/delete",
           // deleteBatch: "/xmcbDetail/comContractInfoExchange/deleteBatch",
-          exportXlsUrl: "/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewYskDetail",
+          exportXlsUrl: "/xmcbDetail/comContractInfoExchange/exportYskDetail",
           // importExcelUrl: "xmcbDetail/comContractInfoExchange/importExcel",
 
         },
@@ -317,34 +348,39 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'skdh',text:'收款单号.',dictCode:''})
-        fieldList.push({type:'string',value:'zxzt',text:'执行状态.',dictCode:''})
+        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:'date',value:'dkhpdqrq',text:'到款日期/汇票到期日期.'})
         fieldList.push({type:'string',value:'fkfmc',text:'付款方名称.',dictCode:''})
-        fieldList.push({type:'string',value:'yhjc',text:'用户简称.',dictCode:''})
         fieldList.push({type:'string',value:'htbh',text:'合同编号.',dictCode:''})
-        fieldList.push({type:'string',value:'htname',text:'合同名称.',dictCode:''})
-        fieldList.push({type:'string',value:'httype',text:'合同类型.',dictCode:''})
-        fieldList.push({type:'string',value:'xh',text:'型号.',dictCode:''})
+        fieldList.push({type:'string',value:'htlx',text:'合同类型.',dictCode:''})
+        fieldList.push({type:'string',value:'htmc',text:'合同名称.',dictCode:''})
+        fieldList.push({type:'string',value:'htzgbm',text:'合同主管部门.',dictCode:''})
         fieldList.push({type:'string',value:'jd',text:'阶段.',dictCode:''})
-        fieldList.push({type:'int',value:'sl',text:'数量.',dictCode:''})
-        fieldList.push({type:'string',value:'bm',text:'部门.',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'jeskzkp',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:'string',value:'rwbh',text:'任务编号.',dictCode:''})
-        fieldList.push({type:'string',value:'rwname',text:'任务名称.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'skzje',text:'收款总金额.',dictCode:''})
+        fieldList.push({type:'string',value:'rwmc',text:'任务名称.',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'rwskje',text:'任务收款金额.',dictCode:''})
-        fieldList.push({type:'date',value:'dkhpdqrq',text:'到款日期/汇票到期日期.'})
-        fieldList.push({type:'string',value:'sktype',text:'收款类型.',dictCode:''})
+        fieldList.push({type:'string',value:'skbh',text:'收款编号（sn）.',dictCode:''})
         fieldList.push({type:'string',value:'skkmdm',text:'收款科目代码.',dictCode:''})
-        fieldList.push({type:'string',value:'pzh',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:'xh',text:'序号.',dictCode:''})
         fieldList.push({type:'string',value:'ywy',text:'业务员.',dictCode:''})
-        fieldList.push({type:'string',value:'ywbm',text:'业务部门.',dictCode:''})
-        fieldList.push({type:'string',value:'lrr',text:'录入人.',dictCode:''})
-        fieldList.push({type:'date',value:'lrrq',text:'录入日期.'})
-        fieldList.push({type:'string',value:'jylsh',text:'交易流水号.',dictCode:''})
-        fieldList.push({type:'string',value:'jyid',text:'交易ID.',dictCode:''})
-        fieldList.push({type:'string',value:'hph',text:'汇票号.',dictCode:''})
-        fieldList.push({type:'string',value:'hpid',text:'汇票ID.',dictCode:''})
-        fieldList.push({type:'string',value:'skdw',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:'zxzt',text:'执行状态（status）.',dictCode:''})
+        fieldList.push({type:'string',value:'pici',text:'类型（无用）.',dictCode:''})
         this.superFieldList = fieldList
       }
     }

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

@@ -11,28 +11,11 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
-      <a-button type="primary" icon="download" @click="handleExportXls(taskno+'已收款明细')">导出</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> -->
-      <!-- 高级查询区域 -->
-      <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown> -->
+      <a-button type="primary" icon="download" @click="handleExport">导出</a-button>
     </div>
 
     <!-- table区域-begin -->
     <div>
-      <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div> -->
-
       <a-table
         ref="table"
         size="middle"
@@ -46,46 +29,6 @@
         class="j-table-force-nowrap"
         @change="handleTableChange">
         <!-- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" -->
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <!-- <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span> -->
-
       </a-table>
     </div>
 
@@ -106,6 +49,10 @@
       taskno: {
         type: String,
         default: ''
+      },
+      ji: {
+        // type: String,
+        default: 2
       }
     },
     data () {
@@ -125,7 +72,7 @@
             fixed: 'left',
           },
           {
-            title:'任务号',
+            title:'任务编号',
             align:"center",
             dataIndex: 'rwbh',
             width: 120,
@@ -134,45 +81,15 @@
           {
             title:'任务名称',
             align:"center",
-            dataIndex: 'rwmc',
+            dataIndex: 'rwname',
             width: 120,
             fixed: 'left',
           },
           // 所属型号
           {
-            title:'阶段',
+            title:'收款单号',
             align:"center",
-            dataIndex: 'jd'
-          },
-          {
-            title:'数量', // （合同付款）
-            align:"center",
-            dataIndex: 'sl'
-          },
-          {
-            title:'类型', // （无用）
-            align:"center",
-            dataIndex: 'pici'
-          },
-          {
-            title:'客户ID',
-            align:"center",
-            dataIndex: 'khid'
-          },
-          {
-            title:'客户流程编号',
-            align:"center",
-            dataIndex: 'khlcbh'
-          },
-          {
-            title:'编号',
-            align:"center",
-            dataIndex: 'bh'
-          },
-          {
-            title:'收款编号',
-            align:"center",
-            dataIndex: 'skbh'
+            dataIndex: 'skdh'
           },
           {
             title:'执行状态',
@@ -197,31 +114,45 @@
           {
             title:'合同名称',
             align:"center",
-            dataIndex: 'htmc'
+            dataIndex: 'htname'
           },
           {
             title:'合同类型',
             align:"center",
-            dataIndex: 'htlx'
+            dataIndex: 'httype'
+          },
+          {
+            title:'型号',
+            align:"center",
+            dataIndex: 'xh'
           },
           {
-            title:'部门', // （合同付款）
+            title:'阶段',
+            align:"center",
+            dataIndex: 'jd'
+          },
+          {
+            title:'数量',
+            align:"center",
+            dataIndex: 'sl'
+          },
+          {
+            title:'部门',
             align:"center",
             dataIndex: 'bm'
           },
-          // 业务员部门
           {
             title:'到款日期', // /汇票到期日期
             align:"center",
             dataIndex: 'dkhpdqrq',
             customRender:function (text) {
-              return !text?"":(text.length>10?textsubstr(0,10):text)
+              return !text?"":(text.length>10?text.substr(0,10):text)
             }
           },
           {
             title:'收款类型',
             align:"center",
-            dataIndex: 'sklx'
+            dataIndex: 'sktype'
           },
           {
             title:'收款科目代码',
@@ -239,22 +170,52 @@
             dataIndex: 'ywy'
           },
           {
+            title:'业务部门',
+            align:"center",
+            dataIndex: 'ywbm'
+          },
+          {
             title:'录入人', // 、申请人
             align:"center",
-            dataIndex: 'lrsqr'
+            dataIndex: 'lrr'
           },
           {
             title:'录入日期', // 起草日期、 、申请日期
             align:"center",
-            dataIndex: 'qclrsqrq',
+            dataIndex: 'lrrq',
             customRender:function (text) {
               return !text?"":(text.length>10?text.substr(0,10):text)
             }
           },
           {
+            title:'交易流水号',
+            align:"center",
+            dataIndex: 'jylsh'
+          },
+          {
+            title:'交易ID',
+            align:"center",
+            dataIndex: 'jyid'
+          },
+          {
+            title:'汇票号',
+            align:"center",
+            dataIndex: 'hph'
+          },
+          {
+            title:'汇票ID',
+            align:"center",
+            dataIndex: 'hpid'
+          },
+          {
+            title:'收款单位',
+            align:"center",
+            dataIndex: 'skdw'
+          },
+          {
             title:'收款总金额（元）', // 金额（元）、  、开票金额
             align:"center",
-            dataIndex: 'jeskzkp',
+            dataIndex: 'skzje',
             width: 120,
             fixed: 'right',
           },
@@ -265,124 +226,59 @@
             width: 120,
             fixed: 'right',
           },
-
-
-
-
-
-
-
-          // {
-          //   title:'产品型号',
-          //   align:"center",
-          //   dataIndex: 'cpxh'
-          // },
-          // {
-          //   title:'合同主管部门',
-          //   align:"center",
-          //   dataIndex: 'htzgbm'
-          // },
-          // {
-          //   title:'联系人（对方）',
-          //   align:"center",
-          //   dataIndex: 'lxr'
-          // },
-
-          // {
-          //   title:'数据来源',
-          //   // ：10：合同管理，20：合同任务，30：任务合同，40：合同付款，50：合同发票，60：外协合同
-          //   align:"center",
-          //   dataIndex: 'sjly'
-          // },
-          // {
-          //   title:'序号',
-          //   align:"center",
-          //   dataIndex: 'xh'
-          // },
-          // {
-          //   title:'用户id',
-          //   align:"center",
-          //   dataIndex: 'yhid'
-          // },
-          // {
-          //   title:'用户名称',
-          //   align:"center",
-          //   dataIndex: 'yhmc'
-          // },
-
         ],
         url: {
-          list: "/xmcbDetail/comContractInfoExchange/getCrmYskDetail",
-          // delete: "/xmcbDetail/comContractInfoExchange/delete",
-          // deleteBatch: "/xmcbDetail/comContractInfoExchange/deleteBatch",
-          exportXlsUrl: "/xmcbDetail/comContractInfoExchange/exportYskDetail",
-          // importExcelUrl: "xmcbDetail/comContractInfoExchange/importExcel",
-
+          listZiji: "/comContractInfoExchangeNew/comContractInfoExchangeNew/getNewCrmYskDetail",
+          listHuiji: '/comContractInfoExchangeNew/comContractInfoExchangeNew/getNewCrmYskDetailByTasknos',
+          // exportXlsUrl: "/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewYskDetail",
         },
         dictOptions:{},
         superFieldList:[],
-        queryParam: {
-          taskno: this.taskno
-        }
       }
     },
     created() {
-      this.getSuperFieldList();
-      this.loadData()
     },
     computed: {
-      // importExcelUrl: function(){
-      //   return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      // },
     },
     methods: {
-      loadData() {
+      loadData(arg) {
+        var url = this.ji === 2 ? this.url.listZiji : this.url.listHuiji
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        // var params = this.getQueryParams();//查询条件
+        var params = this.queryParam
+        params.field = this.getQueryField();
+        params.pageNo = this.ipagination.current;
+        params.pageSize = this.ipagination.pageSize;
+        params.taskno = this.taskno;
         this.loading = true;
-        getAction(this.url.list, {taskno: this.taskno}).then((res) => {
-          this.dataSource = res
+        getAction(url, 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：适配不分页的数据列表------------
+          }else{
+            this.$message.warning(res.message)
+          }
         }).finally(() => {
           this.loading = false
         })
       },
+      handleExport(){
+        this.url.exportXlsUr = this.ji === 2 ? '/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewYskDetail' : '/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewYskDetailByTasknos'
+        this.handleExportXls('已收款明细')
+        // this.handleExportXls(taskno+'已收款明细')
+      },
       initDictConfig(){
       },
-      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:'date',value:'dkhpdqrq',text:'到款日期/汇票到期日期.'})
-        fieldList.push({type:'string',value:'fkfmc',text:'付款方名称.',dictCode:''})
-        fieldList.push({type:'string',value:'htbh',text:'合同编号.',dictCode:''})
-        fieldList.push({type:'string',value:'htlx',text:'合同类型.',dictCode:''})
-        fieldList.push({type:'string',value:'htmc',text:'合同名称.',dictCode:''})
-        fieldList.push({type:'string',value:'htzgbm',text:'合同主管部门.',dictCode:''})
-        fieldList.push({type:'string',value:'jd',text:'阶段.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'jeskzkp',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:'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:'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:'xh',text:'序号.',dictCode:''})
-        fieldList.push({type:'string',value:'ywy',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:'zxzt',text:'执行状态（status）.',dictCode:''})
-        fieldList.push({type:'string',value:'pici',text:'类型（无用）.',dictCode:''})
-        this.superFieldList = fieldList
-      }
     }
   }
 </script>

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

@@ -124,6 +124,12 @@
             },
             fixed: 'left',
           },
+          // {
+          //   title:'序号',
+          //   align:"center",
+          //   dataIndex: 'xh',
+          //   fixed: 'left',
+          // },
           {
             title:'任务编号',
             align:"center",
@@ -134,14 +140,39 @@
           {
             title:'任务名称',
             align:"center",
-            dataIndex: 'rwname',
+            dataIndex: 'rwmc',
             width: 120,
             fixed: 'left',
           },
           {
-            title:'主合同编号',
+            title:'所属型号',
+            align:"center",
+            dataIndex: 'ssxh'
+          },
+          {
+            title:'产品型号',
+            align:"center",
+            dataIndex: 'cpxh'
+          },
+          {
+            title:'阶段',
             align:"center",
-            dataIndex: 'zhtbh'
+            dataIndex: 'jd'
+          },
+          {
+            title:'研制部门',
+            align:"center",
+            dataIndex: 'yzbm'
+          },
+          {
+            title:'主管设计师',
+            align:"center",
+            dataIndex: 'zgsjs'
+          },
+          {
+            title:'已收款(元)',
+            align:"center",
+            dataIndex: 'ysk'
           },
           {
             title:'合同编号',
@@ -151,114 +182,129 @@
           {
             title:'合同名称',
             align:"center",
-            dataIndex: 'htname'
+            dataIndex: 'htmc'
           },
           {
-            title:'签署日期',
+            title:'合同状态',
             align:"center",
-            dataIndex: 'qsrq',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
+            dataIndex: 'htzt'
           },
           {
-            title:'甲方（付款方）',
+            title:'合同类型',
             align:"center",
-            dataIndex: 'jf'
+            dataIndex: 'htlx'
           },
+          // 签署日期
           {
-            title:'甲方简称',
+            title:'合同密级',
             align:"center",
-            dataIndex: 'jfjc'
+            dataIndex: 'htmj'
           },
           {
-            title:'合同金额',
+            title:'项目密级',
             align:"center",
-            dataIndex: 'htje'
+            dataIndex: 'xmmj'
           },
           {
-            title:'自筹',
+            title:'合同数量',
             align:"center",
-            dataIndex: 'zc'
+            dataIndex: 'htsl'
           },
           {
-            title:'合同到款',
+            title:'合同页数',
             align:"center",
-            dataIndex: 'htdk'
+            dataIndex: 'htys'
           },
           {
-            title:'合同待收款',
+            title:'归档编号',
             align:"center",
-            dataIndex: 'htdsk'
+            dataIndex: 'gdbh'
           },
-          // 签署日期
           {
-            title:'合同已开票',
+            title:'归档日期',
             align:"center",
-            dataIndex: 'htykp'
+            dataIndex: 'gdrq',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
           },
           {
-            title:'合同待开票',
+            title:'合同款状态',
             align:"center",
-            dataIndex: 'htdkp'
+            dataIndex: 'htkzt'
           },
           {
-            title:'产品型号',
+            title:'甲方（付款方）',
             align:"center",
-            dataIndex: 'cpxh'
+            dataIndex: 'jf'
           },
           {
-            title:'阶段',
+            title:'甲方简称',
             align:"center",
-            dataIndex: 'jd'
+            dataIndex: 'jfyhjc'
           },
           {
-            title:'研制部门',
+            title:'乙方（收款方）',
             align:"center",
-            dataIndex: 'yzbm'
+            dataIndex: 'yf'
+          },
+          {
+            title:'金额（元）', // 、收款总金额、开票金额
+            align:"center",
+            dataIndex: 'jeskzkp'
           },
-          // {
-          //   title:'归档日期',
-          //   align:"center",
-          //   dataIndex: 'gdrq',
-          //   customRender:function (text) {
-          //     return !text?"":(text.length>10?text.substr(0,10):text)
-          //   }
-          // },
           {
-            title:'任务已收款',
+            title:'自筹（元）',
             align:"center",
-            dataIndex: 'rwyisk'
+            dataIndex: 'zc'
+          },
+          {
+            title:'到款（元）',
+            align:"center",
+            dataIndex: 'dk'
+          },
+          {
+            title:'待付款（元）',
+            align:"center",
+            dataIndex: 'dfk'
           },
           {
-            title:'发票类型1',
+            title:'开票状态',
             align:"center",
-            dataIndex: 'fptypeone'
+            dataIndex: 'kpzt'
           },
           {
-            title:'发票1金额',
+            title:'已开票（元）',
             align:"center",
-            dataIndex: 'fpjeone'
+            dataIndex: 'ykp'
           },
           {
-            title:'1已开票额',
+            title:'待开票（元）',
             align:"center",
-            dataIndex: 'ykpeone'
+            dataIndex: 'dkp'
           },
           {
-            title:'发票类型2', // 、收款总金额、开票金额
+            title:'联系人（对方）',
             align:"center",
-            dataIndex: 'fptypetwo'
+            dataIndex: 'lxr'
           },
           {
-            title:'发票2金额',
+            title:'电话',
             align:"center",
-            dataIndex: 'fpjetwo'
+            dataIndex: 'dh'
           },
           {
-            title:'2已开票额',
+            title:'合同起草人',
             align:"center",
-            dataIndex: 'ykpetwo'
+            dataIndex: 'htqcr'
+          },
+          {
+            title:'起草日期', // 、录入日期、申请日期
+            align:"center",
+            dataIndex: 'qclrsqrq',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
           },
           {
             title:'合同主管部门',
@@ -271,6 +317,11 @@
             dataIndex: 'ywy'
           },
           {
+            title:'抓总部门',
+            align:"center",
+            dataIndex: 'zzbm'
+          },
+          {
             title:'合同履行情况',
             align:"center",
             dataIndex: 'htlxqk'
@@ -283,16 +334,56 @@
           {
             title:'合同分配额(元)',
             align:"center",
-            dataIndex: 'rwyingsk',
+            dataIndex: 'htfpe',
             width: 120,
             fixed: 'right',
           },
+
+
+
+          // {
+          //   title:'id',
+          //   align:"center",
+          //   dataIndex: 'id'
+          // },
+
+          // {
+          //   title:'开票时间',
+          //   align:"center",
+          //   dataIndex: 'kpsj',
+          //   customRender:function (text) {
+          //     return !text?"":(text.length>10?text.substr(0,10):text)
+          //   }
+          // },
+          // {
+          //   title:'客户id',
+          //   align:"center",
+          //   dataIndex: 'khid'
+          // },
+
+
+          // {
+          //   title:'数据来源：10：合同管理，20：合同任务，30：任务合同，40：合同付款，50：合同发票，60：外协合同',
+          //   align:"center",
+          //   dataIndex: 'sjly'
+          // },
+          // {
+          //   title:'用户id',
+          //   align:"center",
+          //   dataIndex: 'yhid'
+          // },
+
+          // {
+          //   title:'类型（无用）',
+          //   align:"center",
+          //   dataIndex: 'pici'
+          // },
         ],
         url: {
-          list: "/comContractInfoExchangeNew/comContractInfoExchangeNew/getNewCrmHteDetail",
+          list: "/xmcbDetail/comContractInfoExchange/getCrmHteDetail",
           // delete: "/xmcbDetail/comContractInfoExchange/delete",
           // deleteBatch: "/xmcbDetail/comContractInfoExchange/deleteBatch",
-          exportXlsUrl: "/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewHteDetail",
+          exportXlsUrl: "/xmcbDetail/comContractInfoExchange/exportHteDetail",
           // importExcelUrl: "xmcbDetail/comContractInfoExchange/importExcel",
 
         },
@@ -326,37 +417,51 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'serialno',text:'序号.',dictCode:''})
-        fieldList.push({type:'string',value:'htid',text:'ID.',dictCode:''})
-        fieldList.push({type:'string',value:'zhtbh',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:'string',value:'dh',text:'电话.',dictCode:''})
+        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:'htname',text:'合同名称.',dictCode:''})
-        fieldList.push({type:'date',value:'qsrq',text:'签署日期.'})
+        fieldList.push({type:'BigDecimal',value:'htfpe',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:'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:'jfjc',text:'甲方简称.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'htje',text:'合同金额.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'zc',text:'自筹.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'htdk',text:'合同到款.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'htdsk',text:'合同待收款.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'htykp',text:'合同已开票.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'htdkp',text:'合同待开票.',dictCode:''})
-        fieldList.push({type:'string',value:'rwbh',text:'任务编号.',dictCode:''})
-        fieldList.push({type:'string',value:'rwname',text:'任务名称.',dictCode:''})
-        fieldList.push({type:'string',value:'cpxh',text:'产品型号.',dictCode:''})
+        fieldList.push({type:'string',value:'jfyhjc',text:'甲方简称、用户简称.',dictCode:''})
         fieldList.push({type:'string',value:'jd',text:'阶段.',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'jeskzkp',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:'lxr',text:'联系人（对方）.',dictCode:''})
+        fieldList.push({type:'date',value:'qclrsqrq',text:'起草日期、录入日期、申请日期.'})
+        fieldList.push({type:'string',value:'rwbh',text:'任务编号.',dictCode:''})
+        fieldList.push({type:'string',value:'rwmc',text:'任务名称.',dictCode:''})
+        fieldList.push({type:'int',value:'sjly',text:'数据来源：10：合同管理，20：合同任务，30：任务合同，40：合同付款，50：合同发票，60：外协合同.',dictCode:''})
+        fieldList.push({type:'string',value:'ssxh',text:'所属型号.',dictCode:''})
+        fieldList.push({type:'string',value:'xmmj',text:'项目密级.',dictCode:''})
+        fieldList.push({type:'string',value:'xh',text:'序号.',dictCode:''})
         fieldList.push({type:'string',value:'yzbm',text:'研制部门.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'rwyingsk',text:'合同额.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'rwyisk',text:'任务已收款.',dictCode:''})
-        fieldList.push({type:'string',value:'fptypeone',text:'发票类型1.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'fpjeone',text:'发票1金额.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'ykpeone',text:'1已开票额.',dictCode:''})
-        fieldList.push({type:'string',value:'fptypetwo',text:'发票类型2.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'fpjetwo',text:'发票2金额.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'ykpetwo',text:'2已开票额.',dictCode:''})
-        fieldList.push({type:'string',value:'htzgbm',text:'合同主管部门.',dictCode:''})
         fieldList.push({type:'string',value:'ywy',text:'业务员.',dictCode:''})
-        fieldList.push({type:'string',value:'htlxqk',text:'合同履行情况.',dictCode:''})
-        fieldList.push({type:'string',value:'htztsm',text:'合同状态说明.',dictCode:''})
+        fieldList.push({type:'string',value:'yf',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:'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:''})
         this.superFieldList = fieldList
       }
     }

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

@@ -124,12 +124,6 @@
             },
             fixed: 'left',
           },
-          // {
-          //   title:'序号',
-          //   align:"center",
-          //   dataIndex: 'xh',
-          //   fixed: 'left',
-          // },
           {
             title:'任务编号',
             align:"center",
@@ -140,39 +134,14 @@
           {
             title:'任务名称',
             align:"center",
-            dataIndex: 'rwmc',
+            dataIndex: 'rwname',
             width: 120,
             fixed: 'left',
           },
           {
-            title:'所属型号',
-            align:"center",
-            dataIndex: 'ssxh'
-          },
-          {
-            title:'产品型号',
-            align:"center",
-            dataIndex: 'cpxh'
-          },
-          {
-            title:'阶段',
+            title:'主合同编号',
             align:"center",
-            dataIndex: 'jd'
-          },
-          {
-            title:'研制部门',
-            align:"center",
-            dataIndex: 'yzbm'
-          },
-          {
-            title:'主管设计师',
-            align:"center",
-            dataIndex: 'zgsjs'
-          },
-          {
-            title:'已收款(元)',
-            align:"center",
-            dataIndex: 'ysk'
+            dataIndex: 'zhtbh'
           },
           {
             title:'合同编号',
@@ -182,129 +151,114 @@
           {
             title:'合同名称',
             align:"center",
-            dataIndex: 'htmc'
-          },
-          {
-            title:'合同状态',
-            align:"center",
-            dataIndex: 'htzt'
+            dataIndex: 'htname'
           },
           {
-            title:'合同类型',
+            title:'签署日期',
             align:"center",
-            dataIndex: 'htlx'
-          },
-          // 签署日期
-          {
-            title:'合同密级',
-            align:"center",
-            dataIndex: 'htmj'
-          },
-          {
-            title:'项目密级',
-            align:"center",
-            dataIndex: 'xmmj'
-          },
-          {
-            title:'合同数量',
-            align:"center",
-            dataIndex: 'htsl'
+            dataIndex: 'qsrq',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
           },
           {
-            title:'合同页数',
+            title:'甲方（付款方）',
             align:"center",
-            dataIndex: 'htys'
+            dataIndex: 'jf'
           },
           {
-            title:'归档编号',
+            title:'甲方简称',
             align:"center",
-            dataIndex: 'gdbh'
+            dataIndex: 'jfjc'
           },
           {
-            title:'归档日期',
+            title:'合同金额',
             align:"center",
-            dataIndex: 'gdrq',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
+            dataIndex: 'htje'
           },
           {
-            title:'合同款状态',
+            title:'自筹',
             align:"center",
-            dataIndex: 'htkzt'
+            dataIndex: 'zc'
           },
           {
-            title:'甲方（付款方）',
+            title:'合同到款',
             align:"center",
-            dataIndex: 'jf'
+            dataIndex: 'htdk'
           },
           {
-            title:'甲方简称',
+            title:'合同待收款',
             align:"center",
-            dataIndex: 'jfyhjc'
+            dataIndex: 'htdsk'
           },
+          // 签署日期
           {
-            title:'乙方（收款方）',
+            title:'合同已开票',
             align:"center",
-            dataIndex: 'yf'
+            dataIndex: 'htykp'
           },
           {
-            title:'金额（元）', // 、收款总金额、开票金额
+            title:'合同待开票',
             align:"center",
-            dataIndex: 'jeskzkp'
+            dataIndex: 'htdkp'
           },
           {
-            title:'自筹（元）',
+            title:'产品型号',
             align:"center",
-            dataIndex: 'zc'
+            dataIndex: 'cpxh'
           },
           {
-            title:'到款（元）',
+            title:'阶段',
             align:"center",
-            dataIndex: 'dk'
+            dataIndex: 'jd'
           },
           {
-            title:'待付款（元）',
+            title:'研制部门',
             align:"center",
-            dataIndex: 'dfk'
+            dataIndex: 'yzbm'
           },
+          // {
+          //   title:'归档日期',
+          //   align:"center",
+          //   dataIndex: 'gdrq',
+          //   customRender:function (text) {
+          //     return !text?"":(text.length>10?text.substr(0,10):text)
+          //   }
+          // },
           {
-            title:'开票状态',
+            title:'任务已收款',
             align:"center",
-            dataIndex: 'kpzt'
+            dataIndex: 'rwyisk'
           },
           {
-            title:'已开票（元）',
+            title:'发票类型1',
             align:"center",
-            dataIndex: 'ykp'
+            dataIndex: 'fptypeone'
           },
           {
-            title:'待开票（元）',
+            title:'发票1金额',
             align:"center",
-            dataIndex: 'dkp'
+            dataIndex: 'fpjeone'
           },
           {
-            title:'联系人（对方）',
+            title:'1已开票额',
             align:"center",
-            dataIndex: 'lxr'
+            dataIndex: 'ykpeone'
           },
           {
-            title:'电话',
+            title:'发票类型2', // 、收款总金额、开票金额
             align:"center",
-            dataIndex: 'dh'
+            dataIndex: 'fptypetwo'
           },
           {
-            title:'合同起草人',
+            title:'发票2金额',
             align:"center",
-            dataIndex: 'htqcr'
+            dataIndex: 'fpjetwo'
           },
           {
-            title:'起草日期', // 、录入日期、申请日期
+            title:'2已开票额',
             align:"center",
-            dataIndex: 'qclrsqrq',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
+            dataIndex: 'ykpetwo'
           },
           {
             title:'合同主管部门',
@@ -317,11 +271,6 @@
             dataIndex: 'ywy'
           },
           {
-            title:'抓总部门',
-            align:"center",
-            dataIndex: 'zzbm'
-          },
-          {
             title:'合同履行情况',
             align:"center",
             dataIndex: 'htlxqk'
@@ -334,56 +283,16 @@
           {
             title:'合同分配额(元)',
             align:"center",
-            dataIndex: 'htfpe',
+            dataIndex: 'rwyingsk',
             width: 120,
             fixed: 'right',
           },
-
-
-
-          // {
-          //   title:'id',
-          //   align:"center",
-          //   dataIndex: 'id'
-          // },
-
-          // {
-          //   title:'开票时间',
-          //   align:"center",
-          //   dataIndex: 'kpsj',
-          //   customRender:function (text) {
-          //     return !text?"":(text.length>10?text.substr(0,10):text)
-          //   }
-          // },
-          // {
-          //   title:'客户id',
-          //   align:"center",
-          //   dataIndex: 'khid'
-          // },
-
-
-          // {
-          //   title:'数据来源：10：合同管理，20：合同任务，30：任务合同，40：合同付款，50：合同发票，60：外协合同',
-          //   align:"center",
-          //   dataIndex: 'sjly'
-          // },
-          // {
-          //   title:'用户id',
-          //   align:"center",
-          //   dataIndex: 'yhid'
-          // },
-
-          // {
-          //   title:'类型（无用）',
-          //   align:"center",
-          //   dataIndex: 'pici'
-          // },
         ],
         url: {
-          list: "/xmcbDetail/comContractInfoExchange/getCrmHteDetail",
+          list: "/comContractInfoExchangeNew/comContractInfoExchangeNew/getNewCrmHteDetail",
           // delete: "/xmcbDetail/comContractInfoExchange/delete",
           // deleteBatch: "/xmcbDetail/comContractInfoExchange/deleteBatch",
-          exportXlsUrl: "/xmcbDetail/comContractInfoExchange/exportHteDetail",
+          exportXlsUrl: "/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewHteDetail",
           // importExcelUrl: "xmcbDetail/comContractInfoExchange/importExcel",
 
         },
@@ -417,51 +326,37 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        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:'string',value:'dh',text:'电话.',dictCode:''})
-        fieldList.push({type:'string',value:'gdbh',text:'归档编号.',dictCode:''})
-        fieldList.push({type:'date',value:'gdrq',text:'归档日期.'})
+        fieldList.push({type:'string',value:'serialno',text:'序号.',dictCode:''})
+        fieldList.push({type:'string',value:'htid',text:'ID.',dictCode:''})
+        fieldList.push({type:'string',value:'zhtbh',text:'主合同编号.',dictCode:''})
         fieldList.push({type:'string',value:'htbh',text:'合同编号.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'htfpe',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:'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:'htname',text:'合同名称.',dictCode:''})
+        fieldList.push({type:'date',value:'qsrq',text:'签署日期.'})
         fieldList.push({type:'string',value:'jf',text:'甲方（付款方）.',dictCode:''})
-        fieldList.push({type:'string',value:'jfyhjc',text:'甲方简称、用户简称.',dictCode:''})
-        fieldList.push({type:'string',value:'jd',text:'阶段.',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'jeskzkp',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:'lxr',text:'联系人（对方）.',dictCode:''})
-        fieldList.push({type:'date',value:'qclrsqrq',text:'起草日期、录入日期、申请日期.'})
+        fieldList.push({type:'string',value:'jfjc',text:'甲方简称.',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'htje',text:'合同金额.',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'zc',text:'自筹.',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'htdk',text:'合同到款.',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'htdsk',text:'合同待收款.',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'htykp',text:'合同已开票.',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'htdkp',text:'合同待开票.',dictCode:''})
         fieldList.push({type:'string',value:'rwbh',text:'任务编号.',dictCode:''})
-        fieldList.push({type:'string',value:'rwmc',text:'任务名称.',dictCode:''})
-        fieldList.push({type:'int',value:'sjly',text:'数据来源：10：合同管理，20：合同任务，30：任务合同，40：合同付款，50：合同发票，60：外协合同.',dictCode:''})
-        fieldList.push({type:'string',value:'ssxh',text:'所属型号.',dictCode:''})
-        fieldList.push({type:'string',value:'xmmj',text:'项目密级.',dictCode:''})
-        fieldList.push({type:'string',value:'xh',text:'序号.',dictCode:''})
+        fieldList.push({type:'string',value:'rwname',text:'任务名称.',dictCode:''})
+        fieldList.push({type:'string',value:'cpxh',text:'产品型号.',dictCode:''})
+        fieldList.push({type:'string',value:'jd',text:'阶段.',dictCode:''})
         fieldList.push({type:'string',value:'yzbm',text:'研制部门.',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'rwyingsk',text:'合同额.',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'rwyisk',text:'任务已收款.',dictCode:''})
+        fieldList.push({type:'string',value:'fptypeone',text:'发票类型1.',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'fpjeone',text:'发票1金额.',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'ykpeone',text:'1已开票额.',dictCode:''})
+        fieldList.push({type:'string',value:'fptypetwo',text:'发票类型2.',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'fpjetwo',text:'发票2金额.',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'ykpetwo',text:'2已开票额.',dictCode:''})
+        fieldList.push({type:'string',value:'htzgbm',text:'合同主管部门.',dictCode:''})
         fieldList.push({type:'string',value:'ywy',text:'业务员.',dictCode:''})
-        fieldList.push({type:'string',value:'yf',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:'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:'string',value:'htlxqk',text:'合同履行情况.',dictCode:''})
+        fieldList.push({type:'string',value:'htztsm',text:'合同状态说明.',dictCode:''})
         this.superFieldList = fieldList
       }
     }

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

@@ -8,27 +8,27 @@
     cancelText="关闭"
     @cancel="handleCancel">
     <!-- 合同 -->
-    <contract-detail-list v-if="columnValue === 'contractfpe'" :taskno="taskno"></contract-detail-list>
+    <contract-detail-list v-if="columnValue === 'contractfpe'" :taskno="taskno" :ji="ji"></contract-detail-list>
     <!-- 已收款 -->
-    <collect-detail-list v-if="columnValue === 'taskmoney'" :taskno="taskno"></collect-detail-list>
+    <collect-detail-list v-if="columnValue === 'taskmoney'" :taskno="taskno" :ji="ji"></collect-detail-list>
     <!-- 材料费 -->
-    <material-detail-list v-if="columnValue === 'clf'" :taskno="taskno"></material-detail-list>
+    <material-detail-list v-if="columnValue === 'clf'" :taskno="taskno" :ji="ji"></material-detail-list>
     <!-- 专用费 -->
-    <project-chb-zyf-list v-if="columnValue === 'zyf'" :taskno="taskno"></project-chb-zyf-list>
+    <project-chb-zyf-list v-if="columnValue === 'zyf'" :taskno="taskno" :ji="ji"></project-chb-zyf-list>
     <!-- 事务费 -->
-    <project-chb-swf-list v-if="columnValue === 'swf'" :taskno="taskno"></project-chb-swf-list>
+    <project-chb-swf-list v-if="columnValue === 'swf'" :taskno="taskno" :ji="ji"></project-chb-swf-list>
     <!-- 外协费 -->
-    <project-chb-wxf-list v-if="columnValue === 'wxf'" :taskno="taskno"></project-chb-wxf-list>
+    <project-chb-wxf-list v-if="columnValue === 'wxf'" :taskno="taskno" :ji="ji"></project-chb-wxf-list>
     <!-- 筛选费 -->
-    <project-chb-sxf-list v-if="columnValue === 'sxf'" :taskno="taskno"></project-chb-sxf-list>
+    <project-chb-sxf-list v-if="columnValue === 'sxf'" :taskno="taskno" :ji="ji"></project-chb-sxf-list>
     <!-- 燃动费 -->
-    <project-chb-rdf-list v-if="columnValue === 'rldlf'" :taskno="taskno"></project-chb-rdf-list>
+    <project-chb-rdf-list v-if="columnValue === 'rldlf'" :taskno="taskno" :ji="ji"></project-chb-rdf-list>
     <!-- 人工费 -->
-    <project-chb-rgf-list v-if="columnValue === 'gzjlwf'" :taskno="taskno"></project-chb-rgf-list>
+    <project-chb-rgf-list v-if="columnValue === 'gzjlwf'" :taskno="taskno" :ji="ji"></project-chb-rgf-list>
     <!-- 固资费 -->
-    <project-chb-gzf-list v-if="columnValue === 'gdzczj'" :taskno="taskno"></project-chb-gzf-list>
+    <project-chb-gzf-list v-if="columnValue === 'gdzczj'" :taskno="taskno" :ji="ji"></project-chb-gzf-list>
     <!-- 管理费 -->
-    <project-chb-glf-list v-if="columnValue === 'glf'" :taskno="taskno"></project-chb-glf-list>
+    <project-chb-glf-list v-if="columnValue === 'glf'" :taskno="taskno" :ji="ji"></project-chb-glf-list>
     <!-- 装机 -->
     <mes-detail-list v-if="columnValue === 'zjcb'" :taskno="taskno"></mes-detail-list>
     <!-- 工时 -->
@@ -43,10 +43,14 @@
 </template>
 
 <script>
-// import ContractDetailList from './ContractDetailList.vue'      // 采集的合同数据
-import ContractDetailList from './ContractNewDetailList.vue'      // 导入的合同数据
-// import CollectDetailList from './CollectDetailList.vue'        // 采集的已收款数据
-import CollectDetailList from './CollectNewDetailList.vue'        // 导入的已收款数据
+// 采集的合同数据
+// import ContractDetailList from './CollectDetailList-caijiziduan.vue'
+// 导入的合同数据
+import ContractDetailList from './ContractDetailList.vue'
+// 采集的已收款数据
+// import CollectDetailList from './CollectDetailList-caijiziduan.vue'
+// 导入的已收款数据
+import CollectDetailList from './CollectDetailList.vue'
 import MaterialDetailList from './MaterialDetailList.vue'
 import ProjectChbSwfList from './ProjectChbSwfList.vue'
 import ProjectChbWxfList from './ProjectChbWxfList.vue'
@@ -82,6 +86,7 @@ import ProjectChbGlfList from './ProjectChbGlfList.vue'
       return {
         taskno: '',
         columnValue: '',
+        ji: '',
         pichanInfo: {},
         title:'',
         width: '60%',