Sfoglia il codice sorgente

修改合同额+已收款由采集改成导入之后的详情

丁治程 1 anno fa
parent
commit
9337b13f6b

+ 362 - 0
src/views/module_kzks/projectCostList/modulesDetail/CollectNewDetailList.vue

@@ -0,0 +1,362 @@
+<template>
+  <a-card :bordered="false" class="u-dialog-card">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <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> -->
+    </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"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        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>
+
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { getAction } from '@/api/manage'
+
+  export default {
+    name: 'ContractDetailList',
+    mixins:[JeecgListMixin, mixinDevice],
+    props: {
+      taskno: {
+        type: String,
+        default: ''
+      }
+    },
+    data () {
+      return {
+        description: '合同信息存储表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '序号',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            },
+            fixed: 'left',
+          },
+          {
+            title:'任务编号',
+            align:"center",
+            dataIndex: 'rwbh',
+            width: 120,
+            fixed: 'left',
+          },
+          {
+            title:'任务名称',
+            align:"center",
+            dataIndex: 'rwname',
+            width: 120,
+            fixed: 'left',
+          },
+          // 所属型号
+          {
+            title:'收款单号',
+            align:"center",
+            dataIndex: 'skdh'
+          },
+          {
+            title:'执行状态',
+            align:"center",
+            dataIndex: 'zxzt'
+          },
+          {
+            title:'付款方名称',
+            align:"center",
+            dataIndex: 'fkfmc'
+          },
+          {
+            title:'用户简称',
+            align:"center",
+            dataIndex: 'yhjc'
+          },
+          {
+            title:'合同编号',
+            align:"center",
+            dataIndex: 'htbh'
+          },
+          {
+            title:'合同名称',
+            align:"center",
+            dataIndex: 'htname'
+          },
+          {
+            title:'合同类型',
+            align:"center",
+            dataIndex: 'httype'
+          },
+          {
+            title:'型号',
+            align:"center",
+            dataIndex: 'xh'
+          },
+          {
+            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?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'收款类型',
+            align:"center",
+            dataIndex: 'sktype'
+          },
+          {
+            title:'收款科目代码',
+            align:"center",
+            dataIndex: 'skkmdm'
+          },
+          {
+            title:'凭证号',
+            align:"center",
+            dataIndex: 'pzh'
+          },
+          {
+            title:'业务员',
+            align:"center",
+            dataIndex: 'ywy'
+          },
+          {
+            title:'业务部门',
+            align:"center",
+            dataIndex: 'ywbm'
+          },
+          {
+            title:'录入人', // 、申请人
+            align:"center",
+            dataIndex: 'lrr'
+          },
+          {
+            title:'录入日期', // 起草日期、 、申请日期
+            align:"center",
+            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: 'skzje',
+            width: 120,
+            fixed: 'right',
+          },
+          {
+            title:'任务收款金额(元)',
+            align:"center",
+            dataIndex: 'rwskje',
+            width: 120,
+            fixed: 'right',
+          },
+        ],
+        url: {
+          list: "/comContractInfoExchangeNew/comContractInfoExchangeNew/getNewCrmYskDetail",
+          // delete: "/xmcbDetail/comContractInfoExchange/delete",
+          // deleteBatch: "/xmcbDetail/comContractInfoExchange/deleteBatch",
+          exportXlsUrl: "/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewYskDetail",
+          // importExcelUrl: "xmcbDetail/comContractInfoExchange/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+        queryParam: {
+          taskno: this.taskno
+        }
+      }
+    },
+    created() {
+      this.getSuperFieldList();
+      this.loadData()
+    },
+    computed: {
+      // importExcelUrl: function(){
+      //   return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      // },
+    },
+    methods: {
+      loadData() {
+        this.loading = true;
+        getAction(this.url.list, {taskno: this.taskno}).then((res) => {
+          this.dataSource = res
+        }).finally(() => {
+          this.loading = false
+        })
+      },
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'skdh',text:'收款单号.',dictCode:''})
+        fieldList.push({type:'string',value:'zxzt',text:'执行状态.',dictCode:''})
+        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:'jd',text:'阶段.',dictCode:''})
+        fieldList.push({type:'int',value:'sl',text:'数量.',dictCode:''})
+        fieldList.push({type:'string',value:'bm',text:'部门.',dictCode:''})
+        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:'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:'skkmdm',text:'收款科目代码.',dictCode:''})
+        fieldList.push({type:'string',value:'pzh',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:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
+<style lang="less" scoped>
+  .u-dialog-card{
+    /deep/.ant-card-body{
+      padding: 0 !important;
+    }
+  }
+</style>

+ 374 - 0
src/views/module_kzks/projectCostList/modulesDetail/ContractNewDetailList.vue

@@ -0,0 +1,374 @@
+<template>
+  <a-card :bordered="false" class="u-dialog-card">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator" style="padding: -24px !important;">
+      <!-- <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> -->
+    </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"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        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>
+
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { getAction } from '@/api/manage'
+
+  export default {
+    name: 'ContractDetailList',
+    mixins:[JeecgListMixin, mixinDevice],
+    props: {
+      taskno: {
+        type: String,
+        default: ''
+      }
+    },
+    data () {
+      return {
+        description: '合同信息存储表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '序号',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            },
+            fixed: 'left',
+          },
+          {
+            title:'任务编号',
+            align:"center",
+            dataIndex: 'rwbh',
+            width: 120,
+            fixed: 'left',
+          },
+          {
+            title:'任务名称',
+            align:"center",
+            dataIndex: 'rwname',
+            width: 120,
+            fixed: 'left',
+          },
+          {
+            title:'主合同编号',
+            align:"center",
+            dataIndex: 'zhtbh'
+          },
+          {
+            title:'合同编号',
+            align:"center",
+            dataIndex: 'htbh'
+          },
+          {
+            title:'合同名称',
+            align:"center",
+            dataIndex: 'htname'
+          },
+          {
+            title:'签署日期',
+            align:"center",
+            dataIndex: 'qsrq',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'甲方(付款方)',
+            align:"center",
+            dataIndex: 'jf'
+          },
+          {
+            title:'甲方简称',
+            align:"center",
+            dataIndex: 'jfjc'
+          },
+          {
+            title:'合同金额',
+            align:"center",
+            dataIndex: 'htje'
+          },
+          {
+            title:'自筹',
+            align:"center",
+            dataIndex: 'zc'
+          },
+          {
+            title:'合同到款',
+            align:"center",
+            dataIndex: 'htdk'
+          },
+          {
+            title:'合同待收款',
+            align:"center",
+            dataIndex: 'htdsk'
+          },
+          // 签署日期
+          {
+            title:'合同已开票',
+            align:"center",
+            dataIndex: 'htykp'
+          },
+          {
+            title:'合同待开票',
+            align:"center",
+            dataIndex: 'htdkp'
+          },
+          {
+            title:'产品型号',
+            align:"center",
+            dataIndex: 'cpxh'
+          },
+          {
+            title:'阶段',
+            align:"center",
+            dataIndex: 'jd'
+          },
+          {
+            title:'研制部门',
+            align:"center",
+            dataIndex: 'yzbm'
+          },
+          // {
+          //   title:'归档日期',
+          //   align:"center",
+          //   dataIndex: 'gdrq',
+          //   customRender:function (text) {
+          //     return !text?"":(text.length>10?text.substr(0,10):text)
+          //   }
+          // },
+          {
+            title:'任务已收款',
+            align:"center",
+            dataIndex: 'rwyisk'
+          },
+          {
+            title:'发票类型1',
+            align:"center",
+            dataIndex: 'fptypeone'
+          },
+          {
+            title:'发票1金额',
+            align:"center",
+            dataIndex: 'fpjeone'
+          },
+          {
+            title:'1已开票额',
+            align:"center",
+            dataIndex: 'ykpeone'
+          },
+          {
+            title:'发票类型2', // 、收款总金额、开票金额
+            align:"center",
+            dataIndex: 'fptypetwo'
+          },
+          {
+            title:'发票2金额',
+            align:"center",
+            dataIndex: 'fpjetwo'
+          },
+          {
+            title:'2已开票额',
+            align:"center",
+            dataIndex: 'ykpetwo'
+          },
+          {
+            title:'合同主管部门',
+            align:"center",
+            dataIndex: 'htzgbm'
+          },
+          {
+            title:'业务员',
+            align:"center",
+            dataIndex: 'ywy'
+          },
+          {
+            title:'合同履行情况',
+            align:"center",
+            dataIndex: 'htlxqk'
+          },
+          {
+            title:'合同状态说明',
+            align:"center",
+            dataIndex: 'htztsm'
+          },
+          {
+            title:'合同分配额(元)',
+            align:"center",
+            dataIndex: 'rwyingsk',
+            width: 120,
+            fixed: 'right',
+          },
+        ],
+        url: {
+          list: "/comContractInfoExchangeNew/comContractInfoExchangeNew/getNewCrmHteDetail",
+          // delete: "/xmcbDetail/comContractInfoExchange/delete",
+          // deleteBatch: "/xmcbDetail/comContractInfoExchange/deleteBatch",
+          exportXlsUrl: "/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewHteDetail",
+          // importExcelUrl: "xmcbDetail/comContractInfoExchange/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+        queryParam: {
+          taskno: this.taskno
+        }
+      }
+    },
+    created() {
+      this.getSuperFieldList();
+      this.loadData()
+    },
+    computed: {
+      // importExcelUrl: function(){
+      //   return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      // },
+    },
+    methods: {
+      loadData() {
+        this.loading = true;
+        getAction(this.url.list, {taskno: this.taskno}).then((res) => {
+          console.log(res)
+          this.dataSource = res
+        }).finally(() => {
+          this.loading = false
+        })
+      },
+      initDictConfig(){
+      },
+      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:'htbh',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:'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:'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:'htlxqk',text:'合同履行情况.',dictCode:''})
+        fieldList.push({type:'string',value:'htztsm',text:'合同状态说明.',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
+<style lang="less" scoped>
+  .u-dialog-card{
+    /deep/.ant-card-body{
+      padding: 0 !important;
+    }
+  }
+</style>

+ 4 - 2
src/views/module_kzks/projectCostList/modulesDetail/ProjectDetailModal.vue

@@ -43,8 +43,10 @@
 </template>
 
 <script>
-import ContractDetailList from './ContractDetailList.vue'
-import CollectDetailList from './CollectDetailList.vue'
+// import ContractDetailList from './ContractDetailList.vue'      // 采集的合同数据
+import ContractDetailList from './ContractNewDetailList.vue'      // 导入的合同数据
+// import CollectDetailList from './CollectDetailList.vue'        // 采集的已收款数据
+import CollectDetailList from './CollectNewDetailList.vue'        // 导入的已收款数据
 import MaterialDetailList from './MaterialDetailList.vue'
 import ProjectChbSwfList from './ProjectChbSwfList.vue'
 import ProjectChbWxfList from './ProjectChbWxfList.vue'