项目库,报表中心的计划完成情况的开工竣工筛选,列表,详情

src/views/project/performanceDrawer/drawerData.ts

@@ -114,12 +114,19 @@ export const performanceFormSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '开工竣工时间',
+    label: '开工时间',
     labelWidth: '140px',
     field: 'beginTime',
     required: false,
     component: 'Input',
   },
+  {
+    label: '竣工时间',
+    labelWidth: '140px',
+    field: 'endTime',
+    required: false,
+    component: 'Input',
+  },
   {
     label: '该年底预计形象进度',
     labelWidth: '140px',
@@ -368,7 +375,7 @@ export function getFormConfig(): Partial<FormProps> {
         },
       },
       {
-        label: '开工竣工时间',
+        label: '开工时间',
         field: 'beginTime',
         labelWidth: '140px',
         component: 'DatePicker',
@@ -385,6 +392,24 @@ export function getFormConfig(): Partial<FormProps> {
           xxl: 4,
         },
       },
+      {
+        label: '竣工时间',
+        field: 'endTime',
+        labelWidth: '140px',
+        component: 'DatePicker',
+        componentProps: {
+          picker: 'date',
+          valueFormat: 'YYYY-MM-DD',
+          format: 'YYYY-MM-DD',
+          style: {
+            width: '100%',
+          },
+        },
+        colProps: {
+          xl: 8,
+          xxl: 4,
+        },
+      },
       {
         label: '该年底形象进度',
         field: 'completionSchedule',

src/views/project/tabs/performance.vue

@@ -7,6 +7,10 @@
       <template v-if="column.key === 'serialNumber'">
         {{ index + 1 }}
       </template>
+      <!--    把开工竣工放在一起  -->
+      <template v-if="column.key === 'beginTime'">
+        {{ record.beginTime + '至' + record.endTime }}
+      </template>
       <template v-if="column.key === 'completionResult'">
         <Tag color="processing">
           {{ record.completionResult == 1 ? '已审核' : '未审核' }}

src/views/statement/performanceDrawer/detail.data.ts

@@ -644,7 +644,7 @@ export function getFormConfig(): Partial<FormProps> {
         },
       },
       {
-        label: '开工竣工时间',
+        label: '开工时间',
         field: 'beginTime',
         labelWidth: '140px',
         component: 'DatePicker',
@@ -661,6 +661,24 @@ export function getFormConfig(): Partial<FormProps> {
           xxl: 4,
         },
       },
+      {
+        label: '竣工时间',
+        field: 'endTime',
+        labelWidth: '140px',
+        component: 'DatePicker',
+        componentProps: {
+          picker: 'date',
+          valueFormat: 'YYYY-MM-DD',
+          format: 'YYYY-MM-DD',
+          style: {
+            width: '100%',
+          },
+        },
+        colProps: {
+          xl: 8,
+          xxl: 4,
+        },
+      },
       {
         label: '该年底形象进度',
         field: 'completionSchedule',

src/views/statement/tabs/performance.vue

@@ -7,6 +7,10 @@
       <template v-if="column.key === 'serialNumber'">
         {{ index + 1 }}
       </template>
+      <!--    把开工竣工放在一起  -->
+      <template v-if="column.key === 'beginTime'">
+        {{ record.beginTime + '至' + record.endTime }}
+      </template>
       <template v-if="column.key === 'completionResult'">
         <Tag color="processing">
           {{ record.completionResult == 1 ? '已审核' : '未审核' }}