Browse Source

合同签署日期等优化

yuhan 1 year ago
parent
commit
0a4f70023e

+ 7 - 2
src/views/module_kzks/costModelClPrice/CostModelClPriceList.vue

@@ -179,11 +179,16 @@
             dataIndex: 'danjia'
           },
           {
-            title:'采购时间',
+            title:'合同签署日期',
             align:"center",
-            dataIndex: 'caigouTime'
+            dataIndex: 'htDate'
           },
           // {
+          //   title:'采购时间',
+          //   align:"center",
+          //   dataIndex: 'caigouTime'
+          // },
+          // {
           //   title: '操作',
           //   dataIndex: 'action',
           //   align:"center",

+ 14 - 7
src/views/module_kzks/costModelList/modulesDetail/CostModelXmxqClList.vue

@@ -145,7 +145,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,
@@ -184,18 +184,25 @@
             align:"center",
             dataIndex: 'pici'
           },
+          // {
+          //   title:'采购日期',
+          //   align:"center",
+          //   dataIndex: 'caigouTime',
+          //   customRender:function (text) {
+          //     return !text?"":(text.length>10?text.substr(0,10):text)
+          //   }
+          // },
           {
-            title:'采购日期',
+            title:'合同签署日期',
             align:"center",
-            dataIndex: 'caigouTime',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
+            dataIndex: 'htDate'
           },
           {
             title:'数量',
             align:"center",
-            dataIndex: 'number'
+            width: 60,
+            dataIndex: 'number',
+            fixed: 'right',
           },
           // {
           //   title:'单价(最大值)',

+ 9 - 7
src/views/module_kzks/costModelList/modulesDetail/CostModelXmxqWxList.vue

@@ -140,7 +140,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,
@@ -175,9 +175,16 @@
             dataIndex: 'unit'
           },
           {
+            title:'项目描述',
+            align:"center",
+            dataIndex: 'remark'
+          },
+          {
             title:'数量',
             align:"center",
-            dataIndex: 'number'
+            width: 60,
+            dataIndex: 'number',
+            fixed: 'right',
           },
           // {
           //   title:'价格(单价*数量)',
@@ -224,11 +231,6 @@
           //   align:"center",
           //   dataIndex: 'recentPrice'
           // },
-          {
-            title:'项目描述',
-            align:"center",
-            dataIndex: 'remark'
-          },
           // {
           //   title: '操作',
           //   dataIndex: 'action',

+ 6 - 6
src/views/module_kzks/costModelMsg/CostModelMsgList.vue

@@ -140,7 +140,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,
@@ -149,11 +149,11 @@
               return parseInt(index)+1;
             }
           },
-          {
-            title:'项目ID',
-            align:"center",
-            dataIndex: 'xiangmuId'
-          },
+          // {
+          //   title:'项目ID',
+          //   align:"center",
+          //   dataIndex: 'xiangmuId'
+          // },
           {
             title:'项目名称',
             align:"center",

+ 2 - 2
src/views/module_kzks/projectPushSet/ProjectPushSetList.vue

@@ -34,9 +34,9 @@
     <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-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>
       <a-dropdown v-if="selectedRowKeys.length > 0">