项目成本汇集层详情+下载

src/views/module_kzks/projectCostList/ProjectCostList.vue

@@ -1068,8 +1068,8 @@ import { number } from 'echarts';
         // if(record.children || record.id === 'amount'){
         //   return false
         // }
-        // 改成汇集层也需要弹窗
-        if(record.id === 'amount'){
+        // 改成汇集层也需要弹窗且汇集层装机成本和工时不弹窗
+        if(record.id === 'amount' || (record.ji === 1 && columnValue === 'zjcb') || (record.ji === 1 && columnValue === 'workhour')){
           return false
         }
         return {
@@ -1097,7 +1097,7 @@ import { number } from 'echarts';
               if(record.ji === 2){
                 this.$refs.proCostDetail.taskno = record.taskno
               }
-              this.$refs.proCostDetail.ji = record.ji
+              this.$refs.proCostDetail.cengji = record.ji
               if(record.status === '1' && columnValue === 'clf'){
                 // 批产参数
                 this.$refs.proCostDetail.pichanInfo = {

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

@@ -1,19 +1,9 @@
 <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 type="primary" icon="download" @click="handleExport">导出</a-button>
     </div>
-
     <!-- table区域-begin -->
     <div>
       <a-table
@@ -28,7 +18,6 @@
         :loading="loading"
         class="j-table-force-nowrap"
         @change="handleTableChange">
-        <!-- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" -->
       </a-table>
     </div>
 
@@ -50,8 +39,7 @@
         type: String,
         default: ''
       },
-      ji: {
-        // type: String,
+      cengji: {
         default: 2
       }
     },
@@ -230,10 +218,10 @@
         url: {
           listZiji: "/comContractInfoExchangeNew/comContractInfoExchangeNew/getNewCrmYskDetail",
           listHuiji: '/comContractInfoExchangeNew/comContractInfoExchangeNew/getNewCrmYskDetailByTasknos',
+          exportXlsUrl: '',
           // exportXlsUrl: "/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewYskDetail",
         },
         dictOptions:{},
-        superFieldList:[],
       }
     },
     created() {
@@ -242,7 +230,7 @@
     },
     methods: {
       loadData(arg) {
-        var url = this.ji === 2 ? this.url.listZiji : this.url.listHuiji
+        var url = this.cengji === 2 ? this.url.listZiji : this.url.listHuiji
         //加载数据 若传入参数1则加载第一页的内容
         if (arg === 1) {
           this.ipagination.current = 1;
@@ -256,7 +244,6 @@
         this.loading = true;
         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)
             {
@@ -264,7 +251,6 @@
             }else{
               this.ipagination.total = 0;
             }
-            //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
           }else{
             this.$message.warning(res.message)
           }
@@ -273,7 +259,7 @@
         })
       },
       handleExport(){
-        this.url.exportXlsUr = this.ji === 2 ? '/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewYskDetail' : '/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewYskDetailByTasknos'
+        this.url.exportXlsUrl = this.cengji === 2 ? '/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewYskDetail' : '/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewYskDetailByTasknos'
         this.handleExportXls('已收款明细')
         // this.handleExportXls(taskno+'已收款明细')
       },

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

@@ -1,38 +1,11 @@
 <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 class="table-operator">
+      <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"
@@ -45,47 +18,6 @@
         :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>
 
@@ -106,6 +38,9 @@
       taskno: {
         type: String,
         default: ''
+      },
+      cengji: {
+        default: 2
       }
     },
     data () {
@@ -289,76 +224,55 @@
           },
         ],
         url: {
-          list: "/comContractInfoExchangeNew/comContractInfoExchangeNew/getNewCrmHteDetail",
-          // delete: "/xmcbDetail/comContractInfoExchange/delete",
-          // deleteBatch: "/xmcbDetail/comContractInfoExchange/deleteBatch",
-          exportXlsUrl: "/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewHteDetail",
-          // importExcelUrl: "xmcbDetail/comContractInfoExchange/importExcel",
+          listZiji: "/comContractInfoExchangeNew/comContractInfoExchangeNew/getNewCrmHteDetail",
+          listHuiji: "/comContractInfoExchangeNew/comContractInfoExchangeNew/getNewCrmHteDetailByTasknos",
+          // exportXlsUrl: "/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewHteDetail",
 
         },
         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.cengji === 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) => {
-          console.log(res)
-          this.dataSource = res
+        getAction(url, 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
         })
       },
+      handleExport(){
+        this.url.exportXlsUrl = this.cengji === 2 ? '/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewHteDetail' : '/comContractInfoExchangeNew/comContractInfoExchangeNew/exportNewHteDetailByTasknos'
+        this.handleExportXls('合同额明细')
+      },
       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>

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

@@ -1,38 +1,11 @@
 <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" v-if="!detail">
-      <!-- <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"
@@ -45,50 +18,8 @@
         :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>
 
