Selaa lähdekoodia

项目成本明细下载+预算显示

yuhan 1 vuosi sitten
vanhempi
commit
391eb03c43

+ 11 - 7
src/views/module_kzks/projectCostList/ProjectCostList.vue

@@ -212,7 +212,7 @@
 
         <span slot="action" slot-scope="text, record">
           <!-- <a @click="handleEdit(record)">编辑</a> -->
-          <a @click="handleXushi(record)">预算执行</a>
+          <a @click="handleXushi(record)">虚实成本</a>
 
           <!-- <a-divider type="vertical" />
           <a-dropdown>
@@ -413,6 +413,11 @@ import ProjectImportListModal from '../projectImportList/modules/ProjectImportLi
             dataIndex: 'zcb'
           },
           {
+            title:'材料预算',
+            align:"center",
+            dataIndex: 'clys',
+          },
+          {
             title:'材料费',
             align:"center",
             dataIndex: 'clf',
@@ -431,6 +436,11 @@ import ProjectImportListModal from '../projectImportList/modules/ProjectImportLi
             customCell: this.getClickColumn,
           },
           {
+            title:'外协预算',
+            align:"center",
+            dataIndex: 'wxys',
+          },
+          {
             title:'外协费',
             align:"center",
             dataIndex: 'wxf',
@@ -821,12 +831,6 @@ import ProjectImportListModal from '../projectImportList/modules/ProjectImportLi
         console.log(record)
         this.$refs.xushi.open(record)
       },
-      // 监听对比选择项
-      onSelectChange(selectedRowKeys, selectionRows) {
-        console.log(1111111,selectedRowKeys, selectionRows)
-        this.selectedRowKeys = selectedRowKeys;
-        this.selectionRows = selectionRows;
-      },
       onSelect(record, selected, selectedRows, nativeEvent){
         console.log(record, selected, selectedRows, nativeEvent)
         console.log(record.children)

+ 8 - 5
src/views/module_kzks/projectCostList/modulesDetail/CollectDetailList.vue

@@ -12,7 +12,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
-      <a-button type="primary" icon="download" @click="handleExportXls('合同信息存储表')">导出</a-button>
+      <a-button 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> -->
@@ -46,7 +46,7 @@
         class="j-table-force-nowrap"
         @change="handleTableChange">
         <!-- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" -->
-        
+
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
@@ -283,7 +283,7 @@
           //   align:"center",
           //   dataIndex: 'lxr'
           // },
-         
+
           // {
           //   title:'数据来源',
           //   // :10:合同管理,20:合同任务,30:任务合同,40:合同付款,50:合同发票,60:外协合同
@@ -305,18 +305,21 @@
           //   align:"center",
           //   dataIndex: 'yhmc'
           // },
-          
+
         ],
         url: {
           list: "/xmcbDetail/comContractInfoExchange/getCrmYskDetail",
           // delete: "/xmcbDetail/comContractInfoExchange/delete",
           // deleteBatch: "/xmcbDetail/comContractInfoExchange/deleteBatch",
-          // exportXlsUrl: "/xmcbDetail/comContractInfoExchange/exportXls",
+          exportXlsUrl: "/jeecg-boot/xmcbDetail/comContractInfoExchange/exportYskDetail",
           // importExcelUrl: "xmcbDetail/comContractInfoExchange/importExcel",
 
         },
         dictOptions:{},
         superFieldList:[],
+        queryParam: {
+          taskno: this.taskno
+        }
       }
     },
     created() {

+ 12 - 9
src/views/module_kzks/projectCostList/modulesDetail/ContractDetailList.vue

@@ -12,7 +12,7 @@
     <!-- 操作按钮区域 -->
     <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('合同信息存储表')">导出</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> -->
@@ -335,15 +335,15 @@
             dataIndex: 'htfpe',
             fixed: 'right',
           },
