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

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

@@ -14,45 +14,44 @@
       <a-divider orientation="left">基础信息管理</a-divider>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="企业名称" name="CompanyName" :label-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-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}">
+          <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}" >
+          <a-form-item label="负责人姓名" name="DutyUserName" :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"   value-format="YYYY-MM-DD" picker="date"
-                            placeholder="请选择问题反馈日期"  v-if="!isDetail"  />
-                <a-select  ref="select" v-model:value="dataModel.problemCharacteristics"
-                                   :options="problemAttrList"  :field-names="{label:'name',value:'value'}"
-                                   @change="loadData"  :allow-clear="true"  v-if="!isDetail">
-                        </a-select>-->
+            <!--<a-date-picker name="feedbackDate2" v-model:value="dataModel.feedbackDate"
+                               value-format="YYYY-MM-DD" picker="date" placeholder="请选择问题反馈日期"  />-->
+            <!--<a-select ref="select" v-model:value="dataModel.problemCharacteristics"
+                          :options="problemAttrList" :field-names="{label:'name',value:'value'}"
+                          @change="loadData"  :allow-clear="true"></a-select>-->
           </a-form-item>
         </a-col>
       </a-row>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="负责人电话"  name="DutyUserMobile" :label-col="{span:7}">
+          <a-form-item label="负责人电话"  name="DutyUserMobile" :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}">
+          <a-form-item label="法人姓名"  name="LegalerName" :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}">
+          <a-form-item label="法人电话"  name="LegalerMobile" :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>
@@ -60,7 +59,7 @@
       </a-row>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="企业机构代码"  name="CompanyCode" :label-col="{span:7}">
