编辑页面数据提交验证调整

vue/src/views/baseSettings/institution/edit.vue

@@ -10,23 +10,23 @@
     cancel-text="取消"
     :keyboard="false"
     :mask-closable="false"  >
-    <a-form  autocomplete="off" >
+    <a-form :model="dataModel" autocomplete="off">
       <a-divider orientation="left">基础信息管理</a-divider>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="企业名称" name="CompanyName" :label-col="{span:7}" :rules="[{ required: true, message: '请输入企业名称!' }]">
-            <label v-if="opCategory==3">{{dataModel.companyName}}</label>
+          <a-form-item label="企业名称"  name="companyName" :label-col="{span:7}"  :rules="[{ required: true, message: '请输入企业名称!' }]">
+            <label v-if="opCategory==3">{{dataModel.companyName }}</label>
             <a-input v-model:value="dataModel.companyName" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="7">
-          <a-form-item label="企业地址" name="CompanyAddress" :label-col="{span:7}" :rules="[{ required: true, message: '请输入企业地址!' }]">
+          <a-form-item label="企业地址" name="companyAddress" :label-col="{span:7}" :rules="[{ required: true, message: '请输入企业地址!' }]">
             <label v-if="opCategory==3">{{dataModel.companyAddress }}</label>
             <a-input v-model:value="dataModel.companyAddress" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="10">
-          <a-form-item label="负责人姓名" name="DutyUserName" :label-col="{span:10}" :rules="[{ required: true, message: '请输入负责人姓名!' }]">
+          <a-form-item label="负责人姓名" name="fzrName" :label-col="{span:10}" :rules="[{ required: true, message: '请输入负责人姓名!' }]">
             <label v-if="opCategory==3">{{dataModel.fzrName}}</label>
             <a-input v-model:value="dataModel.fzrName" placeholder=""/>
             <!--<a-date-picker name="feedbackDate2" v-model:value="dataModel.feedbackDate"
@@ -39,19 +39,19 @@
       </a-row>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="负责人电话"  name="DutyUserMobile" :label-col="{span:7}" :rules="[{ required: true, message: '请输入负责人电话!' }]">
+          <a-form-item label="负责人电话"  name="fzrMobile" :label-col="{span:7}" :rules="[{ required: true, message: '请输入负责人电话!' }]">
             <label v-if="opCategory==3">{{dataModel.fzrMobile }}</label>
             <a-input v-model:value="dataModel.fzrMobile" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="7">
-          <a-form-item label="法人姓名"  name="LegalerName" :label-col="{span:7}" :rules="[{ required: true, message: '请输入法人姓名!' }]">
+          <a-form-item label="法人姓名"  name="frName" :label-col="{span:7}" :rules="[{ required: true, message: '请输入法人姓名!' }]">
             <label v-if="opCategory==3">{{dataModel.frName }}</label>
             <a-input v-model:value="dataModel.frName" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="10">
-          <a-form-item label="法人电话"  name="LegalerMobile" :label-col="{span:10}" :rules="[{ required: true, message: '请输入法人电话!' }]">
+          <a-form-item label="法人电话"  name="frMobile" :label-col="{span:10}" :rules="[{ required: true, message: '请输入法人电话!' }]">
             <label v-if="opCategory==3">{{dataModel.frMobile }}</label>
             <a-input v-model:value="dataModel.frMobile" placeholder=""/>
           </a-form-item>
@@ -59,7 +59,7 @@
       </a-row>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="企业机构代码"  name="CompanyCode" :label-col="{span:7}" :rules="[{ required: true, message: '请输入企业机构代码!' }]">
+          <a-form-item label="企业机构代码"  name="companyCode" :label-col="{span:7}" :rules="[{ required: true, message: '请输入企业机构代码!' }]">
             <label v-if="opCategory==3">{{dataModel.companyCode }}</label>
             <a-input v-model:value="dataModel.companyCode" placeholder=""/>
           </a-form-item>
