Browse Source

对应表改成本模型和导入详情的显示格式

yuhan 1 year ago
parent
commit
386a4890f3

+ 5 - 0
src/views/module_kzks/costModelClPrice/modules/CostModelClPriceForm.vue

@@ -24,6 +24,11 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
+            <a-form-model-item label="采购时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="caigouTime">
+              <a-input v-model="model.caigouTime" placeholder="请输入采购时间"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
             <a-form-model-item label="单价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="danjia">
               <a-input v-model="model.danjia" placeholder="请输入单价"  ></a-input>
             </a-form-model-item>

+ 94 - 47
src/views/module_kzks/costModelList/CostModelList.vue

@@ -164,11 +164,11 @@
             align:"center",
             dataIndex: 'createBy'
           },
-          {
-            title:'所属部门',
-            align:"center",
-            dataIndex: 'sysOrgCode'
-          },
+          // {
+          //   title:'所属部门',
+          //   align:"center",
+          //   dataIndex: 'sysOrgCode'
+          // },
           {
             title:'知会给',
             align:"center",
@@ -177,53 +177,100 @@
           {
             title:'外协费',
             align:"center",
-            dataIndex: 'wxf'
+            children: [
+              {
+                title:'最大值',
+                align:"center",
+                dataIndex: 'maxWxf'
+              },
+              {
+                title:'最小值',
+                align:"center",
+                dataIndex: 'minWxf'
+              },
+              {
+                title:'平均值',
+                align:"center",
+                dataIndex: 'aveWxf'
+              },
+            ],
           },
           {
             title:'材料费',
             align:"center",
-            dataIndex: 'clf'
-          },
-          {
-            title:'材料费类型',
-            align:"center",
-            dataIndex: 'clfType'
-          },
-          {
-            title:'事务费',
-            align:"center",
-            dataIndex: 'swf'
-          },
-          {
-            title:'专用费',
-            align:"center",
-            dataIndex: 'zyf'
-          },
-          {
-            title:'折旧费', // 固定资产折旧费
-            align:"center",
-            dataIndex: 'gdzczj'
-          },
-          {
-            title:'燃料动力费',
-            align:"center",
-            dataIndex: 'rldlf'
-          },
-          {
-            title:'人工费', // 工资及劳务费
-            align:"center",
-            dataIndex: 'gzjlwf'
-          },
-          {
-            title:'管理费',
-            align:"center",
-            dataIndex: 'glf'
-          },
-          {
-            title:'总价',
-            align:"center",
-            dataIndex: 'totalPrice'
+            children: [
+              {
+                title:'最大值',
+                align:"center",
+                dataIndex: 'maxClf'
+              },
+              {
+                title:'最小值',
+                align:"center",
+                dataIndex: 'minClf'
+              },
+              {
+                title:'平均值',
+                align:"center",
+                dataIndex: 'aveClf'
+              },
+              {
+                title:'近期值',
+                align:"center",
+                dataIndex: 'recentClf'
+              },
+            ],
           },
+          // {
+          //   title:'外协费',
+          //   align:"center",
+          //   dataIndex: 'wxf'
+          // },
+          // {
+          //   title:'材料费',
+          //   align:"center",
+          //   dataIndex: 'clf'
+          // },
+          // {
+          //   title:'材料费类型',
+          //   align:"center",
+          //   dataIndex: 'clfType'
+          // },
+          // {
+          //   title:'事务费',
+          //   align:"center",
+          //   dataIndex: 'swf'
+          // },
+          // {
+          //   title:'专用费',
+          //   align:"center",
+          //   dataIndex: 'zyf'
+          // },
+          // {
+          //   title:'固资费', // 固定资产折旧费
+          //   align:"center",
+          //   dataIndex: 'gdzczj'
+          // },
+          // {
+          //   title:'燃动费',
+          //   align:"center",
+          //   dataIndex: 'rldlf'
+          // },
+          // {
+          //   title:'工资费', // 工资及劳务费
+          //   align:"center",
+          //   dataIndex: 'gzjlwf'
+          // },
+          // {
+          //   title:'管理费',
+          //   align:"center",
+          //   dataIndex: 'glf'
+          // },
+          // {
+          //   title:'总价',
+          //   align:"center",
+          //   dataIndex: 'totalPrice'
+          // },
           {
             title: '操作',
             dataIndex: 'action',

+ 66 - 9
src/views/module_kzks/costModelXmxqCl/CostModelXmxqClList.vue

@@ -192,25 +192,82 @@
             }
           },
           {
-            title:'单价',
-            align:"center",
-            dataIndex: 'danjia'
-          },
-          {
             title:'数量',
             align:"center",
             dataIndex: 'number'
           },
           {
-            title:'价格(单价*数量)',
+            title:'单价',
             align:"center",
-            dataIndex: 'price'
+            children: [
+              {
+                title:'最大值',
+                align:"center",
+                dataIndex: 'maxDanjia'
+              },
+              {
+                title:'最小值',
+                align:"center",
+                dataIndex: 'minDanjia'
+              },
+              {
+                title:'平均值',
+                align:"center",
+                dataIndex: 'aveDanjia'
+              },
+              {
+                title:'近期值',
+                align:"center",
+                dataIndex: 'recentDanjia'
+              },
+            ],
           },
           {
-            title:'材料费类型',
+            title:'价格',
             align:"center",
-            dataIndex: 'clfType'
+            children: [
+              {
+                title:'最大值',
+                align:"center",
+                dataIndex: 'maxPrice'
+              },
+              {
+                title:'最小值',
+                align:"center",
+                dataIndex: 'minPrice'
+              },
+              {
+                title:'平均值',
+                align:"center",
+                dataIndex: 'avePrice'
+              },
+              {
+                title:'近期值',
+                align:"center",
+                dataIndex: 'recentPrice'
+              },
+            ],
           },
+          // {
+          //   title:'单价',
+          //   align:"center",
+          //   dataIndex: 'danjia'
+          // },
+          // {
+          //   title:'数量',
+          //   align:"center",
+          //   dataIndex: 'number'
+          // },
+          // {
+          //   title:'价格(单价*数量)',
+          //   align:"center",
+          //   dataIndex: 'price'
+          // },
+          // {
+          //   title:'材料费类型',
+          //   align:"center",
+          //   dataIndex: 'clfType'
+          // },
           {
             title: '操作',
             dataIndex: 'action',

+ 59 - 7
src/views/module_kzks/costModelXmxqWx/CostModelXmxqWxList.vue

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