国际采购

src/components/common/contractFactListModal.vue

@@ -16,27 +16,26 @@
     import { getLngContractFactPage,} from '/@/api/contract/ContractFact';
 
     const { t } = useI18n();
-    const codeFormSchema: FormSchema[] = [
+    const codeFormSchema: FormSchema[] = [  
       { field: 'kName', label: '合同号/名称', component: 'Input'},
       {
-          field: 'relTypeCode',
-          label: '关联类别',
-          component: 'XjrSelect',
-          componentProps: {
-            datasourceType: 'dic',
-            params: { itemId: '2003815292742479874' },
-            labelField: 'name',
-            valueField: 'value',
-      
-            getPopupContainer: () => document.body,
-          },
+        field: 'dateFrom',
+        label: '有效期',
+        component: 'RangePicker',
+        componentProps: {
+          format: 'YYYY-MM-DD',
+          style: { width: '100%' },
+          getPopupContainer: () => document.body,
         },
+      },
     ];
 
     const columns: BasicColumn[] = [
       { title: t('合同号'), dataIndex: 'kNo', },
       { title: t('合同名称'), dataIndex: 'kName', },
-      { title: t('关联类别'), dataIndex: 'relTypeName', },
+      { dataIndex: 'periodTypeName', title: '合同期限', width: 120},
+      { dataIndex: 'dateFrom', title: '有效期开始', width: 120,},
+      { dataIndex: 'dateTo', title: '有效期结束', width: 120},
       { title: t('合同类别'), dataIndex: 'kTypeName1', },
       { title: t('承办人'), dataIndex: 'empName' ,},
       { title: t('承办部门'), dataIndex: 'bDeptName' ,},
@@ -72,6 +71,7 @@
         formConfig: {
           labelCol:{span: 9, offSet:10},
           schemas: codeFormSchema,
+          fieldMapToTime: [['dateFrom', ['startDate', 'endDate'], 'YYYY-MM-DD']],
           showResetButton: true,
         },
         immediate: false, // 设置为不立即调用
@@ -120,4 +120,14 @@
     position: inherit !important;
     top: 0;
   }
+  
+</style>
+<style lang="less" scoped>
+:deep( .ant-col-8:nth-child(2)) {
+    width: 360px !important;
+    max-width: 360px !important;;
+  }
+  :deep(.ant-col-8:nth-child(2) .ant-form-item-label) {
+    width: 80px !important;
+  }
 </style>

src/components/common/correlationApproList.vue

@@ -10,7 +10,7 @@
         </template>
         <template v-if="column.dataIndex === 'operation'">
           <a style="margin-right: 10px" @click="btnCheck('view', record, index)">查看</a>
-          <a v-if="!disabled" style="margin-right: 10px" @click="btnCheck('delete', record, index)">删除</a>
+          <a v-if="!disabled" style="margin-right: 10px" @click="btnCheck('delete', record, index)">取消关联</a>
         </template>
       </template>
     </a-table>

src/components/common/correlationContractFactList.vue

@@ -10,7 +10,7 @@
         </template>
         <template v-if="column.dataIndex === 'operation'">
           <a style="margin-right: 10px" @click="btnCheck('view', record, index)">查看</a>
-          <a v-if="!disabled" style="margin-right: 10px" @click="btnCheck('delete', record, index)">删除</a>
+          <a v-if="!disabled" style="margin-right: 10px" @click="btnCheck('delete', record, index)">取消关联</a>
         </template>
       </template>
     </a-table>