@@ -110,6 +41,9 @@
       detail: {
         type: Boolean,
         default: false
+      },
+      cengji: {
+        default: 2
       }
     },
     data () {
@@ -159,72 +93,60 @@
           },
         ],
         url: {
-          list: "/wzOutboundOrder/wzOutboundOrderH/getCLFList",
-          // delete: "/wzOutboundOrder/wzOutboundOrderH/delete",
-          // deleteBatch: "/wzOutboundOrder/wzOutboundOrderH/deleteBatch",
-          exportXlsUrl: "/wzOutboundOrder/wzOutboundOrderH/exportCLFDetail",
-          // importExcelUrl: "wzOutboundOrder/wzOutboundOrderH/importExcel",
-
+          listZiji: "/wzOutboundOrder/wzOutboundOrderH/getCLFList",
+          listHuiji: "/wzOutboundOrder/wzOutboundOrderH/getCLFListByTasknos",
+          // exportXlsUrl: "/wzOutboundOrder/wzOutboundOrderH/exportCLFDetail",
         },
         dictOptions:{},
-        superFieldList:[],
-        queryParam: {
-          taskno: this.taskno
-        }
       }
     },
     created() {
-      this.getSuperFieldList();
       this.loadData()
     },
-    watch: {
-      taskno(newV, oldV){
-        console.log(newV, oldV)
-        this.loadData()
-      }
-    },
+    // watch: {
+    //   taskno(newV, oldV){
+    //     console.log(newV, oldV)
+    //     this.loadData()
+    //   }
+    // },
     computed: {
-      // importExcelUrl: function(){
-      //   return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      // },
     },
     methods: {
-      loadData() {
+      loadData(arg) {
+        var url = this.cengji === 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) {
+            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
         })
       },
+      handleExport(){
+        this.url.exportXlsUrl = this.cengji === 2 ? '/wzOutboundOrder/wzOutboundOrderH/exportCLFDetail' : '/wzOutboundOrder/wzOutboundOrderH/exportCLFDetailByTasknos'
+        this.handleExportXls('材料费明细')
+      },
       initDictConfig(){
       },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'qzr',text:'签字人'})
-        fieldList.push({type:'string',value:'zdr',text:'制单人'})
-        fieldList.push({type:'string',value:'lly',text:'领料员'})
-        fieldList.push({type:'string',value:'lybm',text:'领用部门'})
-        fieldList.push({type:'string',value:'ck',text:'仓库'})
-        fieldList.push({type:'string',value:'khybm',text:'库管员编码'})
-        fieldList.push({type:'string',value:'kgymc',text:'库管员名称'})
-        fieldList.push({type:'string',value:'zdrq',text:'制单日期'})
-        fieldList.push({type:'string',value:'djzt',text:'单据状态'})
-        fieldList.push({type:'string',value:'zsl',text:'总数量'})
-        fieldList.push({type:'string',value:'qzrq',text:'签字日期'})
-        fieldList.push({type:'string',value:'ckdh',text:'出库单号'})
-        fieldList.push({type:'string',value:'ptzlh',text:'配套指令号'})
-        fieldList.push({type:'string',value:'rwh',text:'任务号'})
-        fieldList.push({type:'string',value:'gcxh',text:'工程型号'})
-        fieldList.push({type:'string',value:'zbdw',text:'质保单位'})
-        fieldList.push({type:'string',value:'zbyj',text:'质保依据'})
-        fieldList.push({type:'string',value:'bh',text:'板号'})
-        fieldList.push({type:'string',value:'sbmc',text:'设备名称'})
-        fieldList.push({type:'string',value:'rwjd',text:'任务阶段'})
-        fieldList.push({type:'string',value:'dycs',text:'打印次数'})
-        fieldList.push({type:'string',value:'ckdzj',text:'出库单主键'})
-        this.superFieldList = fieldList
-      }
     }
   }
 </script>

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

@@ -1,38 +1,11 @@
 <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> -->
+      <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,49 +19,8 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap"
         @change="handleTableChange">
-
-        <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>
 
@@ -106,6 +38,9 @@
       taskno: {
         type: String,
         default: ''
+      },
+      cengji: {
+        default: 2
       }
     },
     data () {
@@ -228,62 +163,54 @@
           // }
         ],
         url: {
-          list: "/projectChbGlf/kzksProjectChbGlf/getGLFDetailList",
-          // delete: "/projectChbSwf/projectChbSwf/delete",
-          // deleteBatch: "/projectChbSwf/projectChbSwf/deleteBatch",
-          exportXlsUrl: "/projectChbGlf/kzksProjectChbGlf/exportGLFDetail",
-          // importExcelUrl: "projectChbSwf/projectChbSwf/importExcel",
-
+          listZiji: "/projectChbGlf/kzksProjectChbGlf/getGLFDetailList",
+          listHuiji: "/projectChbGlf/kzksProjectChbGlf/getGLFDetailListByTasknos",
+          // exportXlsUrl: "/projectChbGlf/kzksProjectChbGlf/exportGLFDetail",
         },
         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.cengji === 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) {
+            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
         })
       },