@@ -260,6 +260,7 @@ export default defineComponent({
 
     const handleOk = () => {
       validateSameSite();
+      if (formData.dataModel.name == "")isAllowCommit.value=false;
       if (isAllowCommit.value){
         formData.dataModel.manageSites = manageSites.value;
         saveInstitution(formData.dataModel).then(result => {

vue/src/views/baseSettings/site/edit.vue

@@ -10,23 +10,23 @@
     cancel-text="取消"
     :keyboard="false"
     :mask-closable="false"  >
-    <a-form  autocomplete="off" >
+    <a-form :model="dataModel" autocomplete="off" >
       <a-divider orientation="left">基础信息管理</a-divider>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="驿站编号" name="SiteCode" :label-col="{span:7}" :rules="[{ required: true, message: '请输入驿站编号!' }]">
+          <a-form-item label="驿站编号" name="siteCode" :label-col="{span:7}" :rules="[{ required: true, message: '请输入驿站编号!' }]">
             <label v-if="opCategory==3">{{dataModel.siteCode}}</label>
             <a-input v-model:value="dataModel.siteCode" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="8">
-          <a-form-item label="站点名称" name="SiteName" :label-col="{span:6}" :rules="[{ required: true, message: '请输入站点名称!' }]">
+          <a-form-item label="站点名称" name="siteName" :label-col="{span:6}" :rules="[{ required: true, message: '请输入站点名称!' }]">
             <label v-if="opCategory==3">{{dataModel.siteName }}</label>
             <a-input v-model:value="dataModel.siteName" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="8">
-          <a-form-item label="所属机构" name="InstitutionName" :label-col="{span:6}" :rules="[{ required: true, message: '请选择所属机构!' }]">
+          <a-form-item label="所属机构" name="institutionName" :label-col="{span:6}" :rules="[{ required: true, message: '请选择所属机构!' }]">
             <label v-if="opCategory==3">{{dataModel.institutionName}}</label>
             <a-select  ref="select" v-model:value="dataModel.institutionID" :options="institutionList"
                       :field-names="{ label: 'text', value: 'value' }" :allow-clear="true" > </a-select>
@@ -35,21 +35,21 @@
       </a-row>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="所属县区"  name="RegionCode" :label-col="{span:7}" :rules="[{ required: true, message: '请选择所属县区!' }]">
+          <a-form-item label="所属县区"  name="regionCode" :label-col="{span:7}" :rules="[{ required: true, message: '请选择所属县区!' }]">
             <label v-if="opCategory==3">{{dataModel.regionCode}}</label>
             <a-select ref="select" v-model:value="dataModel.regionCode" :options="regionList"
               :field-names="{ label: 'name', value: 'code' }" :allow-clear="true" @change="getStreetList()" > </a-select>
           </a-form-item>
         </a-col>
         <a-col :span="8">
-          <a-form-item label="所属街道"  name="StreetCode" :label-col="{span:6}" :rules="[{ required: true, message: '请选择所属街道!' }]">
+          <a-form-item label="所属街道"  name="streetCode" :label-col="{span:6}" :rules="[{ required: true, message: '请选择所属街道!' }]">
             <label v-if="opCategory==3">{{dataModel.streetCode }}</label>
             <a-select ref="select" v-model:value="dataModel.streetCode" :options="streetList"
               :field-names="{ label: 'name', value: 'code' }" :allow-clear="true" > </a-select>
           </a-form-item>
         </a-col>
         <a-col :span="8">
-          <a-form-item label="详细地址"  name="DetailAddress" :label-col="{span:6}" :rules="[{ required: true, message: '请输入详细地址!' }]">
+          <a-form-item label="详细地址"  name="detailAddress" :label-col="{span:6}" :rules="[{ required: true, message: '请输入详细地址!' }]">
             <label v-if="opCategory==3">{{dataModel.detailAddress }}</label>
             <a-input v-model:value="dataModel.detailAddress" placeholder=""/>
           </a-form-item>
@@ -57,19 +57,19 @@
       </a-row>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="站点负责人"  name="FzrName" :label-col="{span:7}" :rules="[{ required: true, message: '请输入站点负责人!' }]">
+          <a-form-item label="站点负责人"  name="fzrName" :label-col="{span:7}" :rules="[{ required: true, message: '请输入站点负责人!' }]">
             <label v-if="opCategory==3">{{dataModel.fzrName }}</label>
             <a-input v-model:value="dataModel.fzrName" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="8">
-          <a-form-item label="联系电话"  name="FzrMobile" :label-col="{span:6}" :rules="[{ required: true, message: '请输入联系电话!' }]">
+          <a-form-item label="联系电话"  name="fzrMobile" :label-col="{span:6}" :rules="[{ required: true, message: '请输入联系电话!' }]">
             <label v-if="opCategory==3">{{dataModel.fzrMobile }}</label>
             <a-input v-model:value="dataModel.fzrMobile" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="7">
-          <a-form-item label="驿站坐标"  name="SitePosition" :label-col="{span:7}" :rules="[{ required: true, message: '请选择驿站坐标!' }]">
+          <a-form-item label="驿站坐标"  name="sitePosition" :label-col="{span:7}" :rules="[{ required: true, message: '请选择驿站坐标!' }]">
             <label v-if="opCategory==3">{{dataModel.sitePosition}}</label>
             <a-input v-model:value="dataModel.sitePosition" placeholder=""/>
           </a-form-item>

vue/src/views/baseSettings/user/edit.vue

@@ -4,30 +4,29 @@
     v-model:visible="visible"
     :title="title"
     :confirm-loading="confirmLoading"
-    @ok="handleOk"
     ok-text="提交"
     @cancel="handleCancel"
     cancel-text="取消"
     :keyboard="false"
     :mask-closable="false"  >
-    <a-form  autocomplete="off" >
+    <a-form :model="dataModel" autocomplete="off" @finish="handleOk">
       <a-divider orientation="left">基础信息</a-divider>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="姓名" name="Name" :label-col="{span:7}" :rules="[{ required: true, message: '请输入人员姓名!' }]">
+          <a-form-item label="姓名" name="name" :label-col="{span:7}" :rules="[{ required: true, message: '请输入人员姓名!' }]">
             <label v-if="opCategory==3">{{dataModel.name}}</label>
             <a-input v-model:value="dataModel.name" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="7">
-          <a-form-item label="性别" name="Gender" :label-col="{span:7}" :rules="[{required: true, message: '请选择人员性别!' }]">
-            <label v-if="opCategory==3">{{dataModel.gender }}</label>
+          <a-form-item label="性别" name="gender" :label-col="{span:7}" :rules="[{required: true, message: '请选择人员性别!' }]">
+            <label v-if="opCategory==3">{{dataModel.gender}}</label>
             <a-select ref="select" v-model:value="dataModel.gender" :options="genderList"
                       :field-names="{ label: 'name', value: 'value' }" :allow-clear="false" > </a-select>
           </a-form-item>
         </a-col>
         <a-col :span="10">
-          <a-form-item label="联系电话" name="Mobile" :label-col="{span:10}" :rules="[{ required: true, message: '请输入联系电话!' }]" >
+          <a-form-item label="联系电话" name="mobile" :label-col="{span:10}" :rules="[{ required: true, message: '请输入联系电话!' }]" >
             <label v-if="opCategory==3">{{dataModel.mobile}}</label>
             <a-input v-model:value="dataModel.mobile" placeholder=""/>
           </a-form-item>
@@ -35,7 +34,7 @@
       </a-row>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="角色"  name="RoleID" :label-col="{span:7}" :rules="[{ required: true, message: '请选择人员角色!' }]">
+          <a-form-item label="角色"  name="roleID" :label-col="{span:7}" :rules="[{ required: true, message: '请选择人员角色!' }]">
             <label v-if="opCategory==3">{{dataModel.roleID }}</label>
             <a-select ref="select" v-model:value="dataModel.roleID" :options="roleList"
                       :field-names="{ label: 'name', value: 'value' }" :allow-clear="false" > </a-select>

vue/src/views/taskAndLog/dowork/edit.vue

@@ -10,11 +10,11 @@
     cancel-text="取消"
     :keyboard="false"
     :mask-closable="false"  >
-    <a-form  autocomplete="off" >
+    <a-form :model="dataModel" autocomplete="off" >
       <a-divider orientation="left">基础信息管理</a-divider>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="姓名" name="UserName" :label-col="{span:7}" :rules="[{ required: true, message: '请选择站点人员!' }]">
+          <a-form-item label="姓名" name="userName" :label-col="{span:7}" :rules="[{ required: true, message: '请选择站点人员!' }]">
             <label v-if="opCategory==3">{{dataModel.userName}}</label>
             <a-select ref="select" v-model:value="dataModel.siteUserID" :options="siteUserList"
                       :field-names="{ label: 'text', value: 'value' }" :allow-clear="true" > </a-select>
@@ -22,7 +22,7 @@
           </a-form-item>
         </a-col>
         <a-col :span="7">
-            <a-form-item label="日志类型" name="LogTypeName" :label-col="{span:7}" :rules="[{ required: true, message: '请选择日志类型!' }]">
+            <a-form-item label="日志类型" name="logTypeName" :label-col="{span:7}" :rules="[{ required: true, message: '请选择日志类型!' }]">
             <label v-if="opCategory==3">{{dataModel.logTypeName }}</label>
               <a-select ref="select" v-model:value="dataModel.doTypeID" :options="logTypeList"
                         :field-names="{ label: 'name', value: 'value' }" :allow-clear="false" > </a-select>
@@ -30,7 +30,7 @@
           </a-form-item>
         </a-col>
         <a-col :span="10">
-          <a-form-item label="完成时间" name="WorkTime" :label-col="{span:10}" :rules="[{ required: true, message: '请选择完成时间!' }]">
+          <a-form-item label="完成时间" name="workTime" :label-col="{span:10}" :rules="[{ required: true, message: '请选择完成时间!' }]">
             <label v-if="opCategory==3">{{dataModel.workTime}}</label>
             <a-date-picker  v-model:value="dataModel.workTime" picker="date" value-format="YYYY-MM-DD" />
           </a-form-item>
@@ -38,14 +38,14 @@
       </a-row>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="所属县区"  name="RegionCode" :label-col="{span:7}" :rules="[{ required: true, message: '请选择所属县区!' }]">
+          <a-form-item label="所属县区"  name="regionCode" :label-col="{span:7}" :rules="[{ required: true, message: '请选择所属县区!' }]">
             <label v-if="opCategory==3">{{dataModel.regionCode}}</label>
             <a-select ref="select" v-model:value="dataModel.regionCode" :options="regionList"
                       :field-names="{ label: 'name', value: 'code' }" :allow-clear="true" @change="getStreetList()" ></a-select>
           </a-form-item>
         </a-col>
         <a-col :span="7">
-          <a-form-item label="所属街道"  name="StreetCode" :label-col="{span:7}" :rules="[{ required: true, message: '请选择所属街道!' }]">
+          <a-form-item label="所属街道"  name="streetCode" :label-col="{span:7}" :rules="[{ required: true, message: '请选择所属街道!' }]">
             <label v-if="opCategory==3">{{dataModel.streetCode }}</label>
             <a-select  ref="select" v-model:value="dataModel.streetCode" :options="streetList"
                        :field-names="{ label: 'name', value: 'code' }" :allow-clear="true" > </a-select>