Skip to content

广
广东建设用地-前端
提交 34fe6aa2 authored 作者: wqq's avatar wqq
浏览文件
操作

弹框字体颜色以及填报问题

上级 c48b07cc
隐藏空白字符变更
内嵌 并排
正在显示 包含 383 行增加 和 41 行删除
src/components/customComponent/dkForm.vue
浏览文件 @ 34fe6aa2
......@@ -176,7 +176,7 @@
return values.tdsyqrlx == '4' ? false : true;
},
dynamicRules: () => {
return [{ pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/, message: '工商营业执照号格式有误', required: true }];
return [{ pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/, message: '统一社会信用代码', required: true }];
},
},
{
......@@ -258,7 +258,7 @@
return [
{
pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/,
message: '工商营业执照号格式有误',
message: '统一社会信用代码误',
required: true,
},
];
......@@ -292,7 +292,7 @@
return [
{
pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/,
message: '工商营业执照号格式有误',
message: '统一社会信用代码',
required: true,
},
];
......@@ -328,7 +328,7 @@
return values.qrTdsyqrlx == '4' ? false : true;
},
dynamicRules: () => {
return [{ pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/, message: '工商营业执照号格式有误', required: true }];
return [{ pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/, message: '统一社会信用代码', required: true }];
},
},
{
......@@ -680,9 +680,7 @@
field: 'gsyyzzh',
show: true,
dynamicRules: () => {
return [
{ pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/, message: '工商营业执照号格式有误', required: true },
];
return [{ pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/, message: '统一社会信用代码', required: true }];
},
});
updateSchema({
......@@ -722,9 +720,7 @@
field: 'gsyyzzh',
show: true,
dynamicRules: () => {
return [
{ pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/, message: '工商营业执照号格式有误', required: true },
];
return [{ pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/, message: '统一社会信用代码', required: true }];
},
});
updateSchema({
......
src/components/customComponent/unitMessageForm.vue
浏览文件 @ 34fe6aa2
......@@ -62,7 +62,7 @@
required: true,
component: 'Input',
dynamicRules: () => {
return [{ pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/, message: '工商营业执照号格式有误', required: true }];
return [{ pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/, message: '统一社会信用代码', required: true }];
},
componentProps: {
disabled: props.isRead,
......@@ -199,7 +199,7 @@
await nextTick();
await resetFields();
}
console.log(props.upload, 'upload');
console.log(props.upload, 'upload编制单位');
},
{ deep: true, immediate: true }
);
......
src/components/customComponent/unitMessageJcForm.vue 0 → 100644
浏览文件 @ 34fe6aa2
<!-- 表单布局 -->
<template>
<!-- 自定义表单 -->
<BasicForm @register="registerForm" />
</template>
<script lang="ts" setup>
//引入依赖
import { useForm, BasicForm, FormSchema } from '/@/components/Form';
import { ref, watch, nextTick } from 'vue';
import { useMessage } from '/@/hooks/web/useMessage';
const { createMessage } = useMessage();
const props = defineProps({
data: {
type: Object,
},
title: {
type: String,
default: '检测',
},
isRead: {
type: Boolean,
default: false,
},
upload: {
type: String,
default: '',
},
dkxx: {
type: Object,
},
});
//自定义表单字段
const formSchemas: FormSchema[] = [
{
label: '污染地块Id',
field: 'wrdkid',
component: 'Input',
show: false,
},
{
label: 'id',
field: 'id',
component: 'Input',
show: false,
},
{
label: '单位名称',
field: 'syqdwmc',
component: 'Input',
required: true,
componentProps: {
disabled: props.isRead,
},
},
{
label: '统一社会信用代码',
field: 'gsyyzzh',
required: true,
component: 'Input',
dynamicRules: () => {
return [{ pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/, message: '统一社会信用代码', required: true }];
},
componentProps: {
disabled: props.isRead,
},
},
{
label: '法定代表人/负责人姓名',
field: 'frdb',
component: 'Input',
required: true,
componentProps: {
disabled: props.isRead,
},
},
{
label: '住所',
field: 'wrdkdz',
component: 'Input',
required: true,
componentProps: {
disabled: props.isRead,
},
},
{
label: '联系人',
field: 'lxr',
component: 'Input',
required: true,
componentProps: {
disabled: props.isRead,
},
},
{
label: '联系电话',
field: 'lxdh',
component: 'Input',
required: true,
dynamicRules: () => {
return [{ pattern: /^(\d{3}-\d{8}|\d{4}-\d{7}|\d{11})$/, message: '电话格式有误', required: true }];
},
componentProps: {
disabled: props.isRead,
},
},
{
label: '直接负责的主管人员',
field: 'zjzgfzry',
component: 'Input',
required: true,
componentProps: {
disabled: props.isRead,
},
},
{
label: '其他直接责任人员',
field: 'qtzgfzry',
component: 'Input',
required: true,
componentProps: {
disabled: props.isRead,
},
},
{
label: '委托调查合同金额',
field: 'wthtje',
component: 'InputNumber',
required: true,
suffix: '万元',
componentProps: {
disabled: props.isRead,
},
},
{
label: `${props.title}单位报告`,
field: 'bglj',
required: true,
ifShow: () => {
return props.upload == '检测单位' ? true : false;
},
component: 'JUpload',
componentProps: () => {
return {
showUploadList: false,
returnUrl: true,
fileName: `${props.title}单位报告`,
disabled: props.isRead,
accept: '.pdf,.zip',
beforeUpload: (file) => {
let isshow = false;
const isFile = file.name.split('.')[file.name.split('.').length - 1];
if (isFile == 'pdf' || isFile == 'zip' || isFile == 'PDF') {
isshow = true;
} else {
createMessage.error('只能上传.pdf/.zip格式的文件');
isshow = false;
}
return isshow;
},
};
},
},
];
/**
* BasicForm绑定注册;
*/
const [registerForm, { getFieldsValue, setFieldsValue, resetFields, updateSchema, validate }] = useForm({
//注册表单列
schemas: formSchemas,
//不显示查询和重置按钮
showActionButtonGroup: false,
//默认row行配置,当 layout 为 horizontal 生效
rowProps: { gutter: 24, justify: 'start', align: 'middle' },
//全局col列占比(每列显示多少位)，和schemas中的colProps属性一致
baseColProps: { span: 12 },
//使用labelCol的样式参数来控制标题宽度
labelCol: { style: { width: '150px' } },
//row行的样式
baseRowStyle: { width: '100%' },
//表单布局属性，支持（vertical,horizontal），默认为horizontal
layout: 'horizontal',
});
watch(
() => props?.data?.id,
async (val: any) => {
if (val) {
await nextTick();
await setFieldsValue({
...props.data,
});
} else {
await nextTick();
await resetFields();
}
console.log(val, 'val');
console.log(props.upload, 'upload');
},
{ deep: true, immediate: true }
);
watch(
() => props?.isRead,
async (val: any) => {
await nextTick();
handleChange(val);
},
{ deep: true, immediate: true }
);
// 根据isRead字段判断是否禁用
function handleChange(val) {
updateSchema({
label: '单位名称',
field: 'syqdwmc',
component: 'Input',
required: true,
componentProps: {
disabled: val,
},
});
updateSchema({
label: '统一社会信用代码',
field: 'gsyyzzh',
required: true,
component: 'Input',
dynamicRules: () => {
return [{ pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/, message: '统一社会信用代码', required: true }];
},
componentProps: {
disabled: val,
},
});
updateSchema({
label: '法定代表人/负责人姓名',
field: 'frdb',
component: 'Input',
required: true,
componentProps: {
disabled: val,
},
});
updateSchema({
label: '住所',
field: 'wrdkdz',
component: 'Input',
required: true,
componentProps: {
disabled: val,
},
});
updateSchema({
label: '联系人',
field: 'lxr',
component: 'Input',
required: true,
componentProps: {
disabled: val,
},
});
updateSchema({
label: '联系电话',
field: 'lxdh',
component: 'Input',
required: true,
dynamicRules: () => {
return [{ pattern: /^(\d{3}-\d{8}|\d{4}-\d{7}|\d{11})$/, message: '电话格式有误', required: true }];
},
componentProps: {
disabled: val,
},
});
updateSchema({
label: '直接负责的主管人员',
field: 'zjzgfzry',
component: 'Input',
required: true,
componentProps: {
disabled: val,
},
});
updateSchema({
label: '其他直接责任人员',
field: 'qtzgfzry',
component: 'Input',
required: true,
componentProps: {
disabled: val,
},
});
updateSchema({
label: '委托调查合同金额',
field: 'wthtje',
component: 'InputNumber',
required: true,
suffix: '万元',
componentProps: {
disabled: val,
},
});
updateSchema({
label: `${props.title}单位报告`,
field: 'bglj',
required: true,
ifShow: () => {
return props.upload == '检测单位' ? true : false;
},
component: 'JUpload',
componentProps: () => {
return {
showUploadList: false,
returnUrl: true,
fileName: `${props.title}单位报告`,
disabled: val,
};
},
});
}
const fieldsValue = ref<any>({});
// 获取子组件 列表
async function getFormValueBz() {
//获取所有值
fieldsValue.value = await getFieldsValue();
fieldsValue.value = await validate();
return fieldsValue.value;
}
// 通过ref必须把在父组件里面的方法导出
defineExpose({
getFormValueBz,
});
</script>
<style scoped>
/** 时间和数字输入框样式 */
:deep(.ant-input-number) {
width: 100%;
}
:deep(.ant-picker) {
width: 100%;
}
/* :deep(.ant-radio-wrapper) {
width: 120px;
text-align: left;
} */
</style>
src/design/index.less
浏览文件 @ 34fe6aa2
......@@ -137,7 +137,7 @@ ul {
}
.jeecg-basic-title,.ant-modal-close{
.jeecg-basic-title,.ant-modal-close,.ant-modal-title{
color: @white!important;
}
.ant-modal-close:hover,.jeecg-basic-modal-close span:nth-child(1):hover,.jeecg-basic-modal-close span:last-child{
......
src/views/dkgl/investigate/modal/DataFilling.vue
浏览文件 @ 34fe6aa2
......@@ -43,7 +43,7 @@
v-for="(item, index) in cbdcBzdw"
:key="index + 5"
>
<unitMessageForm :isRead="!bzdw" :ref="(el) => childRef(el, index)" :data="item" />
<unitMessageForm :isRead="!bzdw" :ref="(el) => childRef(el, index)" upload=" " :data="item" />
<template #extra>
<a-button type="primary" @click.prevent="addUnitMessageFormList($event)" :disabled="!bzdw">添加</a-button>
<a-button type="primary" class="ml-5" v-if="index != 0" @click.prevent="delMessageFormList($event, index)" :disabled="!bzdw">删除</a-button>
......@@ -58,7 +58,7 @@
v-for="(item, index) in cbjcdw"
:key="index + 8"
>
<unitMessageForm
<unitMessageJcForm
:isRead="!jcdw"
upload="检测单位"
:dkxx="{ wrdkid: dsInfor.wrdkjbxxb.wrdkid, scjdbm: 'S1' }"
......@@ -77,7 +77,7 @@
v-if="dsInfor.wrdkjbxxb.dclx == 3 || dsInfor.wrdkjbxxb.dclx == 2"
key="100000"
>
<suBainForm ref="chilrenxxReport" :data="dsInfor.xxdc" :labelFirst="'详细'" />
<suBainForm ref="chilrenxxReport" :data="dsInfor.xxdc" upload=" " :labelFirst="'详细'" />
<template #extra><a-button type="primary" @click.prevent="saveXx($event)">保存</a-button></template>
</a-collapse-panel>
<a-collapse-panel
......@@ -102,7 +102,7 @@
v-for="(item, index) in xxjcdw"
:key="index + 7"
>
<unitMessageForm
<unitMessageJcForm
:ref="(el) => childRefxxjc(el, index)"
upload="检测单位"
:dkxx="{ wrdkid: dsInfor.wrdkjbxxb.wrdkid, scjdbm: 'S2' }"
......@@ -165,6 +165,7 @@
import DkForm from '/@/components/customComponent/dkForm.vue';
import suBainForm from '/@/components/customComponent/suBainForm.vue';
import unitMessageForm from '/@/components/customComponent/unitMessageForm.vue';
import unitMessageJcForm from '@/components/customComponent/unitMessageJcForm.vue';
import EditMgst from '/@/components/customComponent/EditMgst.vue';
import EditTrwr from '/@/components/customComponent/EditTrwr.vue';
import CdUpload from '/@/components/customComponent/CdUpload.vue';
......@@ -194,10 +195,10 @@
let router = useRouter();
const wrdkid = ref(router.currentRoute.value.query.wrdkid);
const saveFlg = ref(true);
let cbdcBzdw = ref([{ id: 'cbbz01' }]);
let xxdcBzdw = ref([{ id: 'xxbz01' }]);
let cbjcdw = ref([{ id: 'cbjs01' }]);
let xxjcdw = ref([{ id: 'xxjs01' }]);
let cbdcBzdw = ref([{ id: null }]);
let xxdcBzdw = ref([{ id: null }]);
let cbjcdw = ref([{ id: null }]);
let xxjcdw = ref([{ id: null }]);
const bzdw = ref(true);
const jcdw = ref(true);
......@@ -248,13 +249,13 @@
});
}
if (cbdcBzdw.value.length == 0) cbdcBzdw.value.push({ id: 'cbbz01' });
if (cbdcBzdw.value.length == 0) cbdcBzdw.value.push({ id: null });
if (xxdcBzdw.value.length == 0) xxdcBzdw.value.push({ id: 'xxbz01' });
if (xxdcBzdw.value.length == 0) xxdcBzdw.value.push({ id: null });
if (cbjcdw.value.length == 0) cbjcdw.value.push({ id: 'cbjc01' });
if (cbjcdw.value.length == 0) cbjcdw.value.push({ id: null });
if (xxjcdw.value.length == 0) xxjcdw.value.push({ id: 'xxjc01' });
if (xxjcdw.value.length == 0) xxjcdw.value.push({ id: null });
// jyCl()
}
getdkInfor();
......@@ -539,7 +540,7 @@
};
function addUnitMessageFormList(event) {
event.stopPropagation();
cbdcBzdw.value.push({ id: 'cbbz' + cbdcBzdw.value.length });
cbdcBzdw.value.push({ id: null });
nextTick(() => {
callChildMethod(cbdcBzdw.value.length - 1);
});
......@@ -562,9 +563,6 @@
// 新增的时候没有这个值
res.jgtype = 'bzdw';
res.wrdkid = wrdkid.value;
if (res.id.includes('cbbz')) {
res.id = null;
}
if (saveFlg.value) {
saveFlg.value = false;
const id = await updateBzdw(res);
......@@ -600,7 +598,7 @@
}
function addXxbzdw(event) {
event.stopPropagation();
xxdcBzdw.value.push({ id: 'xxbz' + xxdcBzdw.value.length });
xxdcBzdw.value.push({ id: null });
nextTick(() => {
callChildxx(xxdcBzdw.value.length - 1);
});
......@@ -613,9 +611,6 @@
// 详细编制传S2初步编制单位S1
res.scjdbm = 'S2';
res.jgtype = 'bzdw';
if (res.id.includes('xxbz')) {
res.id = null;
}
// 新增的时候没有这个值
res.wrdkid = wrdkid.value;
if (saveFlg.value) {
......@@ -644,7 +639,7 @@
// 新增
function addDetectionMessageFormList(event) {
event.stopPropagation();
cbjcdw.value.push({ id: 'cbjc' + cbjcdw.value.length });
cbjcdw.value.push({ id: null });
nextTick(() => {
callChildMethodjc(cbjcdw.value.length - 1);
});
......@@ -664,9 +659,6 @@
res.scjdbm = 'S1';
res.jgtype = 'jcdw';
res.wthtje = String(res.wthtje);
if (res.id.includes('cbjc')) {
res.id = null;
}
// 新增的时候没有这个值
res.wrdkid = wrdkid.value;
if (saveFlg.value) {
......@@ -694,7 +686,7 @@
};
function addxxjcdw(event) {
event.stopPropagation();
xxjcdw.value.push({ id: 'xxjc' + xxjcdw.value.length });
xxjcdw.value.push({ id: null });
nextTick(() => {
callChildMethodxxjc(xxjcdw.value.length - 1);
});
......@@ -714,9 +706,6 @@
res.scjdbm = 'S2';
res.jgtype = 'jcdw';
res.wthtje = String(res.wthtje);
if (res.id.includes('xxjc')) {
res.id = null;
}
// 新增的时候没有这个值
res.wrdkid = wrdkid.value;
if (saveFlg.value) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论