编辑页面验证及显示调整

src/main/resources/mapping/cquery/JobhuntCQuery.xml

@@ -37,8 +37,8 @@
         <if test="maxSalary != '' and maxSalary != null">
             and salary <![CDATA[ <= ]]> #{maxSalary}
         </if>
-        <if test="isAccomplish != '' and isAccomplish != null">
+       <!-- <if test="isAccomplish != '' and isAccomplish != null">
             and isAccomplish = #{isAccomplish}
-        </if>
+        </if>-->
     </select>
 </mapper>

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

@@ -259,8 +259,8 @@ export default defineComponent({
       validateSameSite();
       if (!isAllowCommit.value){
         message.error("不允许添加相同的站点!");
-      }else if(formData.dataModel.companyName==""||formData.dataModel.companyAddress ==""||formData.dataModel.fzrName==""||
-        formData.dataModel.fzrMobile==""||formData.dataModel.frName==""||formData.dataModel.frMobile==""||formData.dataModel.companyCode==""){
+      }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){
         message.error("请填写完整的机构信息!");
         isAllowCommit.value = false;
       }

vue/src/views/baseSettings/institution/index.vue

@@ -3,75 +3,41 @@
     <a-form ref="formRef" name="advanced_search"  class="ant-advanced-search-form" :model="searchParams" >
       <a-row :gutter="24">
         <a-col :span="6">
-          <a-form-item label="企业名称" :label-col="{span:8}" name="CompanyName">
+          <a-form-item label="企业名称" :label-col="{span:8}" name="companyName">
             <a-input v-model:value="searchParams.companyName" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="企业地址" :label-col="{span:8}" name="CompanyAddress">
+          <a-form-item label="企业地址" :label-col="{span:8}" name="companyAddress">
             <a-input v-model:value="searchParams.companyAddress" placeholder=""/>
             <!--<a-range-picker format="YYYY-MM-DD" :placeholder="['开始日期', '结束日期']" @change="onRangeChange"/>-->
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="负责人名称" :label-col="{span:8}" name="DutyUserName">
+          <a-form-item label="负责人名称" :label-col="{span:8}" name="dutyUserName">
             <a-input v-model:value="searchParams.dutyUserName" placeholder=""/>
             <!--<a-select  ref="select"  v-model:value="searchParamsState.collegeID" :options="collegeList"
                        :field-names="{label:'name',value:'collegeID'}"  @change="loadData"  functioncode="T014000" :allow-clear="true"  >
             </a-select>-->
           </a-form-item>
         </a-col>
-      <a-col :span="6" style="text-align: right">
+      <a-col :span="6" style="text-align: left">
           <a-button type="primary" html-type="submit" @click="onSearch">查询</a-button>
-<!--          <a style="font-size: 12px" @click="expand = !expand">
-            <template v-if="expand">
-              <UpOutlined/>
-            </template>
-            <template v-else>
-              <DownOutlined/>
-            </template>
-            {{ expand ? '收缩' : '展开' }}
-          </a>-->
+        <a-button
+          style="margin: 0 8px"
+          @click="
+              () => {
+                formRef.resetFields();
+                loadData();
+              }
+            ">重置</a-button>
         </a-col>
       </a-row>
-<!--      <a-row :gutter="24" v-show="expand">
-        <a-col :span="6">
-          <a-form-item label="问题描述" :label-col="{span:6}" name="ProblemDesc">
-            <a-input v-model:value="searchParamsState.problemDesc" placeholder=""/>
-          </a-form-item>
-        </a-col>
-        <a-col :span="7">
-          <a-form-item label="问题特性" :label-col="{span:7}" name="ProblemCharacteristics">
-            <a-select
-              ref="select"
-              v-model:value="searchParamsState.problemCharacteristics"
-              :options="problemAttrList"
-              :field-names="{label:'name',value:'value'}"
-              @change="loadData"
-              :allow-clear="true" >
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="6">
-          <a-form-item label="是否解决" :label-col="{span:6}" name="IsResolve">
-            <a-select
-              ref="select"
-              v-model:value="searchParamsState.isResolve"
-              :options="resolveList"
-              :field-names="{label:'resolveName',value:'resolveID'}"
-              @change="loadData"
-              :allow-clear="true" >
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="5" style="text-align: left">
-        </a-col>
-      </a-row>-->
+
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
-<!--functioncode="T014001"-->
-          <a-button type="primary" html-type="submit" @click='onOperates(null,"新增",1)' >新增</a-button>
-          <BExportExcel :title="'导出'" :filename="'运营机构信息'" :url="'/institution/export'" :params="{...searchParams, rows:100000}"></BExportExcel>
+          <a-button type="primary" html-type="submit" functioncode="T01010102" @click='onOperates(null,"新增",1)' >新增</a-button>
+          <BExportExcel :title="'导出'"   :filename="'运营机构信息'" :url="'/institution/export'" :params="{...searchParams, rows:100000}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>
@@ -85,8 +51,8 @@
         <template #bodyCell="{ column, text, record }">
           <template v-if="column.key === 'operation'">
             <div class="table-operation">
-              <a-button type="link" size="small" @click='onOperates(record.institutionID,"修改",2)' >编辑</a-button>
-              <a-button type="link" size="small" @click="onDel(record)" >删除</a-button>
+              <a-button type="link" size="small" functioncode="T01010103" @click='onOperates(record.institutionID,"修改",2)' >编辑</a-button>
+              <a-button type="link" size="small" functioncode="T01010104" @click="onDel(record)" >删除</a-button>
             </div>
           </template>
         </template>
@@ -99,8 +65,7 @@
 <script lang="ts">
 import {reactive, ref, computed, defineComponent, createVNode} from 'vue';
 import {DownOutlined, ExclamationCircleOutlined, UpOutlined} from '@ant-design/icons-vue';
-import type {FormInstance} from 'ant-design-vue';
-import type {TableColumnsType, TableProps} from 'ant-design-vue';
+import type {FormInstance,TableColumnsType, TableProps} from 'ant-design-vue';
 import {getInstitutionList, delInstitution} from '@/api/baseSettings/institution';
 import InstitutionEditForm from "@/views/baseSettings/institution/edit.vue";
 import BExportExcel from "@/components/basic/excel/exportExcel/exportExcel.vue";
@@ -148,9 +113,6 @@ export default defineComponent({
     }));
 
     const dataList = ref([]);
