Browse Source

成本模型优化

wyh 1 year ago
parent
commit
7e810e1fd5

+ 8 - 7
src/views/module_kzks/costModelList/modules/CostModelListForm.vue

@@ -89,6 +89,7 @@
     data () {
       return {
         model:{
+          xmName: '',
           fileWX: [],
           fileCL: [],
          },
@@ -124,16 +125,16 @@
     },
     methods: {
       add () {
-        this.edit(this.modelDefault);
+        this.visible = true;
+        // this.edit(this.modelDefault);
       },
       edit (record) {
-        // const model2 = Object.assign({}, record);
-        const model2 = record;
-        console.log(model2)
-        const id = model2.id
-        console.log(id)
-        getModalIdList(id).then((res) => {
+        const data = {
+          id: record.id
+        }
+        getModalIdList(data).then((res) => {
           console.log(res)
+          this.model = res.result
         })
         this.visible = true;
       },

+ 34 - 51
src/views/module_kzks/costModelXmxqWx/CostModelXmxqWxList.vue

@@ -168,11 +168,6 @@
             align:"center",
             dataIndex: 'wxCompany'
           },
-          // {
-          //   title:'单价',
-          //   align:"center",
-          //   dataIndex: 'danjia'
-          // },
           {
             title:'计量单位',
             align:"center",
@@ -189,56 +184,44 @@
           //   dataIndex: 'price'
           // },
           {
-            title:'单价',
+            title:'单价(最大值)',
+            align:"center",
+            dataIndex: 'maxDanjia'
+          },
+          {
+            title:'单价(最小值)',
+            align:"center",
+            dataIndex: 'minDanjia'
+          },
+          {
+            title:'单价(平均值)',
+            align:"center",
+            dataIndex: 'aveDanjia'
+          },
+          {
+            title:'单价(近期值)',
+            align:"center",
+            dataIndex: 'recentDanjia'
+          },
+          {
+            title:'价格(最大值)',
+            align:"center",
+            dataIndex: 'maxPrice'
+          },
+          {
+            title:'价格(最小值)',
+            align:"center",
+            dataIndex: 'minPrice'
+          },
+          {
+            title:'价格(平均值)',
             align:"center",
-            children: [
-              {
-                title:'最大值',
-                align:"center",
-                dataIndex: 'maxDanjia'
-              },
-              {
-                title:'最小值',
-                align:"center",
-                dataIndex: 'minDanjia'
-              },
-              {
-                title:'平均值',
-                align:"center",
-                dataIndex: 'aveDanjia'
-              },
-              {
-                title:'近期值',
-                align:"center",
-                dataIndex: 'recentDanjia'
-              },
-            ],
+            dataIndex: 'avePrice'
           },
           {
-            title:'价格',
+            title:'价格(近期值)',
             align:"center",
-            children: [
-              {
-                title:'最大值',
-                align:"center",
-                dataIndex: 'maxPrice'
-              },
-              {
-                title:'最小值',
-                align:"center",
-                dataIndex: 'minPrice'
-              },
-              {
-                title:'平均值',
-                align:"center",
-                dataIndex: 'avePrice'
-              },
-              {
-                title:'近期值',
-                align:"center",
-                dataIndex: 'recentPrice'
-              },
-            ],
+            dataIndex: 'recentPrice'
           },
           {
             title:'描述',