Liudijing 11 місяців тому
батько
коміт
99602e7693

+ 24 - 5
vue/src/views/companyService/company/index.vue

@@ -3,17 +3,17 @@
     <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:6}" name="CompanyName">
+          <a-form-item label="企业名称" :label-col="{span:6}" 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:6}" name="CompanyCode">
+          <a-form-item label="统一信用代码" :label-col="{span:6}" name="companyCode">
             <a-input v-model:value="searchParams.companyCode" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="企业状态" :label-col="{span:6}" name="RecordStatus">
+          <a-form-item label="企业状态" :label-col="{span:6}" name="recordStatus">
             <a-select
               ref="select"
               v-model:value="searchParams.recordStatus"
@@ -25,11 +25,28 @@
             </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-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:6}" name="regionCode">
             <a-select
@@ -128,6 +145,7 @@ export default defineComponent({
       selectedRowKeys: [],
       loading: false
     });
+    const expand = ref(false);
     const importOptions = ref<ImportProps>({
       title: '导入',
       url: 'companyService/company/importCompany  ',
@@ -274,6 +292,7 @@ export default defineComponent({
       columns,
       pagination,
       dataList,
+      expand,
       institutionEditModelRef,
       handleTableChange,
       onSelectChange,

+ 21 - 2
vue/src/views/companyService/post/index.vue

@@ -21,11 +21,28 @@
             <a-input v-model:value="searchParams.companyName" placeholder=""/>
           </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="recordStatus">
             <a-select
@@ -107,6 +124,7 @@ export default defineComponent({
       maxCount: null,
       recordStatus: null
     });
+    const expand = ref(false);
     const postStatusList = [{name: '启用', value: 1}, {name: '停用', value: 0}];
     const importOptions = ref<ImportProps>({
       title: '导入',
@@ -264,6 +282,7 @@ export default defineComponent({
       loadData,
       onAdd,
       onEdit,
+      expand,
       postStatusList
     };
   },

+ 14 - 6
vue/src/views/jobUserManager/jobuser/index.vue

@@ -47,13 +47,19 @@
                 formRef.resetFields();
                 loadData();
               }
-            "
-          >重置
-          </a-button
-          >
+            ">重置</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="sexId">
             <a-select
@@ -146,6 +152,7 @@ export default defineComponent({
   components: {DownOutlined, UpOutlined, BExportExcel, BImportExcel},
   setup() {
     const modalRoleUserRef = ref();
+    const expand = ref(false);
     const modalRoleEditRef = ref();
     const formRef = ref<FormInstance>();
     const searchParamsState = reactive({
@@ -336,7 +343,8 @@ export default defineComponent({
       getSexList,
       getEducationList,
       getEmphasisTypeList,
-      calculateAge
+      calculateAge,
+      expand
     };
   },
   created() {

+ 0 - 1
vue/src/views/taskAndLog/dotask/edit.vue

@@ -189,7 +189,6 @@ export default defineComponent(
         if(formState.dataModel.regionCode){
           get('system/area/getAreaList', {code: formState.dataModel.regionCode}).then(data => {
             streetList.value = data;
-            formState.dataModel.streetCode = "";
           })
         }
       }