+      handleExport(){
+        this.url.exportXlsUrl = this.cengji === 2 ? '/projectChbGlf/kzksProjectChbGlf/exportGLFDetail' : '/projectChbGlf/kzksProjectChbGlf/exportGLFDetailByTasknos'
+        this.handleExportXls('管理费明细')
+      },
       initDictConfig(){
       },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'nd',text:'年度',dictCode:''})
-        fieldList.push({type:'string',value:'pzrq',text:'凭证日期',dictCode:''})
-        fieldList.push({type:'string',value:'pzh',text:'凭证号',dictCode:''})
-        fieldList.push({type:'string',value:'zy',text:'摘要',dictCode:''})
-        fieldList.push({type:'string',value:'kmbh',text:'科目编号',dictCode:''})
-        fieldList.push({type:'string',value:'km',text:'科目名称',dictCode:''})
-        fieldList.push({type:'string',value:'fx',text:'方向',dictCode:''})
-        fieldList.push({type:'string',value:'je',text:'金额',dictCode:''})
-        fieldList.push({type:'string',value:'bm',text:'部门',dictCode:''})
-        fieldList.push({type:'string',value:'wldw',text:'往来单位',dictCode:''})
-        fieldList.push({type:'string',value:'fzje',text:'辅助金额',dictCode:''})
-        fieldList.push({type:'string',value:'zdr',text:'制单人',dictCode:''})
-        fieldList.push({type:'string',value:'kjqj',text:'会计期间',dictCode:''})
-        fieldList.push({type:'string',value:'pznm',text:'凭证内码',dictCode:''})
-        fieldList.push({type:'string',value:'xmbh',text:'项目编号',dictCode:''})
-        fieldList.push({type:'string',value:'xmmc',text:'项目名称',dictCode:''})
-        fieldList.push({type:'string',value:'xmlb',text:'项目类别',dictCode:''})
-        fieldList.push({type:'string',value:'taskno',text:'任务号',dictCode:''})
-        this.superFieldList = fieldList
-      }
     }
   }
 </script>

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

@@ -1,38 +1,11 @@
 <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> -->
+      <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,49 +19,8 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap"
         @change="handleTableChange">
-
-        <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>
 
@@ -106,6 +38,9 @@
       taskno: {
         type: String,
         default: ''
+      },
+      cengji: {
+        default: 2
       }
     },
     data () {
@@ -228,62 +163,54 @@
           // }
         ],
         url: {
-          list: "/projectChbZjf/kzksProjectChbZjf/getZJFDetailList",
-          // delete: "/projectChbSwf/projectChbSwf/delete",
-          // deleteBatch: "/projectChbSwf/projectChbSwf/deleteBatch",
-          exportXlsUrl: "/projectChbZjf/kzksProjectChbZjf/exportZJFDetail",
-          // importExcelUrl: "projectChbSwf/projectChbSwf/importExcel",
-
+          listZiji: "/projectChbZjf/kzksProjectChbZjf/getZJFDetailList",
+          listHuiji: "/projectChbZjf/kzksProjectChbZjf/getZJFDetailListByTasknos",
+          // exportXlsUrl: "/projectChbZjf/kzksProjectChbZjf/exportZJFDetail",
         },
         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.cengji === 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) {
+            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
         })
       },
+      handleExport(){
+        this.url.exportXlsUrl = this.cengji === 2 ? '/projectChbZjf/kzksProjectChbZjf/exportZJFDetail' : '/projectChbZjf/kzksProjectChbZjf/exportZJFDetailByTasknos'
+        this.handleExportXls('固资费明细')
+      },
       initDictConfig(){
       },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'nd',text:'年度',dictCode:''})
-        fieldList.push({type:'string',value:'pzrq',text:'凭证日期',dictCode:''})
-        fieldList.push({type:'string',value:'pzh',text:'凭证号',dictCode:''})
-        fieldList.push({type:'string',value:'zy',text:'摘要',dictCode:''})
-        fieldList.push({type:'string',value:'kmbh',text:'科目编号',dictCode:''})
-        fieldList.push({type:'string',value:'km',text:'科目名称',dictCode:''})
-        fieldList.push({type:'string',value:'fx',text:'方向',dictCode:''})
-        fieldList.push({type:'string',value:'je',text:'金额',dictCode:''})
-        fieldList.push({type:'string',value:'bm',text:'部门',dictCode:''})
-        fieldList.push({type:'string',value:'wldw',text:'往来单位',dictCode:''})
-        fieldList.push({type:'string',value:'fzje',text:'辅助金额',dictCode:''})
-        fieldList.push({type:'string',value:'zdr',text:'制单人',dictCode:''})
-        fieldList.push({type:'string',value:'kjqj',text:'会计期间',dictCode:''})
-        fieldList.push({type:'string',value:'pznm',text:'凭证内码',dictCode:''})
-        fieldList.push({type:'string',value:'xmbh',text:'项目编号',dictCode:''})
-        fieldList.push({type:'string',value:'xmmc',text:'项目名称',dictCode:''})
-        fieldList.push({type:'string',value:'xmlb',text:'项目类别',dictCode:''})
-        fieldList.push({type:'string',value:'taskno',text:'任务号',dictCode:''})
-        this.superFieldList = fieldList
-      }
     }
   }
 </script>

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

