Pārlūkot izejas kodu

app-我的任务

liao-sea 1 gadu atpakaļ
vecāks
revīzija
d6c7abe579

+ 11 - 3
h5app/src/views/pages/jobuser/jobHuntEdit.vue

@@ -56,14 +56,16 @@
             </ion-item>
             <ion-item :class="[huntDataValid.dataModel.maxSalary.$error||huntDataValid.dataModel.minSalary.$error?'ion-invalid':'ion-valid']">
               <ion-label>月薪要求<span class="danger">*</span></ion-label>
-              <ion-input name="minSalary" id="minSalary" style="text-align: center;" placeholder="输入最低薪资" v-model="dataModel.minSalary" ></ion-input>
+              <ion-input inputmode="numeric" name="minSalary" id="minSalary" style="text-align: center;" placeholder="输入最低薪资" v-model="dataModel.minSalary" ></ion-input>
-              <ion-input name="maxSalary" id="maxSalary" style="text-align: center;" placeholder="输入最高薪资" v-model="dataModel.maxSalary" ></ion-input>
+              <ion-input inputmode="numeric" name="maxSalary" id="maxSalary" style="text-align: center;" placeholder="输入最高薪资" v-model="dataModel.maxSalary" ></ion-input>
               <ion-note slot="error">月薪要求不能为空</ion-note>
             </ion-item>
             <ion-item :class="[huntDataValid.dataModel.workYear.$error?'ion-invalid':'ion-valid']">
               <ion-label>工作年限<span class="danger">*</span></ion-label>
-              <ion-input name="workYear" id="workYear" style="text-align: right;" placeholder="请输入工作年限" v-model="dataModel.workYear" ></ion-input>
+              <ion-input inputmode="numeric" name="workYear" id="workYear" style="text-align: right;" placeholder="请输入工作年限" v-model="dataModel.workYear" ></ion-input>
+<!--           <ion-range name="workYear" id="workYear" aria-label="Range with pin"  pin="true" pin-formatter="pinFormatter" v-model="dataModel.workYear"
+                         min=0 max=60 style="display: inline-block; width: 320px;"></ion-range>-->
               <ion-note slot="error">工作年限不能为空</ion-note>
             </ion-item>
             <ion-item :class="[huntDataValid.dataModel.areaWork.$error?'ion-invalid':'ion-valid']">
@@ -104,6 +106,12 @@ interface StepParams{
   name: string,
   statusVal: number
 }
+export class ExampleComponent {
+  pinFormatter(value: number) {
+    return `${value}`;
+  }
+}
+
 export default defineComponent({
   name: 'jobHuntEdit',
   setup() {

+ 4 - 4
h5app/src/views/pages/work/task/edit.vue

@@ -25,10 +25,10 @@
           <ion-item-group style="overflow: hidden;"  >
             <ion-label style="padding-left:16px;">指派人<span class="danger">*</span></ion-label>
             <ion-item style="width:50%;text-align: center;float:left;" v-for="(it,key) in allTaskUserList" :key="key">
-              <ion-checkbox style="margin-right:10px;" name="taskUserItem" :value="it.siteUserID" :checked="it.checked"
-                            @ionChange="selectTaskUser(it)">
+              <ion-checkbox justify="start" labelPlacement="end"  style="margin-right:10px;" name="taskUserItem"
+                            :value="it.siteUserID"  :checked="it.checked" @ionChange="selectTaskUser(it)">
+                {{ it.text }}
               </ion-checkbox>
-              {{ it.text }}
             </ion-item>
           </ion-item-group>
           <ion-item :class="[workTaskValid.dataModel.finishTime.$error?'ion-invalid':'ion-valid']">
@@ -107,7 +107,7 @@ interface CheckProps {
   checked: boolean
 }
 export default defineComponent({
-  name: 'WorkLogEdit',
+  name: 'WorkTaskEdit',
   setup() {
     const router = useRouter();
     const route = useRoute();

+ 1 - 1
h5app/src/views/pages/work/task/list.vue

@@ -49,7 +49,7 @@ import BEmpty from "@/components/empty.vue";
 import {getWorkTaskList} from '@/api/workTask';
 
 export default defineComponent({
-  name: 'PracticeIntention',
+  name: 'WorkLogList',
   components: {IonIcon, BEmpty},
   setup() {
     const searchParamsState = reactive({

+ 8 - 2
h5app/src/views/sapp/tabMain.vue

@@ -48,12 +48,12 @@
             我的任务
           </div>
           <ion-list class="list-content" >
-            <ion-item v-for="(record,key) in dataList" :key="key" detail>
+            <ion-item v-for="(record,key) in dataList" :key="key" detail  @click="onDetail(record.doTaskID)">
               <ion-avatar aria-hidden="true" slot="end" style="width:70px;">
                 {{dayjs(record.finishTime).format("YYYY年MM-DD")}}
               </ion-avatar>
               <ion-label>
-                <p>任务名称:{{ record.dotaskName }}</p>
+                <p>任务名称:{{ record.doTaskName }}</p>
                 <p>任务详情:{{record.content}}</p>
               </ion-label>
             </ion-item>
@@ -99,6 +99,10 @@ export default defineComponent({
       loading.value = false;
     }
 
+    const onDetail = (doTaskID:string) =>{
+      router.push({path: "./work/task/edit", query: {reload:1, doTaskID: doTaskID}});
+    }
+
     const onScroll = (e: any) => {
       setTimeout(() => {
         e.target.complete();
@@ -120,9 +124,11 @@ export default defineComponent({
 
     return {
       router,
+      loading,
       dataList,
       searchParamsState,
       loadData,
+      onDetail,
       onScroll,
       reload,
       dayjs

+ 1 - 1
src/main/java/com/hz/employmentsite/services/impl/taskAndLog/DoTaskImpl.java

@@ -50,7 +50,7 @@ public class DoTaskImpl implements DoTaskService {
     public PageInfo<DoTaskVo> getMyTasks(Integer page, Integer rows, String curUserID) {
         PcDotaskUserExample exp = new PcDotaskUserExample();
         PcDotaskUserExample.Criteria cro = exp.createCriteria();
-        cro.andDotaskUserIDEqualTo(curUserID);
+        cro.andSiteUserIDEqualTo(curUserID);
         var curDoTaskUserInfo = doTaskUserMapper.selectByExample(exp).stream().toList();
         List<String> curDoTaskIDs = new ArrayList<String>();
         if (curDoTaskUserInfo.size()>0){