浏览代码

预算执行弹窗新需求等

yuhan 10 月之前
父节点
当前提交
067644cd4f

+ 402 - 0
src/views/module_kzks/projectXushiContrast/chengbeneDetali/clfDetail.vue

@@ -0,0 +1,402 @@
+<template>
+  <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">
+  </a-table>
+</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: 'clfDetail',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+    },
+    data () {
+      return {
+        // 表头
+        columns: [
+          {
+            title: '序号',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+                return parseInt(index)+1;
+            }
+          },
+          {
+            title:'库存组织',
+            align:"center",
+            dataIndex: 'kczz'
+          },
+          {
+            title:'仓库',
+            align:"center",
+            dataIndex: 'ck'
+          },
+          {
+            title:'制单人',
+            align:"center",
+            dataIndex: 'zdr'
+          },
+          {
+            title:'制单日期',
+            align:"center",
+            dataIndex: 'zdrq'
+          },
+          {
+            title:'出库单号',
+            align:"center",
+            dataIndex: 'ckdh'
+          },
+          {
+            title:'行号',
+            align:"center",
+            dataIndex: 'hh'
+          },
+          {
+            title:'出库类型',
+            align:"center",
+            dataIndex: 'cklx'
+          },
+          {
+            title:'原图纸编码',
+            align:"center",
+            dataIndex: 'ytzbm'
+          },
+          {
+            title:'原图纸规格',
+            align:"center",
+            dataIndex: 'ytzgg'
+          },
+          {
+            title:'物料分类',
+            align:"center",
+            dataIndex: 'wlfl'
+          },
+          {
+            title:'物料编码',
+            align:"center",
+            dataIndex: 'wlbm'
+          },
+          {
+            title:'是否积压物资',
+            align:"center",
+            dataIndex: 'sfjywz'
+          },
+          {
+            title:'	国产/进口',
+            align:"center",
+            dataIndex: 'gcjk'
+          },
+          {
+            title:'物资名称',
+            align:"center",
+            dataIndex: 'wzmc'
+          },
+          {
+            title:'型号规格',
+            align:"center",
+            dataIndex: 'ggxh'
+          },
+          {
+            title:'外观标识',
+            align:"center",
+            dataIndex: 'wgbs'
+          },
+          {
+            title:'供应商批次号',
+            align:"center",
+            dataIndex: 'gyspch'
+          },
+          {
+            title:'质量等级',
+            align:"center",
+            dataIndex: 'zldj'
+          },
+          {
+            title:'封装形式',
+            align:"center",
+            dataIndex: 'fzxs'
+          },
+          {
+            title:'生产厂商',
+            align:"center",
+            dataIndex: 'sccs'
+          },
+          {
+            title:'应发数量',
+            align:"center",
+            dataIndex: 'yfsl'
+          },
+          {
+            title:'实发数量',
+            align:"center",
+            dataIndex: 'sfsl'
+          },
+          {
+            title:'质保有效期',
+            align:"center",
+            dataIndex: 'zbyxq'
+          },
+          {
+            title:'质保单位',
+            align:"center",
+            dataIndex: 'zbdw'
+          },
+          {
+            title:'质保依据',
+            align:"center",
+            dataIndex: 'zbyj'
+          },
+          {
+            title:'配套指令号',
+            align:"center",
+            dataIndex: 'ptzlh'
+          },
+          {
+            title:'投产任务号',
+            align:"center",
+            dataIndex: 'tcrwh'
+          },
+          {
+            title:'研制阶段',
+            align:"center",
+            dataIndex: 'yzjd'
+          },
+          {
+            title:'设备名称',
+            align:"center",
+            dataIndex: 'sbmc'
+          },
+          {
+            title:'单板号',
+            align:"center",
+            dataIndex: 'dbh'
+          },
+          {
+            title:'合格证号',
+            align:"center",
+            dataIndex: 'hgzh'
+          },
+          {
+            title:'合格证是否已上传',
+            align:"center",
+            dataIndex: 'hgzysc'
+          },
+          {
+            title:'DPA号',
+            align:"center",
+            dataIndex: 'dpah'
+          },
+          {
+            title:'领用单位',
+            align:"center",
+            dataIndex: 'lydw'
+          },
+          {
+            title:'领用人',
+            align:"center",
+            dataIndex: 'lyr'
+          },
+          {
+            title:'仓库名称',
+            align:"center",
+            dataIndex: 'ckmc'
+          },
+          {
+            title:'单据状态',
+            align:"center",
+            dataIndex: 'djztone'
+          },
+          {
+            title:'单位',
+            align:"center",
+            dataIndex: 'dw'
+          },
+          {
+            title:'内转移价',
+            align:"center",
+            dataIndex: 'nzyj'
+          },
+          {
+            title:'单价',
+            align:"center",
+            dataIndex: 'nbdj'
+          },
+          {
+            title:'采购单价',
+            align:"center",
+            dataIndex: 'cgdj'
+          },
+          {
+            title:'金额',
+            align:"center",
+            dataIndex: 'je'
+          },
+          {
+            title:'储位号',
+            align:"center",
+            dataIndex: 'cwh'
+          },
+          {
+            title:'当前保管员',
+            align:"center",
+            dataIndex: 'dqbgy'
+          },
+          {
+            title:'出库状态',
+            align:"center",
+            dataIndex: 'ckzt'
+          },
+          {
+            title:'单据状态',
+            align:"center",
+            dataIndex: 'djzttwo'
+          },
+          {
+            title:'配套单号',
+            align:"center",
+            dataIndex: 'ptdh'
+          },
+          {
+            title:'备料计划单号',
+            align:"center",
+            dataIndex: 'bljhdh'
+          },
+          {
+            title:'批次号',
+            align:"center",
+            dataIndex: 'pch'
+          },
+          {
+            title:'首次入库时间',
+            align:"center",
+            dataIndex: 'scrksj'
+          },
+          {
+            title:'任务号',
+            align:"center",
+            dataIndex: 'rwh'
+          },
+          {
+            title:'型号分类',
+            align:"center",
+            dataIndex: 'xhfl'
+          },
+          {
+            title:'军品管理员',
+            align:"center",
+            dataIndex: 'jpgly'
+          },
+          {
+            title:'民品管理员',
+            align:"center",
+            dataIndex: 'mpgly'
+          },
+          {
+            title:'箱号',
+            align:"center",
+            dataIndex: 'xh'
+          },
+          {
+            title:'智能仓储标识',
+            align:"center",
+            dataIndex: 'znccbs'
+          },
+          {
+            title:'打印次数',
+            align:"center",
+            dataIndex: 'dycs'
+          },
+          {
+            title:'A',
+            align:"center",
+            dataIndex: 'a'
+          },
+          {
+            title:'优先级',
+            align:"center",
+            dataIndex: 'yxj'
+          },
+        ],
+        url: {
+          // list: "/index/getZhiChuDetail",
+          list: "/index/getClfDetailNew",
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    },
+    computed: {
+      departNameList() {
+        return this.$store.getters.departNameList
+      },
+    },
+    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();//查询条件
+        var params = this.queryParam
+        params.field = this.getQueryField();
+        params.pageNo = this.ipagination.current;
+        params.pageSize = this.ipagination.pageSize;
+        params.departNameList = this.departNameList;
+        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:适配不分页的数据列表------------
+          }else{
+            this.$message.warning(res.message)
+          }
+        }).finally(() => {
+          this.loading = false
+        })
+      },
+      initDictConfig(){
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
+<style lang="less" scoped>
+  .u-dialog-card{
+    /deep/.ant-card-body{
+      padding: 0 !important;
+    }
+  }
+</style>

+ 202 - 0
src/views/module_kzks/projectXushiContrast/chengbeneDetali/otherDetail.vue

@@ -0,0 +1,202 @@
+<template>
+  <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">
+  </a-table>
+</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: 'OtherDetail',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+    },
+    props: ['listUrl'],
+    data () {
+      return {
+        // 表头
+        columns: [
+          {
+            title: '序号',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+                return parseInt(index)+1;
+            }
+          },
+          {
+            title:'年度',
+            align:"center",
+            dataIndex: 'nd'
+          },
+          {
+            title:'凭证日期',
+            align:"center",
+            dataIndex: 'pzrq'
+          },
+          {
+            title:'凭证号',
+            align:"center",
+            dataIndex: 'pzh'
+          },
+          {
+            title:'摘要',
+            align:"center",
+            dataIndex: 'zy'
+          },
+          {
+            title:'科目编号',
+            align:"center",
+            dataIndex: 'kmbh'
+          },
+          {
+            title:'科目名称',
+            align:"center",
+            dataIndex: 'km'
+          },
+          {
+            title:'方向',
+            align:"center",
+            dataIndex: 'fx'
+          },
+          {
+            title:'金额',
+            align:"center",
+            dataIndex: 'je'
+          },
+          {
+            title:'部门',
+            align:"center",
+            dataIndex: 'zrbm'
+          },
+          {
+            title:'往来单位',
+            align:"center",
+            dataIndex: 'wldw'
+          },
+          {
+            title:'辅助金额',
+            align:"center",
+            dataIndex: 'fzje'
+          },
+          {
+            title:'制单人',
+            align:"center",
+            dataIndex: 'zdr'
+          },
+          {
+            title:'会计期间',
+            align:"center",
+            dataIndex: 'kjqj'
+          },
+          {
+            title:'凭证内码',
+            align:"center",
+            dataIndex: 'pznm'
+          },
+          {
+            title:'项目编号',
+            align:"center",
+            dataIndex: 'xmbh'
+          },
+          {
+            title:'项目名称',
+            align:"center",
+            dataIndex: 'xmmc'
+          },
+          {
+            title:'项目类别',
+            align:"center",
+            dataIndex: 'xmlb'
+          },
+          {
+            title:'任务号',
+            align:"center",
+            dataIndex: 'taskno'
+          },
+        ],
+        // url: {
+        //   list: "/index/getZhiChuDetail",
+        // },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    },
+    computed: {
+      departNameList() {
+        return this.$store.getters.departNameList
+      },
+    },
+    watch: {
+      listUrl(oldValue, newValue){
+        console.log(oldValue, newValue)
+        this.loadData()
+      }
+    },
+    methods: {
+      loadData(arg) {
+        if(!this.listUrl){
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        var params = this.getQueryParams();//查询条件
+        params.field = this.getQueryField();
+        params.pageNo = this.ipagination.current;
+        params.pageSize = this.ipagination.pageSize;
+        params.departNameList = this.departNameList;
+        this.loading = true;
+        getAction(this.listUrl, 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
+        })
+      },
+      initDictConfig(){
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
+<style lang="less" scoped>
+  .u-dialog-card{
+    /deep/.ant-card-body{
+      padding: 0 !important;
+    }
+  }
+</style>

+ 115 - 0
src/views/module_kzks/projectXushiContrast/modulesDetail/ChengbenDetailList.vue

@@ -0,0 +1,115 @@
+<template>
+  <a-spin :spinning="spinning">
+    <a-card :bordered="false" class="u-dialog-card">
+      <!-- <div class="table-operator">
+        <a-button type="primary" icon="download" @click="handleExportXls('当月成本额明细')">导出</a-button>
+      </div> -->
+      <a-tabs :default-active-key="0" @change="changeTab">
+        <a-tab-pane :key="index" :tab="item.title" v-for="(item, index) in chengbenTabs">
+          <clf-detail v-if="chooseTabIndex === 0"></clf-detail>
+          <other-detail v-if="chooseTabIndex !== 0 && chooseTab === item.value" :listUrl="listUrl"></other-detail>
+        </a-tab-pane>
+      </a-tabs>
+    </a-card>
+  </a-spin>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { downFile } from '@/api/manage'
+  import ClfDetail from '../chengbeneDetali/clfDetail.vue'
+  import OtherDetail from '../chengbeneDetali/otherDetail.vue'
+
+  export default {
+    name: 'ChengbenDetailList',
+    components: {
+      ClfDetail,
+      OtherDetail
+    },
+    data () {
+      return {
+        spinning: false,
+        chengbenTabs: [
+          { title: '材料费', value: 'clf', url: '/index/getClfDetailNew'},
+          { title: '专用费', value: 'zyf', url: '/index/getZyfDetailNew'},
+          { title: '事务费', value: 'swf', url: '/index/getSwfDetailNew'},
+          { title: '外协费', value: 'wxf', url: '/index/getWxfDetailNew'},
+          { title: '燃动费', value: 'rdf', url: '/index/getRdfDetailNew'},
+          { title: '固资费', value: 'gzf', url: '/index/getZjfDetailNew'},
+          { title: '人工费', value: 'rgf', url: '/index/getRgfDetailNew'},
+          { title: '管理费', value: 'glf', url: '/index/getGlfDetailNew'},
+          { title: '筛选费', value: 'sxf', url: '/index/getSxfDetailNew'},
+        ],
+        chooseTabIndex: 0,
+        chooseTab: '', // 为了解决用v-else会出现多个请求的问题
+        listUrl: '',
+        url: {
+          exportXlsUrl: "/index/exportCneXls",
+        },
+      }
+    },
+    created() {
+    },
+    computed: {
+      departNameList() {
+        return this.$store.getters.departNameList
+      },
+    },
+    methods: {
+      // 使用jeecgListMinxin中方法,但不需要loadData
+      // loadData(){},
+      changeTab(e){
+        console.log(e)
+        this.chooseTabIndex = e
+        this.chooseTab = this.chengbenTabs[e].value
+        if(e !== 0){
+          this.listUrl = this.chengbenTabs[e].url
+        }
+      },
+      handleExportXls(fileName){
+        if(!fileName || typeof fileName != "string"){
+          fileName = "导出文件"
+        }
+        // let param = this.getQueryParams();
+        // let param = {};
+        // if(this.selectedRowKeys && this.selectedRowKeys.length>0){
+        //   param['selections'] = this.selectedRowKeys.join(",")
+        // }
+        // console.log("导出参数",param)
+        this.spinning = true
+        downFile(this.url.exportXlsUrl, {departNameList: this.departNameList}).then((data)=>{
+          if (!data) {
+            this.$message.warning("文件下载失败")
+            this.spinning = false
+            return
+          }
+          this.spinning = false
+          if (typeof window.navigator.msSaveBlob !== 'undefined') {
+            window.navigator.msSaveBlob(new Blob([data],{type: 'application/vnd.ms-excel'}), fileName+'.xls')
+          }else{
+            let url = window.URL.createObjectURL(new Blob([data],{type: 'application/vnd.ms-excel'}))
+            let link = document.createElement('a')
+            link.style.display = 'none'
+            link.href = url
+            link.setAttribute('download', fileName+'.xls')
+            document.body.appendChild(link)
+            link.click()
+            document.body.removeChild(link); //下载完成移除元素
+            window.URL.revokeObjectURL(url); //释放掉blob对象
+          }
+        })
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
+<style lang="less" scoped>
+  .u-dialog-card{
+    /deep/.ant-card-body{
+      padding: 0 !important;
+    }
+  }
+</style>

+ 328 - 0
src/views/module_kzks/projectXushiContrast/modulesDetail/CollectDetailList.vue

@@ -0,0 +1,328 @@
+<template>
+  <a-card :bordered="false" class="u-dialog-card">
+    <!-- 操作按钮区域 -->
+    <!-- <div class="table-operator">
+      <a-button type="primary" icon="download" @click="handleExport">导出</a-button>
+    </div> -->
+    <!-- 时间范围选择 -->
+    <div style="float: right;margin-top: -25px;">
+      <div>总金额:{{ (Number(totalAmount)/10000).toFixed(2) + '万元' }}</div>
+    </div>
+    <!-- table区域-begin -->
+    <div style="margin-top: 8px;">
+      <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">
+      </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: ''
+      },
+      // dateRange: {
+      //   type: Array,
+      //   default: function(){
+      //     return []
+      //   }
+      // }
+    },
+    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/getNewCrmYskDetailByTasknoYs",
+          totalAmount: '/comContractInfoExchangeNew/comContractInfoExchangeNew/getNewCrmSumYskByTasknoYs',
+          exportXlsUrl: '',
+          // exportXlsUrl: "/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewYskDetail",
+        },
+        dictOptions:{},
+        totalAmount: '',
+      }
+    },
+    created() {
+    },
+    computed: {
+      dateRange() {
+        return this.$store.getters.pcDateRange
+      },
+    },
+    watch: {
+      dateRange: {
+        handler(newValue, oldValue){
+          console.log(newValue, oldValue)
+          this.loadData()
+          this.getTotalAmount()
+        },
+        deep: true,
+        immediate: true,
+      }
+    },
+    methods: {
+      loadData(arg) {
+        //加载数据 若传入参数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;
+        params.beginDate = this.dateRange[0];
+        params.endDate = this.dateRange[1];
+        this.loading = true;
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records||res.result;
+            if(res.result.total)
+            {
+              this.ipagination.total = res.result.total;
+            }else{
+              this.ipagination.total = 0;
+            }
+          }else{
+            this.$message.warning(res.message)
+          }
+        }).finally(() => {
+          this.loading = false
+        })
+      },
+      getTotalAmount(){
+        this.loading = true
+        var params = {
+          beginDate: this.dateRange[0],
+          endDate: this.dateRange[1],
+          taskno: this.taskno,
+        }
+        getAction(this.url.totalAmount, params).then(res => {
+          if (res.success) {
+            this.totalAmount = res.result
+          }else{
+            this.$message.warning(res.message)
+          }
+        }).finally(() => {
+          this.loading = false
+        })
+      },
+      // 日期范围选择
+      onChange(date, dateString) {
+        console.log(date, dateString);
+        this.queryParam.beginDate = dateString[0]
+        this.queryParam.endDate = dateString[1]
+        this.loadData()
+        this.getTotalAmount()
+      },
+      // handleExport(){
+      //   this.url.exportXlsUrl = this.cengji === 2 ? '/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewYskDetail' : '/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewYskDetailByTasknos'
+      //   this.handleExportXls('已收款明细')
+      //   // this.handleExportXls(taskno+'已收款明细')
+      // },
+      initDictConfig(){
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
+<style lang="less" scoped>
+  .u-dialog-card{
+    /deep/.ant-card-body{
+      padding: 0 !important;
+    }
+  }
+</style>

+ 327 - 0
src/views/module_kzks/projectXushiContrast/modulesDetail/ContractDetailList.vue

@@ -0,0 +1,327 @@
+<template>
+  <a-card :bordered="false" class="u-dialog-card">
+    <!-- 操作按钮区域 -->
+    <!-- <div class="table-operator">
+      <a-button type="primary" icon="download" @click="handleExport">导出</a-button>
+    </div> -->
+    <!-- table区域-begin -->
+    <!-- 时间范围选择 -->
+    <div style="float: right;margin-top: -25px;">
+      <div>总金额:{{ (Number(totalAmount)/10000).toFixed(2) + '万元' }}</div>
+    </div>
+
+    <div style="margin-top: 8px;">
+      <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">
+      </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: ''
+      },
+      // dateRange: {
+      //   type: Array,
+      //   default: function(){
+      //     return []
+      //   }
+      // }
+    },
+    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/getNewCrmHteDetailByTasknoYs",
+          totalAmount: '/comContractInfoExchangeNew/comContractInfoExchangeNew/getNewCrmSumHteByTasknoYs',
+          // exportXlsUrl: "/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewHteDetail",
+        },
+        dictOptions:{},
+        totalAmount: '',
+      }
+    },
+    created() {
+      // this.loadData()
+      // this.getTotalAmount()
+    },
+    computed: {
+      dateRange() {
+        return this.$store.getters.pcDateRange
+      },
+    },
+    watch: {
+      dateRange: {
+        handler(newValue, oldValue){
+          console.log(newValue, oldValue)
+          this.loadData()
+          this.getTotalAmount()
+        },
+        deep: true,
+        immediate: true,
+      }
+    },
+    methods: {
+      loadData(arg) {
+        //加载数据 若传入参数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;
+        params.beginDate = this.dateRange[0];
+        params.endDate = this.dateRange[1];
+        this.loading = true;
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records||res.result;
+            if(res.result.total)
+            {
+              this.ipagination.total = res.result.total;
+            }else{
+              this.ipagination.total = 0;
+            }
+          }else{
+            this.$message.warning(res.message)
+          }
+        }).finally(() => {
+          this.loading = false
+        })
+      },
+      getTotalAmount(){
+        var params = {
+          beginDate: this.dateRange[0],
+          endDate: this.dateRange[1],
+          taskno: this.taskno,
+        }
+        getAction(this.url.totalAmount, params).then(res => {
+          if (res.success) {
+            this.totalAmount = res.result
+          }else{
+            this.$message.warning(res.message)
+          }
+        }).finally(() => {
+        })
+      },
+      // handleExport(){
+      //   this.url.exportXlsUrl = this.cengji === 2 ? '/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewHteDetail' : '/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewHteDetailByTasknos'
+      //   this.handleExportXls('合同额明细')
+      // },
+      initDictConfig(){
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
+<style lang="less" scoped>
+  .u-dialog-card{
+    /deep/.ant-card-body{
+      padding: 0 !important;
+    }
+  }
+</style>