@@ -1,38 +1,11 @@
 <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> -->
+      <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,49 +19,8 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap"
         @change="handleTableChange">
-
-        <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>
 
@@ -106,6 +38,9 @@
       taskno: {
         type: String,
         default: ''
+      },
+      cengji: {
+        default: 2
       }
     },
     data () {
@@ -228,62 +163,54 @@
           // }
         ],
         url: {
-          list: "/projectChbRdf/kzksProjectChbRdf/getRDFDetailList",
-          // delete: "/projectChbSwf/projectChbSwf/delete",
-          // deleteBatch: "/projectChbSwf/projectChbSwf/deleteBatch",
-          exportXlsUrl: "/projectChbRdf/kzksProjectChbRdf/exportRDFDetail",
-          // importExcelUrl: "projectChbSwf/projectChbSwf/importExcel",
-
+          listZiji: "/projectChbRdf/kzksProjectChbRdf/getRDFDetailList",
+          listHuiji: "/projectChbRdf/kzksProjectChbRdf/getRDFDetailListByTasknos",
+          // exportXlsUrl: "/projectChbRdf/kzksProjectChbRdf/exportRDFDetail",
         },
         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.cengji === 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) {
+            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
         })
       },
+      handleExport(){
+        this.url.exportXlsUrl = this.cengji === 2 ? '/projectChbRdf/kzksProjectChbRdf/exportRDFDetail' : '/projectChbRdf/kzksProjectChbRdf/exportRDFDetailByTasknos'
+        this.handleExportXls('燃动费明细')
+      },
       initDictConfig(){
       },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'nd',text:'年度',dictCode:''})
-        fieldList.push({type:'string',value:'pzrq',text:'凭证日期',dictCode:''})
-        fieldList.push({type:'string',value:'pzh',text:'凭证号',dictCode:''})
-        fieldList.push({type:'string',value:'zy',text:'摘要',dictCode:''})
-        fieldList.push({type:'string',value:'kmbh',text:'科目编号',dictCode:''})
-        fieldList.push({type:'string',value:'km',text:'科目名称',dictCode:''})
-        fieldList.push({type:'string',value:'fx',text:'方向',dictCode:''})
-        fieldList.push({type:'string',value:'je',text:'金额',dictCode:''})
-        fieldList.push({type:'string',value:'bm',text:'部门',dictCode:''})
-        fieldList.push({type:'string',value:'wldw',text:'往来单位',dictCode:''})
-        fieldList.push({type:'string',value:'fzje',text:'辅助金额',dictCode:''})
-        fieldList.push({type:'string',value:'zdr',text:'制单人',dictCode:''})
-        fieldList.push({type:'string',value:'kjqj',text:'会计期间',dictCode:''})
-        fieldList.push({type:'string',value:'pznm',text:'凭证内码',dictCode:''})
-        fieldList.push({type:'string',value:'xmbh',text:'项目编号',dictCode:''})
-        fieldList.push({type:'string',value:'xmmc',text:'项目名称',dictCode:''})
-        fieldList.push({type:'string',value:'xmlb',text:'项目类别',dictCode:''})
-        fieldList.push({type:'string',value:'taskno',text:'任务号',dictCode:''})
-        this.superFieldList = fieldList
-      }
     }
   }
 </script>

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

@@ -1,38 +1,11 @@
 <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> -->
+      <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 +19,6 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap"
         @change="handleTableChange">
-
-        <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 +39,9 @@
       taskno: {
         type: String,
         default: ''
+      },
+      cengji: {
+        default: 2
       }
     },
     data () {
@@ -228,62 +164,54 @@
           // }
         ],
         url: {
-          list: "/projectChbRgf/kzksProjectChbRgf/getRGFDetailList",
-          // delete: "/projectChbSwf/projectChbSwf/delete",
-          // deleteBatch: "/projectChbSwf/projectChbSwf/deleteBatch",
-          exportXlsUrl: "/projectChbRgf/kzksProjectChbRgf/exportRGFDetail",
-          // importExcelUrl: "projectChbSwf/projectChbSwf/importExcel",
-
+          listZiji: "/projectChbRgf/kzksProjectChbRgf/getRGFDetailList",
+          listHuiji: "/projectChbRgf/kzksProjectChbRgf/getRGFDetailListByTasknos",
+          // exportXlsUrl: "/projectChbRgf/kzksProjectChbRgf/exportRGFDetail",
         },
         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.cengji === 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) {
+            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
         })
       },
