Browse Source

项目成本明细

yuhan 1 year ago
parent
commit
f3da8b37cd

+ 34 - 17
src/views/module_kzks/projectCostList/modulesDetail/ContractDetailList.vue

@@ -10,28 +10,28 @@
     <!-- 查询区域-END -->
 
     <!-- 操作按钮区域 -->
-    <div class="table-operator">
+    <!-- <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">
         <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+      </a-upload> -->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <!-- <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>
+    </div> -->
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+      <!-- <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>
+      </div> -->
 
       <a-table
         ref="table"
@@ -67,7 +67,7 @@
           </a-button>
         </template>
 
-        <span slot="action" slot-scope="text, record">
+        <!-- <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
           <a-divider type="vertical" />
@@ -84,7 +84,7 @@
               </a-menu-item>
             </a-menu>
           </a-dropdown>
-        </span>
+        </span> -->
 
       </a-table>
     </div>
@@ -97,10 +97,17 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { getAction } from '@/api/manage'
 
   export default {
     name: 'ContractDetailList',
     mixins:[JeecgListMixin, mixinDevice],
+    props: {
+      taskno: {
+        type: String,
+        default: ''
+      }
+    },
     data () {
       return {
         description: '合同信息存储表管理页面',
@@ -583,11 +590,11 @@
           }
         ],
         url: {
-          list: "/xmcbDetail/comContractInfoExchange/list",
-          delete: "/xmcbDetail/comContractInfoExchange/delete",
-          deleteBatch: "/xmcbDetail/comContractInfoExchange/deleteBatch",
-          exportXlsUrl: "/xmcbDetail/comContractInfoExchange/exportXls",
-          importExcelUrl: "xmcbDetail/comContractInfoExchange/importExcel",
+          list: "/xmcbDetail/comContractInfoExchange/getCrmHteDetail",
+          // delete: "/xmcbDetail/comContractInfoExchange/delete",
+          // deleteBatch: "/xmcbDetail/comContractInfoExchange/deleteBatch",
+          // exportXlsUrl: "/xmcbDetail/comContractInfoExchange/exportXls",
+          // importExcelUrl: "xmcbDetail/comContractInfoExchange/importExcel",
           
         },
         dictOptions:{},
@@ -595,14 +602,24 @@
       }
     },
     created() {
-    this.getSuperFieldList();
+      this.getSuperFieldList();
+      this.loadData()
     },
     computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