-          
-          
-          
+
+
+
           // {
           //   title:'id',
           //   align:"center",
           //   dataIndex: 'id'
           // },
-          
+
           // {
           //   title:'开票时间',
           //   align:"center",
@@ -357,8 +357,8 @@
           //   align:"center",
           //   dataIndex: 'khid'
           // },
-          
-          
+
+
           // {
           //   title:'数据来源:10:合同管理,20:合同任务,30:任务合同,40:合同付款,50:合同发票,60:外协合同',
           //   align:"center",
@@ -369,7 +369,7 @@
           //   align:"center",
           //   dataIndex: 'yhid'
           // },
-          
+
           // {
           //   title:'类型(无用)',
           //   align:"center",
@@ -380,12 +380,15 @@
           list: "/xmcbDetail/comContractInfoExchange/getCrmHteDetail",
           // delete: "/xmcbDetail/comContractInfoExchange/delete",
           // deleteBatch: "/xmcbDetail/comContractInfoExchange/deleteBatch",
-          exportXlsUrl: "/xmcbDetail/comContractInfoExchange/exportXls",
+          exportXlsUrl: "/jeecg-boot/xmcbDetail/comContractInfoExchange/exportHteDetail",
           // importExcelUrl: "xmcbDetail/comContractInfoExchange/importExcel",
 
         },
         dictOptions:{},
         superFieldList:[],