+      handleExport(){
+        this.url.exportXlsUrl = this.cengji === 2 ? '/projectChbRgf/kzksProjectChbRgf/exportRGFDetail' : '/projectChbRgf/kzksProjectChbRgf/exportRGFDetailByTasknos'
+        this.handleExportXls('人工费明细')
+      },
       initDictConfig(){
       },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'nd',text:'年度',dictCode:''})
-        fieldList.push({type:'string',value:'pzrq',text:'凭证日期',dictCode:''})
-        fieldList.push({type:'string',value:'pzh',text:'凭证号',dictCode:''})
-        fieldList.push({type:'string',value:'zy',text:'摘要',dictCode:''})
-        fieldList.push({type:'string',value:'kmbh',text:'科目编号',dictCode:''})
-        fieldList.push({type:'string',value:'km',text:'科目名称',dictCode:''})
-        fieldList.push({type:'string',value:'fx',text:'方向',dictCode:''})
-        fieldList.push({type:'string',value:'je',text:'金额',dictCode:''})
-        fieldList.push({type:'string',value:'bm',text:'部门',dictCode:''})
-        fieldList.push({type:'string',value:'wldw',text:'往来单位',dictCode:''})
-        fieldList.push({type:'string',value:'fzje',text:'辅助金额',dictCode:''})
-        fieldList.push({type:'string',value:'zdr',text:'制单人',dictCode:''})
-        fieldList.push({type:'string',value:'kjqj',text:'会计期间',dictCode:''})
-        fieldList.push({type:'string',value:'pznm',text:'凭证内码',dictCode:''})
-        fieldList.push({type:'string',value:'xmbh',text:'项目编号',dictCode:''})
-        fieldList.push({type:'string',value:'xmmc',text:'项目名称',dictCode:''})
-        fieldList.push({type:'string',value:'xmlb',text:'项目类别',dictCode:''})
-        fieldList.push({type:'string',value:'taskno',text:'任务号',dictCode:''})
-        this.superFieldList = fieldList
-      }
     }
   }
 </script>

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

@@ -1,38 +1,11 @@
 <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> -->
+      <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,49 +19,8 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap"
         @change="handleTableChange">
-
-        <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>
 
@@ -106,6 +38,9 @@
       taskno: {
         type: String,
         default: ''
+      },
+      cengji: {
+        default: 2
       }
     },
     data () {
@@ -228,62 +163,54 @@
           // }
         ],
         url: {
-          list: "/projectChbSwf/projectChbSwf/getSWFDetailList",
-          // delete: "/projectChbSwf/projectChbSwf/delete",
-          // deleteBatch: "/projectChbSwf/projectChbSwf/deleteBatch",
-          exportXlsUrl: "/projectChbSwf/projectChbSwf/exportSWFDetail",
-          // importExcelUrl: "projectChbSwf/projectChbSwf/importExcel",
-
+          listZiji: "/projectChbSwf/projectChbSwf/getSWFDetailList",
+          listHuiji: "/projectChbSwf/projectChbSwf/getSWFDetailListByTasknos",
+          // exportXlsUrl: "/projectChbSwf/projectChbSwf/exportSWFDetail",
         },
         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.cengji === 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) {
+            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
         })
       },
+      handleExport(){
+        this.url.exportXlsUrl = this.cengji === 2 ? '/projectChbSwf/projectChbSwf/exportSWFDetail' : '/projectChbSwf/projectChbSwf/exportSWFDetailByTasknos'
+        this.handleExportXls('事务费明细')
+      },
       initDictConfig(){
       },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'nd',text:'年度',dictCode:''})
-        fieldList.push({type:'string',value:'pzrq',text:'凭证日期',dictCode:''})
-        fieldList.push({type:'string',value:'pzh',text:'凭证号',dictCode:''})
-        fieldList.push({type:'string',value:'zy',text:'摘要',dictCode:''})
-        fieldList.push({type:'string',value:'kmbh',text:'科目编号',dictCode:''})
-        fieldList.push({type:'string',value:'km',text:'科目名称',dictCode:''})
-        fieldList.push({type:'string',value:'fx',text:'方向',dictCode:''})
-        fieldList.push({type:'string',value:'je',text:'金额',dictCode:''})
-        fieldList.push({type:'string',value:'bm',text:'部门',dictCode:''})
-        fieldList.push({type:'string',value:'wldw',text:'往来单位',dictCode:''})
-        fieldList.push({type:'string',value:'fzje',text:'辅助金额',dictCode:''})
-        fieldList.push({type:'string',value:'zdr',text:'制单人',dictCode:''})
-        fieldList.push({type:'string',value:'kjqj',text:'会计期间',dictCode:''})
-        fieldList.push({type:'string',value:'pznm',text:'凭证内码',dictCode:''})
-        fieldList.push({type:'string',value:'xmbh',text:'项目编号',dictCode:''})
-        fieldList.push({type:'string',value:'xmmc',text:'项目名称',dictCode:''})
-        fieldList.push({type:'string',value:'xmlb',text:'项目类别',dictCode:''})
-        fieldList.push({type:'string',value:'taskno',text:'任务号',dictCode:''})
-        this.superFieldList = fieldList
-      }
     }
   }
 </script>

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