+      // importExcelUrl: function(){
+      //   return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      // },
     },
     methods: {
+      loadData() {
+        this.loading = true;
+        getAction(this.url.list, {taskno: this.taskno}).then((res) => {
+          console.log(res)
+          this.dataSource = res
+        }).finally(() => {
+          this.loading = false
+        })
+      },
       initDictConfig(){
       },
       getSuperFieldList(){

+ 33 - 17
src/views/module_kzks/projectCostList/modulesDetail/MesDetailList.vue

@@ -10,28 +10,28 @@
     <!-- 查询区域-END -->
 
     <!-- 操作按钮区域 -->
-    <div class="table-operator">
+    <!-- <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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+      </a-upload> -->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <!-- <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>
+    </div> -->
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+      <!-- <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>
+      </div> -->
 
       <a-table
         ref="table"
@@ -67,7 +67,7 @@
           </a-button>
         </template>
 
-        <span slot="action" slot-scope="text, record">
+        <!-- <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
           <a-divider type="vertical" />
@@ -84,7 +84,7 @@
               </a-menu-item>
             </a-menu>
           </a-dropdown>
-        </span>
+        </span> -->
 
       </a-table>
     </div>
@@ -97,10 +97,17 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { getAction } from '@/api/manage'
 
   export default {
     name: 'MesInfoList',
     mixins:[JeecgListMixin, mixinDevice],
+    props: {
+      taskno: {
+        type: String,
+        default: ''
+      }
+    },
     data () {
       return {
         description: 'mes装机信息卡管理页面',
@@ -340,11 +347,11 @@
           }
         ],
         url: {
-          list: "/mesInfo/mesInfo/list",
-          delete: "/mesInfo/mesInfo/delete",
-          deleteBatch: "/mesInfo/mesInfo/deleteBatch",
-          exportXlsUrl: "/mesInfo/mesInfo/exportXls",
-          importExcelUrl: "mesInfo/mesInfo/importExcel",
+          list: "/mesInfo/mesInfo/getZJDetailList",
+          // delete: "/mesInfo/mesInfo/delete",
+          // deleteBatch: "/mesInfo/mesInfo/deleteBatch",
+          // exportXlsUrl: "/mesInfo/mesInfo/exportXls",
+          // importExcelUrl: "mesInfo/mesInfo/importExcel",
           
         },
         dictOptions:{},
@@ -352,14 +359,23 @@
       }
     },
     created() {
-    this.getSuperFieldList();
+      this.getSuperFieldList();
+      this.loadData()
     },
     computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
+      // importExcelUrl: function(){
+      //   return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      // },
     },
     methods: {
+      loadData() {
+        this.loading = true;
+        getAction(this.url.list, {taskno: this.taskno}).then((res) => {
+          this.dataSource = res
+        }).finally(() => {
+          this.loading = false
+        })
+      },
       initDictConfig(){
       },
       getSuperFieldList(){

+ 33 - 17
src/views/module_kzks/projectCostList/modulesDetail/ProjectChbSwfList.vue

@@ -10,28 +10,28 @@
     <!-- 查询区域-END -->
 
     <!-- 操作按钮区域 -->
-    <div class="table-operator">
+    <!-- <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">
         <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+      </a-upload> -->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <!-- <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>
+    </div> -->
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+      <!-- <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>
+      </div> -->
 
       <a-table
         ref="table"
@@ -67,7 +67,7 @@
           </a-button>
         </template>
 
-        <span slot="action" slot-scope="text, record">
+        <!-- <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
           <a-divider type="vertical" />
@@ -84,7 +84,7 @@
               </a-menu-item>
             </a-menu>
           </a-dropdown>
-        </span>
+        </span> -->
 
       </a-table>
     </div>
@@ -97,10 +97,17 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { getAction } from '@/api/manage'
 
   export default {
     name: 'ProjectChbSwfList',
     mixins:[JeecgListMixin, mixinDevice],
+    props: {
+      taskno: {
+        type: String,
+        default: ''
+      }
+    },
     data () {
       return {
         description: '事务费管理页面',
@@ -216,11 +223,11 @@
           }
         ],
         url: {
-          list: "/projectChbSwf/projectChbSwf/list",
-          delete: "/projectChbSwf/projectChbSwf/delete",
-          deleteBatch: "/projectChbSwf/projectChbSwf/deleteBatch",
-          exportXlsUrl: "/projectChbSwf/projectChbSwf/exportXls",
-          importExcelUrl: "projectChbSwf/projectChbSwf/importExcel",
+          list: "/projectChbSwf/projectChbSwf/getSWFDetailList",
+          // delete: "/projectChbSwf/projectChbSwf/delete",
+          // deleteBatch: "/projectChbSwf/projectChbSwf/deleteBatch",
+          // exportXlsUrl: "/projectChbSwf/projectChbSwf/exportXls",
+          // importExcelUrl: "projectChbSwf/projectChbSwf/importExcel",
           
         },
         dictOptions:{},
@@ -228,14 +235,23 @@
       }
     },
     created() {
-    this.getSuperFieldList();
+      this.getSuperFieldList();
+      this.loadData()
     },
     computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
+      // importExcelUrl: function(){
+      //   return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      // },
     },
     methods: {
+      loadData() {
+        this.loading = true;
+        getAction(this.url.list, {taskno: this.taskno}).then((res) => {
+          this.dataSource = res
+        }).finally(() => {
+          this.loading = false
+        })
+      },
       initDictConfig(){
       },
       getSuperFieldList(){

+ 23 - 7
src/views/module_kzks/projectCostList/modulesDetail/ProjectChbWxfList.vue

@@ -97,10 +97,17 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { getAction } from '@/api/manage'
 
   export default {
     name: 'ProjectChbWxfList',
     mixins:[JeecgListMixin, mixinDevice],
+    props: {
+      taskno: {
+        type: String,
+        default: ''
+      }
+    },
     data () {
       return {
         description: '外协费管理页面',
@@ -219,9 +226,9 @@
           list: "/projectChbWxf/projectChbWxf/getWXFDetailList",
           // list: "/projectChbWxf/projectChbWxf/list",
           // delete: "/projectChbWxf/projectChbWxf/delete",
-          deleteBatch: "/projectChbWxf/projectChbWxf/deleteBatch",
-          exportXlsUrl: "/projectChbWxf/projectChbWxf/exportXls",
-          importExcelUrl: "projectChbWxf/projectChbWxf/importExcel",
+          // deleteBatch: "/projectChbWxf/projectChbWxf/deleteBatch",
+          // exportXlsUrl: "/projectChbWxf/projectChbWxf/exportXls",
+          // importExcelUrl: "projectChbWxf/projectChbWxf/importExcel",
           
         },
         dictOptions:{},
@@ -229,14 +236,23 @@
       }
     },
     created() {
-    this.getSuperFieldList();
+      this.getSuperFieldList();
+      this.loadData()
     },
     computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
+      // importExcelUrl: function(){
+      //   return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      // },
     },
     methods: {
+      loadData() {
+        this.loading = true;
+        getAction(this.url.list, {taskno: this.taskno}).then((res) => {
+          this.dataSource = res
+        }).finally(() => {
+          this.loading = false
+        })
+      },
       initDictConfig(){
       },
       getSuperFieldList(){

+ 3 - 26
src/views/module_kzks/projectCostList/modulesDetail/ProjectChbZyfList.vue

@@ -22,9 +22,9 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap"
         @change="handleTableChange">
+        <!-- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" -->
 
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
@@ -191,33 +191,10 @@
     methods: {
       initDictConfig(){
       },
-      loadData(arg) {
-        // if(!this.url.list){
-        //   this.$message.error("请设置url.list属性!")
-        //   return
-        // }
-        // //加载数据 若传入参数1则加载第一页的内容
-        // if (arg === 1) {
-        //   this.ipagination.current = 1;
-        // }
-        // var params = this.getQueryParams();//查询条件
+      loadData() {
         this.loading = true;
         getAction(this.url.list, {taskno: this.taskno}).then((res) => {
-          console.log(res)
-          if (res.success) {
-            //update-begin---author:zhangyafei    Date:20201118  for:适配不分页的数据列表------------
-            this.dataSource = res.result.records||res.result;
-            if(res.result.total)
-            {
-              this.ipagination.total = res.result.total;
-            }else{
-              this.ipagination.total = 0;
-            }
-            //update-end---author:zhangyafei    Date:20201118  for:适配不分页的数据列表------------
-          }else{
-            this.$message.warning(res.message)
-          }
-          console.log(this.dataSource)
+          this.dataSource = res
         }).finally(() => {
           this.loading = false
         })

+ 5 - 1
src/views/module_kzks/projectCostList/modulesDetail/ProjectDetailModal.vue

@@ -9,6 +9,8 @@
     @cancel="handleCancel">
     <!-- 合同 -->
     <contract-detail-list v-if="columnValue === 'contractfpe'" :taskno="taskno"></contract-detail-list>
+    <!-- 材料费 -->
+    <material-detail-list v-if="columnValue === 'clf'" :taskno="taskno"></material-detail-list>
     <!-- 专用费 -->
     <project-chb-zyf-list v-if="columnValue === 'zyf'" :taskno="taskno"></project-chb-zyf-list>
     <!-- 事务费 -->
@@ -22,6 +24,7 @@
 
 <script>
 import ContractDetailList from './ContractDetailList.vue'
+import MaterialDetailList from './MaterialDetailList.vue'
 import MesDetailList from './MesDetailList.vue'
 import ProjectChbSwfList from './ProjectChbSwfList.vue'
 import ProjectChbWxfList from './ProjectChbWxfList.vue'
@@ -31,10 +34,11 @@ import ProjectChbZyfList from './ProjectChbZyfList.vue'
     name: 'ProjectCostModal',
     components: {
       ContractDetailList,
-      MesDetailList,
+      MaterialDetailList,
       ProjectChbZyfList,
       ProjectChbSwfList,
       ProjectChbWxfList,
+      MesDetailList,
     },
     data () {
       return {