编辑页面验证及显示调整

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

@@ -13,8 +13,8 @@
     <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: '请输入企业名称!' }]">
+        <a-col :span="8">
+          <a-form-item label="企业名称"  name="companyName" :label-col="{span:8}"  :rules="[{ required: true, message: '请输入企业名称!' }]">
             <label v-if="opCategory==3">{{dataModel.companyName }}</label>
             <a-input v-model:value="dataModel.companyName" placeholder=""/>
           </a-form-item>
@@ -25,8 +25,8 @@
             <a-input v-model:value="dataModel.companyAddress" placeholder=""/>
           </a-form-item>
         </a-col>
-        <a-col :span="10">
-          <a-form-item label="负责人姓名" name="fzrName" :label-col="{span:10}" :rules="[{ required: true, message: '请输入负责人姓名!' }]">
+        <a-col :span="8">
+          <a-form-item label="负责人姓名" name="fzrName" :label-col="{span:8}" :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"
@@ -38,8 +38,8 @@
         </a-col>
       </a-row>
       <a-row type="flex">
-        <a-col :span="7">
-          <a-form-item label="负责人电话"  name="fzrMobile" :label-col="{span:7}" :rules="[{ required: true, message: '请输入负责人电话!' }]">
+        <a-col :span="8">
+          <a-form-item label="负责人电话"  name="fzrMobile" :label-col="{span:8}" :rules="[{ required: true, message: '请输入负责人电话!' }]">
             <label v-if="opCategory==3">{{dataModel.fzrMobile }}</label>
             <a-input v-model:value="dataModel.fzrMobile" placeholder=""/>
           </a-form-item>
@@ -50,16 +50,16 @@
             <a-input v-model:value="dataModel.frName" placeholder=""/>
           </a-form-item>
         </a-col>
-        <a-col :span="10">
-          <a-form-item label="法人电话"  name="frMobile" :label-col="{span:10}" :rules="[{ required: true, message: '请输入法人电话!' }]">
+        <a-col :span="8">
+          <a-form-item label="法人电话"  name="frMobile" :label-col="{span:8}" :rules="[{ required: true, message: '请输入法人电话!' }]">
             <label v-if="opCategory==3">{{dataModel.frMobile }}</label>
             <a-input v-model:value="dataModel.frMobile" placeholder=""/>
           </a-form-item>
         </a-col>
       </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-col :span="8">
+          <a-form-item label="企业机构代码"  name="companyCode" :label-col="{span:8}" :rules="[{ required: true, message: '请输入企业机构代码!' }]">
             <label v-if="opCategory==3">{{dataModel.companyCode }}</label>
             <a-input v-model:value="dataModel.companyCode" placeholder=""/>
           </a-form-item>
@@ -259,8 +259,8 @@ export default defineComponent({
       validateSameSite();
       if (!isAllowCommit.value){
         message.error("不允许添加相同的站点!");
-      }else if(formData.dataModel.companyName==null||formData.dataModel.companyAddress ==null||formData.dataModel.fzrName==null||
-        formData.dataModel.fzrMobile==null||formData.dataModel.frName==null||formData.dataModel.frMobile==null||formData.dataModel.companyCode==null){
+      }else if(formData.dataModel.companyName==""||formData.dataModel.companyAddress ==""||formData.dataModel.fzrName==""||
+        formData.dataModel.fzrMobile==""||formData.dataModel.frName==""||formData.dataModel.frMobile==""||formData.dataModel.companyCode==""){
         message.error("请填写完整的机构信息!");
         isAllowCommit.value = false;
       }

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

@@ -20,13 +20,13 @@
           </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:7}" :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:7}" :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>
@@ -42,14 +42,14 @@
           </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: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>
           </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:7}" :rules="[{ required: true, message: '请输入详细地址!' }]">
             <label v-if="opCategory==3">{{dataModel.detailAddress }}</label>
             <a-input v-model:value="dataModel.detailAddress" placeholder=""/>
           </a-form-item>
@@ -63,12 +63,12 @@
           </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: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-col :span="8">
           <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=""/>