@@ -1,38 +1,11 @@
 <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> -->
+      <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,49 +19,8 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap"
         @change="handleTableChange">
-
-        <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>
 
@@ -106,6 +38,9 @@
       taskno: {
         type: String,
         default: ''
+      },
+      cengji: {
+        default: 2
       }
     },
     data () {
@@ -228,62 +163,54 @@
           // }
         ],
         url: {
-          list: "/projectChbSxf/kzksProjectChbSxf/getSXFDetailList",
-          // delete: "/projectChbSwf/projectChbSwf/delete",
-          // deleteBatch: "/projectChbSwf/projectChbSwf/deleteBatch",
-          exportXlsUrl: "/projectChbSxf/kzksProjectChbSxf/exportSXFDetail",
-          // importExcelUrl: "projectChbSwf/projectChbSwf/importExcel",
-
+          listZiji: "/projectChbSxf/kzksProjectChbSxf/getSXFDetailList",
+          listHuiji: "/projectChbSxf/projectChbSxf/getSXFDetailListByTasknos",
+          // exportXlsUrl: "/projectChbSxf/kzksProjectChbSxf/exportSXFDetail",
         },
         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.cengji === 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) {
+            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
         })
       },
+      handleExport(){
+        this.url.exportXlsUrl = this.cengji === 2 ? '/projectChbSxf/projectChbSxf/exportSXFDetail' : '/projectChbSxf/projectChbSxf/exportSXFDetailByTasknos'
+        this.handleExportXls('筛选费明细')
+      },
       initDictConfig(){
       },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'nd',text:'年度',dictCode:''})
-        fieldList.push({type:'string',value:'pzrq',text:'凭证日期',dictCode:''})
-        fieldList.push({type:'string',value:'pzh',text:'凭证号',dictCode:''})
-        fieldList.push({type:'string',value:'zy',text:'摘要',dictCode:''})
-        fieldList.push({type:'string',value:'kmbh',text:'科目编号',dictCode:''})
-        fieldList.push({type:'string',value:'km',text:'科目名称',dictCode:''})
-        fieldList.push({type:'string',value:'fx',text:'方向',dictCode:''})
-        fieldList.push({type:'string',value:'je',text:'金额',dictCode:''})
-        fieldList.push({type:'string',value:'bm',text:'部门',dictCode:''})
-        fieldList.push({type:'string',value:'wldw',text:'往来单位',dictCode:''})
-        fieldList.push({type:'string',value:'fzje',text:'辅助金额',dictCode:''})
-        fieldList.push({type:'string',value:'zdr',text:'制单人',dictCode:''})
-        fieldList.push({type:'string',value:'kjqj',text:'会计期间',dictCode:''})
-        fieldList.push({type:'string',value:'pznm',text:'凭证内码',dictCode:''})
-        fieldList.push({type:'string',value:'xmbh',text:'项目编号',dictCode:''})
-        fieldList.push({type:'string',value:'xmmc',text:'项目名称',dictCode:''})
-        fieldList.push({type:'string',value:'xmlb',text:'项目类别',dictCode:''})
-        fieldList.push({type:'string',value:'taskno',text:'任务号',dictCode:''})
-        this.superFieldList = fieldList
-      }
     }
   }
 </script>

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

@@ -1,38 +1,11 @@
 <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> -->
+      <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 +19,6 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap"
         @change="handleTableChange">
-
-        <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 +39,9 @@
       taskno: {
         type: String,
         default: ''
+      },
+      cengji: {
+        default: 2
       }
     },
     data () {
@@ -220,63 +156,54 @@
           },
         ],
         url: {
-          list: "/projectChbWxf/projectChbWxf/getWXFDetailList",
-          // list: "/projectChbWxf/projectChbWxf/list",
-          // delete: "/projectChbWxf/projectChbWxf/delete",
-          // deleteBatch: "/projectChbWxf/projectChbWxf/deleteBatch",
-          exportXlsUrl: "/projectChbWxf/projectChbWxf/exportWXFDetail",
-          // importExcelUrl: "projectChbWxf/projectChbWxf/importExcel",
-
+          listZiji: "/projectChbWxf/projectChbWxf/getWXFDetailList",
+          listHuiji: "/projectChbWxf/projectChbWxf/getWXFDetailListByTasknos",
+          // exportXlsUrl: "/projectChbWxf/projectChbWxf/exportWXFDetail",
         },
         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.cengji === 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) {
+            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
         })
       },
