Merge remote-tracking branch 'origin/master'

h5app/src/components/postSelection.vue

@@ -211,6 +211,7 @@ export default defineComponent({
           const twoInfo = professionLevelList.value.find((x: any) => x.professionLevel == "2" && x.professionID == threeInfo.parentProfessionID);
           const oneInfo = professionLevelList.value.find((x: any) => x.professionLevel == "1" && x.professionID == twoInfo.parentProfessionID);
 
+          selectModelList[selectType.one].isSelect = false;
           selectModelList[selectType.one].disabled = false;
           selectModelList[selectType.one].professionName = oneInfo.professionName;
           selectModelList[selectType.one].professionID = oneInfo.professionID;
@@ -221,6 +222,7 @@ export default defineComponent({
               }));
           selectModelList[selectType.one].professionList.find((x: any) => x.professionID == oneInfo.professionID).isSelect = true;
 
+          selectModelList[selectType.two].isSelect = false;
           selectModelList[selectType.two].disabled = false;
           selectModelList[selectType.two].professionName = twoInfo.professionName;
           selectModelList[selectType.two].professionID = twoInfo.professionID;

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

@@ -30,7 +30,7 @@
           <div class="form-input">
             <ion-label>岗位名称<span class="danger">*</span></ion-label>
             <ion-item :class="[v$.dataModel.professionName.$error?'ion-invalid':'ion-valid']">
-              <ion-input placeholder="请选择岗位" label-placement="stacked" :clear-input="true"
+              <ion-input readonly placeholder="请选择岗位" label-placement="stacked" :clear-input="true"
                          v-model="dataModel.professionName" class="custom">
               </ion-input>
 <!--              <picker :ProfessionID="dataModel.professionID" aria-disabled="false"  @SetProfessionID="onSetProfessionID"></picker>-->

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

@@ -5,7 +5,7 @@
         <ion-buttons slot="start">
           <ion-icon :icon="arrowBackOutline" @click="onBack"></ion-icon>
         </ion-buttons>
-        <ion-title>推荐信息管理</ion-title>
+        <ion-title>推荐库</ion-title>
       </ion-toolbar>
     </ion-header>
     <ion-content>

h5app/src/views/pages/user/myInfo.vue

@@ -11,7 +11,7 @@
     <ion-content>
       <div class="bw-vue-form">
         <div class="form-detail">
-          <ion-label>登录名</ion-label>
+          <ion-label>工号</ion-label>
           <ion-text>{{ userInfo.loginID }}</ion-text>
         </div>
         <div class="form-detail">

h5app/src/views/pages/user/updatePassword.vue

@@ -15,7 +15,7 @@
           <ion-text>{{ dataModel.userName }}</ion-text>
         </div>
         <div class="form-detail">
-          <ion-label>姓名</ion-label>
+          <ion-label>账号</ion-label>
           <ion-text>{{ dataModel.loginID }}</ion-text>
         </div>
       </div>

h5app/src/views/sapp/about.vue

@@ -13,7 +13,7 @@
         <div class="form-title">关于我们</div>
         <div class="form-detail">
           <ion-label>当前版本</ion-label>
-          <ion-text>V1.1</ion-text>
+          <ion-text>V1.2</ion-text>
         </div>
         <div class="form-detail">
           <ion-label>技术支持</ion-label>

h5app/src/views/sapp/tabWork.vue

@@ -78,6 +78,12 @@
          <div class="content-title">我的应用</div>
          <div class="content-applist">
            <div class="tool-box">
+             <a class="tool-item box-line"  @click="router.push('/tabs/tabMain/userQrCode/index')">
+               <div class="tool-img">
+                 <img src="@/assets/icon/qrcode.png">
+               </div>
+               <div class="tool-title">我的二维码</div>
+             </a>
              <a class="tool-item box-line"  @click="router.push('/tabs/tabMain/jobhunt/list')">
                <div class="tool-img">
                  <img src="@/assets/icon/qzxx.png">
@@ -106,26 +112,22 @@
                <div class="tool-img">
                  <img src="@/assets/icon/gwtj.png">
                </div>
-               <div class="tool-title">推荐信息管理</div>
+               <div class="tool-title">推荐库</div>
              </a>
-             <a class="tool-item box-line"  @click="router.push('/tabs/tabMain/work/log/list')">
-               <div class="tool-img">
-                 <img src="@/assets/icon/gzrz.png">
-               </div>
-               <div class="tool-title">工作日志</div>
-             </a>
-             <a class="tool-item box-line"  @click="router.push('/tabs/tabMain/work/task/list')">
+             <a class="tool-item box-line" @click="router.push('/tabs/tabMain/workTask/list')">
                <div class="tool-img">
                  <img src="@/assets/icon/gzrw.png">
                </div>
                <div class="tool-title">工作任务</div>
              </a>
-             <a class="tool-item box-line"  @click="router.push('/tabs/tabMain/sitemap/index')">
+             <a class="tool-item box-line" @click="router.push('/tabs/tabMain/workLog/list')">
                <div class="tool-img">
-                 <img src="@/assets/icon/map.png">
+                 <img src="@/assets/icon/gzrz.png">
                </div>
-               <div class="tool-title">驿站地图</div>
+               <div class="tool-title">工作日志</div>
              </a>
+
+
              <a class="tool-item box-line"  @click="router.push('/tabs/tabWork/work/track/index')">
                <div class="tool-img">
                  <img src="@/assets/icon/map.png">

vue/src/views/companyService/company/edit.vue

@@ -212,9 +212,7 @@
           </a-form-item>
         </a-col>
       </a-row>
-      <a-divider orientation="left">附件图片上传</a-divider>
-      <b-upload-file :fileRefId="dataModel.companyID" :readonly="false" :multiple="true" style="width: 100%;"
-                     :setFileList="setFileList" :accept="'.pdf,.png,.jpg'"  ></b-upload-file>
+
       <a-divider orientation="left">其他信息</a-divider>
       <a-row>
         <a-col :span="8">
@@ -358,6 +356,9 @@
           </a-form-item>
         </a-col>
       </a-row>
+      <a-divider orientation="left">附件图片上传</a-divider>
+      <b-upload-file :fileRefId="dataModel.companyID" :readonly="false" :multiple="true" style="width: 100%;"
+                     :setFileList="setFileList" :accept="'.pdf,.png,.jpg'"  ></b-upload-file>
       <a-form-item class="buttom-btns">
         <a-button @click="onClose">取消</a-button>
         <a-button type="primary" html-type="submit">提交</a-button>