采购lng

src/views/contract/ContractPurLng/components/config.ts

@@ -107,7 +107,7 @@ export const columns: BasicColumn[] = [
   },
 
   {
-    dataIndex: 'comId',
+    dataIndex: 'comName',
     title: '合同主体',
     componentType: 'input',
     align: 'left',
@@ -116,7 +116,7 @@ export const columns: BasicColumn[] = [
   },
 
   {
-    dataIndex: 'approCode',
+    dataIndex: 'approName',
     title: '状态',
     componentType: 'select',
     align: 'left',

src/views/contract/ContractPurLng/components/createForm.vue

@@ -33,11 +33,6 @@
                 <a-date-picker v-model:value="formState.dateTo" style="width: 100%" @change="dateChange(formState.dateTo, 'dateTo')" :disabled="isDisable" :disabled-date="disabledDateEnd" placeholder="请选择结束日期" />
               </a-form-item>
             </a-col>
-            <a-col :span="8">
-              <a-form-item label="有效期结束" name="dateTo">
-                <a-date-picker v-model:value="formState.dateTo" style="width: 100%" @change="dateChange(formState.dateTo, 'dateTo')" :disabled="isDisable" :disabled-date="disabledDateEnd" placeholder="请选择结束日期" />
-              </a-form-item>
-            </a-col>
             <a-col :span="8">
               <a-form-item label="合同签订日期" name="dateSign">
                 <a-date-picker v-model:value="formState.dateSign" style="width: 100%" :disabled="isDisable" placeholder="请选择合同签订日期" />
@@ -60,7 +55,7 @@
             </a-col>
             <a-col :span="8">
               <a-form-item label="长协/现货/年度合同" name="longSpotCode">
-                <a-select v-model:value="formState.lngContractPurLngList[0].longSpotCode" :disabled="isDisable" placeholder="请选择" style="width: 100%" allow-clear @change="periodTypeCodeChange">
+                <a-select v-model:value="formState.lngContractPurLngList[0].longSpotCode" :disabled="isDisable" placeholder="请选择" style="width: 100%" allow-clear>
                   <a-select-option v-for="item in optionSelect.longSpotCodeList" :key="item.code" :value="item.code">
                     {{ item.name }}
                   </a-select-option>
@@ -131,7 +126,7 @@
     import type { Rule } from 'ant-design-vue/es/form';
     import { getDictionary } from '/@/api/sales/Customer';
     import { useModal } from '/@/components/Modal';
-    import { addLngContract,updateLngContract, getLngContract, getAllPriceTerm} from '/@/api/contract/ContractPurLng';
+    import { addLngContract,updateLngContract, getLngContract} from '/@/api/contract/ContractPurLng';
     import { getLngContractFact } from '/@/api/contract/ContractFact';
     import { getAllCurrency } from '/@/api/contract/ContractFact';
     import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
@@ -288,10 +283,6 @@
       }
 
     }
-    async function getOptionParams() {
- 
-      optionSelect.prcTermCodeList = await getAllPriceTerm({eid: formState.prcTermCode})
-    }
     const getCompDeptInfo = async (id, deptId)=> {
       const res = await getCompDept(id, deptId)
       formState.bDeptName = res?.dept?.name
@@ -338,7 +329,20 @@
       }
       return endValue.valueOf() <= startValue.valueOf();
     }
-  
+       const disabledDateCfmStart = (startValue) => {
+      const endValue = formState?.dateCfmTo;
+      if (!startValue || !endValue) {
+        return false
+      }
+      return startValue.valueOf() >= endValue.valueOf();
+    }
+    const disabledDateCfmEnd = (endValue) => {
+      const startValue = formState?.dateCfmFrom;
+      if (!endValue || !startValue) {
+        return false
+      }
+      return endValue.valueOf() <= startValue.valueOf();
+    }
     const onSearchSupplier = () => {
       openModalSupplier(true,{isUpdate: false})
     }

src/views/contract/ContractPurLng/index.vue

@@ -127,7 +127,7 @@
       showResetButton: false,
     },
     beforeFetch: (params) => {
-      return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
+      return { ...params, FormId: formIdComputedRef.value, PK: 'id',page: params.limit};
     },
     afterFetch: (res) => {
       tableRef.value.setToolBarWidth();
@@ -299,7 +299,7 @@
         deleteLngContract(ids).then((_) => {
           handleSuccess();
           notification.success({
-            message: 'Tip',
+            message: '提示',
             description: t('删除成功！'),
           });
         });