pdm文件管理

h5app/package-lock.json

@@ -20,6 +20,7 @@
         "core-js": "^3.6.5",
         "crypto-js": "^4.1.1",
         "dayjs": "~1.11.5",
+        "ion-multi-picker": "^2.1.3",
         "ionicons": "^6.0.3",
         "pinia": "~2.0.18",
         "vue": "^3.2.47",
@@ -8613,6 +8614,23 @@
         "node": ">=10"
       }
     },
+    "node_modules/ion-multi-picker": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmmirror.com/ion-multi-picker/-/ion-multi-picker-2.1.3.tgz",
+      "integrity": "sha512-O8dE44jJGWRVJXzlWK75lTDkpAfpB77VE1Dxg6r4X1wZCyvreKb5RQQQlscnHANoq12woyzztfTjYF05thjehw==",
+      "engines": {
+        "node": ">=8.0.0"
+      },
+      "peerDependencies": {
+        "ionic-angular": "^3.0.0"
+      }
+    },
+    "node_modules/ionic-angular": {
+      "version": "3.9.10",
+      "resolved": "https://registry.npmmirror.com/ionic-angular/-/ionic-angular-3.9.10.tgz",
+      "integrity": "sha512-4nmGrdpu4Zy3SZwF0AaS/3gDrbFGU1dV+zn1eqInFgFj9q20N1cIITgvyIcoxUI/IoqYiohsJX1rGY5vB/HrhQ==",
+      "peer": true
+    },
     "node_modules/ionicons": {
       "version": "6.1.3",
       "integrity": "sha512-ptzz38dd/Yq+PgjhXegh7yhb/SLIk1bvL9vQDtLv1aoSc7alO6mX2DIMgcKYzt9vrNWkRu1f9Jr78zIFFyOXqw==",
@@ -22877,6 +22895,18 @@
       "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
       "dev": true
     },