+          <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>
@@ -151,7 +150,6 @@ export default defineComponent({
     const title = ref();
     const opCategory = ref<any>();
     const visible = ref<boolean>(false);
-    const isAllowAdd = ref<boolean>(true);
     const isAllowCommit = ref<boolean>(false);
     const confirmLoading = ref<boolean>(false);
     const formData = reactive<InstitutionModel>({ dataModel:{}});
@@ -245,51 +243,23 @@ export default defineComponent({
     }
 
     const validateSameSite = ()=>{
-      isAllowCommit.value = false;
-      isAllowAdd.value = true;
+      isAllowCommit.value = true;
       if(manageSites.value.length>1){
         manageSites.value.forEach(item=>{
           const sameData = manageSites.value.filter(x => x.siteID == item.siteID);
           console.log("sameData",sameData);
           if (sameData.length >1){
-            isAllowAdd.value = false;
+            isAllowCommit.value = false;
           }
         });
       }
+      if (!isAllowCommit.value){
+        message.error("不允许添加相同的站点!");
+      }
     }
 
-    const validateCommit = ()  =>{
-        validateSameSite();
-        if (!isAllowAdd.value){
-          message.error("不允许添加相同的站点!");
-          return;
-        }else if (formData.dataModel.companyName==null) {
-          message.error("请输入企业名称!");
-          return;
-        }else if (formData.dataModel.companyAddress==null) {
-          message.error("请输入企业地址!");
-          return;
-        }else if (formData.dataModel.fzrName==null) {
-          message.error("请输入负责人名称!");
-          return;
-        }else if (formData.dataModel.fzrMobile==null) {
-          message.error("请填写负责人电话!");
-          return;
-        }else if (formData.dataModel.frName==null) {
-          message.error("请填写法人姓名!");
-          return;
-        }else if (formData.dataModel.frMobile==null) {
-          message.error("请填写法人电话!");
-          return;
-        }else if (formData.dataModel.companyCode==null) {
-          message.error("请填写企业机构代码!");
-          return;
-        }
-        isAllowCommit.value = true;
-    };
-
     const handleOk = () => {
-      validateCommit();
+      validateSameSite();
       if (isAllowCommit.value){
         formData.dataModel.manageSites = manageSites.value;
         saveInstitution(formData.dataModel).then(result => {
@@ -317,10 +287,9 @@ export default defineComponent({
       formState,
       allSites,
       manageSites,
+      isAllowCommit,
       /*feedbackDateDetail,
       resolveDateDetail,*/
-      isAllowCommit,
-      isAllowAdd,
       show,
       getAllSites,
       GetManageSites,
@@ -330,8 +299,7 @@ export default defineComponent({
       onSelectChange,
       manageSitesChange,
       handleOk,
-      handleCancel,
-      validateCommit
+      handleCancel
     };
   },
   created() {

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

@@ -14,43 +14,42 @@
       <a-divider orientation="left">基础信息管理</a-divider>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="驿站编号" name="SiteCode" :label-col="{span:7}">
+          <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="7">
-          <a-form-item label="站点名称" name="SiteName" :label-col="{span:7}">
+        <a-col :span="8">
+          <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="10">
-          <a-form-item label="所属机构" name="InstitutionName" :label-col="{span:10}" >
+        <a-col :span="8">
+          <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>
-<!--            <a-input v-model:value="dataModel.institutionName" placeholder=""/>-->
           </a-form-item>
         </a-col>
       </a-row>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="所属县区"  name="RegionCode" :label-col="{span:7}">
+          <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}">
+        <a-col :span="8">
+          <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="10">
-          <a-form-item label="详细地址"  name="DetailAddress" :label-col="{span:10}">
+        <a-col :span="8">
+          <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>
@@ -58,23 +57,26 @@
       </a-row>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="站点负责人"  name="FzrName" :label-col="{span:7}">
+          <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="7">
-          <a-form-item label="联系电话"  name="FzrMobile" :label-col="{span:7}">
+        <a-col :span="8">
+          <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="10">
-          <a-form-item label="驿站坐标"  name="SiteXY" :label-col="{span:10}">
+        <a-col :span="7">
+          <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>
         </a-col>
+        <a-col :span="1">
+            <a-button type="primary"  @click='' >选择</a-button>
+        </a-col>
       </a-row>
       <a-divider orientation="left">管理人员 共计：{{manageUsers.length}}</a-divider>
       <a-row>
@@ -154,7 +156,6 @@ export default defineComponent({
   },
   setup(props) {
     const visible = ref<boolean>(false);
-    const isAllowAdd = ref<boolean>(false);
     const isAllowCommit = ref<boolean>(false);
     const confirmLoading = ref<boolean>(false);
     const title = ref();
@@ -281,37 +282,23 @@ export default defineComponent({
     }
 
     const validateSameUser = ()=>{
-      isAllowCommit.value = false;
-      isAllowAdd.value = true;
+      isAllowCommit.value = true;
       if (manageUsers.value.length>1){
         manageUsers.value.forEach(item=>{
           const sameData = manageUsers.value.filter(x => x.siteUserID == item.siteUserID);
           console.log("sameData",sameData);
           if (sameData.length >1){
-            isAllowAdd.value = false;
+            isAllowCommit.value = false;
           }
         });
       }
-    }
-
-    const validateCommit = () => {
-      validateSameUser();
-      console.log(formData.dataModel);
-      if (!isAllowAdd.value){
+      if (!isAllowCommit.value){
         message.error("不允许添加相同的人员!");
-        return;
-      }else if (formData.dataModel.siteCode==null) {
-        message.error("请输入驿站编号!");
-        return;
-      }else if (formData.dataModel.detailAddress==null) {
-        message.error("请填写详细地址!");
-        return;
       }
-      isAllowCommit.value = true;
-    };
+    }
 
     const handleOk = () => {
-      validateCommit();
+      validateSameUser();
       if (isAllowCommit.value){
         formData.dataModel.manageUsers = manageUsers.value;
         saveSite(formData.dataModel).then(result => {
@@ -333,7 +320,6 @@ export default defineComponent({
       opCategory,
       visible,
       formState,
-      isAllowAdd,
       isAllowCommit,
       confirmLoading,
       columns,
@@ -357,8 +343,7 @@ export default defineComponent({
       delSiteUser,
       manageUsersChange,
       handleOk,
-      handleCancel,
-      validateCommit
+      handleCancel
     };
   },
   created() {

vue/src/views/baseSettings/site/index.vue

@@ -56,7 +56,6 @@
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
           <a-button type="primary" html-type="submit" @click='onOperates(null,"新增",1)' >新增</a-button>
-          <a-button type="primary" >驿站地图</a-button>
           <BExportExcel :title="'导出'" :filename="'驿站站点信息'" :url="'/siteInfo/export'" :params="{...searchParams, rows:100000}"></BExportExcel>
         </a-col>
       </a-row>

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

@@ -14,20 +14,20 @@
       <a-divider orientation="left">基础信息</a-divider>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="姓名" name="Name" :label-col="{span:7}">
+          <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}">
+          <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}" >
+          <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 +35,7 @@
       </a-row>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="角色"  name="RoleID" :label-col="{span:7}">
+          <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>
@@ -75,7 +75,6 @@ export default defineComponent({
     const visible = ref<boolean>(false);
     const confirmLoading = ref<boolean>(false);
     const title = ref();
-    const isAllowCommit = ref<boolean>(false);
     const opCategory = ref<any>();
     const formState = reactive({
       total: 0,
@@ -84,6 +83,14 @@ export default defineComponent({
     });
     const genderList =  ref<SelectProps["options"]>();
     const roleList =  ref<SelectProps["options"]>();
+    const getGenderList = async function(){
+      const genderResult :any = await getSysDictionaryList("Gender");
+      genderList.value = genderResult;
+    }
+    const getRoleList = async function(){
+      const roleResult :any = await getSysDictionaryList("SiteUserRole");
+      roleList.value = roleResult;
+    }
 
     const loadData = (siteUserID: string) => {
       getSiteUserByID(siteUserID).then((result: any) => {
@@ -91,7 +98,6 @@ export default defineComponent({
         console.log(formData.dataModel);
       });
     }
-
     const show = (id: any,method:string,category:any) => {
       title.value ="人员管理-"+method;
       opCategory.value = category;
@@ -101,43 +107,17 @@ export default defineComponent({
       visible.value = true;
     };
 
-
-    const getGenderList = async function(){
-      const genderResult :any = await getSysDictionaryList("Gender");
-      genderList.value = genderResult;
-    }
-
-    const getRoleList = async function(){
-      const roleResult :any = await getSysDictionaryList("SiteUserRole");
-      roleList.value = roleResult;
-    }
-
     const onSelectChange = (selectedRowKeys: any) => {
       formState.selectedRowKeys = selectedRowKeys;
     };
 
-    const validate = ()  =>{
-      console.log(formData.dataModel);
-      if (formData.dataModel.name==null) {
-        message.error("请输入姓名!");
-        return;
-      }else if (formData.dataModel.mobile==null) {
-        message.error("请填写联系电话!");
-        return;
-      }
-      isAllowCommit.value = true;
-    };
-
     const handleOk = () => {
-      validate();
-      if (isAllowCommit.value){
-        saveSiteUser(formData.dataModel).then(result => {
-          if (result) {
-            visible.value = false;
-            props.loadData();
-          }
-        });
-      }
+      saveSiteUser(formData.dataModel).then(result => {
+        if (result) {
+          visible.value = false;
+          props.loadData();
+        }
+      });
     };
 
     const handleCancel = () => {
@@ -159,8 +139,7 @@ export default defineComponent({
       show,
       onSelectChange,
       handleOk,
-      handleCancel,
-      validate
+      handleCancel
     };
   },
   created() {

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

@@ -14,7 +14,7 @@
       <a-divider orientation="left">基础信息管理</a-divider>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="姓名" name="UserName" :label-col="{span:7}">
+          <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}">
+            <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}" >
+          <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}">
+          <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}">
+          <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>
@@ -91,7 +91,6 @@ export default defineComponent({
     const visible = ref<boolean>(false);
     const confirmLoading = ref<boolean>(false);
     const title = ref();
-    const isAllowCommit = ref<boolean>(false);
     const opCategory = ref<any>();
     const formState = reactive({
       total: 0,
@@ -149,25 +148,15 @@ export default defineComponent({
       formState.selectedRowKeys = selectedRowKeys;
     };
 
-    const validate = ()  =>{
-      console.log(formData.dataModel);
-      if (formData.dataModel.siteUserID==null) {
-        message.error("请输入姓名!");
-        return;
-      }
-      isAllowCommit.value = true;
-    };
+
 
     const handleOk = () => {
-      validate();
-      if (isAllowCommit.value){
-        save(formData.dataModel).then(result => {
-          if (result) {
-            visible.value = false;
-            props.loadData();
-          }
-        });
-      }
+      save(formData.dataModel).then(result => {
+        if (result) {
+          visible.value = false;
+          props.loadData();
+        }
+      });
     };
 
     const handleCancel = () => {
@@ -192,8 +181,7 @@ export default defineComponent({
       setFileList,
       onSelectChange,
       handleOk,
-      handleCancel,
-      validate
+      handleCancel
     };
   },
   created() {