+      handleExport(){
+        this.url.exportXlsUrl = this.cengji === 2 ? '/projectChbWxf/projectChbWxf/exportWXFDetail' : '/projectChbWxf/projectChbWxf/exportWXFDetailByTasknos'
+        this.handleExportXls('外协费明细')
+      },
       initDictConfig(){
       },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'nd',text:'年度',dictCode:''})
-        fieldList.push({type:'string',value:'pzrq',text:'凭证日期',dictCode:''})
-        fieldList.push({type:'string',value:'pzh',text:'凭证号',dictCode:''})
-        fieldList.push({type:'string',value:'zy',text:'摘要',dictCode:''})
-        fieldList.push({type:'string',value:'kmbh',text:'科目编号',dictCode:''})
-        fieldList.push({type:'string',value:'km',text:'科目名称',dictCode:''})
-        fieldList.push({type:'string',value:'fx',text:'方向',dictCode:''})
-        fieldList.push({type:'string',value:'je',text:'金额',dictCode:''})
-        fieldList.push({type:'string',value:'bm',text:'部门',dictCode:''})
-        fieldList.push({type:'string',value:'wldw',text:'往来单位',dictCode:''})
-        fieldList.push({type:'string',value:'fzje',text:'辅助金额',dictCode:''})
-        fieldList.push({type:'string',value:'zdr',text:'制单人',dictCode:''})
-        fieldList.push({type:'string',value:'kjqj',text:'会计期间',dictCode:''})
-        fieldList.push({type:'string',value:'pznm',text:'凭证内码',dictCode:''})
-        fieldList.push({type:'string',value:'xmbh',text:'项目编号',dictCode:''})
-        fieldList.push({type:'string',value:'xmmc',text:'项目名称',dictCode:''})
-        fieldList.push({type:'string',value:'xmlb',text:'项目类别',dictCode:''})
-        fieldList.push({type:'string',value:'taskno',text:'任务号',dictCode:''})
-        this.superFieldList = fieldList
-      }
     }
   }
 </script>

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

@@ -1,34 +1,11 @@
 <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> -->
+      <a-button type="primary" icon="download" @click="handleExport">导出</a-button>
     </div>
-
     <!-- table区域-begin -->
     <div>
-
       <a-table
         ref="table"
         size="middle"
@@ -41,28 +18,6 @@
         :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>
-
       </a-table>
     </div>
 
@@ -82,6 +37,9 @@
       taskno: {
         type: String,
         default: ''
+      },
+      cengji: {
+        default: 2
       }
     },
     data () {
@@ -196,54 +154,53 @@
           },
         ],
         url: {
-          list: "/projectChbZyf/projectChbZyf/getZYFDetailList",
-          exportXlsUrl: "/projectChbZyf/projectChbZyf/exportZYFDetail",
+          listZiji: "/projectChbZyf/projectChbZyf/getZYFDetailList",
+          listHuiji: "/projectChbZyf/projectChbZyf/getZYFDetailListByTasknos",
+          // exportXlsUrl: "/projectChbZyf/projectChbZyf/exportZYFDetail",
         },
         dictOptions:{},
-        superFieldList:[],
-        queryParam: {
-          taskno: this.taskno
-        }
       }
     },
     created() {
-      this.getSuperFieldList();
       this.loadData()
     },
     computed: {
     },
     methods: {
-      initDictConfig(){
-      },
-      loadData() {
+      loadData(arg) {
+        var url = this.cengji === 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) {
+            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
         })
       },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'nd',text:'年度',dictCode:''})
-        fieldList.push({type:'string',value:'pzrq',text:'凭证日期',dictCode:''})
-        fieldList.push({type:'string',value:'pzh',text:'凭证号',dictCode:''})
-        fieldList.push({type:'string',value:'zy',text:'摘要',dictCode:''})
-        fieldList.push({type:'string',value:'kmbh',text:'科目编号',dictCode:''})
-        fieldList.push({type:'string',value:'km',text:'科目名称',dictCode:''})
-        fieldList.push({type:'string',value:'fx',text:'方向',dictCode:''})
-        fieldList.push({type:'string',value:'je',text:'金额',dictCode:''})
-        fieldList.push({type:'string',value:'bm',text:'部门',dictCode:''})
-        fieldList.push({type:'string',value:'wldw',text:'往来单位',dictCode:''})
-        fieldList.push({type:'string',value:'fzje',text:'辅助金额',dictCode:''})
-        fieldList.push({type:'string',value:'zdr',text:'制单人',dictCode:''})
-        fieldList.push({type:'string',value:'kjqj',text:'会计期间',dictCode:''})
-        fieldList.push({type:'string',value:'pznm',text:'凭证内码',dictCode:''})
-        fieldList.push({type:'string',value:'xmbh',text:'项目编号',dictCode:''})
-        fieldList.push({type:'string',value:'xmmc',text:'项目名称',dictCode:''})
-        fieldList.push({type:'string',value:'xmlb',text:'项目类别',dictCode:''})
-        fieldList.push({type:'string',value:'taskno',text:'任务号',dictCode:''})
-        this.superFieldList = fieldList
+      handleExport(){
+        this.url.exportXlsUrl = this.cengji === 2 ? '/projectChbZyf/projectChbZyf/exportZYFDetail' : '/projectChbZyf/projectChbZyf/exportZYFDetailByTasknos'
+        this.handleExportXls('专用费明细')
+      },
+      initDictConfig(){
       },
     }
   }

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