-    /*const problemAttrList = ref<SelectProps['options']>();
-    const collegeList = ref<SelectProps['options']>();
-    const resolveList = ref([{resolveName:"是",resolveID:1},{resolveName:"否",resolveID:0}]);*/
     const institutionEditModelRef = ref();
 
 

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

@@ -298,8 +298,8 @@ export default defineComponent({
       validateSameUser();
       if (!isAllowCommit.value){
         message.error("不允许添加相同的人员!");
-      }else if(formData.dataModel.siteCode==""||formData.dataModel.siteName ==""||formData.dataModel.institutionID==""||
-      formData.dataModel.regionCode==""||formData.dataModel.streetCode==""||formData.dataModel.detailAddress==""){
+      }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){
         message.error("请填写完整的站点信息!");
         isAllowCommit.value = false;
       }

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

@@ -3,27 +3,44 @@
     <a-form ref="formRef" name="advanced_search"  class="ant-advanced-search-form" :model="searchParams" >
       <a-row :gutter="24">
         <a-col :span="6">
-          <a-form-item label="驿站编号" :label-col="{span:8}" name="SiteCode">
+          <a-form-item label="驿站编号" :label-col="{span:8}" name="siteCode">
             <a-input v-model:value="searchParams.siteCode" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="站点名称" :label-col="{span:8}" name="SiteName">
+          <a-form-item label="站点名称" :label-col="{span:8}" name="siteName">
             <a-input v-model:value="searchParams.siteName" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="所属机构" :label-col="{span:8}" name="InstitutionName">
+          <a-form-item label="所属机构" :label-col="{span:8}" name="institutionName">
             <a-input v-model:value="searchParams.institutionName" placeholder=""/>
           </a-form-item>
         </a-col>
-      <a-col :span="6" style="text-align: right">
-          <a-button type="primary" html-type="submit" @click="onSearch">查询</a-button>
+      <a-col :span="6" style="text-align: left">
+        <a-button type="primary" html-type="submit" @click="onSearch">查询</a-button>
+        <a-button
+          style="margin: 0 8px"
+          @click="
+              () => {
+                formRef.resetFields();
+                loadData();
+              }
+            ">重置</a-button>
+        <a style="font-size: 12px" @click="expand = !expand">
+          <template v-if="expand">
+            <UpOutlined />
+          </template>
+          <template v-else>
+            <DownOutlined />
+          </template>
+          {{ expand ? '收缩' : '展开' }}
+        </a>
         </a-col>
       </a-row>
-      <a-row :gutter="24">
+      <a-row :gutter="24" v-show="expand">
         <a-col :span="6">
-          <a-form-item label="所属县区" :label-col="{span:8}" name="RegionCode">
+          <a-form-item label="所属县区" :label-col="{span:8}" name="regionCode">
             <a-select
               ref="select"
               v-model:value="searchParams.regionCode"
@@ -36,7 +53,7 @@
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="所属街道" :label-col="{span:8}" name="StreetCode">
+          <a-form-item label="所属街道" :label-col="{span:8}" name="streetCode">
             <a-select
               ref="select"
               v-model:value="searchParams.streetCode"
@@ -55,7 +72,7 @@
       </a-row>
       <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" html-type="submit"  functioncode="T01010202" @click='onOperates(null,"新增",1)' >新增</a-button>
           <BExportExcel :title="'导出'" :filename="'驿站站点信息'" :url="'/siteInfo/export'" :params="{...searchParams, rows:100000}"></BExportExcel>
         </a-col>
       </a-row>
@@ -70,8 +87,8 @@
         <template #bodyCell="{ column, text, record }">
           <template v-if="column.key === 'operation'">
             <div class="table-operation">
-              <a-button type="link" size="small" @click='onOperates(record.siteID.toString(),"修改",2)' >编辑</a-button>
-              <a-button type="link" size="small" @click="onDel(record)" >删除</a-button>
+              <a-button type="link" size="small"  functioncode="T01010203" @click='onOperates(record.siteID.toString(),"修改",2)' >编辑</a-button>
+              <a-button type="link" size="small"  functioncode="T01010204" @click="onDel(record)" >删除</a-button>
             </div>
           </template>
         </template>
@@ -98,6 +115,7 @@ export default defineComponent({
   components: {DownOutlined, UpOutlined, BExportExcel,SiteInfoEditForm},
   setup() {
     const formRef = ref<FormInstance>();
+    const expand = ref(false);
     const searchParams = reactive({
       pageIndex: 1,
       pageSize: 20,
@@ -210,6 +228,7 @@ export default defineComponent({
 
     return {
       formRef,
+      expand,
       searchParams,
       formState,
       columns,

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

@@ -77,7 +77,7 @@ export default defineComponent({
     const confirmLoading = ref<boolean>(false);
     const title = ref();
     const opCategory = ref<any>();
-    const isAllowCommit = ref<boolean>(false) ;
+    const isAllowCommit = ref<boolean>(true) ;
     const formState = reactive({
       total: 0,
       selectedRowKeys: [],
@@ -97,7 +97,7 @@ export default defineComponent({
     const loadData = (siteUserID: string) => {
       getSiteUserByID(siteUserID).then((result: any) => {
         formData.dataModel = result;
-        console.log(formData.dataModel);
+        console.log("dataModel",formData.dataModel);
       });
     }
     const show = (id: any,method:string,category:any) => {
@@ -114,7 +114,7 @@ export default defineComponent({
     };
 
     const handleOk = () => {
-      if(formData.dataModel.name==""||formData.dataModel.gender ==""||formData.dataModel.mobile==""|| formData.dataModel.roleID==""){
+      if(formData.dataModel.name==null||formData.dataModel.gender ==null||formData.dataModel.mobile==null|| formData.dataModel.roleID==null){
         message.error("请填写完整的人员信息!");
         isAllowCommit.value = false;
       }

vue/src/views/baseSettings/user/index.vue

@@ -3,7 +3,7 @@
     <a-form ref="formRef" name="advanced_search"  class="ant-advanced-search-form" :model="searchParams" >
       <a-row :gutter="24">
         <a-col :span="6">
-          <a-form-item label="人员名称" :label-col="{span:8}" name="UserName">
+          <a-form-item label="人员名称" :label-col="{span:8}" name="userName">
             <a-input v-model:value="searchParams.userName" placeholder=""/>
           </a-form-item>
         </a-col>
@@ -13,14 +13,22 @@
         <a-col :span="6">
 
         </a-col>
-      <a-col :span="6" style="text-align: right">
+      <a-col :span="6" style="text-align: left">
           <a-button type="primary" html-type="submit" @click="onSearch">查询</a-button>
+          <a-button
+          style="margin: 0 8px"
+          @click="
+              () => {
+                formRef.resetFields();
+                loadData();
+              }
+            ">重置</a-button>
         </a-col>
       </a-row>
 
       <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" html-type="submit" functioncode="T01010302" @click='onOperates(null,"新增",1)' >新增</a-button>
           <BExportExcel :title="'导出'" :filename="'驿站人员信息'" :url="'/userInfo/export'" :params="{...searchParams, rows:100000}"></BExportExcel>
         </a-col>
       </a-row>
@@ -35,8 +43,8 @@
         <template #bodyCell="{ column, text, record }">
           <template v-if="column.key === 'operation'">
             <div class="table-operation">
-              <a-button type="link" size="small" @click='onOperates(record.siteUserID.toString(),"修改",2)' >编辑</a-button>
-              <a-button type="link" size="small" @click="onDel(record)" >删除</a-button>
+              <a-button type="link" size="small"  functioncode="T01010303"  @click='onOperates(record.siteUserID.toString(),"修改",2)' >编辑</a-button>
+              <a-button type="link" size="small"  functioncode="T01010304"  @click="onDel(record)" >删除</a-button>
             </div>
           </template>
         </template>

vue/src/views/jobUserManager/jobhunt/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="name" :label-col="{span:8}"  :rules="[{ required: true, message: '请输选择求职人员!' }]">
+          <a-form-item label="姓名"  name="jobUserID" :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"  >
@@ -22,15 +22,16 @@
           </a-form-item>
         </a-col>
         <a-col :span="8">
-          <a-form-item label="工种名称" name="workName" :label-col="{span:7}" :rules="[{ required: true, message: '请选择工种类型!' }]">
+          <a-form-item label="工种名称" name="workCode" :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"
+            <a-input  v-model:value="dataModel.workName" placeholder=""/>
+            <!--<a-select  ref="select"  v-model:value="dataModel.workCode" :options="jobWorkTypeList"
                        :field-names="{label:'name',value:'value'}"  @change="loadData"  :allow-clear="true"  >
-            </a-select>
+            </a-select>-->
           </a-form-item>
         </a-col>
         <a-col :span="9">
-          <a-form-item label="求职类型" name="wantedJobType" :label-col="{span:7}" :rules="[{ required: true, message: '请选择求职类型!' }]">
+          <a-form-item label="求职类型" name="ucHuntType" :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,7 +41,7 @@
       </a-row>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="人才类型"  name="talentsTypeName" :label-col="{span:8}" :rules="[{ required: true, message: '请选择人才类型!' }]">
+          <a-form-item label="人才类型"  name="abilityType" :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"  >
@@ -50,7 +51,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-input type="number" v-model:value="dataModel.salary" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="9">
@@ -62,7 +63,7 @@
       </a-row>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="希望工作地区"  name="workAddress" :label-col="{span:8}" :rules="[{ required: true, message: '请输入工作地区!' }]">
+          <a-form-item label="希望工作地区"  name="areaWork" :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>
@@ -107,7 +108,7 @@ export default defineComponent({
     const title = ref();
     const opCategory = ref<any>();
     const visible = ref<boolean>(false);
-    const isAllowCommit = ref<boolean>(false);
+    const isAllowCommit = ref<boolean>(true);
     const confirmLoading = ref<boolean>(false);
     const formData = reactive<InstitutionModel>({ dataModel:{}});
     const formState = reactive({
@@ -157,9 +158,9 @@ export default defineComponent({
     };
 
     const handleOk = () => {
-      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==""){
+      if(formData.dataModel.jobUserID==null||formData.dataModel.workName ==""||formData.dataModel.ucHuntType==null||
+        formData.dataModel.abilityType==null||formData.dataModel.salary==""||formData.dataModel.workYear==null||
+        formData.dataModel.areaWork==null||formData.dataModel.inDate==""){
         message.error("请填写完整的求职意向!");
         isAllowCommit.value = false;
       }

vue/src/views/jobUserManager/jobhunt/index.vue

@@ -8,7 +8,7 @@
     >
       <a-row :gutter="24">
         <a-col :span="6">
-          <a-form-item label="姓名" :label-col="{ span: 8 }" name="name">
+          <a-form-item label="姓名" :label-col="{ span: 8 }" name="jobUserName">
             <a-input v-model:value="searchParamsState.jobUserName" placeholder="" />
           </a-form-item>
         </a-col>
@@ -19,18 +19,35 @@
         </a-col>
         <a-col :span="6">
           <a-form-item label="工作年限" :label-col="{ span: 8 }" name="workYear">
-            <a-input type="number" v-model:value="searchParamsState.minWorkYear" style="width:115px;" placeholder="" />
+            <a-input type="number" v-model:value="searchParamsState.minWorkYear" style="width:110px;" placeholder="" />
             <label style="margin:10px;">-</label>
-            <a-input type="number" v-model:value="searchParamsState.maxWorkYear" style="width:115px;" placeholder="" />
+            <a-input type="number" v-model:value="searchParamsState.maxWorkYear" style="width:110px;" placeholder="" />
           </a-form-item>
         </a-col>
         <a-col :span="6" style="text-align: left">
           <a-button type="primary" html-type="submit" @click="onSearch">查询</a-button>
+          <a-button
+            style="margin: 0 8px"
+            @click="
+              () => {
+                formRef.resetFields();
+                loadData();
+              }
+            ">重置</a-button>
+          <a style="font-size: 12px" @click="expand = !expand">
+            <template v-if="expand">
+              <UpOutlined />
+            </template>
+            <template v-else>
+              <DownOutlined />
+            </template>
+            {{ expand ? '收缩' : '展开' }}
+          </a>
         </a-col>
       </a-row>
-      <a-row :gutter="24">
+      <a-row :gutter="24"  v-show="expand">
         <a-col :span="6">
-          <a-form-item label="求职类型" :label-col="{ span: 8 }" name="jobHuntType">
+          <a-form-item label="求职类型" :label-col="{ span: 8 }" name="jobHuntTypeID">
             <a-select ref="select"
               v-model:value="searchParamsState.jobHuntTypeID"
               :options="jobHuntTypeList"
@@ -42,7 +59,7 @@
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="人才类型" :label-col="{ span: 8 }" name="jobUserType">
+          <a-form-item label="人才类型" :label-col="{ span: 8 }" name="jobUserTypeID">
             <a-select ref="select"
                       v-model:value="searchParamsState.jobUserTypeID"
                       :options="jobUserTypeList"
@@ -54,16 +71,16 @@
         </a-col>
         <a-col :span="6">
           <a-form-item label="月薪要求" :label-col="{ span: 8 }" name="salary">
-            <a-input type="number" v-model:value="searchParamsState.minSalary" style="width:115px;" placeholder="" />
+            <a-input type="number" v-model:value="searchParamsState.minSalary" style="width:110px;" placeholder="" />
             <label style="margin:10px;">-</label>
-            <a-input type="number" v-model:value="searchParamsState.maxSalary" style="width:115px;" placeholder="" />
+            <a-input type="number" v-model:value="searchParamsState.maxSalary" style="width:110px;" placeholder="" />
           </a-form-item>
         </a-col>
         <a-col :span="6" style="text-align: left"></a-col>
       </a-row>
-      <a-row :gutter="24">
+      <a-row :gutter="24"  v-show="expand">
         <a-col :span="6">
-          <a-form-item label="是否完成求职" :label-col="{ span: 8 }" name="ucHuntType">
+          <a-form-item label="是否完成求职" :label-col="{ span: 8 }" name="isAccomplish">
             <a-select ref="select"
                       v-model:value="searchParamsState.isAccomplish"
                       :options="isAccomplishList"
@@ -80,8 +97,8 @@
       </a-row>
       <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>
-          <BImportExcel
+          <a-button type="primary" html-type="submit" functioncode="T01030202" @click='onOperates(null,"新增",1)' >新增</a-button>
+          <BImportExcel functioncode="T01030205"
             :options="importOptions"
             @success="loadData"
           ></BImportExcel>
@@ -96,8 +113,8 @@
         <template #bodyCell="{ column, text, record }">
           <template v-if="column.key === 'operation'">
             <div class="table-operation">
-              <a-button type="link" size="small" @click='onOperates(record.jobHuntID,"修改",2)' >编辑</a-button>
-              <a-button type="link" size="small" @click="onDel(record)" >删除</a-button>
+              <a-button type="link" size="small" functioncode="T01030203" @click='onOperates(record.jobHuntID,"修改",2)' >编辑</a-button>
+              <a-button type="link" size="small" functioncode="T01030204" @click="onDel(record)" >删除</a-button>
             </div>
           </template>
         </template>
@@ -126,6 +143,7 @@ import type {ImportProps} from "@/components/basic/excel/importExcel/ImportProps
     components: {BImportExcel,BExportExcel,JobHuntEditForm},
     setup() {
       const formRef = ref<FormInstance>();
+      const expand = ref(false);
       const searchParamsState = reactive({
         pageIndex: 1,
         pageSize: 20,
@@ -281,8 +299,8 @@ import type {ImportProps} from "@/components/basic/excel/importExcel/ImportProps
       };
 
       return {
-        jobHuntEditModelRef,
         formRef,
+        expand,
         searchParamsState,
         formState,
         columns,
@@ -292,6 +310,7 @@ import type {ImportProps} from "@/components/basic/excel/importExcel/ImportProps
         jobHuntTypeList,
         jobUserTypeList,
         isAccomplishList,
+        jobHuntEditModelRef,
         loadData,
         onDel,
         onSearch,

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}" :rules="[{ required: true, message: '请选择站点人员!' }]">
+          <a-form-item label="姓名" name="siteUserID" :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="8">
-            <a-form-item label="日志类型" name="logTypeName" :label-col="{span:8}" :rules="[{ required: true, message: '请选择日志类型!' }]">
+            <a-form-item label="日志类型" name="doTypeID" :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>
@@ -90,7 +90,7 @@ export default defineComponent({
   setup(props) {
     const formData = reactive<InstitutionModel>({ dataModel:{}});
     const visible = ref<boolean>(false);
-    const isAllowCommit = ref<boolean>(false);
+    const isAllowCommit = ref<boolean>(true);
     const confirmLoading = ref<boolean>(false);
     const title = ref();
     const opCategory = ref<any>();
@@ -129,7 +129,7 @@ export default defineComponent({
     const loadData = (doWorkID: string) => {
       get(doWorkID).then((result: any) => {
         formData.dataModel = result;
-        console.log(formData.dataModel);
+        console.log("dataModel",formData.dataModel);
         if (formData.dataModel.regionCode != null){
           getStreetList();
         }
@@ -151,8 +151,8 @@ export default defineComponent({
     };
 
     const handleOk = () => {
-      if(formData.dataModel.siteUserID==""||formData.dataModel.doTypeID ==""||formData.dataModel.workTime==""||
-        formData.dataModel.regionCode==""||formData.dataModel.streetCode==""||formData.dataModel.workContent==""){
+      if(formData.dataModel.siteUserID==null||formData.dataModel.doTypeID ==null||formData.dataModel.workTime==null||
+        formData.dataModel.regionCode==null||formData.dataModel.streetCode==null||formData.dataModel.workContent==null){
         message.error("请填写完整的工作日志!");
         isAllowCommit.value = false;
       }

vue/src/views/taskAndLog/dowork/index.vue

@@ -13,18 +13,35 @@
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="日志类型" :label-col="{span:6}" name="logType">
+          <a-form-item label="日志类型" :label-col="{span:6}" name="doTypeID">
             <a-select  ref="select"
               v-model:value="searchParams.doTypeID" :options="logTypeList"
               :field-names="{ label: 'name', value: 'value' }" @change="onSearch">
             </a-select>
           </a-form-item>
         </a-col>
-        <a-col :span="5" style="text-align: right">
+        <a-col :span="6" style="text-align: left">
           <a-button type="primary" html-type="submit" @click="onSearch">查询</a-button>
+          <a-button
+            style="margin: 0 8px"
+            @click="
+              () => {
+                formRef.resetFields();
+                loadData();
+              }
+            ">重置</a-button>
+          <a style="font-size: 12px" @click="expand = !expand">
+            <template v-if="expand">
+              <UpOutlined />
+            </template>
+            <template v-else>
+              <DownOutlined />
+            </template>
+            {{ expand ? '收缩' : '展开' }}
+          </a>
         </a-col>
       </a-row>
-      <a-row>
+      <a-row :gutter="24"  v-show="expand">
         <a-col :span="6">
           <a-form-item label="所属县区" :label-col="{span:6}" name="regionCode">
             <a-select
@@ -51,14 +68,10 @@
             </a-select>
           </a-form-item>
         </a-col>
-        <a-col :span="6">
-        </a-col>
-        <a-col :span="5"  style="text-align: right">
-        </a-col>
       </a-row>
       <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" html-type="submit" functioncode="T01040202" @click='onOperates(null,"新增",1)'>新增</a-button>
           <BExportExcel :title="'导出'" :filename="'工作日志信息'" :url="'/doWork/export'" :params="{...searchParams, rows:100000}"></BExportExcel>
         </a-col>
       </a-row>
@@ -73,8 +86,8 @@
         <template #bodyCell="{ column, text, record }">
           <template v-if="column.key === 'operation'">
             <div class="table-operation">
-              <a-button type="link" size="small" @click='onOperates(record.doWorkID,"修改",2)'>编辑</a-button>
-              <a-button type="link" size="small" @click="onDel(record)">删除</a-button>
+              <a-button type="link" size="small" functioncode="T01040203" @click='onOperates(record.doWorkID,"修改",2)'>编辑</a-button>
+              <a-button type="link" size="small" functioncode="T01040204" @click="onDel(record)">删除</a-button>
             </div>
           </template>
         </template>
@@ -102,6 +115,7 @@ export default defineComponent({
   components: { DownOutlined, UpOutlined, BExportExcel,DoWorkEditForm},
   setup() {
     const formRef = ref<FormInstance>();
+    const expand = ref(false);
     const searchParams = reactive({
       pageIndex: 1,
       pageSize: 20,
@@ -241,10 +255,11 @@ export default defineComponent({
     };
 
     return {
+      formRef,
+      expand,
       logTypeList,
       regionList,
       streetList,
-      formRef,
       searchParams,
       formState,
       columns,