geg-gas/geg-gas-web
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-web into dev

Browse Source
This commit is contained in:
张福财
2026-03-11 18:00:17 +08:00
parent 22d04e5e41 282983885e
commit ccc18882b1
34 changed files with 237 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/api/contract/ContractFact/index.ts
View File

@ -12,8 +12,19 @@ enum Api {
queryAllCurrency ='/magic-api/mdm/queryAllCurrency', queryAllCurrency ='/magic-api/mdm/queryAllCurrency',
queryAllUser ='/magic-api/mdm/queryAllUser', queryAllUser ='/magic-api/mdm/queryAllUser',
queryBankByCode ='/magic-api/sales/queryBankByCode', queryBankByCode ='/magic-api/sales/queryBankByCode',
PageModal ='/magic-api/contract/lngContractFact/page/modal' PageModal ='/magic-api/contract/lngContractFact/page/modal',
MainContractById = '/magic-api/contract/getMainContractById',
}
export async function getMainContractById(id: String,bizType: String, mode: ErrorMessageMode = 'modal') {
return defHttp.get<LngContractFactPageModel>(
{
url: Api.MainContractById,
params: { id,bizType },
},
{
errorMessageMode: mode,
},
);
} }
export async function getLngContractFactPageModal(params: LngContractFactPageParams, mode: ErrorMessageMode = 'modal') { export async function getLngContractFactPageModal(params: LngContractFactPageParams, mode: ErrorMessageMode = 'modal') {
return defHttp.get<LngContractFactPageResult>( return defHttp.get<LngContractFactPageResult>(

2
src/components/SecondDev/OpinionDialogSelected.vue
View File

@ -19,7 +19,7 @@
</SelectUser> </SelectUser>
</a-form-item> </a-form-item>
<a-form-item v-if="_action === 'select' && selected.choseTime" label="审批时间"> <a-form-item v-if="_action === 'select' && selected.choseTime" label="审批时间">
<a-date-picker show-time format="YYYY-MM-DD HH:mm:ss" placeholder="请选择时间" v-model:value="selected.time" @change="onChange" @ok="onOk" /> <a-date-picker :inputReadOnly="true" show-time format="YYYY-MM-DD HH:mm:ss" placeholder="请选择时间" v-model:value="selected.time" @change="onChange" @ok="onOk" />
</a-form-item> </a-form-item>
<!--选择任意节点 end--> <!--选择任意节点 end-->
<template v-for="node in flowNextNodes"> <template v-for="node in flowNextNodes">

4
src/components/common/certificateModal.vue
View File

@ -18,12 +18,12 @@
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="有效期开始" name="dateFrom" :label-col="{ span: 8 }" :wrapper-col="{ span: 24 }"> <a-form-item label="有效期开始" name="dateFrom" :label-col="{ span: 8 }" :wrapper-col="{ span: 24 }">
<a-date-picker v-model:value="formState.dateFrom" format="YYYY-MM-DD" :disabled="isDisable" :disabled-date="disabledDateStart" style="width: 100%" placeholder="请选择有效期开始" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateFrom" format="YYYY-MM-DD" :disabled="isDisable" :disabled-date="disabledDateStart" style="width: 100%" placeholder="请选择有效期开始" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="有效期结束" name="dateTo" :label-col="{ span: 8 }" :wrapper-col="{ span: 24 }"> <a-form-item label="有效期结束" name="dateTo" :label-col="{ span: 8 }" :wrapper-col="{ span: 24 }">
<a-date-picker v-model:value="formState.dateTo" format="YYYY-MM-DD" :disabled="isDisable" :disabled-date="disabledDateEnd" style="width: 100%" placeholder="请选择有效期结束" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateTo" format="YYYY-MM-DD" :disabled="isDisable" :disabled-date="disabledDateEnd" style="width: 100%" placeholder="请选择有效期结束" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">

3
src/components/common/contractFactUserModal.vue
View File

@ -9,7 +9,7 @@
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="相对方序号" name="sort"> <a-form-item label="相对方序号" name="sort">
<input-number v-model:value="formState.sort" style="width: 100%" :digits="0" :min="0" :step="1"/> <input-number v-model:value="formState.sort" style="width: 100%" :digits="0" :min="1" :step="1"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
@ -151,6 +151,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
message.warning('相对方名称：'+ arr[0].cpName + '已重复') message.warning('相对方名称：'+ arr[0].cpName + '已重复')
return return
} }
formState.sort = Number(formState.sort)
emit('success', formState); emit('success', formState);
notification.success({ notification.success({
message: t('操作'), message: t('操作'),

4
src/components/common/contractQtyList.vue
View File

@ -24,10 +24,10 @@
</template> </template>
<template #bodyCell="{ column, record, index }"> <template #bodyCell="{ column, record, index }">
<template v-if="column.dataIndex === 'dateFrom'"> <template v-if="column.dataIndex === 'dateFrom'">
<a-date-picker v-model:value="record.dateFrom" format="YYYY-MM-DD" :value-format="'YYYY-MM-DD'" :disabled="disabled" @change="dateFromTb(dayjs(record.dateFrom || null), index, record)" style="width: 100%" /> <a-date-picker :inputReadOnly="true" v-model:value="record.dateFrom" format="YYYY-MM-DD" :value-format="'YYYY-MM-DD'" :disabled="disabled" @change="dateFromTb(dayjs(record.dateFrom || null), index, record)" style="width: 100%" />
</template> </template>
<template v-if="column.dataIndex === 'dateTo'"> <template v-if="column.dataIndex === 'dateTo'">
<a-date-picker v-model:value="record.dateTo" format="YYYY-MM-DD" :value-format="'YYYY-MM-DD'" :disabled="disabled" @change="dateToTb(dayjs(record.dateTo || null), index, record)" style="width: 100%" /> <a-date-picker :inputReadOnly="true" v-model:value="record.dateTo" format="YYYY-MM-DD" :value-format="'YYYY-MM-DD'" :disabled="disabled" @change="dateToTb(dayjs(record.dateTo || null), index, record)" style="width: 100%" />
</template> </template>
<template v-if="column.dataIndex === 'sort'"> <template v-if="column.dataIndex === 'sort'">
<input-number v-model:value="record.sort" :disabled="disabled" :digits="0" :min="0" style="width: 100%" /> <input-number v-model:value="record.sort" :disabled="disabled" :digits="0" :min="0" style="width: 100%" />

4
src/components/common/contractQtyLngList.vue
View File

@ -24,10 +24,10 @@
</template> </template>
<template #bodyCell="{ column, record, index }"> <template #bodyCell="{ column, record, index }">
<template v-if="column.dataIndex === 'dateFrom'"> <template v-if="column.dataIndex === 'dateFrom'">
<a-date-picker v-model:value="record.dateFrom" format="YYYY-MM-DD" :value-format="'YYYY-MM-DD'" :disabled="disabled" @change="dateFromTb(dayjs(record.dateFrom || null), index, record)" style="width: 100%" /> <a-date-picker :inputReadOnly="true" v-model:value="record.dateFrom" format="YYYY-MM-DD" :value-format="'YYYY-MM-DD'" :disabled="disabled" @change="dateFromTb(dayjs(record.dateFrom || null), index, record)" style="width: 100%" />
</template> </template>
<template v-if="column.dataIndex === 'dateTo'"> <template v-if="column.dataIndex === 'dateTo'">
<a-date-picker v-model:value="record.dateTo" format="YYYY-MM-DD" :value-format="'YYYY-MM-DD'" :disabled="disabled" @change="dateToTb(dayjs(record.dateTo || null), index, record)" style="width: 100%" /> <a-date-picker :inputReadOnly="true" v-model:value="record.dateTo" format="YYYY-MM-DD" :value-format="'YYYY-MM-DD'" :disabled="disabled" @change="dateToTb(dayjs(record.dateTo || null), index, record)" style="width: 100%" />
</template> </template>
<template v-if="column.dataIndex === 'sort'"> <template v-if="column.dataIndex === 'sort'">
<input-number v-model:value="record.sort" :disabled="disabled" :digits="0" :min="0" style="width: 100%" /> <input-number v-model:value="record.sort" :disabled="disabled" :digits="0" :min="0" style="width: 100%" />

4
src/components/common/discountList.vue
View File

@ -15,10 +15,10 @@
</template> </template>
<template #bodyCell="{ column, record, index }"> <template #bodyCell="{ column, record, index }">
<template v-if="column.dataIndex === 'dateFrom'"> <template v-if="column.dataIndex === 'dateFrom'">
<a-date-picker v-model:value="record.dateFrom" format="YYYY-MM-DD" :value-format="'YYYY-MM-DD'" :disabled="disabled" @change="dateFromTb(dayjs(record.dateFrom || null), index, record)" style="width: 100%" /> <a-date-picker :inputReadOnly="true" v-model:value="record.dateFrom" format="YYYY-MM-DD" :value-format="'YYYY-MM-DD'" :disabled="disabled" @change="dateFromTb(dayjs(record.dateFrom || null), index, record)" style="width: 100%" />
</template> </template>
<template v-if="column.dataIndex === 'dateTo'"> <template v-if="column.dataIndex === 'dateTo'">
<a-date-picker v-model:value="record.dateTo" format="YYYY-MM-DD" :value-format="'YYYY-MM-DD'" :disabled="disabled" @change="dateToTb(dayjs(record.dateTo || null), index, record)" style="width: 100%" /> <a-date-picker :inputReadOnly="true" v-model:value="record.dateTo" format="YYYY-MM-DD" :value-format="'YYYY-MM-DD'" :disabled="disabled" @change="dateToTb(dayjs(record.dateTo || null), index, record)" style="width: 100%" />
</template> </template>
<template v-if="column.dataIndex === 'discTypeCode'"> <template v-if="column.dataIndex === 'discTypeCode'">
<a-select v-model:value="record.discTypeCode" :disabled="disabled" style="width: 100%" allow-clear> <a-select v-model:value="record.discTypeCode" :disabled="disabled" style="width: 100%" allow-clear>

2
src/components/common/priceInfoList.vue
View File

@ -22,7 +22,7 @@
<template #label> <template #label>
<span><span style="color:red">*</span>价格生效年月</span> <span><span style="color:red">*</span>价格生效年月</span>
</template> </template>
<a-date-picker v-model:value="item.dateFrom" format="YYYY-MM-DD" :value-format="'YYYY-MM-DD'" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="item.dateFrom" format="YYYY-MM-DD" :value-format="'YYYY-MM-DD'" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8" v-if="pageType=='pur'"> <a-col :span="8" v-if="pageType=='pur'">

2
src/views/approve/Appro/components/createForm.vue
View File

@ -44,7 +44,7 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="拟稿日期" name="dateAppro"> <a-form-item label="拟稿日期" name="dateAppro">
<a-date-picker v-model:value="formState.dateAppro" :disabled="isDisable" style="width: 100%" placeholder="请选择拟稿日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateAppro" :disabled="isDisable" style="width: 100%" placeholder="请选择拟稿日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">

2
src/views/approve/Appro/components/viewForm.vue
View File

@ -55,7 +55,7 @@
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="拟稿日期" name="dateAppro"> <a-form-item label="拟稿日期" name="dateAppro">
<a-date-picker v-model:value="formState.dateAppro" :disabled="isDisable" style="width: 100%" placeholder="请选择评价日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateAppro" :disabled="isDisable" style="width: 100%" placeholder="请选择评价日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">

13
src/views/contract/ContractFact/components/createForm.vue
View File

@ -52,17 +52,17 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="有效期开始" name="dateFrom"> <a-form-item label="有效期开始" name="dateFrom">
<a-date-picker v-model:value="formState.dateFrom" style="width: 100%" @change="dateChange(formState.dateFrom, 'dateFrom')" :disabled="isDisable" :disabled-date="disabledDateStart" placeholder="请选择开始日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateFrom" style="width: 100%" @change="dateChange(formState.dateFrom, 'dateFrom')" :disabled="isDisable" :disabled-date="disabledDateStart" placeholder="请选择开始日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="有效期结束" name="dateTo"> <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-date-picker :inputReadOnly="true" v-model:value="formState.dateTo" style="width: 100%" @change="dateChange(formState.dateTo, 'dateTo')" :disabled="isDisable" :disabled-date="disabledDateEnd" placeholder="请选择结束日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="起草日期" name="dateDraft"> <a-form-item label="起草日期" name="dateDraft">
<a-date-picker v-model:value="formState.dateDraft" style="width: 100%" :disabled="isDisable" placeholder="请选择起草日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateDraft" style="width: 100%" :disabled="isDisable" placeholder="请选择起草日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -603,10 +603,15 @@
message.warn('相对方信息个数必须在1-20间') message.warn('相对方信息个数必须在1-20间')
return return
} }
let arr = JSON.parse(JSON.stringify(dataList.value))
arr.sort((a, b) => a.sort - b.sort)
arr.forEach((v,idx) => {
v.sort = idx +1
})
let obj = { let obj = {
...formState, ...formState,
lngFileUploadList: dataFile.value, lngFileUploadList: dataFile.value,
lngContractFactCpList: dataList.value, lngContractFactCpList: arr,
lngContractApproRelList: dataListAppro.value, lngContractApproRelList: dataListAppro.value,
approCode: pageType.value=='update' ? 'WTJ' : formState.approCode approCode: pageType.value=='update' ? 'WTJ' : formState.approCode

31
src/views/contract/ContractProc/components/createForm.vue
View File

@ -25,12 +25,12 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="有效期开始" name="dateFrom"> <a-form-item label="有效期开始" name="dateFrom">
<a-date-picker v-model:value="formState.dateFrom" style="width: 100%" @change="dateChange(formState.dateFrom, 'dateFrom')" :disabled="isDisable" :disabled-date="disabledDateStart" placeholder="请选择开始日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateFrom" style="width: 100%" @change="dateChange(formState.dateFrom, 'dateFrom')" :disabled="isDisable" :disabled-date="disabledDateStart" placeholder="请选择开始日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="有效期结束" name="dateTo"> <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-date-picker :inputReadOnly="true" v-model:value="formState.dateTo" style="width: 100%" @change="dateChange(formState.dateTo, 'dateTo')" :disabled="isDisable" :disabled-date="disabledDateEnd" placeholder="请选择结束日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -112,7 +112,7 @@
<template #label> <template #label>
<span><span style="color:red">*</span>有效期开始</span> <span><span style="color:red">*</span>有效期开始</span>
</template> </template>
<a-date-picker v-model:value="item.dateFromNew" format="YYYY-MM-DD" :value-format="'YYYY-MM-DD'" @openChange="dateToYCheck(idx)" @change="dateFromNewChange" style="width: 100%" :disabled="isDisable" /> <a-date-picker :inputReadOnly="true" v-model:value="item.dateFromNew" format="YYYY-MM-DD" :value-format="'YYYY-MM-DD'" @openChange="dateToYCheck(idx)" @change="dateFromNewChange" style="width: 100%" :disabled="isDisable" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -132,7 +132,7 @@
<template #label> <template #label>
<span><span style="color:red">*</span>固定结束日</span> <span><span style="color:red">*</span>固定结束日</span>
</template> </template>
<a-date-picker v-model:value="item.dateToF" format="YYYY-MM-DD" :value-format="'YYYY-MM-DD'" style="width: 100%" :disabled="isDisable" /> <a-date-picker :inputReadOnly="true" v-model:value="item.dateToF" format="YYYY-MM-DD" :value-format="'YYYY-MM-DD'" style="width: 100%" :disabled="isDisable" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8" v-if="item.dateToCode=='Y'"> <a-col :span="8" v-if="item.dateToCode=='Y'">
@ -140,7 +140,7 @@
<template #label> <template #label>
<span><span style="color:red">*</span>每年结束日</span> <span><span style="color:red">*</span>每年结束日</span>
</template> </template>
<a-date-picker v-model:value="item.dateToY" format="MM-DD" :value-format="'MM-DD'" style="width: 100%" :disabled="isDisable" @openChange="dateToYCheck(idx)" :disabledDate="disabledCurrentYear"/> <a-date-picker :inputReadOnly="true" v-model:value="item.dateToY" format="MM-DD" :value-format="'MM-DD'" style="width: 100%" :disabled="isDisable" @openChange="dateToYCheck(idx)" :disabledDate="disabledCurrentYear"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
@ -221,7 +221,7 @@
import { getDictionary } from '/@/api/sales/Customer'; import { getDictionary } from '/@/api/sales/Customer';
import { useModal } from '/@/components/Modal'; import { useModal } from '/@/components/Modal';
import { addLngContract,updateLngContract, getLngContract,getParameter } from '/@/api/contract/ContractProc'; import { addLngContract,updateLngContract, getLngContract,getParameter } from '/@/api/contract/ContractProc';
import { getLngContractFact } from '/@/api/contract/ContractFact'; import { getMainContractById } from '/@/api/contract/ContractFact';
import { getLngAppro,getCompDept } from '/@/api/approve/Appro'; import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { h } from 'vue'; import { h } from 'vue';
@ -577,10 +577,10 @@
a.push(v) a.push(v)
} }
}) })
if(a.length == 1) { if(a.length >= 1) {
spinning.value = true spinning.value = true
try { try {
const res = await getLngContractFact(a[0].kFactId) const res = await getMainContractById(a[0].kFactId, 'S')
spinning.value = false spinning.value = false
formState.kNo = formState.kNo ? formState.kNo : res?.kNo formState.kNo = formState.kNo ? formState.kNo : res?.kNo
formState.kName = formState.kName ? formState.kName : res?.kName formState.kName = formState.kName ? formState.kName : res?.kName
@ -588,19 +588,8 @@
formState.curCode = formState.curCode ? formState.curCode : res?.curCode formState.curCode = formState.curCode ? formState.curCode : res?.curCode
formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null) formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null) formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
let arr = res?.lngContractFactCpList || [] formState.cpName = formState.cpName ? formState.cpName : res?.cpName
let arrSales = [] formState.cpCode = formState.cpCode ? formState.cpCode : res?.cpCode
let arrSupplier = []
arr.forEach(v=> {
if (v.cpTableName == 'lng_customer') {
arrSales.push(v)
}
if (v.cpTableName == 'lng_supplier') {
arrSupplier.push(v)
}
})
formState.cpName = formState.cpName ? formState.cpName : arrSupplier[0]?.cpName
formState.cpCode = formState.cpCode ? formState.cpCode : arrSupplier[0]?.cpCode
} catch (error) { } catch (error) {
spinning.value = false spinning.value = false

25
src/views/contract/ContractPurInt/components/createForm.vue
View File

@ -25,12 +25,12 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="有效期开始" name="dateFrom"> <a-form-item label="有效期开始" name="dateFrom">
<a-date-picker v-model:value="formState.dateFrom" style="width: 100%" @change="dateChange(formState.dateFrom, 'dateFrom')" :disabled="isDisable" :disabled-date="disabledDateStart" placeholder="请选择开始日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateFrom" style="width: 100%" @change="dateChange(formState.dateFrom, 'dateFrom')" :disabled="isDisable" :disabled-date="disabledDateStart" placeholder="请选择开始日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="有效期结束" name="dateTo"> <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-date-picker :inputReadOnly="true" v-model:value="formState.dateTo" style="width: 100%" @change="dateChange(formState.dateTo, 'dateTo')" :disabled="isDisable" :disabled-date="disabledDateEnd" placeholder="请选择结束日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -285,7 +285,7 @@
import { getDictionary } from '/@/api/sales/Customer'; import { getDictionary } from '/@/api/sales/Customer';
import { useModal } from '/@/components/Modal'; import { useModal } from '/@/components/Modal';
import { addLngContract,updateLngContract, getLngContract, getAllPriceTerm} from '/@/api/contract/ContractPurInt'; import { addLngContract,updateLngContract, getLngContract, getAllPriceTerm} from '/@/api/contract/ContractPurInt';
import { getLngContractFact } from '/@/api/contract/ContractFact'; import { getMainContractById } from '/@/api/contract/ContractFact';
import { getAllCurrency } from '/@/api/contract/ContractFact'; import { getAllCurrency } from '/@/api/contract/ContractFact';
import { getLngAppro,getCompDept } from '/@/api/approve/Appro'; import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
@ -631,10 +631,10 @@
a.push(v) a.push(v)
} }
}) })
if(a.length == 1) { if(a.length >= 1) {
spinning.value = true spinning.value = true
try { try {
const res = await getLngContractFact(a[0].kFactId) const res = await getMainContractById(a[0].kFactId, 'S')
spinning.value = false spinning.value = false
formState.kNo = formState.kNo ? formState.kNo : res?.kNo formState.kNo = formState.kNo ? formState.kNo : res?.kNo
formState.kName = formState.kName ? formState.kName : res?.kName formState.kName = formState.kName ? formState.kName : res?.kName
@ -642,19 +642,8 @@
formState.curCode = formState.curCode ? formState.curCode : res?.curCode formState.curCode = formState.curCode ? formState.curCode : res?.curCode
formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null) formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null) formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
let arr = res?.lngContractFactCpList || [] formState.cpName = formState.cpName ? formState.cpName : res?.cpName
let arrSales = [] formState.cpCode = formState.cpCode ? formState.cpCode : res?.cpCode
let arrSupplier = []
arr.forEach(v=> {
if (v.cpTableName == 'lng_customer') {
arrSales.push(v)
}
if (v.cpTableName == 'lng_supplier') {
arrSupplier.push(v)
}
})
formState.cpName = formState.cpName ? formState.cpName : arrSupplier[0]?.cpName
formState.cpCode = formState.cpCode ? formState.cpCode : arrSupplier[0]?.cpCode
} catch (error) { } catch (error) {
spinning.value = false spinning.value = false

31
src/views/contract/ContractPurLng/components/createForm.vue
View File

@ -25,27 +25,27 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="有效期开始" name="dateFrom"> <a-form-item label="有效期开始" name="dateFrom">
<a-date-picker v-model:value="formState.dateFrom" style="width: 100%" @change="dateChange(formState.dateFrom, 'dateFrom')" :disabled="isDisable" :disabled-date="disabledDateStart" placeholder="请选择开始日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateFrom" style="width: 100%" @change="dateChange(formState.dateFrom, 'dateFrom')" :disabled="isDisable" :disabled-date="disabledDateStart" placeholder="请选择开始日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="有效期结束" name="dateTo"> <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-date-picker :inputReadOnly="true" v-model:value="formState.dateTo" style="width: 100%" @change="dateChange(formState.dateTo, 'dateTo')" :disabled="isDisable" :disabled-date="disabledDateEnd" placeholder="请选择结束日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="合同签订日期" name="dateSign"> <a-form-item label="合同签订日期" name="dateSign">
<a-date-picker v-model:value="formState.dateSign" style="width: 100%" :disabled="isDisable" placeholder="请选择合同签订日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateSign" style="width: 100%" :disabled="isDisable" placeholder="请选择合同签订日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="确认函开始日" name="dateCfmFrom"> <a-form-item label="确认函开始日" name="dateCfmFrom">
<a-date-picker v-model:value="formState.dateCfmFrom" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateCfmStart" placeholder="请选择确认函开始日" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateCfmFrom" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateCfmStart" placeholder="请选择确认函开始日" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="确认函结束日" name="dateCfmTo"> <a-form-item label="确认函结束日" name="dateCfmTo">
<a-date-picker v-model:value="formState.dateCfmTo" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateCfmEnd" placeholder="请选择确认函结束日" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateCfmTo" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateCfmEnd" placeholder="请选择确认函结束日" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -127,7 +127,7 @@
import { getDictionary } from '/@/api/sales/Customer'; import { getDictionary } from '/@/api/sales/Customer';
import { useModal } from '/@/components/Modal'; import { useModal } from '/@/components/Modal';
import { addLngContract,updateLngContract, getLngContract} from '/@/api/contract/ContractPurLng'; import { addLngContract,updateLngContract, getLngContract} from '/@/api/contract/ContractPurLng';
import { getLngContractFact } from '/@/api/contract/ContractFact'; import { getMainContractById } from '/@/api/contract/ContractFact';
import { getAllCurrency } from '/@/api/contract/ContractFact'; import { getAllCurrency } from '/@/api/contract/ContractFact';
import { getLngAppro,getCompDept } from '/@/api/approve/Appro'; import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
@ -394,10 +394,10 @@
a.push(v) a.push(v)
} }
}) })
if(a.length == 1) { if(a.length >= 1) {
spinning.value = true spinning.value = true
try { try {
const res = await getLngContractFact(a[0].kFactId) const res = await getMainContractById(a[0].kFactId, 'S')
spinning.value = false spinning.value = false
formState.kNo = formState.kNo ? formState.kNo : res?.kNo formState.kNo = formState.kNo ? formState.kNo : res?.kNo
formState.kName = formState.kName ? formState.kName : res?.kName formState.kName = formState.kName ? formState.kName : res?.kName
@ -405,19 +405,8 @@
formState.curCode = formState.curCode ? formState.curCode : res?.curCode formState.curCode = formState.curCode ? formState.curCode : res?.curCode
formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null) formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null) formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
let arr = res?.lngContractFactCpList || [] formState.cpName = formState.cpName ? formState.cpName : res?.cpName
let arrSales = [] formState.cpCode = formState.cpCode ? formState.cpCode : res?.cpCode
let arrSupplier = []
arr.forEach(v=> {
if (v.cpTableName == 'lng_customer') {
arrSales.push(v)
}
if (v.cpTableName == 'lng_supplier') {
arrSupplier.push(v)
}
})
formState.cpName = formState.cpName ? formState.cpName : arrSupplier[0]?.cpName
formState.cpCode = formState.cpCode ? formState.cpCode : arrSupplier[0]?.cpCode
} catch (error) { } catch (error) {
spinning.value = false spinning.value = false

31
src/views/contract/ContractPurPng/components/createForm.vue
View File

@ -25,27 +25,27 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="有效期开始" name="dateFrom"> <a-form-item label="有效期开始" name="dateFrom">
<a-date-picker v-model:value="formState.dateFrom" style="width: 100%" @change="dateChange(formState.dateFrom, 'dateFrom')" :disabled="isDisable" :disabled-date="disabledDateStart" placeholder="请选择开始日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateFrom" style="width: 100%" @change="dateChange(formState.dateFrom, 'dateFrom')" :disabled="isDisable" :disabled-date="disabledDateStart" placeholder="请选择开始日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="有效期结束" name="dateTo"> <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-date-picker :inputReadOnly="true" v-model:value="formState.dateTo" style="width: 100%" @change="dateChange(formState.dateTo, 'dateTo')" :disabled="isDisable" :disabled-date="disabledDateEnd" placeholder="请选择结束日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="合同签订日期" name="dateSign"> <a-form-item label="合同签订日期" name="dateSign">
<a-date-picker v-model:value="formState.dateSign" style="width: 100%" :disabled="isDisable" placeholder="请选择合同签订日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateSign" style="width: 100%" :disabled="isDisable" placeholder="请选择合同签订日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="确认函开始日" name="dateCfmFrom"> <a-form-item label="确认函开始日" name="dateCfmFrom">
<a-date-picker v-model:value="formState.dateCfmFrom" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateCfmStart" placeholder="请选择确认函开始日" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateCfmFrom" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateCfmStart" placeholder="请选择确认函开始日" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="确认函结束日" name="dateCfmTo"> <a-form-item label="确认函结束日" name="dateCfmTo">
<a-date-picker v-model:value="formState.dateCfmTo" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateCfmEnd" placeholder="请选择确认函结束日" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateCfmTo" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateCfmEnd" placeholder="请选择确认函结束日" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -187,7 +187,7 @@
import { getDictionary } from '/@/api/sales/Customer'; import { getDictionary } from '/@/api/sales/Customer';
import { useModal } from '/@/components/Modal'; import { useModal } from '/@/components/Modal';
import { addLngContract,updateLngContract, getLngContract } from '/@/api/contract/ContractPurPng'; import { addLngContract,updateLngContract, getLngContract } from '/@/api/contract/ContractPurPng';
import { getLngContractFact } from '/@/api/contract/ContractFact'; import { getMainContractById } from '/@/api/contract/ContractFact';
import { getLngAppro,getCompDept } from '/@/api/approve/Appro'; import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { h } from 'vue'; import { h } from 'vue';
@ -526,29 +526,18 @@
a.push(v) a.push(v)
} }
}) })
if(a.length == 1) { if(a.length >= 1) {
spinning.value = true spinning.value = true
try { try {
const res = await getLngContractFact(a[0].id || a[0].idNew) const res = await getMainContractById(a[0].id || a[0].idNew, 'S')
spinning.value = false spinning.value = false
formState.kNo = formState.kNo ? formState.kNo : res?.kNo formState.kNo = formState.kNo ? formState.kNo : res?.kNo
formState.kName = formState.kName ? formState.kName : res?.kName formState.kName = formState.kName ? formState.kName : res?.kName
formState.kPeriod = formState.kPeriod ? formState.kPeriod : res?.periodTypeCode formState.kPeriod = formState.kPeriod ? formState.kPeriod : res?.periodTypeCode
formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null) formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null) formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
let arr = res?.lngContractFactCpList || [] formState.cpName = formState.cpName ? formState.cpName : res?.cpName
let arrSales = [] formState.cpCode = formState.cpCode ? formState.cpCode : res?.cpCode
let arrSupplier = []
arr.forEach(v=> {
if (v.cpTableName == 'lng_customer') {
arrSales.push(v)
}
if (v.cpTableName == 'lng_supplier') {
arrSupplier.push(v)
}
})
formState.cpName = formState.cpName ? formState.cpName : arrSupplier[0]?.cpName
formState.cpCode = formState.cpCode ? formState.cpCode : arrSupplier[0]?.cpCode
} catch (error) { } catch (error) {
spinning.value = false spinning.value = false

31
src/views/contract/ContractSales/components/createForm.vue
View File

@ -25,27 +25,27 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="有效期开始" name="dateFrom"> <a-form-item label="有效期开始" name="dateFrom">
<a-date-picker v-model:value="formState.dateFrom" style="width: 100%" @change="dateChange(formState.dateFrom, 'dateFrom')" :disabled="isDisable" :disabled-date="disabledDateStart" placeholder="请选择开始日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateFrom" style="width: 100%" @change="dateChange(formState.dateFrom, 'dateFrom')" :disabled="isDisable" :disabled-date="disabledDateStart" placeholder="请选择开始日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="有效期结束" name="dateTo"> <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-date-picker :inputReadOnly="true" v-model:value="formState.dateTo" style="width: 100%" @change="dateChange(formState.dateTo, 'dateTo')" :disabled="isDisable" :disabled-date="disabledDateEnd" placeholder="请选择结束日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="合同签订日期" name="dateSign"> <a-form-item label="合同签订日期" name="dateSign">
<a-date-picker v-model:value="formState.dateSign" style="width: 100%" :disabled="isDisable" placeholder="请选择合同签订日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateSign" style="width: 100%" :disabled="isDisable" placeholder="请选择合同签订日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="确认函开始日" name="dateCfmFrom"> <a-form-item label="确认函开始日" name="dateCfmFrom">
<a-date-picker v-model:value="formState.dateCfmFrom" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateCfmStart" placeholder="请选择确认函开始日" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateCfmFrom" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateCfmStart" placeholder="请选择确认函开始日" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="确认函结束日" name="dateCfmTo"> <a-form-item label="确认函结束日" name="dateCfmTo">
<a-date-picker v-model:value="formState.dateCfmTo" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateCfmEnd" placeholder="请选择确认函结束日" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateCfmTo" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateCfmEnd" placeholder="请选择确认函结束日" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -189,7 +189,7 @@
import { getDictionary } from '/@/api/sales/Customer'; import { getDictionary } from '/@/api/sales/Customer';
import { useModal } from '/@/components/Modal'; import { useModal } from '/@/components/Modal';
import { addLngContract,updateLngContract, getLngContract, getTransList, getPurList } from '/@/api/contract/ContractSales'; import { addLngContract,updateLngContract, getLngContract, getTransList, getPurList } from '/@/api/contract/ContractSales';
import { getLngContractFact } from '/@/api/contract/ContractFact'; import { getMainContractById } from '/@/api/contract/ContractFact';
import { getLngAppro,getCompDept } from '/@/api/approve/Appro'; import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { getAppEnvConfig } from '/@/utils/env'; import { getAppEnvConfig } from '/@/utils/env';
@ -557,29 +557,18 @@
a.push(v) a.push(v)
} }
}) })
if(a.length == 1) { if(a.length >= 1) {
spinning.value = true spinning.value = true
try { try {
const res = await getLngContractFact(a[0].kFactId) const res = await getMainContractById(a[0].kFactId, 'C')
spinning.value = false spinning.value = false
formState.kNo = formState.kNo ? formState.kNo : res?.kNo formState.kNo = formState.kNo ? formState.kNo : res?.kNo
formState.kName = formState.kName ? formState.kName : res?.kName formState.kName = formState.kName ? formState.kName : res?.kName
formState.kPeriod = formState.kPeriod ? formState.kPeriod : res?.periodTypeCode formState.kPeriod = formState.kPeriod ? formState.kPeriod : res?.periodTypeCode
formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null) formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null) formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
let arr = res?.lngContractFactCpList || [] formState.cpName = formState.cpName ? formState.cpName : res?.cpName
let arrSales = [] formState.cpCode = formState.cpCode ? formState.cpCode : res?.cpCode
let arrSupplier = []
arr.forEach(v=> {
if (v.cpTableName == 'lng_customer') {
arrSales.push(v)
}
if (v.cpTableName == 'lng_supplier') {
arrSupplier.push(v)
}
})
formState.cpName = formState.cpName ? formState.cpName : arrSales[0]?.cpName
formState.cpCode = formState.cpCode ? formState.cpCode : arrSales[0]?.cpCode
} catch (error) { } catch (error) {
spinning.value = false spinning.value = false

25
src/views/contract/ContractSalesInt/components/createForm.vue
View File

@ -25,12 +25,12 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="有效期开始" name="dateFrom"> <a-form-item label="有效期开始" name="dateFrom">
<a-date-picker v-model:value="formState.dateFrom" style="width: 100%" @change="dateChange(formState.dateFrom, 'dateFrom')" :disabled="isDisable" :disabled-date="disabledDateStart" placeholder="请选择开始日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateFrom" style="width: 100%" @change="dateChange(formState.dateFrom, 'dateFrom')" :disabled="isDisable" :disabled-date="disabledDateStart" placeholder="请选择开始日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="有效期结束" name="dateTo"> <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-date-picker :inputReadOnly="true" v-model:value="formState.dateTo" style="width: 100%" @change="dateChange(formState.dateTo, 'dateTo')" :disabled="isDisable" :disabled-date="disabledDateEnd" placeholder="请选择结束日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -286,7 +286,7 @@
import { useModal } from '/@/components/Modal'; import { useModal } from '/@/components/Modal';
import {getAllPriceTerm} from '/@/api/contract/ContractPurInt'; import {getAllPriceTerm} from '/@/api/contract/ContractPurInt';
import { addLngContract,updateLngContract, getLngContract} from '/@/api/contract/ContractSalesInt'; import { addLngContract,updateLngContract, getLngContract} from '/@/api/contract/ContractSalesInt';
import { getLngContractFact } from '/@/api/contract/ContractFact'; import { getMainContractById } from '/@/api/contract/ContractFact';
import { getAllCurrency } from '/@/api/contract/ContractFact'; import { getAllCurrency } from '/@/api/contract/ContractFact';
import { getLngAppro,getCompDept } from '/@/api/approve/Appro'; import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
@ -633,10 +633,10 @@
a.push(v) a.push(v)
} }
}) })
if(a.length == 1) { if(a.length >= 1) {
spinning.value = true spinning.value = true
try { try {
const res = await getLngContractFact(a[0].kFactId) const res = await getMainContractById(a[0].kFactId, 'C')
spinning.value = false spinning.value = false
formState.kNo = formState.kNo ? formState.kNo : res?.kNo formState.kNo = formState.kNo ? formState.kNo : res?.kNo
formState.kName = formState.kName ? formState.kName : res?.kName formState.kName = formState.kName ? formState.kName : res?.kName
@ -644,19 +644,8 @@
formState.curCode = formState.curCode ? formState.curCode : res?.curCode formState.curCode = formState.curCode ? formState.curCode : res?.curCode
formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null) formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null) formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
let arr = res?.lngContractFactCpList || [] formState.cpName = formState.cpName ? formState.cpName : res?.cpName
let arrSales = [] formState.cpCode = formState.cpCode ? formState.cpCode : res?.cpCode
let arrSupplier = []
arr.forEach(v=> {
if (v.cpTableName == 'lng_customer') {
arrSales.push(v)
}
if (v.cpTableName == 'lng_supplier') {
arrSupplier.push(v)
}
})
formState.cpName = formState.cpName ? formState.cpName : arrSales[0]?.cpName
formState.cpCode = formState.cpCode ? formState.cpCode : arrSales[0]?.cpCode
} catch (error) { } catch (error) {
spinning.value = false spinning.value = false

31
src/views/contract/ContractSalesLng/components/createForm.vue
View File

@ -25,27 +25,27 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="有效期开始" name="dateFrom"> <a-form-item label="有效期开始" name="dateFrom">
<a-date-picker v-model:value="formState.dateFrom" style="width: 100%" @change="dateChange(formState.dateFrom, 'dateFrom')" :disabled="isDisable" :disabled-date="disabledDateStart" placeholder="请选择开始日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateFrom" style="width: 100%" @change="dateChange(formState.dateFrom, 'dateFrom')" :disabled="isDisable" :disabled-date="disabledDateStart" placeholder="请选择开始日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="有效期结束" name="dateTo"> <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-date-picker :inputReadOnly="true" v-model:value="formState.dateTo" style="width: 100%" @change="dateChange(formState.dateTo, 'dateTo')" :disabled="isDisable" :disabled-date="disabledDateEnd" placeholder="请选择结束日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="合同签订日期" name="dateSign"> <a-form-item label="合同签订日期" name="dateSign">
<a-date-picker v-model:value="formState.dateSign" style="width: 100%" :disabled="isDisable" placeholder="请选择合同签订日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateSign" style="width: 100%" :disabled="isDisable" placeholder="请选择合同签订日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="确认函开始日" name="dateCfmFrom"> <a-form-item label="确认函开始日" name="dateCfmFrom">
<a-date-picker v-model:value="formState.dateCfmFrom" @change="dateCfmChange" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateCfmStart" placeholder="请选择确认函开始日" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateCfmFrom" @change="dateCfmChange" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateCfmStart" placeholder="请选择确认函开始日" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="确认函结束日" name="dateCfmTo"> <a-form-item label="确认函结束日" name="dateCfmTo">
<a-date-picker v-model:value="formState.dateCfmTo" @change="dateCfmChange" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateCfmEnd" placeholder="请选择确认函结束日" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateCfmTo" @change="dateCfmChange" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateCfmEnd" placeholder="请选择确认函结束日" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -164,7 +164,7 @@
import { getDictionary } from '/@/api/sales/Customer'; import { getDictionary } from '/@/api/sales/Customer';
import { useModal } from '/@/components/Modal'; import { useModal } from '/@/components/Modal';
import { addLngContract,updateLngContract, getLngContract, getTransList, getPurList } from '/@/api/contract/ContractSalesLng'; import { addLngContract,updateLngContract, getLngContract, getTransList, getPurList } from '/@/api/contract/ContractSalesLng';
import { getLngContractFact } from '/@/api/contract/ContractFact'; import { getMainContractById } from '/@/api/contract/ContractFact';
import { getLngAppro,getCompDept } from '/@/api/approve/Appro'; import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { getAppEnvConfig } from '/@/utils/env'; import { getAppEnvConfig } from '/@/utils/env';
@ -482,29 +482,18 @@
a.push(v) a.push(v)
} }
}) })
if(a.length == 1) { if(a.length >= 1) {
spinning.value = true spinning.value = true
try { try {
const res = await getLngContractFact(a[0].id || a[0].idNew) const res = await getMainContractById(a[0].id || a[0].idNew, 'C')
spinning.value = false spinning.value = false
formState.kNo = formState.kNo ? formState.kNo : res?.kNo formState.kNo = formState.kNo ? formState.kNo : res?.kNo
formState.kName = formState.kName ? formState.kName : res?.kName formState.kName = formState.kName ? formState.kName : res?.kName
formState.kPeriod = formState.kPeriod ? formState.kPeriod : res?.periodTypeCode formState.kPeriod = formState.kPeriod ? formState.kPeriod : res?.periodTypeCode
formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null) formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null) formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
let arr = res?.lngContractFactCpList || [] formState.cpName = formState.cpName ? formState.cpName : res?.cpName
let arrSales = [] formState.cpCode = formState.cpCode ? formState.cpCode : res?.cpCode
let arrSupplier = []
arr.forEach(v=> {
if (v.cpTableName == 'lng_customer') {
arrSales.push(v)
}
if (v.cpTableName == 'lng_supplier') {
arrSupplier.push(v)
}
})
formState.cpName = formState.cpName ? formState.cpName : arrSales[0]?.cpName
formState.cpCode = formState.cpCode ? formState.cpCode : arrSales[0]?.cpCode
} catch (error) { } catch (error) {
spinning.value = false spinning.value = false

33
src/views/contract/ContractTransPng/components/createForm.vue
View File

@ -25,17 +25,17 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="有效期开始" name="dateFrom"> <a-form-item label="有效期开始" name="dateFrom">
<a-date-picker v-model:value="formState.dateFrom" style="width: 100%" @change="dateChange(formState.dateFrom, 'dateFrom')" :disabled="isDisable" :disabled-date="disabledDateStart" placeholder="请选择开始日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateFrom" style="width: 100%" @change="dateChange(formState.dateFrom, 'dateFrom')" :disabled="isDisable" :disabled-date="disabledDateStart" placeholder="请选择开始日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="有效期结束" name="dateTo"> <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-date-picker :inputReadOnly="true" v-model:value="formState.dateTo" style="width: 100%" @change="dateChange(formState.dateTo, 'dateTo')" :disabled="isDisable" :disabled-date="disabledDateEnd" placeholder="请选择结束日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="合同签订日期" name="dateSign"> <a-form-item label="合同签订日期" name="dateSign">
<a-date-picker v-model:value="formState.dateSign" style="width: 100%" :disabled="isDisable" placeholder="请选择合同签订日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateSign" style="width: 100%" :disabled="isDisable" placeholder="请选择合同签订日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -126,7 +126,7 @@
<template #label> <template #label>
<span><span style="color:red">*</span>有效期开始</span> <span><span style="color:red">*</span>有效期开始</span>
</template> </template>
<a-date-picker v-model:value="k.dateFromNew" format="YYYY-MM-DD" :value-format="'YYYY-MM-DD'" @openChange="dateToYCheck(idx,idxk)" @change="dateFromNewChange" style="width: 100%" :disabled="isDisable" /> <a-date-picker :inputReadOnly="true" v-model:value="k.dateFromNew" format="YYYY-MM-DD" :value-format="'YYYY-MM-DD'" @openChange="dateToYCheck(idx,idxk)" @change="dateFromNewChange" style="width: 100%" :disabled="isDisable" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -146,7 +146,7 @@
<template #label> <template #label>
<span><span style="color:red">*</span>固定结束日</span> <span><span style="color:red">*</span>固定结束日</span>
</template> </template>
<a-date-picker v-model:value="k.dateToF" format="YYYY-MM-DD" :value-format="'YYYY-MM-DD'" style="width: 100%" :disabled="isDisable" /> <a-date-picker :inputReadOnly="true" v-model:value="k.dateToF" format="YYYY-MM-DD" :value-format="'YYYY-MM-DD'" style="width: 100%" :disabled="isDisable" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8" v-if="k.dateToCode=='Y'"> <a-col :span="8" v-if="k.dateToCode=='Y'">
@ -154,7 +154,7 @@
<template #label> <template #label>
<span><span style="color:red">*</span>每年结束日</span> <span><span style="color:red">*</span>每年结束日</span>
</template> </template>
<a-date-picker v-model:value="k.dateToY" format="MM-DD" :value-format="'MM-DD'" style="width: 100%" :disabled="isDisable" @openChange="dateToYCheck(idx,idxk)" :disabledDate="disabledCurrentYear"/> <a-date-picker :inputReadOnly="true" v-model:value="k.dateToY" format="MM-DD" :value-format="'MM-DD'" style="width: 100%" :disabled="isDisable" @openChange="dateToYCheck(idx,idxk)" :disabledDate="disabledCurrentYear"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<div style="width: 100%"> <div style="width: 100%">
@ -225,7 +225,7 @@
import { getDictionary } from '/@/api/sales/Customer'; import { getDictionary } from '/@/api/sales/Customer';
import { useModal } from '/@/components/Modal'; import { useModal } from '/@/components/Modal';
import { addLngContract,updateLngContract, getLngContract } from '/@/api/contract/ContractTransPng'; import { addLngContract,updateLngContract, getLngContract } from '/@/api/contract/ContractTransPng';
import { getLngContractFact } from '/@/api/contract/ContractFact'; import { getMainContractById } from '/@/api/contract/ContractFact';
import { getLngAppro,getCompDept } from '/@/api/approve/Appro'; import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { h } from 'vue'; import { h } from 'vue';
@ -595,10 +595,10 @@
a.push(v) a.push(v)
} }
}) })
if(a.length == 1) { if(a.length >= 1) {
spinning.value = true spinning.value = true
try { try {
const res = await getLngContractFact(a[0].kFactId) const res = await getMainContractById(a[0].kFactId, 'S')
spinning.value = false spinning.value = false
formState.kNo = formState.kNo ? formState.kNo : res?.kNo formState.kNo = formState.kNo ? formState.kNo : res?.kNo
formState.kName = formState.kName ? formState.kName : res?.kName formState.kName = formState.kName ? formState.kName : res?.kName
@ -606,19 +606,8 @@
formState.curCode = formState.curCode ? formState.curCode : res?.curCode formState.curCode = formState.curCode ? formState.curCode : res?.curCode
formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null) formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null) formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
let arr = res?.lngContractFactCpList || [] formState.cpName = formState.cpName ? formState.cpName : res?.cpName
let arrSales = [] formState.cpCode = formState.cpCode ? formState.cpCode : res?.cpCode
let arrSupplier = []
arr.forEach(v=> {
if (v.cpTableName == 'lng_customer') {
arrSales.push(v)
}
if (v.cpTableName == 'lng_supplier') {
arrSupplier.push(v)
}
})
formState.cpName = formState.cpName ? formState.cpName : arrSupplier[0]?.cpName
formState.cpCode = formState.cpCode ? formState.cpCode : arrSupplier[0]?.cpCode
} catch (error) { } catch (error) {
spinning.value = false spinning.value = false

2
src/views/dayPlan/Demand/components/basicForm.vue
View File

@ -6,7 +6,7 @@
<div v-if="pageType=='compare'" :class="diffResultList.includes('datePlan')?'changeStyle':''"> <div v-if="pageType=='compare'" :class="diffResultList.includes('datePlan')?'changeStyle':''">
{{ formState.datePlan ? dayjs(formState.datePlan).format('YYYY-MM-DD'): null }} {{ formState.datePlan ? dayjs(formState.datePlan).format('YYYY-MM-DD'): null }}
</div> </div>
<a-date-picker v-else v-model:value="formState.datePlan" :disabled-date="disabledDateStart" style="width: 100%" :disabled="disable||pageType=='edit'" placeholder="请选择计划日期" @change="datePlanChange" /> <a-date-picker :inputReadOnly="true" v-else v-model:value="formState.datePlan" :disabled-date="disabledDateStart" style="width: 100%" :disabled="disable||pageType=='edit'" placeholder="请选择计划日期" @change="datePlanChange" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">

107
src/views/dayPlan/PngMeasureSalesPur/components/createForm.vue
View File

@ -1,44 +1,38 @@
<template> <template>
<a-spin :spinning="spinning" tip="加载中..."> <BasicModal v-bind="$attrs" @register="registerModal" width="85%" :title="getTitle" @ok="handleSubmit" @visible-change="handleVisibleChange">
<div class="page-bg-wrap formViewStyle pdcss"> <a-spin :spinning="spinning" tip="加载中...">
<div class="top-toolbar"> <searchForm @search="onSearch" @reset="onReset" ></searchForm>
<a-button style="margin-right: 10px" @click="close"> <BasicTable @register="registerTable" v-if="showTable">
<slot name="icon"><close-outlined /></slot>取消 <template #bodyCell="{ column, record }">
</a-button> <template v-if="column.dataIndex === 'qtySalesGj'">
<a-button style="margin-right: 10px" type="primary" @click="checkBtn"> {{ Number.format(Number.parse(record.qtySalesGj),numFormat) }}
<slot name="icon"><save-outlined /></slot>保存 </template>
</a-button> <template v-if="column.dataIndex === 'qtyMeaGj'">
</div> {{ Number.format(Number.parse(record.qtyMeaGj || 0),numFormat) }}
<searchForm @search="onSearch" @reset="onReset" ></searchForm> </template>
<BasicTable @register="registerTable"> <template v-if="column.dataIndex === 'qtySalesM3'">
<template #bodyCell="{ column, record }"> {{ Number.format(Number.parse(NP.divide(Number(record.qtySalesM3), 10000)),numFormat) }}
<template v-if="column.dataIndex === 'qtySalesGj'"> </template>
{{ Number.format(Number.parse(record.qtySalesGj),numFormat) }} <template v-if="column.dataIndex === 'qtyMeaM3'">
{{ Number.format(Number.parse(NP.divide(Number(record.qtyMeaM3), 10000)),numFormat) }}
</template>
</template> </template>
<template v-if="column.dataIndex === 'qtyMeaGj'"> </BasicTable>
{{ Number.format(Number.parse(record.qtyMeaGj || 0),numFormat) }}
</template> </a-spin>
<template v-if="column.dataIndex === 'qtySalesM3'"> </BasicModal>
{{ Number.format(Number.parse(NP.divide(Number(record.qtySalesM3), 10000)),numFormat) }}
</template>
<template v-if="column.dataIndex === 'qtyMeaM3'">
{{ Number.format(Number.parse(NP.divide(Number(record.qtyMeaM3), 10000)),numFormat) }}
</template>
</template>
</BasicTable>
</div>
</a-spin>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import { ref, computed, onMounted, onBeforeMount, nextTick, defineAsyncComponent, reactive, defineComponent, watch} from 'vue'; import { ref, computed, unref, nextTick } from 'vue';
import { SaveOutlined, } from '@ant-design/icons-vue'; import { SaveOutlined, } from '@ant-design/icons-vue';
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import { useI18n } from '/@/hooks/web/useI18n'; import { useI18n } from '/@/hooks/web/useI18n';
import { useMultipleTabStore } from '/@/store/modules/multipleTab'; import { useMultipleTabStore } from '/@/store/modules/multipleTab';
import useEventBus from '/@/hooks/event/useEventBus'; import useEventBus from '/@/hooks/event/useEventBus';
import { useModal } from '/@/components/Modal'; import { BasicModal, useModalInner, useModal } from '/@/components/Modal';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { message } from 'ant-design-vue'; import { message } from 'ant-design-vue';
import { useUserStore } from '/@/store/modules/user'; import { useUserStore } from '/@/store/modules/user';
@ -60,17 +54,19 @@
const spinning = ref(false); const spinning = ref(false);
const { t } = useI18n(); const { t } = useI18n();
const formState = ref({}); const formState = ref({});
const [register, { openModal:openModal}] = useModal(); const isUpdate = ref(true);
const showTable = ref(false)
onMounted(() => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
showTable.value = true
setModalProps({ confirmLoading: false });
setPagination({'limit': 1,'size': 10,'page': 1});
isUpdate.value = !!data?.isUpdate;
}); });
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
const { notification } = useMessage(); const { notification } = useMessage();
const selectedKeys = ref<string[]>([]); const selectedKeys = ref<string[]>([]);
const selectedValues = ref([]); const selectedValues = ref([]);
const [registerTable, { reload }] = useTable({ const [registerTable, { reload,setPagination }] = useTable({
title: t('管道气计量新增列表'), title: t('管道气计量新增列表'),
api: getLngPngMeasureSalesPurPageAdd, api: getLngPngMeasureSalesPurPageAdd,
columns: columns, columns: columns,
@ -83,15 +79,28 @@
showResetButton: false, showResetButton: false,
showSubmitButton: false showSubmitButton: false
}, },
immediate: true, immediate: false,
beforeFetch: (params) => { beforeFetch: (params) => {
return { ...params,...formState.value}; return { ...params,...formState.value,page:params.limit};
}, },
rowSelection: { rowSelection: {
type: 'checkbox', type: 'checkbox',
onChange: onSelectChange onChange: onSelectChange
}, },
}); });
const getTitle = computed(() => (!unref(isUpdate) ? t('管道气计量新增列表') : t('')));
const handleVisibleChange = async (visible: boolean) => {
if (visible) {
showTable.value = false
await nextTick();
await nextTick();
await nextTick();
nextTick(() => {
reload({searchInfo:{'limit':1,'size':10,'page':1}});
});
}
};
function onSelectChange(rowKeys: string[], e) { function onSelectChange(rowKeys: string[], e) {
selectedKeys.value = rowKeys; selectedKeys.value = rowKeys;
selectedValues.value = e selectedValues.value = e
@ -107,7 +116,7 @@
function close() { function close() {
tabStore.closeTab(currentRoute.value, router); tabStore.closeTab(currentRoute.value, router);
} }
async function checkBtn() { async function handleSubmit() {
if (!selectedValues.value.length) { if (!selectedValues.value.length) {
message.warn('请选择数据') message.warn('请选择数据')
return return
@ -121,10 +130,8 @@
message: 'Tip', message: 'Tip',
description: '保存成功' description: '保存成功'
}); });
setTimeout(() => { closeModal();
bus.emit(FORM_LIST_MODIFIED, {}); emit('success', selectedValues.value);
close();
}, 500);
}catch (errorInfo) { }catch (errorInfo) {
spinning.value = false; spinning.value = false;
} }
@ -133,18 +140,6 @@
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.page-bg-wrap {
background-color: #fff;
}
.top-toolbar {
min-height: 44px;
margin-bottom: 12px;
border-bottom: 1px solid #eee;
}
.pdcss {
padding:0px 12px 6px 12px !important;
}
:deep(.ant-table-title) { :deep(.ant-table-title) {
display: none !important; display: none !important;
} }

