成本模型详情

src/views/module_kzks/costModelList/CostModelList.vue

@@ -63,26 +63,26 @@
         @change="handleTableChange">
 
         <span slot="maxWxf" slot-scope="text, record">
-          <a-button type="link" @click="detailClick(text,record,'wxf','max','外协费最大值')">{{ text }}</a-button>
+          <a-button type="link" @click="detailClick(text,record,'wxf','max','外协费最大值')" style="color: rgba(0,0,0,.65);">{{ text }}</a-button>
           <!-- {{Number(text).toFixed(2)}} -->
         </span>
         <span slot="minWxf" slot-scope="text, record">
-          <a-button type="link" @click="detailClick(text,record,'wxf','min','外协费最小值')">{{ text }}</a-button>
+          <a-button type="link" @click="detailClick(text,record,'wxf','min','外协费最小值')" style="color: rgba(0,0,0,.65);">{{ text }}</a-button>
         </span>
         <span slot="aveWxf" slot-scope="text, record">
-          <a-button type="link" @click="detailClick(text,record,'wxf','ave','外协费平均值')">{{ text }}</a-button>
+          <a-button type="link" @click="detailClick(text,record,'wxf','ave','外协费平均值')" style="color: rgba(0,0,0,.65);">{{ text }}</a-button>
         </span>
         <span slot="maxClf" slot-scope="text, record">
-          <a-button type="link" @click="detailClick(text,record,'clf','max','材料费最大值')">{{ text }}</a-button>
+          <a-button type="link" @click="detailClick(text,record,'clf','max','材料费最大值')" style="color: rgba(0,0,0,.65);">{{ text }}</a-button>
         </span>
         <span slot="minClf" slot-scope="text, record">
-          <a-button type="link" @click="detailClick(text,record,'clf','min','材料费最小值')">{{ text }}</a-button>
+          <a-button type="link" @click="detailClick(text,record,'clf','min','材料费最小值')" style="color: rgba(0,0,0,.65);">{{ text }}</a-button>
         </span>
         <span slot="aveClf" slot-scope="text, record">
-          <a-button type="link" @click="detailClick(text,record,'clf','ave','材料费平均值')">{{ text }}</a-button>
+          <a-button type="link" @click="detailClick(text,record,'clf','ave','材料费平均值')" style="color: rgba(0,0,0,.65);">{{ text }}</a-button>
         </span>
         <span slot="recentClf" slot-scope="text, record">
-          <a-button type="link" @click="detailClick(text,record,'clf','recent','材料费近期值')">{{ text }}</a-button>
+          <a-button type="link" @click="detailClick(text,record,'clf','recent','材料费近期值')" style="color: rgba(0,0,0,.65);">{{ text }}</a-button>
         </span>
 
         <template slot="htmlSlot" slot-scope="text">

src/views/module_kzks/costModelList/modulesDetail/CostModelDetailModal.vue

@@ -10,7 +10,7 @@
     <!-- 合同 -->
     <!-- <contract-detail-list v-if="columnValue === 'contractfpe'" :taskno="taskno"></contract-detail-list> -->
     <cost-model-xmxq-cl-list v-if="dialogType === 'clf'" :id="id" :type="columnType"></cost-model-xmxq-cl-list>
-    <cost-model-xmxq-wx-list v-if="dialogType === 'wxf'" :id="id" :type="columnType"></cost-model-xmxq-wx-list>
+    <cost-model-xmxq-wx-list ref="wxf" v-if="dialogType === 'wxf'" :id="id" :type="columnType"></cost-model-xmxq-wx-list>
 
     <template slot="footer">
       <a-button @click="handleCancel">关闭</a-button>