+    "ion-multi-picker": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmmirror.com/ion-multi-picker/-/ion-multi-picker-2.1.3.tgz",
+      "integrity": "sha512-O8dE44jJGWRVJXzlWK75lTDkpAfpB77VE1Dxg6r4X1wZCyvreKb5RQQQlscnHANoq12woyzztfTjYF05thjehw==",
+      "requires": {}
+    },
+    "ionic-angular": {
+      "version": "3.9.10",
+      "resolved": "https://registry.npmmirror.com/ionic-angular/-/ionic-angular-3.9.10.tgz",
+      "integrity": "sha512-4nmGrdpu4Zy3SZwF0AaS/3gDrbFGU1dV+zn1eqInFgFj9q20N1cIITgvyIcoxUI/IoqYiohsJX1rGY5vB/HrhQ==",
+      "peer": true
+    },
     "ionicons": {
       "version": "6.1.3",
       "integrity": "sha512-ptzz38dd/Yq+PgjhXegh7yhb/SLIk1bvL9vQDtLv1aoSc7alO6mX2DIMgcKYzt9vrNWkRu1f9Jr78zIFFyOXqw==",

h5app/package.json

@@ -23,6 +23,7 @@
     "core-js": "^3.6.5",
     "crypto-js": "^4.1.1",
     "dayjs": "~1.11.5",
+    "ion-multi-picker": "^2.1.3",
     "ionicons": "^6.0.3",
     "pinia": "~2.0.18",
     "vue": "^3.2.47",

h5app/src/views/pages/company/edit.vue

@@ -24,60 +24,70 @@
         </div>
       </div>
       <form autocomplete="off">
-        <ion-list>
-          <ion-item>
-            <div class="panel-title2">
-              <div class="item-flag"></div>
-              基本信息
-            </div>
-          </ion-item>
-          <ion-label class="title-item">统一信用代码<span class="danger">*</span></ion-label>
-          <ion-item mode="md" :class="[v$.dataModel.companyCode.$error?'ion-invalid':'ion-valid']">
+        <div class="bw-vue-form">
+          <div class="form-title">基本信息</div>
+          <div class="form-input">
+          <ion-label>企业名称<span class="danger">*</span></ion-label>
+          <ion-input placeholder="请输入企业名称" label-placement="stacked" :clear-input="true"
+                     v-model="dataModel.companyName" class="custom">
+          </ion-input>
+<!--          <ion-note slot="error">企业名称不能为空</ion-note>-->
+        </div>
+          <div class="form-input">
+            <ion-label>统一信用代码<span class="danger">*</span></ion-label>
             <ion-input placeholder="请输入统一信用代码" label-placement="stacked" :clear-input="true"
                        v-model="dataModel.companyCode" class="custom">
             </ion-input>
-            <ion-note slot="error">统一信用代码不能为空</ion-note>
-          </ion-item>
-          <ion-label class="title-item">企业名称<span class="danger">*</span></ion-label>
-          <ion-item mode="md" :class="[v$.dataModel.companyName.$error?'ion-invalid':'ion-valid']">
-            <ion-input placeholder="请输入企业名称" label-placement="stacked" :clear-input="true"
-                       v-model="dataModel.companyName" class="custom">
-            </ion-input>
-            <ion-note slot="error">企业名称不能为空</ion-note>
-          </ion-item>
-          <ion-label class="title-item">服务驿站<span class="danger">*</span></ion-label>
-          <ion-item mode="md" :class="[v$.dataModel.siteID.$error?'ion-invalid':'ion-valid']">
-              <ion-select id="siteID" name="siteID"  cancel-text="取消"  v-model="dataModel.siteID"
-                          interface="action-sheet" placeholder="请选择服务驿站"  style="width: 100%;text-align: left;">
-                <ion-select-option v-for="(record,key) in siteList" :key="key"  v-model:value="record.siteID">
-                  {{ record.siteName }}
-                </ion-select-option>
-              </ion-select>
-            <ion-note slot="error">服务驿站不能为空</ion-note>
-          </ion-item>
-          <ion-label class="title-item">企业办公地址<span class="danger">*</span></ion-label>
-          <ion-item mode="md" :class="[v$.dataModel.companyAddress.$error?'ion-invalid':'ion-valid']">
-            <ion-textarea placeholder="请输入企业办公地址" label-placement="stacked" :rows="3" :clear-input="true"
-                       v-model="dataModel.companyAddress" class="custom" >
+<!--            <ion-note slot="error">统一信用代码不能为空</ion-note>-->
+          </div>
+         <div class="form-select">
+           <ion-label>所属街道<span class="danger">*</span></ion-label>
+<!--           <ion-multi-picker item-content v-model="dataModel.regionCode"-->
+<!--                             :placeholder="defaultAddText" :multiPickerColumns="cityColumns"-->
+<!--                             cancelText="取消" doneText="选择">-->
+<!--           </ion-multi-picker>-->
+           <ion-select interface="action-sheet" placeholder="请选择所属街道" cancel-text="取消"
+                       id="streetCode" v-model="dataModel.streetCode" style="width: 100%;text-align: left;">
+             <ion-select-option v-for="(record,key) in streetList" :key="key"
+                                v-model:value="record.code">
+               {{ record.name }}
+             </ion-select-option>
+           </ion-select>
+
+          </div>
+          <div class="form-select">
+            <ion-label>所属驿站<span class="danger">*</span></ion-label>
+            <ion-select id="siteID" name="siteID"  cancel-text="取消"  v-model="dataModel.siteID"
+                        interface="action-sheet" placeholder="请选择服务驿站"  style="width: 100%;text-align: left;">
+              <ion-select-option v-for="(record,key) in siteList" :key="key"  v-model:value="record.siteID">
+                {{ record.siteName }}
+              </ion-select-option>
+            </ion-select>
+<!--            <ion-note slot="error">服务驿站不能为空</ion-note>-->
+          </div>
+          <div class="form-input">
+            <ion-label>办公地址<span class="danger">*</span></ion-label>
+            <ion-textarea placeholder="请输入办公地址" label-placement="stacked" :rows="3" :clear-input="true"
+                          v-model="dataModel.companyAddress" class="custom" style="border-bottom: 1px solid #fff2e8;">
             </ion-textarea>
-            <ion-note slot="error">企业办公地址不能为空</ion-note>
-          </ion-item>
-          <ion-label class="title-item">企业联系人<span class="danger">*</span></ion-label>
-          <ion-item mode="md" :class="[v$.dataModel.userName.$error?'ion-invalid':'ion-valid']">
+<!--            <ion-note slot="error">办公地址不能为空</ion-note>-->
+          </div>
+          <div class="form-input">
+            <ion-label>企业联系人<span class="danger">*</span></ion-label>
             <ion-input placeholder="请输入企业联系人" label-placement="stacked" :clear-input="true"
                        v-model="dataModel.userName" class="custom">
             </ion-input>
-            <ion-note slot="error">企业联系人不能为空</ion-note>
-          </ion-item>
-          <ion-label class="title-item">联系电话<span class="danger">*</span></ion-label>
-          <ion-item mode="md" :class="[v$.dataModel.userMobile.$error?'ion-invalid':'ion-valid']">
+<!--            <ion-note slot="error">企业联系人不能为空</ion-note>-->
+          </div>
+          <div class="form-input">
+            <ion-label>联系电话<span class="danger">*</span></ion-label>
             <ion-input placeholder="请输入联系电话" label-placement="stacked" :clear-input="true"
                        v-model="dataModel.userMobile" class="custom">
             </ion-input>
-            <ion-note slot="error">企业联系电话不能为空</ion-note>
-          </ion-item>
-          <ion-label class="title-item">企业状态<span class="danger">*</span></ion-label>
-          <ion-item mode="md" :class="[v$.dataModel.recordStatus.$error?'ion-invalid':'ion-valid']">
+<!--            <ion-note slot="error">企业联系电话不能为空</ion-note>-->
+          </div>
+          <div class="form-select">
+            <ion-label>企业状态<span class="danger">*</span></ion-label>
             <ion-select id="recordStatus" name="recordStatus" cancel-text="取消"  v-model="dataModel.recordStatus"
                         interface="action-sheet" placeholder="请选择企业状态" style="width: 100%;text-align: left;">
               <ion-select-option v-for="(record,key) in companyStatusList" :key="key"
@@ -85,10 +95,10 @@
                 {{ record.name }}
               </ion-select-option>
             </ion-select>
-            <ion-note slot="error">企业状态不能为空</ion-note>
-          </ion-item>
-          <ion-label class="title-item">是否缺工<span class="danger">*</span></ion-label>
-          <ion-item mode="md" :class="[v$.dataModel.isShortage.$error?'ion-invalid':'ion-valid']">
+<!--            <ion-note slot="error">企业状态不能为空</ion-note>-->
+          </div>
+          <div class="form-select">
+            <ion-label>是否缺工<span class="danger">*</span></ion-label>
             <ion-select id="isShortAge" name="isShortAge" cancel-text="取消"  v-model="dataModel.isShortage"
                         interface="action-sheet" placeholder="请选择是否缺工" style="width: 100%;text-align: left;">
               <ion-select-option v-for="(record,key) in shortAgeTypeList" :key="key"
@@ -96,34 +106,31 @@
                 {{ record.name }}
               </ion-select-option>
             </ion-select>
-            <ion-note slot="error">企业状态不能为空</ion-note>
-          </ion-item>
+<!--            <ion-note slot="error">是否缺工不能为空</ion-note>-->
+          </div>
+          <div class="form-title">
+            其他信息
+            <div style="float:right;">
+                <ion-icon :icon="chevronDownOutline" @click="isShow=!isShow" v-show="!isShow"
+                          style="font-size: 24px;"></ion-icon>
+                <ion-icon :icon="chevronUpOutline" @click="isShow=!isShow" v-show="isShow"
+                          style="font-size: 24px;"></ion-icon>
+              </div>
+          </div>
 
-          <ion-item mode="md" >
-            <div class="panel-title2" style="width: 25%;">
-              <div class="item-flag"></div>
-              其他信息
-            </div>
-            <div style="width: 75%;text-align: right;">
-              <ion-icon :icon="chevronDownOutline" @click="isShow=!isShow" v-show="!isShow"
-                        style="font-size: 24px;"></ion-icon>
-              <ion-icon :icon="chevronUpOutline" @click="isShow=!isShow" v-show="isShow"
-                        style="font-size: 24px;"></ion-icon>
-            </div>
-          </ion-item>
-          <ion-list v-show="isShow" >
-            <ion-label class="title-item">法定代表人(负责人)</ion-label>
-            <ion-item mode="md">
+          <div v-show="isShow" >
+            <div class="form-input">
+              <ion-label>法定代表人(负责人)</ion-label>
               <ion-input placeholder="请输入法定代表人" label-placement="stacked" :clear-input="true"
                          v-model="dataModel.frName" class="custom">
               </ion-input>
-            </ion-item>
-            <ion-label class="title-item">营业执照有效期</ion-label>
-            <ion-item mode="md">
+            </div>
+            <div class="form-input">
+              <ion-label>营业执照有效期</ion-label>
               <div>
                 <ion-radio v-model:checked="isLongDate" justify="start" labelPlacement="end"
                            @click="changeLongDate" style="height:30px;">至长期</ion-radio>
-                <ion-datetime-button datetime="validDate" style=""></ion-datetime-button>
+                <ion-datetime-button datetime="validDate" style="position:relative;right:110px;"></ion-datetime-button>
                 <ion-modal :keep-contents-mounted="true" >
                   <ion-datetime id="validDate" name="validDate" placeholder="营业执照有效期"
                                 v-model="dataModel.validDate"  :prefer-wheel="true"  @ionChange="changeValidDate"
@@ -132,25 +139,25 @@
                   </ion-datetime>
                 </ion-modal>
               </div>
-            </ion-item>
-            <ion-label class="title-item">企业邮箱</ion-label>
-            <ion-item mode="md">
+            </div>
+            <div class="form-input" >
+              <ion-label>企业邮箱</ion-label>
               <ion-input placeholder="请输入企业邮箱" label-placement="stacked" :clear-input="true"
                          v-model="dataModel.companyEmail" class="custom">
               </ion-input>
-            </ion-item>
-            <ion-label class="title-item">企业归类</ion-label>
-            <ion-item mode="md">
-              <ion-select interface="action-sheet" placeholder="请选择企业归类" cancel-text="取消"
+            </div>
+            <div class="form-select">
+            <ion-label>企业分类</ion-label>
+              <ion-select interface="action-sheet" placeholder="请选择企业分类" cancel-text="取消"
                           id="companyType" v-model="dataModel.companyType"  style="width: 100%;text-align: left;">
                 <ion-select-option v-for="(record,key) in companyTypeList" :key="key"
                                    v-model:value="record.code">
                   {{ record.name }}
                 </ion-select-option>
               </ion-select>
-            </ion-item>
-            <ion-label class="title-item">企业规模</ion-label>
-            <ion-item mode="md">
+            </div>
+            <div class="form-select">
+            <ion-label>企业规模</ion-label>
               <ion-select interface="action-sheet" placeholder="请选择企业规模" cancel-text="取消"
                           id="companyModel" v-model="dataModel.companyModel"  style="width: 100%;text-align: left;">
                 <ion-select-option v-for="(record,key) in companyModelList" :key="key"
@@ -158,53 +165,33 @@
                   {{ record.name }}
                 </ion-select-option>
               </ion-select>
-            </ion-item>
-            <ion-label class="title-item">所属县区</ion-label>
-            <ion-item mode="md">
-              <ion-select interface="action-sheet" placeholder="请选择所属县区" cancel-text="取消" @ionChange="changeCity"
-                          id="regionCode" v-model="dataModel.regionCode" style="width:100%;text-align: left;">
-                <ion-select-option v-for="(record,key) in regionList" :key="key"
-                                   v-model:value="record.code">
-                  {{ record.name }}
-                </ion-select-option>
-              </ion-select>
-            </ion-item>
-            <ion-label class="title-item">所属街道</ion-label>
-            <ion-item  mode="md">
-              <ion-select interface="action-sheet" placeholder="请选择所属街道" cancel-text="取消"
-                          id="streetCode" v-model="dataModel.streetCode" style="width: 100%;text-align: left;">
-                <ion-select-option v-for="(record,key) in streetList" :key="key"
-                                   v-model:value="record.code">
-                  {{ record.name }}
-                </ion-select-option>
-              </ion-select>
-            </ion-item>
-            <ion-label class="title-item">用工情况(人)</ion-label>
-            <ion-item mode="md">
+            </div>
+            <div class="form-input">
+            <ion-label>用工情况(人)</ion-label>
               <ion-input type="number" placeholder="请输入用工人数" label-placement="stacked" :clear-input="true"
                          v-model="dataModel.workSituation" class="custom">
               </ion-input>
-            </ion-item>
-            <ion-label class="title-item">参保人数(人)</ion-label>
-            <ion-item mode="md">
+            </div>
+            <div class="form-input">
+            <ion-label>参保人数(人)</ion-label>
               <ion-input type="number" placeholder="请输入参保人数" label-placement="stacked" :clear-input="true"
                          v-model="dataModel.insuredCount" class="custom">
               </ion-input>
-            </ion-item>
-            <ion-label class="title-item">经营范围</ion-label>
-            <ion-item mode="md">
+            </div>
+            <div class="form-input">
+            <ion-label>经营范围</ion-label>
               <ion-textarea placeholder="请输入经营范围" :rows="3" label-placement="stacked" :clear-input="true"
                             v-model="dataModel.businScope" class="custom">
               </ion-textarea>
-            </ion-item>
-            <ion-label class="title-item">企业简介</ion-label>
-            <ion-item mode="md">
+            </div>
+            <div class="form-input">
+            <ion-label>企业简介</ion-label>
               <ion-textarea placeholder="请输入企业简介" :rows="3" label-placement="stacked" :clear-input="true"
-                         v-model="dataModel.companyDesc" class="custom">
+                            v-model="dataModel.companyDesc" class="custom">
               </ion-textarea>
-            </ion-item>
-          </ion-list>
-        </ion-list>
+            </div>
+          </div>
+        </div>
       </form>
     </ion-content>
     <ion-footer>
@@ -217,14 +204,15 @@
   </ion-page>
 </template>
 <script lang="ts">
-import {defineComponent, ref, reactive, computed, watch, toRefs} from "vue";
+import {defineComponent, ref, reactive, computed, toRefs} from "vue";
+// import {MultiPickerModule} from 'ion-multi-picker';
 import {chevronDownOutline, chevronUpOutline, arrowBackOutline} from 'ionicons/icons';
 import {getRegionList, getSiteList, getStreeList} from '@/api/company/index'
 import {useRoute,useRouter} from "vue-router";
-import {alertController, onIonViewDidEnter} from "@ionic/vue";
+import {alertController, IonIcon, onIonViewDidEnter} from "@ionic/vue";
 import {useVuelidate} from "@vuelidate/core";
 import {getCompanyById,saveCompanyInfo} from "@/api/company";
-import {minLength,required} from "@vuelidate/validators";
+import {required} from "@vuelidate/validators";
 import {getSysDictionaryList} from "@/api/system/dictionary";
 import dayjs from "dayjs";
 
@@ -236,6 +224,7 @@ interface StepParams{
 
 export default defineComponent({
   name: 'CompanyEdit',
+  // components: {MultiPickerModule},
   setup() {
     const route = useRoute();
     const router = useRouter();
@@ -289,6 +278,51 @@ export default defineComponent({
       {value: 0, name: '否'},
     ];
 
+    // 选中省市区
+    const cityDefault = ref<string >('');
+    //数据数组
+    const provinceColumns = ref<any>([{name:"广东省",code:"440000000000000"}]);
+    const cityColumns = ref<any>([{name:"惠州市",code:"441300000000000"}]);
+    const regionColumns = ref<any>([]);
+    const streetColumns = ref<any>([]);
+
+    // /** 选择的区域 */
+    // const regionChecked= ref<string>('');
+    // // /** 选择的街道 */
+    // const streetChecked= ref<string>('');
+    //
+    // // /** 编辑传入的地址 */
+    // const defaultAddText= ref<string>('');
+    //
+    // const allData = ref<any>({
+    //   province: [],
+    //   city: [],
+    //   region: [{name:"",code:""}],
+    //   street: [{name:"",code:""}]
+    // });
+    //
+    // //获取选定的省市区
+    // const getCityArea = () =>{
+    //   // 城市选中后默认为字符串，并且获取到的是编码不是直接内容，为了把省份 城市 区域分为三个字段，所以把字符串分割为数组，在每个单独赋值
+    //   let cities = cityDefault.value.split(' ');
+    //   allData.value.province = provinceColumns.value;
+    //   allData.value.city = cityColumns.value;
+    //   allData.value.region = regionColumns.value[0].options;
+    //   allData.value.street = streetColumns.value[0].options;
+    //
+    //   /*  循环城市数组，通过获取到的省市区编码来查询对应的文字内容 **/
+    //   allData.value.region.map(v=>{
+    //     if(v.code == cities[0]){
+    //       regionChecked.value = v.name; /* 县区 */
+    //     }
+    //   })
+    //   allData.value.street.map(v => {
+    //     if (v.code == cities[1]) {
+    //       streetChecked.value = v.name;  /* 街道 */
+    //     }
+    //   })
+    // }
+
     const getCompanyModelList = async function(){
       const companyModelResult :any = await getSysDictionaryList("CompanyModel");
       companyModelList.value = companyModelResult;
@@ -360,7 +394,7 @@ export default defineComponent({
       }
       const emailReg = /^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/;
       // 这里由于企业邮箱非必填所以先判断是否填写了企业邮箱
-      if(formState.dataModel.companyEmail!==""){
+      if(formState.dataModel.companyEmail!=null&&formState.dataModel.companyEmail!=""){
         if(!emailReg.test(formState.dataModel.companyEmail)){
           presentAlert("输入的企业邮箱有误!");
           isAllowCommit.value = false;
@@ -374,20 +408,12 @@ export default defineComponent({
         await presentAlert('请输入完整信息！');
         return null;
       }
-      /*const jsonStr = JSON.stringify(formState.dataModel);
-      localStorage.removeItem('companyData');
-      localStorage.setItem("companyData", jsonStr);*/
       companyCodeValidate();
       inputDataValidate();
       if(isAllowCommit.value){
         saveCompanyInfo(formState.dataModel).then(result => {
           if (result) {
-            if(isAdd.value){
-              router.push({path: './menu', query: {reload:1,id:formState.dataModel.companyID,status:2}});
-            }
-            else{
               router.push({path: './postList', query: {reload:1,id:formState.dataModel.companyID,status:3}});
-            }
           }
         });
       }
@@ -475,6 +501,12 @@ export default defineComponent({
       siteList,
       regionList,
       streetList,
+      // defaultAddText,
+      // cityDefault,
+      // provinceColumns,
+      // cityColumns ,
+      // regionColumns ,
+      // streetColumns,
       shortAgeTypeList,
       companyStatusList,
       companyModelList,
@@ -500,8 +532,7 @@ export default defineComponent({
 
 .custom{
   --placeholder-color: gray;
-  --placeholder-font-style:italic;
-  --placeholder-opacity: 1;
+  --placeholder-opacity: 0.5;
 }
 
 .title-item{

h5app/src/views/pages/company/list.vue

@@ -20,21 +20,33 @@
       </ion-item>
 
       <div class="bw-vue-list">
-        <div class="list-content">
+        <div class="list-content" v-if="!loading">
           <ion-list>
-            <ion-item v-for="(record,key) in dataList" :key="key" detail @click="onDetail(record.companyID)">
-              <ion-label>
-                <div class="multi-title">
-                  <h2>{{ record.companyName }}</h2>
-                </div>
-                <p>地点：{{record.companyAddress}}</p>
-                <p>联系人：{{record.userName}}</p>
-                <div class="multi-title">
-                  <p>联系电话：{{record.userMobile}}</p>
-                  <p>岗位数量：{{ record.postCount }}</p>
-                </div>
-              </ion-label>
-            </ion-item>
+            <div v-for="(record,key) in dataList" :key="key">
+              <ion-item-sliding>
+                <ion-item  detail @click="onDetail(record.companyID)">
+                  <ion-label>
+                    <div class="multi-title">
+                      <h2>{{ record.companyName }}</h2>
+                    </div>
+                    <p>地点：{{record.companyAddress}}</p>
+                    <p>联系人：{{record.userName}}</p>
+                    <div class="multi-title">
+                      <p>联系电话：{{record.userMobile}}</p>
+                      <p>岗位数量：{{ record.postCount }}</p>
+                    </div>
+                  </ion-label>
+                </ion-item>
+                <ion-item-options>
+                  <ion-item-option @click="onEdit(record.companyID)">
+                    <ion-icon :icon="buildOutline"></ion-icon>
+                  </ion-item-option>
+                  <ion-item-option color="danger" @click="setDelAlertOpen(true, record.companyID)">
+                    <ion-icon :icon="trashOutline"></ion-icon>
+                  </ion-item-option>
+                </ion-item-options>
+              </ion-item-sliding>
+            </div>
           </ion-list>
         </div>
       </div>
@@ -46,6 +58,26 @@
         </ion-infinite-scroll-content>
       </ion-infinite-scroll>
     </ion-content>
+    <ion-alert
+        :is-open="delAlertOpen"
+        header="删除确认"
+        message="确定要删除该企业吗？"
+        :buttons="delAlertButtons"
+        @didDismiss="setDelAlertOpen(false, null)"
+    ></ion-alert>
+
+    <ion-alert
+        :is-open="infoAlertOpen"
+        :header="infoAlterData.title"
+        :message="infoAlterData.message"
+        :buttons="infoAlertButtons"
+        @didDismiss="setInfoAlertOpen(false)"
+    ></ion-alert>
+    <ion-loading
+        :is-open="delLoading"
+        message="删除中..."
+        @didDismiss="setDelLoadingOpen(false)" >
+    </ion-loading>
   </ion-page>
 </template>
 
@@ -57,7 +89,9 @@ import {useRoute, useRouter} from "vue-router";
 import {arrowBackOutline, ellipse, addCircleOutline} from 'ionicons/icons';
 import {IonIcon, onIonViewDidEnter} from '@ionic/vue';
 import BEmpty from "@/components/empty.vue";
-import {getCompanyList} from '@/api/company/index'
+import {getCompanyList} from '@/api/company/index';
+import {chevronForwardOutline,buildOutline,trashOutline} from 'ionicons/icons';
+import {get} from "@/api/common";
 
 export default defineComponent({
   name: 'CompanyList',
@@ -67,16 +101,16 @@ export default defineComponent({
     const route = useRoute();
     const total = ref(10);
     const loading = ref(true);
-    const pagination = computed(() => ({
-      total: total,
-      current: searchParams.pageIndex,
-      pageSize: searchParams.pageSize
-    }));
     const searchParams = reactive({
       pageIndex: 1,
       pageSize: 5,
       companyName: '',
     });
+    const pagination = computed(() => ({
+      total: total,
+      current: searchParams.pageIndex,
+      pageSize: searchParams.pageSize
+    }));
     const dataList = ref<any>([]);
     const colors = ref(["secondary", "tertiary", "success", "warning"]);
 
@@ -109,12 +143,77 @@ export default defineComponent({
     const onAdd = () => {
       router.push({path: './edit', query: {reload: 1,id: null,status: 1}});
     }
+    const onEdit = (companyID: string) => {
+      router.push({path: './edit', query: {reload: 1, id: companyID,status: 1}});
+    }
+    // 信息弹窗内容
+    const infoAlterData = reactive({
+      title:"",
+      message:""
+    })
+    // 删除警告弹窗开关
+    const delAlertOpen = ref(false);
+    // 删除警告弹窗按钮定义
+    const infoAlertButtons = [
+      {
+        text: '确定',
+        role: 'confirm',
+        handler: () => {
+          reload();
+        },
+      },
+    ];
 
+    // 删除数据
+    const delCompanyID = ref("");
+    // 删除加载
+    const delLoading = ref(false);
+    // 信息弹窗开关
+    const infoAlertOpen = ref(false);
+    // 删除警告弹窗按钮定义
+    const delAlertButtons = [
+      {
+        text: '取消',
+        role: 'cancel',
+        handler: () => {
+          reload();
+        },
+      },
+      {
+        text: '确定',
+        role: 'confirm',
+        handler: () => {
+          delLoading.value = true;
+          get("companyService/company/delete",{id:delCompanyID.value}).then((res) => {
+            infoAlterData.title = "提示";
+            infoAlterData.message = "删除成功";
+            setInfoAlertOpen(true);
+          }).finally(()=>{
+            delLoading.value = false;
+            reload();
+          });
+        },
+      },
+    ];
+    // 设置要删除的日志
+    function setDelAlertOpen(value: boolean, companyID: any) {
+      delAlertOpen.value = value;
+      if(companyID != null) {
+        delCompanyID.value = companyID;
+      }
+    }
+    // 设置信息提示弹窗开关
+    function setInfoAlertOpen(value: boolean) {
+      infoAlertOpen.value = value;
+    }
+    // 设置删除弹窗开启关闭
+    function setDelLoadingOpen(value: boolean) {
+      delLoading.value = value;
+    }
     const onDetail = (companyID:string) => {
       router.push({path: './detail', query: {reload: 1,id: companyID}});
     }
 
-
     const onBack = () => {
       router.push('../');
     }
@@ -127,6 +226,9 @@ export default defineComponent({
       ellipse,
       arrowBackOutline,
       addCircleOutline,
+      chevronForwardOutline,
+      buildOutline,
+      trashOutline,
       router,
       colors,
       total,
@@ -134,10 +236,21 @@ export default defineComponent({
       dataList,
       pagination,
       searchParams,
+      delCompanyID,
+      delAlertButtons,
+      infoAlertButtons,
+      delAlertOpen,
+      infoAlertOpen,
+      delLoading,
+      infoAlterData,
       onBack,
       onAdd,
       onDetail,
       onScroll,
+      onEdit,
+      setDelAlertOpen,
+      setInfoAlertOpen,
+      setDelLoadingOpen,
       loadData,
       reload,
       dayjs,
@@ -160,7 +273,6 @@ export default defineComponent({
     border-radius: 0 !important;
 
     ion-item {
-      margin-top: 10px;
       font-size: 14px;
 
       p {

h5app/src/views/pages/company/postList.vue

@@ -151,10 +151,7 @@ export default defineComponent({
       router.push({path: './editPost', query: {reload:1,id:postID,companyID:pageParams.companyID}});
     };
     const onBack = () => {
-      if(curStepData.value.statusVal==3)
-        router.push({path: './menu', query: {reload:1,id:pageParams.companyID,status:2}});
-      else if(curStepData.value.statusVal==2)
-        router.push({path: './edit', query: {reload:1,companyID:pageParams.companyID,status:1}});
+        router.push({path: './edit', query: {reload:1,id:pageParams.companyID,status:1}});
     };
 
     const onFinish = () => {
@@ -174,7 +171,7 @@ export default defineComponent({
       loading.value = true;
       pageParams.companyID = companyID;
       curStepData.value.statusVal = status;
-      console.log(pageParams);
+      console.log("S",pageParams);
       const result:any = await getCompanyPostList(pageParams);
       postList.value = postList.value.concat(result.list);
       pageParams.total = result.total;

h5app/src/views/pages/jobhunt/jobHuntEdit.vue

@@ -215,7 +215,7 @@ export default defineComponent({
     }
 
     const getAllPostList = async function(){
-      const allPostResult :any = await getPostList();
+      const allPostResult :any = await getPostList({pageIndex:1,pageSize:10000});
       allPostList.value = allPostResult.list;
       console.log("allPostList",allPostList.value);
     }

h5app/src/views/pages/post/recommendJob.vue

@@ -108,7 +108,7 @@ export default defineComponent({
         recommendType: 0
       });
       addRecommend(addRecommendList.value).then(() => {
-        let index = dataList.value.findIndex((x: any) => x.recommendMgtID == item.recommendMgtID);
+        const index = dataList.value.findIndex((x: any) => x.recommendMgtID == item.recommendMgtID);
         dataList.value.splice(index, 1)
         addRecommendList.value = [];
       });

src/main/java/com/hz/employmentsite/controller/companyService/CompanyController.java

@@ -4,7 +4,11 @@ import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.filter.exception.BaseErrorEnum;
 import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
+import com.hz.employmentsite.mapper.PcSiteMapper;
+import com.hz.employmentsite.mapper.PcSiteUserMapper;
 import com.hz.employmentsite.model.PcSite;
+import com.hz.employmentsite.model.PcSiteExample;
+import com.hz.employmentsite.model.PcSiteUserExample;
 import com.hz.employmentsite.util.DateUtils;
 import com.hz.employmentsite.util.ExcelHelper;
 import com.hz.employmentsite.vo.companyService.AppCompanyPostVo;
@@ -28,10 +32,10 @@ public class CompanyController {
     private CompanyService companyService;
 
     @Autowired
-    private DateUtils dateUtils;
+    private PcSiteUserMapper pcSiteUserMapper;
 
     @Autowired
-    private ExcelHelper excelHelper;
+    private DateUtils dateUtils;
 
 
     @ResponseBody
@@ -55,6 +59,13 @@ public class CompanyController {
             data.recordStatus = 1;
             data.validDate = dateUtils.StrToDate("2099-12-31 00:00:00") ;
             data.isShortage = 1;
+            PcSiteUserExample siteUserExp = new PcSiteUserExample();
+            PcSiteUserExample.Criteria siteUserCro = siteUserExp.createCriteria();
+            siteUserCro.andUserIDEqualTo(accountService.getLoginUserID());
+            var curSiteUserInfo = pcSiteUserMapper.selectByExample(siteUserExp).stream().findFirst().orElse(null);
+            if(curSiteUserInfo != null){
+                data.siteID = curSiteUserInfo.getSiteID();
+            }
         }
         return RespGenerstor.success(data);
     }

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

@@ -4,7 +4,7 @@
     <select id="getList" resultType="com.hz.employmentsite.vo.companyService.CompanyVo">
         select company.*,city.name as regionName,area.name as streetName,sys_cmodel.Name as companyModelType,
         (select count(*) from pc_post where CompanyID=company.CompanyID) as postCount,u.`Name` as createUserName
-        ,inSites.InstitutionID as institutionID
+        ,inSites.InstitutionID as institutionID,site.SiteName
         from pc_company company
         left join sys_user u on u.UserID = company.CreateUserID
         left join (select * from sys_dictionary_item where DictionaryCode ='CompanyModel') sys_cmodel on company.CompanyModel = sys_cmodel.Value