@@ -298,8 +298,8 @@ export default defineComponent({
       validateSameUser();
       if (!isAllowCommit.value){
         message.error("不允许添加相同的人员!");
-      }else if(formData.dataModel.siteCode==null||formData.dataModel.siteName ==null||formData.dataModel.institutionID==null||
-      formData.dataModel.regionCode==null||formData.dataModel.streetCode==null||formData.dataModel.detailAddress==null){
+      }else if(formData.dataModel.siteCode==""||formData.dataModel.siteName ==""||formData.dataModel.institutionID==""||
+      formData.dataModel.regionCode==""||formData.dataModel.streetCode==""||formData.dataModel.detailAddress==""){
         message.error("请填写完整的站点信息!");
         isAllowCommit.value = false;
       }

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

@@ -19,15 +19,15 @@
             <a-input v-model:value="dataModel.name" placeholder=""/>
           </a-form-item>
         </a-col>
-        <a-col :span="7">
+        <a-col :span="8">
           <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-col :span="8">
+          <a-form-item label="联系电话" name="mobile" :label-col="{span:8}" :rules="[{ required: true, message: '请输入联系电话!' }]" >
             <label v-if="opCategory==3">{{dataModel.mobile}}</label>
             <a-input v-model:value="dataModel.mobile" placeholder=""/>
           </a-form-item>
@@ -41,10 +41,10 @@
                       :field-names="{ label: 'name', value: 'value' }" :allow-clear="false" > </a-select>
           </a-form-item>
         </a-col>
-        <a-col :span="7">
+        <a-col :span="8">
 
         </a-col>
-        <a-col :span="10">
+        <a-col :span="7">
 
         </a-col>
       </a-row>
@@ -114,7 +114,7 @@ export default defineComponent({
     };
 
     const handleOk = () => {
-      if(formData.dataModel.name==null||formData.dataModel.gender ==null||formData.dataModel.mobile==null|| formData.dataModel.roleID==null){
+      if(formData.dataModel.name==""||formData.dataModel.gender ==""||formData.dataModel.mobile==""|| formData.dataModel.roleID==""){
         message.error("请填写完整的人员信息!");
         isAllowCommit.value = false;
       }

vue/src/views/jobUserManager/jobhunt/edit.vue

@@ -14,14 +14,14 @@
       <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:8}"  :rules="[{ required: true, message: '请输选择求职人员!' }]">
             <label v-if="opCategory==3">{{dataModel.name}}</label>
             <a-select  ref="select"  v-model:value="dataModel.jobUserID" :options="jobUserList"
                        :field-names="{label:'text',value:'value'}"  @change="loadData"  :allow-clear="true"  >
             </a-select>
           </a-form-item>
         </a-col>
-        <a-col :span="7">
+        <a-col :span="8">
           <a-form-item label="工种名称" name="workName" :label-col="{span:7}" :rules="[{ required: true, message: '请选择工种类型!' }]">
             <label v-if="opCategory==3">{{dataModel.workName}}</label>
             <a-select  ref="select"  v-model:value="dataModel.workCode" :options="jobWorkTypeList"
@@ -29,8 +29,8 @@
             </a-select>
           </a-form-item>
         </a-col>
-        <a-col :span="10">
-          <a-form-item label="求职类型" name="wantedJobType" :label-col="{span:10}" :rules="[{ required: true, message: '请选择求职类型!' }]">
+        <a-col :span="9">
+          <a-form-item label="求职类型" name="wantedJobType" :label-col="{span:7}" :rules="[{ required: true, message: '请选择求职类型!' }]">
             <label v-if="opCategory==3">{{dataModel.jobHuntType}}</label>
             <a-select  ref="select"  v-model:value="dataModel.ucHuntType" :options="jobHuntTypeList"
                        :field-names="{label:'name',value:'value'}"  @change="loadData"  :allow-clear="true"  >
@@ -40,21 +40,21 @@
       </a-row>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="人才类型"  name="talentsTypeName" :label-col="{span:7}" :rules="[{ required: true, message: '请选择人才类型!' }]">
+          <a-form-item label="人才类型"  name="talentsTypeName" :label-col="{span:8}" :rules="[{ required: true, message: '请选择人才类型!' }]">
             <label v-if="opCategory==3">{{dataModel.jobUserType }}</label>
             <a-select  ref="select"  v-model:value="dataModel.abilityType" :options="jobUserTypeList"
                        :field-names="{label:'name',value:'value'}"  @change="loadData"  :allow-clear="true"  >
             </a-select>
           </a-form-item>
         </a-col>
-        <a-col :span="7">
+        <a-col :span="8">
           <a-form-item label="月薪要求"  name="salary" :label-col="{span:7}" :rules="[{ required: true, message: '请输入月薪要求!' }]">
             <label v-if="opCategory==3">{{dataModel.salary}}</label>
             <a-input v-model:value="dataModel.salary" placeholder=""/>
           </a-form-item>
         </a-col>
-        <a-col :span="10">
-          <a-form-item label="工作年限"  name="workYear" :label-col="{span:10}" :rules="[{ required: true, message: '请输入工作年限!' }]">
+        <a-col :span="9">
+          <a-form-item label="工作年限"  name="workYear" :label-col="{span:7}" :rules="[{ required: true, message: '请输入工作年限!' }]">
             <label v-if="opCategory==3">{{dataModel.workYear}}</label>
             <a-input type="number" v-model:value="dataModel.workYear" placeholder=""/>
           </a-form-item>
@@ -62,18 +62,18 @@
       </a-row>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="希望工作地区"  name="workAddress" :label-col="{span:7}" :rules="[{ required: true, message: '请输入工作地区!' }]">
+          <a-form-item label="希望工作地区"  name="workAddress" :label-col="{span:8}" :rules="[{ required: true, message: '请输入工作地区!' }]">
             <label v-if="opCategory==3">{{dataModel.areaWork}}</label>
             <a-input v-model:value="dataModel.areaWork" placeholder=""/>
           </a-form-item>
         </a-col>
-        <a-col :span="7">
+        <a-col :span="8">
           <a-form-item label="可到职日期"  name="inDate" :label-col="{span:7}" :rules="[{ required: true, message: '请输入工作地区!' }]">
             <label v-if="opCategory==3">{{dataModel.inDate}}</label>
             <a-date-picker v-model:value="dataModel.inDate"  picker="date" value-format="YYYY-MM-DD"  />
           </a-form-item>
         </a-col>
-        <a-col :span="10"></a-col>
+        <a-col :span="9"></a-col>
       </a-row>
       <a-divider orientation="left">其他信息</a-divider>
       <a-row>
@@ -89,7 +89,7 @@ import {getJobHuntByID,saveJobHunt} from "@/api/jobUserManager/jobhunt"
 import {getJobUserDataList} from "@/api/jobUserManager/jobuser";
 import {getSysDictionaryList} from '@/api/system/dictionary';
 import BUploadFile from "@/components/file/uploadFile.vue";
-import type {SelectProps} from "ant-design-vue";
+import {message,SelectProps} from "ant-design-vue";
 
 interface InstitutionModel {
   dataModel: any;
@@ -157,12 +157,12 @@ export default defineComponent({
     };
 
     const handleOk = () => {
-      isAllowCommit.value = true;
-      /*if(formData.dataModel.companyName==null||formData.dataModel.companyAddress ==null||formData.dataModel.fzrName==null||
-        formData.dataModel.fzrMobile==null||formData.dataModel.frName==null||formData.dataModel.frMobile==null||formData.dataModel.companyCode==null){
-        message.error("请填写完整的机构信息!");
+      if(formData.dataModel.jobUserID==""||formData.dataModel.workName ==""||formData.dataModel.ucHuntType==""||
+        formData.dataModel.abilityType==""||formData.dataModel.salary==""||formData.dataModel.workYear==""||
+        formData.dataModel.areaWork==""||formData.dataModel.inDate==""){
+        message.error("请填写完整的求职意向!");
         isAllowCommit.value = false;
-      }*/
+      }
       if (isAllowCommit.value){
         saveJobHunt(formData.dataModel).then(result => {
           if (result) {

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

@@ -21,16 +21,16 @@
 <!--            <a-input v-model:value="dataModel.userName" placeholder=""/>-->
           </a-form-item>
         </a-col>
-        <a-col :span="7">
-            <a-form-item label="日志类型" name="logTypeName" :label-col="{span:7}" :rules="[{ required: true, message: '请选择日志类型!' }]">
+        <a-col :span="8">
+            <a-form-item label="日志类型" name="logTypeName" :label-col="{span:8}" :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>
 <!--            <a-input v-model:value="dataModel.logTypeName" placeholder=""/>-->
           </a-form-item>
         </a-col>
-        <a-col :span="10">
-          <a-form-item label="完成时间" name="workTime" :label-col="{span:10}" :rules="[{ required: true, message: '请选择完成时间!' }]">
+        <a-col :span="8">
+          <a-form-item label="完成时间" name="workTime" :label-col="{span:7}" :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>
@@ -44,14 +44,14 @@
                       :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-col :span="8">
+          <a-form-item label="所属街道"  name="streetCode" :label-col="{span:8}" :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-col :span="8">
         </a-col>
       </a-row>
       <a-row>
@@ -73,6 +73,7 @@ import type {SelectProps} from "ant-design-vue";
 import {getSysDictionaryList} from "@/api/system/dictionary";
 import {getRegionCodeList, getStreetCodeList} from "@/api/system/area/index";
 import {getSiteUserDataList} from "@/api/baseSettings/userInfo";
+import {message} from "ant-design-vue";
 
 interface InstitutionModel {
   dataModel: any;
@@ -89,6 +90,7 @@ export default defineComponent({
   setup(props) {
     const formData = reactive<InstitutionModel>({ dataModel:{}});
     const visible = ref<boolean>(false);
+    const isAllowCommit = ref<boolean>(false);
     const confirmLoading = ref<boolean>(false);
     const title = ref();
     const opCategory = ref<any>();
@@ -149,12 +151,19 @@ export default defineComponent({
     };
 
     const handleOk = () => {
-      save(formData.dataModel).then(result => {
-        if (result) {
-          visible.value = false;
-          props.loadData();
-        }
-      });
+      if(formData.dataModel.siteUserID==""||formData.dataModel.doTypeID ==""||formData.dataModel.workTime==""||
+        formData.dataModel.regionCode==""||formData.dataModel.streetCode==""||formData.dataModel.workContent==""){
+        message.error("请填写完整的工作日志!");
+        isAllowCommit.value = false;
+      }
+      if (isAllowCommit.value){
+        save(formData.dataModel).then(result => {
+          if (result) {
+            visible.value = false;
+            props.loadData();
+          }
+        });
+      }
     };
 
     const handleCancel = () => {
@@ -172,6 +181,7 @@ export default defineComponent({
       siteUserList,
       regionList,
       streetList,
+      isAllowCommit,
       show,
       getRegionList,
       getStreetList,