+        queryParam: {
+          taskno: this.taskno
+        }
       }
     },
     created() {

+ 6 - 3
src/views/module_kzks/projectCostList/modulesDetail/KyBgDetailList.vue

@@ -12,7 +12,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
-      <a-button type="primary" icon="download" @click="handleExportXls('科研报工')">导出</a-button>
+      <a-button 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> -->
@@ -244,12 +244,15 @@
           list: "/kyBgInfo/kyBgInfo/getGSDeatilList",
           // delete: "/kyBgInfo/kyBgInfo/delete",
           // deleteBatch: "/kyBgInfo/kyBgInfo/deleteBatch",
-          exportXlsUrl: "/kyBgInfo/kyBgInfo/exportXls",
+          exportXlsUrl: "/jeecg-boot/kyBgInfo/kyBgInfo/exportGSDetail",
           // importExcelUrl: "kyBgInfo/kyBgInfo/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
+        queryParam: {
+          taskno: this.taskno
+        }
       }
     },
     created() {

+ 19 - 9
src/views/module_kzks/projectCostList/modulesDetail/MaterialDetailList.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false">
+  <a-card :bordered="false" class="u-dialog-card">
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -10,10 +10,10 @@
     <!-- 查询区域-END -->
 
     <!-- 操作按钮区域 -->
-    <!-- <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('物资出库单')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+    <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> -->
       <!-- 高级查询区域 -->
@@ -23,8 +23,8 @@
           <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> -->
+      </a-dropdown> -->
+    </div>
 
     <!-- table区域-begin -->
     <div>
@@ -148,12 +148,15 @@
           list: "/wzOutboundOrder/wzOutboundOrderH/getCLFList",
           // delete: "/wzOutboundOrder/wzOutboundOrderH/delete",
           // deleteBatch: "/wzOutboundOrder/wzOutboundOrderH/deleteBatch",
-          // exportXlsUrl: "/wzOutboundOrder/wzOutboundOrderH/exportXls",
+          exportXlsUrl: "/jeecg-boot/wzOutboundOrder/wzOutboundOrderH/exportCLFDetail",
           // importExcelUrl: "wzOutboundOrder/wzOutboundOrderH/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
+        queryParam: {
+          taskno: this.taskno
+        }
       }
     },
     created() {
@@ -207,4 +210,11 @@
 </script>
 <style scoped>
   @import '~@assets/less/common.less';
+</style>
+<style lang="less" scoped>
+  .u-dialog-card{
+    /deep/.ant-card-body{
+      padding: 0 !important;
+    }
+  }
 </style>

+ 6 - 3
src/views/module_kzks/projectCostList/modulesDetail/MesDetailList.vue

@@ -12,7 +12,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
-      <a-button type="primary" icon="download" @click="handleExportXls('mes装机信息卡')">导出</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> -->
@@ -347,12 +347,15 @@
           list: "/mesInfo/mesInfo/getZJDetailList",
           // delete: "/mesInfo/mesInfo/delete",
           // deleteBatch: "/mesInfo/mesInfo/deleteBatch",
-          // exportXlsUrl: "/mesInfo/mesInfo/exportXls",
+          exportXlsUrl: "/jeecg-boot/mesInfo/mesInfo/exportZJCBDetail",
           // importExcelUrl: "mesInfo/mesInfo/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
+        queryParam: {
+          taskno: this.taskno
+        }
       }
     },
     created() {

+ 6 - 3
src/views/module_kzks/projectCostList/modulesDetail/ProjectChbSwfList.vue

@@ -12,7 +12,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
-      <a-button type="primary" icon="download" @click="handleExportXls('事务费')">导出</a-button>
+      <a-button 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> -->
@@ -229,12 +229,15 @@
           list: "/projectChbSwf/projectChbSwf/getSWFDetailList",
           // delete: "/projectChbSwf/projectChbSwf/delete",
           // deleteBatch: "/projectChbSwf/projectChbSwf/deleteBatch",
-          exportXlsUrl: "/projectChbSwf/projectChbSwf/exportXls",
+          exportXlsUrl: "/jeecg-boot/projectChbSwf/projectChbSwf/exportSWFDetail",
           // importExcelUrl: "projectChbSwf/projectChbSwf/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
+        queryParam: {
+          taskno: this.taskno
+        }
       }
     },
     created() {

+ 6 - 3
src/views/module_kzks/projectCostList/modulesDetail/ProjectChbWxfList.vue

@@ -12,7 +12,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
-      <a-button type="primary" icon="download" @click="handleExportXls('外协费')">导出</a-button>
+      <a-button 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> -->
@@ -222,12 +222,15 @@
           // list: "/projectChbWxf/projectChbWxf/list",
           // delete: "/projectChbWxf/projectChbWxf/delete",
           // deleteBatch: "/projectChbWxf/projectChbWxf/deleteBatch",
-          exportXlsUrl: "/projectChbWxf/projectChbWxf/exportXls",
+          exportXlsUrl: "/jeecg-boot/projectChbWxf/projectChbWxf/exportWXFDetail",
           // importExcelUrl: "projectChbWxf/projectChbWxf/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
+        queryParam: {
+          taskno: this.taskno
+        }
       }
     },
     created() {

+ 6 - 4
src/views/module_kzks/projectCostList/modulesDetail/ProjectChbZyfList.vue

@@ -12,7 +12,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
-      <a-button type="primary" icon="download" @click="handleExportXls('外协费')">导出</a-button>
+      <a-button 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> -->
@@ -75,7 +75,6 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getAction } from '@/api/manage'
-
   export default {
     name: 'ProjectChbZyfList',
     mixins:[JeecgListMixin, mixinDevice],
@@ -196,10 +195,13 @@
         ],
         url: {
           list: "/projectChbZyf/projectChbZyf/getZYFDetailList",
-          exportXlsUrl: "/projectChbWxf/projectChbWxf/exportXls",
+          exportXlsUrl: "/projectChbZyf/projectChbZyf/exportZYFDetail",
         },
         dictOptions:{},
         superFieldList:[],
+        queryParam: {
+          taskno: this.taskno
+        }
       }
     },
     created() {
@@ -240,7 +242,7 @@
         fieldList.push({type:'string',value:'xmlb',text:'项目类别',dictCode:''})
         fieldList.push({type:'string',value:'taskno',text:'任务号',dictCode:''})
         this.superFieldList = fieldList
-      }
+      },
     }
   }
 </script>