3
src/views/dayPlan/PngMeasureSalesPur/components/searchForm.vue
View File

@ -3,7 +3,7 @@
<a-row> <a-row>
<a-col :span="6"> <a-col :span="6">
<a-form-item label="计量日期" name="dateMea" > <a-form-item label="计量日期" name="dateMea" >
<a-range-picker v-model:value="formState.dateMea" /> <RangePicker v-model:value="formState.dateMea" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="7"> <a-col :span="7">
@ -61,6 +61,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import { RangePicker } from '/@/components/RangePicker';
import { ref, computed, onMounted, onBeforeMount, nextTick, defineAsyncComponent, reactive, defineComponent, watch} from 'vue'; import { ref, computed, onMounted, onBeforeMount, nextTick, defineAsyncComponent, reactive, defineComponent, watch} from 'vue';
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import { useI18n } from '/@/hooks/web/useI18n'; import { useI18n } from '/@/hooks/web/useI18n';

30
src/views/dayPlan/PngMeasureSalesPur/index.vue
View File

@ -54,6 +54,7 @@
</BasicTable> </BasicTable>
<PngMeasureSalesPurModal @register="registerModal" @success="handleSuccess" /> <PngMeasureSalesPurModal @register="registerModal" @success="handleSuccess" />
<createFormModal @register="registerModalForm" @success="handleSuccessForm"/>
<ImportModal @register="registerImportModal" importUrl="/dayPlan/pngMeasureSalesPur/import" @success="handleImportSuccess"/> <ImportModal @register="registerImportModal" importUrl="/dayPlan/pngMeasureSalesPur/import" @success="handleImportSuccess"/>
<DataLog :logId="logId" :logPath="logPath" v-model:visible="modalVisible"/> <DataLog :logId="logId" :logPath="logPath" v-model:visible="modalVisible"/>
@ -93,6 +94,7 @@
import { DeleteOutlined } from '@ant-design/icons-vue'; import { DeleteOutlined } from '@ant-design/icons-vue';
import searchForm from './components/searchForm.vue' import searchForm from './components/searchForm.vue'
import NP from 'number-precision'; import NP from 'number-precision';
import createFormModal from './components/createForm.vue'
const { bus, CREATE_FLOW, FLOW_PROCESSED, FORM_LIST_MODIFIED } = useEventBus(); const { bus, CREATE_FLOW, FLOW_PROCESSED, FORM_LIST_MODIFIED } = useEventBus();
const numFormat = "###,###,###,###,###,###.000" const numFormat = "###,###,###,###,###,###.000"
@ -160,6 +162,7 @@
const curIdx = ref() const curIdx = ref()
const [registerModal, { openModal }] = useModal(); const [registerModal, { openModal }] = useModal();
const [registerModalForm, { openModal: openModalForm }] = useModal();
const [registerImportModal, { openModal: openImportModal }] = useModal(); const [registerImportModal, { openModal: openImportModal }] = useModal();
const tableId = ''; const tableId = '';
const tableName = 'PngMeasureSalesPur'; const tableName = 'PngMeasureSalesPur';
@ -218,21 +221,24 @@
downloadByUrl({ url, fileName: fileName}); downloadByUrl({ url, fileName: fileName});
}; };
const numChange = (record, index) => { const numChange = (record, index) => {
record.rateM3Gj = Number(record.qtyMeaGj) ? (Number(record.qtyMeaM3) || 0 ) / Number(record.qtyMeaGj) : '0' record.rateM3Gj = Number(record.qtyMeaGj) ? (Number(record.qtyMeaM3) || 0 ) / Number(record.qtyMeaGj) : 0
record.rateM3Gj = record.rateM3Gj.toFixed(6) record.rateM3Gj = record.rateM3Gj ? Number(record.rateM3Gj).toFixed(6) : 0
tableData.value[index] = record tableData.value[index] = record
} }
const handleSuccessForm = (val) => {
handleSuccess()
}
function handleAdd() { function handleAdd() {
openModalForm(true,{isUpdate: false});
router.push({ // router.push({
path: '/dayPlan/PngMeasureSalesPur/createForm', // path: '/dayPlan/PngMeasureSalesPur/createForm',
query: { // query: {
formPath: 'dayPlan/PngMeasureSalesPur', // formPath: 'dayPlan/PngMeasureSalesPur',
formName: "新建"+formName, // formName: "新建"+formName,
formId:currentRoute.value.meta.formId, // formId:currentRoute.value.meta.formId,
type:'add' // type:'add'
} // }
}); // });
} }
async function handleReject() { async function handleReject() {

6
src/views/dayPlan/PngSettleHdr/components/createForm.vue
View File

@ -6,17 +6,17 @@
<a-row> <a-row>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="结算月" name="settleMonth"> <a-form-item label="结算月" name="settleMonth">
<a-date-picker v-model:value="formState.settleMonth" style="width: 100%" picker="month" :disabled="isDisable" placeholder="请选择结算月" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.settleMonth" style="width: 100%" picker="month" :disabled="isDisable" placeholder="请选择结算月" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="结算月开始日期" name="dateFrom"> <a-form-item label="结算月开始日期" name="dateFrom">
<a-date-picker v-model:value="formState.dateFrom" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateStart" placeholder="请选择开始日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateFrom" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateStart" placeholder="请选择开始日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="结算月结束日期" name="dateTo"> <a-form-item label="结算月结束日期" name="dateTo">
<a-date-picker v-model:value="formState.dateTo" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateEnd" placeholder="请选择结束日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateTo" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateEnd" placeholder="请选择结束日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">

6
src/views/dayPlan/PngSettleHdrPur/components/createForm.vue
View File

@ -6,17 +6,17 @@
<a-row> <a-row>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="结算月" name="settleMonth"> <a-form-item label="结算月" name="settleMonth">
<a-date-picker v-model:value="formState.settleMonth" style="width: 100%" picker="month" :disabled="isDisable" placeholder="请选择结算月" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.settleMonth" style="width: 100%" picker="month" :disabled="isDisable" placeholder="请选择结算月" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="结算月开始日期" name="dateFrom"> <a-form-item label="结算月开始日期" name="dateFrom">
<a-date-picker v-model:value="formState.dateFrom" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateStart" placeholder="请选择开始日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateFrom" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateStart" placeholder="请选择开始日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="结算月结束日期" name="dateTo"> <a-form-item label="结算月结束日期" name="dateTo">
<a-date-picker v-model:value="formState.dateTo" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateEnd" placeholder="请选择结束日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateTo" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateEnd" placeholder="请选择结束日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">

4
src/views/sales/Customer/components/createForm.vue
View File

@ -65,12 +65,12 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="成立日期" name="dateEstab"> <a-form-item label="成立日期" name="dateEstab">
<a-date-picker v-model:value="formState.dateEstab" :disabled="isDisable" style="width: 100%" placeholder="请选择成立日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEstab" :disabled="isDisable" style="width: 100%" placeholder="请选择成立日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="准入时间" name="dateEntry"> <a-form-item label="准入时间" name="dateEntry">
<a-date-picker v-model:value="formState.dateEntry" :disabled="isDisable" style="width: 100%" placeholder="请选择准入时间" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEntry" :disabled="isDisable" style="width: 100%" placeholder="请选择准入时间" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">

4
src/views/sales/CustomerGroup/components/Form.vue
View File

@ -7,12 +7,12 @@
:isWorkFlow="props.fromPage!=FromPageType.MENU"> :isWorkFlow="props.fromPage!=FromPageType.MENU">
<template #dateFrom="{ formModel }"> <template #dateFrom="{ formModel }">
<FormItem label="起始日期" :label-col="{ span: 5, offset: 0 }" labelAlign="right" name="dateFrom" class="dateStyle"> <FormItem label="起始日期" :label-col="{ span: 5, offset: 0 }" labelAlign="right" name="dateFrom" class="dateStyle">
<a-date-picker v-model:value="formModel.dateFrom" :disabled="isView" format="YYYY-MM-DD" :disabled-date="disabledDateStart" style="width: 100%" placeholder="请选择" /> <a-date-picker :inputReadOnly="true" v-model:value="formModel.dateFrom" :disabled="isView" format="YYYY-MM-DD" :disabled-date="disabledDateStart" style="width: 100%" placeholder="请选择" />
</FormItem> </FormItem>
</template> </template>
<template #dateTo="{ formModel }"> <template #dateTo="{ formModel }">
<FormItem label="结束日期" labelAlign="right" name="dateTo" class="dateStyle"> <FormItem label="结束日期" labelAlign="right" name="dateTo" class="dateStyle">
<a-date-picker v-model:value="formModel.dateTo" :disabled="isView" format="YYYY-MM-DD" :disabled-date="disabledDateEnd" style="width: 100%" placeholder="请选择" /> <a-date-picker :inputReadOnly="true" v-model:value="formModel.dateTo" :disabled="isView" format="YYYY-MM-DD" :disabled-date="disabledDateEnd" style="width: 100%" placeholder="请选择" />
</FormItem> </FormItem>
</template> </template>
</SimpleForm> </SimpleForm>

2
src/views/sales/ScoreCustomer/components/createForm.vue
View File

@ -25,7 +25,7 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="评价日期" name="dateGrade"> <a-form-item label="评价日期" name="dateGrade">
<a-date-picker v-model:value="formState.dateGrade" disabled style="width: 100%" placeholder="请选择评价日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateGrade" disabled style="width: 100%" placeholder="请选择评价日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">

4
src/views/ship/MeaPurInt/components/createForm.vue
View File

@ -43,7 +43,7 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="卸港ETA" name="dateEta"> <a-form-item label="卸港ETA" name="dateEta">
<a-date-picker v-model:value="formState.dateEta" style="width: 100%" disabled /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEta" style="width: 100%" disabled />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -57,7 +57,7 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="计量时间" name="dateMea"> <a-form-item label="计量时间" name="dateMea">
<a-date-picker v-model:value="formState.dateMea" style="width: 100%" placeholder="请选择" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateMea" style="width: 100%" placeholder="请选择" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">

36
src/views/ship/OpsPurInt/components/createForm.vue
View File

@ -103,12 +103,12 @@
<a-row> <a-row>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="执行日" name="dateOps"> <a-form-item label="执行日" name="dateOps">
<a-date-picker v-model:value="formState.dateOps" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateOps" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="货权转移日" name="dateTrans"> <a-form-item label="货权转移日" name="dateTrans">
<a-date-picker v-model:value="formState.dateTrans" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateTrans" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -209,27 +209,27 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="NOR日" name="dateNor"> <a-form-item label="NOR日" name="dateNor">
<a-date-picker v-model:value="formState.dateNor" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateNor" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="最迟交货日" name="dateEnd"> <a-form-item label="最迟交货日" name="dateEnd">
<a-date-picker v-model:value="formState.dateEnd" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEnd" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="发出付款通知日" name="datePayNtc"> <a-form-item label="发出付款通知日" name="datePayNtc">
<a-date-picker v-model:value="formState.datePayNtc" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.datePayNtc" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="收到发票日" name="dateInv"> <a-form-item label="收到发票日" name="dateInv">
<a-date-picker v-model:value="formState.dateInv" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateInv" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="付款日" name="dateRp"> <a-form-item label="付款日" name="dateRp">
<a-date-picker v-model:value="formState.dateRp" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateRp" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
@ -248,22 +248,22 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="装港ETA" name="dateEtaL"> <a-form-item label="装港ETA" name="dateEtaL">
<a-date-picker v-model:value="formState.dateEtaL" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEtaL" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="装港ETB" name="dateEtbL"> <a-form-item label="装港ETB" name="dateEtbL">
<a-date-picker v-model:value="formState.dateEtbL" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEtbL" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="装港ETC" name="dateEtcL"> <a-form-item label="装港ETC" name="dateEtcL">
<a-date-picker v-model:value="formState.dateEtcL" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEtcL" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="装港ETD" name="dateEtdL"> <a-form-item label="装港ETD" name="dateEtdL">
<a-date-picker v-model:value="formState.dateEtdL" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEtdL" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
@ -282,22 +282,22 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="卸港ETA" name="dateEta"> <a-form-item label="卸港ETA" name="dateEta">
<a-date-picker v-model:value="formState.dateEta" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEta" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="卸港ETB" name="dateEtb"> <a-form-item label="卸港ETB" name="dateEtb">
<a-date-picker v-model:value="formState.dateEtb" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEtb" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="卸港ETC" name="dateEtc"> <a-form-item label="卸港ETC" name="dateEtc">
<a-date-picker v-model:value="formState.dateEtc" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEtc" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="卸港ETD" name="dateEtd"> <a-form-item label="卸港ETD" name="dateEtd">
<a-date-picker v-model:value="formState.dateEtd" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEtd" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
@ -316,7 +316,7 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="提单日" name="dateBl"> <a-form-item label="提单日" name="dateBl">
<a-date-picker v-model:value="formState.dateBl" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateBl" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -331,7 +331,7 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="邮寄报关资料日" name="datePost"> <a-form-item label="邮寄报关资料日" name="datePost">
<a-date-picker v-model:value="formState.datePost" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.datePost" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -346,7 +346,7 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="办理许可证日" name="dateLic"> <a-form-item label="办理许可证日" name="dateLic">
<a-date-picker v-model:value="formState.dateLic" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateLic" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>

28
src/views/ship/OpsSalesInt/components/createForm.vue
View File

@ -106,12 +106,12 @@
<a-row> <a-row>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="执行日" name="dateOps"> <a-form-item label="执行日" name="dateOps">
<a-date-picker v-model:value="formState.dateOps" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateOps" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="货权转移日" name="dateTrans"> <a-form-item label="货权转移日" name="dateTrans">
<a-date-picker v-model:value="formState.dateTrans" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateTrans" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -212,22 +212,22 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="NOR日" name="dateNor"> <a-form-item label="NOR日" name="dateNor">
<a-date-picker v-model:value="formState.dateNor" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateNor" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="最迟交货日" name="dateEnd"> <a-form-item label="最迟交货日" name="dateEnd">
<a-date-picker v-model:value="formState.dateEnd" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEnd" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="发出付款通知日" name="datePayNtc"> <a-form-item label="发出付款通知日" name="datePayNtc">
<a-date-picker v-model:value="formState.datePayNtc" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.datePayNtc" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="付款日" name="dateRp"> <a-form-item label="付款日" name="dateRp">
<a-date-picker v-model:value="formState.dateRp" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateRp" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
@ -246,22 +246,22 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="卸港ETA" name="dateEta"> <a-form-item label="卸港ETA" name="dateEta">
<a-date-picker v-model:value="formState.dateEta" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEta" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="卸港ETB" name="dateEtb"> <a-form-item label="卸港ETB" name="dateEtb">
<a-date-picker v-model:value="formState.dateEtb" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEtb" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="卸港ETC" name="dateEtc"> <a-form-item label="卸港ETC" name="dateEtc">
<a-date-picker v-model:value="formState.dateEtc" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEtc" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="卸港ETD" name="dateEtd"> <a-form-item label="卸港ETD" name="dateEtd">
<a-date-picker v-model:value="formState.dateEtd" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEtd" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
@ -271,7 +271,7 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="卸载日期" name="dateIn"> <a-form-item label="卸载日期" name="dateIn">
<a-date-picker v-model:value="formState.dateIn" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateIn" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
@ -285,7 +285,7 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="提单日" name="dateBl"> <a-form-item label="提单日" name="dateBl">
<a-date-picker v-model:value="formState.dateBl" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateBl" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -300,7 +300,7 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="邮寄报关资料日" name="datePost"> <a-form-item label="邮寄报关资料日" name="datePost">
<a-date-picker v-model:value="formState.datePost" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.datePost" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -315,7 +315,7 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="办理许可证日" name="dateLic"> <a-form-item label="办理许可证日" name="dateLic">
<a-date-picker v-model:value="formState.dateLic" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateLic" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>

12
src/views/ship/ShipSchedule/components/createForm.vue
View File

@ -116,32 +116,32 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="NOR" name="dateNor"> <a-form-item label="NOR" name="dateNor">
<a-date-picker v-model:value="formState.dateNor" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateNor" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="最迟交货日" name="dateEnd"> <a-form-item label="最迟交货日" name="dateEnd">
<a-date-picker v-model:value="formState.dateEnd" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEnd" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="卸港ETA" name="dateEta"> <a-form-item label="卸港ETA" name="dateEta">
<a-date-picker v-model:value="formState.dateEta" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEta" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="卸港ETB" name="dateEtb"> <a-form-item label="卸港ETB" name="dateEtb">
<a-date-picker v-model:value="formState.dateEtb" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEtb" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="卸港ETC" name="dateEtc"> <a-form-item label="卸港ETC" name="dateEtc">
<a-date-picker v-model:value="formState.dateEtc" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEtc" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="卸港ETD" name="dateEtd"> <a-form-item label="卸港ETD" name="dateEtd">
<a-date-picker v-model:value="formState.dateEtd" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEtd" style="width: 100%" :disabled="isDisable" placeholder="请选择日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">

2
src/views/supplier/ScoreSupplier/components/createForm.vue
View File

@ -25,7 +25,7 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="评价日期" name="dateGrade"> <a-form-item label="评价日期" name="dateGrade">
<a-date-picker v-model:value="formState.dateGrade" disabled style="width: 100%" placeholder="请选择评价日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateGrade" disabled style="width: 100%" placeholder="请选择评价日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">

4
src/views/supplier/Supplier/components/createForm.vue
View File

@ -88,12 +88,12 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="成立日期" name="dateEstab"> <a-form-item label="成立日期" name="dateEstab">
<a-date-picker v-model:value="formState.dateEstab" :disabled="isDisable" style="width: 100%" placeholder="请选择成立日期" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEstab" :disabled="isDisable" style="width: 100%" placeholder="请选择成立日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="准入时间" name="dateEntry"> <a-form-item label="准入时间" name="dateEntry">
<a-date-picker v-model:value="formState.dateEntry" :disabled="isDisable" style="width: 100%" placeholder="请选择准入时间" /> <a-date-picker :inputReadOnly="true" v-model:value="formState.dateEntry" :disabled="isDisable" style="width: 100%" placeholder="请选择准入时间" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">