@@ -8,27 +8,27 @@
     cancelText="关闭"
     @cancel="handleCancel">
     <!-- 合同 -->
-    <contract-detail-list v-if="columnValue === 'contractfpe'" :taskno="taskno" :ji="ji"></contract-detail-list>
+    <contract-detail-list v-if="columnValue === 'contractfpe'" :taskno="taskno" :cengji="cengji"></contract-detail-list>
     <!-- 已收款 -->
-    <collect-detail-list v-if="columnValue === 'taskmoney'" :taskno="taskno" :ji="ji"></collect-detail-list>
+    <collect-detail-list v-if="columnValue === 'taskmoney'" :taskno="taskno" :cengji="cengji"></collect-detail-list>
     <!-- 材料费 -->
-    <material-detail-list v-if="columnValue === 'clf'" :taskno="taskno" :ji="ji"></material-detail-list>
+    <material-detail-list v-if="columnValue === 'clf'" :taskno="taskno" :cengji="cengji"></material-detail-list>
     <!-- 专用费 -->
-    <project-chb-zyf-list v-if="columnValue === 'zyf'" :taskno="taskno" :ji="ji"></project-chb-zyf-list>
+    <project-chb-zyf-list v-if="columnValue === 'zyf'" :taskno="taskno" :cengji="cengji"></project-chb-zyf-list>
     <!-- 事务费 -->
-    <project-chb-swf-list v-if="columnValue === 'swf'" :taskno="taskno" :ji="ji"></project-chb-swf-list>
+    <project-chb-swf-list v-if="columnValue === 'swf'" :taskno="taskno" :cengji="cengji"></project-chb-swf-list>
     <!-- 外协费 -->
-    <project-chb-wxf-list v-if="columnValue === 'wxf'" :taskno="taskno" :ji="ji"></project-chb-wxf-list>
+    <project-chb-wxf-list v-if="columnValue === 'wxf'" :taskno="taskno" :cengji="cengji"></project-chb-wxf-list>
     <!-- 筛选费 -->
-    <project-chb-sxf-list v-if="columnValue === 'sxf'" :taskno="taskno" :ji="ji"></project-chb-sxf-list>
+    <project-chb-sxf-list v-if="columnValue === 'sxf'" :taskno="taskno" :cengji="cengji"></project-chb-sxf-list>
     <!-- 燃动费 -->
-    <project-chb-rdf-list v-if="columnValue === 'rldlf'" :taskno="taskno" :ji="ji"></project-chb-rdf-list>
+    <project-chb-rdf-list v-if="columnValue === 'rldlf'" :taskno="taskno" :cengji="cengji"></project-chb-rdf-list>
     <!-- 人工费 -->
-    <project-chb-rgf-list v-if="columnValue === 'gzjlwf'" :taskno="taskno" :ji="ji"></project-chb-rgf-list>
+    <project-chb-rgf-list v-if="columnValue === 'gzjlwf'" :taskno="taskno" :cengji="cengji"></project-chb-rgf-list>
     <!-- 固资费 -->
-    <project-chb-gzf-list v-if="columnValue === 'gdzczj'" :taskno="taskno" :ji="ji"></project-chb-gzf-list>
+    <project-chb-gzf-list v-if="columnValue === 'gdzczj'" :taskno="taskno" :cengji="cengji"></project-chb-gzf-list>
     <!-- 管理费 -->
-    <project-chb-glf-list v-if="columnValue === 'glf'" :taskno="taskno" :ji="ji"></project-chb-glf-list>
+    <project-chb-glf-list v-if="columnValue === 'glf'" :taskno="taskno" :cengji="cengji"></project-chb-glf-list>
     <!-- 装机 -->
     <mes-detail-list v-if="columnValue === 'zjcb'" :taskno="taskno"></mes-detail-list>
     <!-- 工时 -->
@@ -86,7 +86,7 @@ import ProjectChbGlfList from './ProjectChbGlfList.vue'
       return {
         taskno: '',
         columnValue: '',
-        ji: '',
+        cengji: 2,
         pichanInfo: {},
         title:'',
         width: '60%',