@@ -43,6 +43,7 @@ import CostModelXmxqWxList from './CostModelXmxqWxList.vue';
     methods: {
       show() {
         this.visible = true
+        // this.$refs.wxf.getList(this.id, this.columnType)
       },
       close () {
         this.$emit('close');

src/views/module_kzks/costModelList/modulesDetail/CostModelXmxqClList.vue

@@ -138,6 +138,7 @@
     components: {
       // CostModelXmxqClModal
     },
+    props: ['id', 'type'],
     data () {
       return {
         description: '项目材料导入详情管理页面',
@@ -288,6 +289,7 @@
     methods: {
       // 获取页面列表
       loadData(arg) {
+        this.queryParam.xiangmuId = this.id
         if(!this.url.list){
           this.$message.error("请设置url.list属性!")
           return
@@ -302,6 +304,24 @@
           if (res.success) {
             //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
             this.dataSource = res.result.records||res.result;
+
+            if (this.type == 'max') {
+              this.columns.push({ title:'单价(最大值)', align:"center", dataIndex: 'maxDanjia', fixed: 'right' })
+              this.columns.push({ title:'价格(最大值)', align:"center", dataIndex: 'maxPrice', fixed: 'right' })
+            }
+            if (this.type == 'min') {
+              this.columns.push({ title:'单价(最小值)', align:"center", dataIndex: 'minDanjia', fixed: 'right' })
+              this.columns.push({ title:'价格(最小值)', align:"center", dataIndex: 'minPrice', fixed: 'right' })
+            }
+            if (this.type == 'ave') {
+              this.columns.push({ title:'单价(平均值)', align:"center", dataIndex: 'aveDanjia', fixed: 'right' })
+              this.columns.push({ title:'价格(平均值)', align:"center", dataIndex: 'avePrice', fixed: 'right' })
+            }
+            if (this.type == 'recent') {
+              this.columns.push({ title:'单价(近期值)', align:"center", dataIndex: 'recentDanjia', fixed: 'right' })
+              this.columns.push({ title:'价格(近期值)', align:"center", dataIndex: 'recentPrice', fixed: 'right' })
+            }
+
             if(res.result.total)
             {
               this.ipagination.total = res.result.total;
@@ -333,26 +353,6 @@
         fieldList.push({type:'string',value:'clfType',text:'材料费类型',dictCode:''})
         this.superFieldList = fieldList
       },
-      getList(id,type){
-        this.queryParam.id = id
-        this.loadData(1)
-        if (type == 'max') {
-          this.columns.push({ title:'单价(最大值)', align:"center", dataIndex: 'maxDanjia' })
-          this.columns.push({ title:'价格(最大值)', align:"center", dataIndex: 'maxPrice' })
-        }
-        if (type == 'min') {
-          this.columns.push({ title:'单价(最小值)', align:"center", dataIndex: 'minDanjia' })
-          this.columns.push({ title:'价格(最小值)', align:"center", dataIndex: 'minPrice' })
-        }
-        if (type == 'ave') {
-          this.columns.push({ title:'单价(平均值)', align:"center", dataIndex: 'aveDanjia' })
-          this.columns.push({ title:'价格(平均值)', align:"center", dataIndex: 'avePrice' })
-        }
-        if (type == 'recent') {
-          this.columns.push({ title:'单价(近期值)', align:"center", dataIndex: 'recentDanjia' })
-          this.columns.push({ title:'价格(近期值)', align:"center", dataIndex: 'recentPrice' })
-        }
-      }
     }
   }
 </script>

src/views/module_kzks/costModelList/modulesDetail/CostModelXmxqWxList.vue

@@ -133,6 +133,7 @@
     components: {
       // CostModelXmxqWxModal
     },
+    props: ['id', 'type'],
     data () {
       return {
         description: '项目外协导入详情管理页面',
@@ -260,6 +261,7 @@
     methods: {
       // 获取页面列表
       loadData(arg) {
+        this.queryParam.xiangmuId = this.id
         if(!this.url.list){
           this.$message.error("请设置url.list属性!")
           return
@@ -274,6 +276,20 @@
           if (res.success) {
             //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
             this.dataSource = res.result.records||res.result;
+
+            if (this.type == 'max') {
+              this.columns.push({ title:'单价(最大值)', align:"center", dataIndex: 'maxDanjia', fixed: 'right' },
+              { title:'价格(最大值)', align:"center", dataIndex: 'maxPrice', fixed: 'right' })
+            }
+            if (this.type == 'min') {
+              this.columns.splice(7,0,{ title:'单价(最小值)', align:"center", dataIndex: 'minDanjia', fixed: 'right' },
+              { title:'价格(最小值)', align:"center", dataIndex: 'minPrice', fixed: 'right' })
+            }
+            if (this.type == 'ave') {
+              this.columns.splice(7,0,{ title:'单价(平均值)', align:"center", dataIndex: 'aveDanjia', fixed: 'right' },
+              { title:'价格(平均值)', align:"center", dataIndex: 'avePrice', fixed: 'right' })
+            }
+
             if(res.result.total)
             {
               this.ipagination.total = res.result.total;
@@ -303,28 +319,28 @@
         fieldList.push({type:'string',value:'remark',text:'描述',dictCode:''})
         this.superFieldList = fieldList
       },
-      getList(id,type){
-        this.queryParam.id = id
-        this.loadData(1)
-        if (type == 'max') {
-          // this.columns.push({ title:'单价(最大值)', align:"center", dataIndex: 'maxDanjia' })
-          // this.columns.push({ title:'价格(最大值)', align:"center", dataIndex: 'maxPrice' })
-          this.columns.splice(7,0,{ title:'单价(最大值)', align:"center", dataIndex: 'maxDanjia' },
-          { title:'价格(最大值)', align:"center", dataIndex: 'maxPrice' })
-        }
-        if (type == 'min') {
-          // this.columns.push({ title:'单价(最小值)', align:"center", dataIndex: 'minDanjia' })
-          // this.columns.push({ title:'价格(最小值)', align:"center", dataIndex: 'minPrice' })
-          this.columns.splice(7,0,{ title:'单价(最小值)', align:"center", dataIndex: 'minDanjia' },
-          { title:'价格(最小值)', align:"center", dataIndex: 'minPrice' })
-        }
-        if (type == 'ave') {
-          // this.columns.push({ title:'单价(平均值)', align:"center", dataIndex: 'aveDanjia' })
-          // this.columns.push({ title:'价格(平均值)', align:"center", dataIndex: 'avePrice' })
-          this.columns.splice(7,0,{ title:'单价(平均值)', align:"center", dataIndex: 'aveDanjia' },
-          { title:'价格(平均值)', align:"center", dataIndex: 'avePrice' })
-        }
-      }
+      // getList(id,type){
+      //   this.queryParam.id = id
+      //   this.loadData(1)
+      //   if (type == 'max') {
+      //     // this.columns.push({ title:'单价(最大值)', align:"center", dataIndex: 'maxDanjia' })
+      //     // this.columns.push({ title:'价格(最大值)', align:"center", dataIndex: 'maxPrice' })
+      //     this.columns.splice(7,0,{ title:'单价(最大值)', align:"center", dataIndex: 'maxDanjia' },
+      //     { title:'价格(最大值)', align:"center", dataIndex: 'maxPrice' })
+      //   }
+      //   if (type == 'min') {
+      //     // this.columns.push({ title:'单价(最小值)', align:"center", dataIndex: 'minDanjia' })
+      //     // this.columns.push({ title:'价格(最小值)', align:"center", dataIndex: 'minPrice' })
+      //     this.columns.splice(7,0,{ title:'单价(最小值)', align:"center", dataIndex: 'minDanjia' },
+      //     { title:'价格(最小值)', align:"center", dataIndex: 'minPrice' })
+      //   }
+      //   if (type == 'ave') {
+      //     // this.columns.push({ title:'单价(平均值)', align:"center", dataIndex: 'aveDanjia' })
+      //     // this.columns.push({ title:'价格(平均值)', align:"center", dataIndex: 'avePrice' })
+      //     this.columns.splice(7,0,{ title:'单价(平均值)', align:"center", dataIndex: 'aveDanjia' },
+      //     { title:'价格(平均值)', align:"center", dataIndex: 'avePrice' })
+      //   }
+      // }
     }
   }
 </script>

src/views/module_kzks/costModelXmxqWx/CostModelXmxqWxList.vue

@@ -1,10 +1,15 @@
 <template>
   <a-card :bordered="false">
     <!-- 查询区域 -->
-    <!-- <div class="table-page-search-wrapper">
+    <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="外协项目ID">
+              <a-input placeholder="请输入外协项目ID" v-model="queryParam.wxProject"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="外协项目">
               <a-input placeholder="请输入外协项目" v-model="queryParam.wxProject"></a-input>
             </a-form-item>
@@ -33,7 +38,7 @@
           </a-col>
         </a-row>
       </a-form>
-    </div> -->
+    </div>
     <!-- 查询区域-END -->
 
     <!-- 操作按钮区域 -->