pengjing 1 год назад
Родитель
Сommit
bb65e8aad3

BIN
h5app/src/assets/icon/map-demo.jpg


+ 4 - 0
h5app/src/router/index.ts

@@ -48,6 +48,10 @@ const routes: Array<RouteRecordRaw> = [
                 path: 'tabMain/work/log/list',
                 component: () => import('@/views/pages/work/log/list.vue')
             },
+            {
+                path: 'tabMain/work/log/edit',
+                component: () => import('@/views/pages/work/log/edit.vue')
+            },
             {
                 path: 'tabMain/work/task/list',
                 component: () => import('@/views/pages/work/task/list.vue')

+ 2 - 55
h5app/src/views/pages/sitemap/index.vue

@@ -5,64 +5,11 @@
         <ion-buttons slot="start">
           <ion-icon :icon="arrowBackOutline" @click="()=>router.push('../')"></ion-icon>
         </ion-buttons>
-        <ion-title>企业信息收集</ion-title>
-        <ion-buttons slot="end">
-          <ion-icon :icon="addCircleOutline" @click="onAdd()"></ion-icon>
-        </ion-buttons>
+        <ion-title>驿站地图</ion-title>
       </ion-toolbar>
     </ion-header>
     <ion-content>
-      <ion-item style="margin: 10px 0;">
-        <ion-input style="border: 1px solid #f2f2f5;border-radius: 8px;--padding-start: 10px;"></ion-input>
-        <ion-button slot="end" style="height: 40px;width: 70px;margin-left: 10px;">搜索</ion-button>
-      </ion-item>
-      <ion-list class="list-content">
-        <ion-item v-for="(record,key) in dataList" :key="key"  detail>
-          <ion-grid>
-            <ion-row>
-              <ion-col>
-                <ion-label style="display: flex;justify-content: space-between;">
-                  <ion-text>
-                    {{record.companyName}}
-                  </ion-text>
-                  <p>
-                    {{record.statusName}}
-                  </p>
-                </ion-label>
-              </ion-col>
-            </ion-row>
-            <ion-row>
-              <ion-col>
-                <ion-label>
-                  <p>
-                    最新跟进时间:{{record.updateTime}}
-
-                  </p>
-                </ion-label>
-              </ion-col>
-            </ion-row>
-            <ion-row>
-              <ion-col>
-                <ion-label style="display: flex;justify-content: space-between;">
-                  <p>
-                    参保人数:16人
-                  </p>
-                  <p>
-                    岗位数量:6
-                  </p>
-                </ion-label>
-              </ion-col>
-            </ion-row>
-          </ion-grid>
-        </ion-item>
-      </ion-list>
-      <b-empty v-if="dataList.length<=0" :loading="loading"/>
-      <ion-infinite-scroll threshold="100px" @ionInfinite="onScroll($event)">
-        <ion-infinite-scroll-content
-            :loadingText="pagination.total>pagination.current*pagination.pageSize?'正在加载...':'暂无更多'"
-            loadingSpinner="bubbles">
-        </ion-infinite-scroll-content>
-      </ion-infinite-scroll>
+      <img src="@/assets/icon/map-demo.jpg" style="width: 100%;height: 100%;">
     </ion-content>
   </ion-page>
 </template>

+ 150 - 0
h5app/src/views/pages/work/log/edit.vue

@@ -0,0 +1,150 @@
+<template>
+  <ion-page class="work-log-page">
+    <ion-header class="header-theme2">
+      <ion-toolbar>
+        <ion-buttons slot="start">
+          <ion-icon :icon="arrowBackOutline" @click="()=>router.push('./list')"></ion-icon>
+        </ion-buttons>
+        <ion-title>
+          工作日志录入
+        </ion-title>
+      </ion-toolbar>
+    </ion-header>
+    <ion-content>
+      <form autocomplete="off">
+        <ion-list>
+          <ion-item>
+            <ion-input type="date" label="工作日志日期" label-placement="stacked" :clear-input="true"
+                       placeholder="工作日志日期"
+                       v-model="dataModel.logDate">
+            </ion-input>
+          </ion-item>
+          <ion-item>
+            <ion-input label="日志类型" label-placement="stacked" :clear-input="true"
+                       placeholder="日志类型">
+            </ion-input>
+          </ion-item>
+          <ion-item>
+            <ion-textarea label="工作内容" label-placement="stacked" placeholder="工作内容" rows="8"></ion-textarea>
+          </ion-item>
+        </ion-list>
+      </form>
+    </ion-content>
+    <ion-footer>
+      <ion-button class="save-btn" @click="onSave">提交</ion-button>
+    </ion-footer>
+  </ion-page>
+</template>
+<script lang="ts">
+import {defineComponent, ref, watch} from "vue";
+/*import {getPracticeBaseForStudentList,getSysAreaList} from "@/api/system/dictionary";
+import {get, save} from "@/api/practice/intention";*/
+import {useRoute, useRouter} from "vue-router";
+import {alertController, onIonViewDidEnter} from "@ionic/vue";
+import {arrowBackOutline} from 'ionicons/icons';
+
+interface DataModel {
+  name: string,
+  logDate: null
+}
+
+export default defineComponent({
+  name: 'WorkLogEdit',
+  setup() {
+    const router = useRouter();
+    const route = useRoute();
+    const dataModel = ref<DataModel>({
+      name: ''
+    });
+
+    const onSave = () => {
+      if (!dataModel.value.name) {
+        presentAlert("请填写姓名!");
+        return false;
+      }
+
+      /*save(dataModel.value as any).then(result => {
+        if (result) {
+          router.push({path: './index', query: {reload: 1}});
+        }
+      });*/
+    }
+
+    const onCancel = () => {
+      router.push("./index");
+    }
+
+    const loadData = (practiceTaskStudentID: any) => {
+      /*get(practiceTaskStudentID).then((result: any) => {
+        dataModel.value = result;
+
+        loadPracticeBaseList(dataModel.value.schoolYearID);
+        loadCityList();
+      });*/
+    };
+
+    const initData = (id: any) => {
+      dataModel.value = {name: '', statusVal: 1};
+      loadData(id);
+    };
+
+    onIonViewDidEnter(() => {
+      if (route.query.reload)
+        initData(route.query.id);
+    });
+
+    const presentAlert = async (message: string) => {
+      const alert = await alertController.create({
+        header: '错误!',
+        message: message,
+        buttons: [
+          '确定'
+        ],
+      });
+
+      await alert.present();
+    }
+
+   /* const inputBlur = (e: any) => {
+      if (dataModel.value.logDate == null)
+        e.target.setAttribute('placeholder', '出生年月日');
+    }
+    const inputFocus = (e: any) => {
+      e.target.removeAttribute('placeholder');
+    }*/
+
+
+    return {
+      dataModel,
+      initData,
+      onSave,
+      onCancel,
+      route,
+      arrowBackOutline,
+      router,
+     /* inputBlur,
+      inputFocus*/
+    }
+  }
+});
+</script>
+
+<style lang="less">
+.work-log-page {
+  .save-btn {
+    width: 100%;
+    --border-radius: 0px;
+    --background: #f2f2f5;
+    margin: 20px 0 0 0;
+    color: #363432;
+    font-size: 14px;
+  }
+
+  /*input[type="date"]:before {
+    content: attr(placeholder);
+    color: #00d9ff;
+  }*/
+}
+
+
+</style>

+ 32 - 26
h5app/src/views/pages/work/log/list.vue

@@ -5,29 +5,30 @@
         <ion-buttons slot="start">
           <ion-icon :icon="arrowBackOutline" @click="()=>router.push('../')"></ion-icon>
         </ion-buttons>
-        <ion-title>企业信息收集</ion-title>
+        <ion-title>工作日志</ion-title>
         <ion-buttons slot="end">
           <ion-icon :icon="addCircleOutline" @click="onAdd()"></ion-icon>
         </ion-buttons>
       </ion-toolbar>
     </ion-header>
     <ion-content>
-      <ion-item style="margin: 10px 0;">
-        <ion-input style="border: 1px solid #f2f2f5;border-radius: 8px;--padding-start: 10px;"></ion-input>
-        <ion-button slot="end" style="height: 40px;width: 70px;margin-left: 10px;">搜索</ion-button>
+      <ion-item class="search-item">
+        <ion-input type="date"
+                   placeholder="开始时间" mode="md"></ion-input>
+        —
+        <ion-input type="date"
+                   placeholder="结束时间" mode="md"></ion-input>
+        <ion-button slot="end" style="height: 30px;width: 60px;margin-left: 10px;--box-shadow: none;">搜索</ion-button>
       </ion-item>
       <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>
           <ion-grid>
             <ion-row>
               <ion-col>
                 <ion-label style="display: flex;justify-content: space-between;">
                   <ion-text>
-                    {{record.companyName}}
+                    {{ record.name }}
                   </ion-text>
-                  <p>
-                    {{record.statusName}}
-                  </p>
                 </ion-label>
               </ion-col>
             </ion-row>
@@ -35,20 +36,7 @@
               <ion-col>
                 <ion-label>
                   <p>
-                    最新跟进时间:{{record.updateTime}}
-
-                  </p>
-                </ion-label>
-              </ion-col>
-            </ion-row>
-            <ion-row>
-              <ion-col>
-                <ion-label style="display: flex;justify-content: space-between;">
-                  <p>
-                    参保人数:16人
-                  </p>
-                  <p>
-                    岗位数量:6
+                    日志类型:{{ record.logTypeName }}
                   </p>
                 </ion-label>
               </ion-col>
@@ -77,7 +65,7 @@ import {IonIcon, onIonViewDidEnter} from '@ionic/vue';
 import BEmpty from "@/components/empty.vue";
 
 export default defineComponent({
-  name: 'PracticeIntention',
+  name: 'WorkLogList',
   components: {IonIcon, BEmpty},
   setup() {
     const loading = ref(true);
@@ -101,8 +89,12 @@ export default defineComponent({
       dataList.value = dataList.value.concat(result.list);
       total.value = result.total;*/
 
-      dataList.value = [{companyName: '惠州市AA信息科技有限公司', statusName: "正在跟进",updateTime:'2023-12-11'},
-        {companyName: '惠州市BB信息科技有限公司', statusName: "正在跟进",updateTime:'2023-12-12'},{companyName: '惠州市CC信息科技有限公司', statusName: "正在跟进",updateTime:'2023-12-13'}];
+      dataList.value = [{name: '2023年11月23日工作日志', logTypeName: "上门服务", updateTime: '2023-12-11'},
+        {
+          name: '2023年11月22日工作日志',
+          logTypeName: "客户服务",
+          updateTime: '2023-12-12'
+        }, {name: '2023年11月21日工作日志', logTypeName: "客户服务", updateTime: '2023-12-13'}];
       loading.value = false;
     }
 
@@ -152,14 +144,28 @@ export default defineComponent({
 </script>
 
 <style lang="less">
+.search-item{
+  margin: 10px 0;
+  font-size: 14px;
+  ion-input{
+    border: 1px solid #f2f2f5;border-radius: 4px;--padding-start: 10px;
+    width: 100px;
+  }
+
+  input{
+    padding: 6px !important;
+  }
+}
 .list-content {
   margin: 0px 15px !important;
   background-color: white !important;
   border-radius: 0 !important;
+
   ion-item {
     margin-top: 10px;
     font-size: 14px;
     border: 1px solid rgb(242, 242, 245);
+
     p {
       font-size: 12px;
     }

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

@@ -5,10 +5,10 @@
         <ion-buttons slot="start">
           <ion-icon :icon="arrowBackOutline" @click="()=>router.push('../')"></ion-icon>
         </ion-buttons>
-        <ion-title>企业信息收集</ion-title>
-        <ion-buttons slot="end">
+        <ion-title>工作任务</ion-title>
+<!--        <ion-buttons slot="end">
           <ion-icon :icon="addCircleOutline" @click="onAdd()"></ion-icon>
-        </ion-buttons>
+        </ion-buttons>-->
       </ion-toolbar>
     </ion-header>
     <ion-content>
@@ -16,46 +16,6 @@
         <ion-input style="border: 1px solid #f2f2f5;border-radius: 8px;--padding-start: 10px;"></ion-input>
         <ion-button slot="end" style="height: 40px;width: 70px;margin-left: 10px;">搜索</ion-button>
       </ion-item>
-      <ion-list class="list-content">
-        <ion-item v-for="(record,key) in dataList" :key="key"  detail>
-          <ion-grid>
-            <ion-row>
-              <ion-col>
-                <ion-label style="display: flex;justify-content: space-between;">
-                  <ion-text>
-                    {{record.companyName}}
-                  </ion-text>
-                  <p>
-                    {{record.statusName}}
-                  </p>
-                </ion-label>
-              </ion-col>
-            </ion-row>
-            <ion-row>
-              <ion-col>
-                <ion-label>
-                  <p>
-                    最新跟进时间:{{record.updateTime}}
-
-                  </p>
-                </ion-label>
-              </ion-col>
-            </ion-row>
-            <ion-row>
-              <ion-col>
-                <ion-label style="display: flex;justify-content: space-between;">
-                  <p>
-                    参保人数:16人
-                  </p>
-                  <p>
-                    岗位数量:6
-                  </p>
-                </ion-label>
-              </ion-col>
-            </ion-row>
-          </ion-grid>
-        </ion-item>
-      </ion-list>
       <b-empty v-if="dataList.length<=0" :loading="loading"/>
       <ion-infinite-scroll threshold="100px" @ionInfinite="onScroll($event)">
         <ion-infinite-scroll-content
@@ -101,8 +61,8 @@ export default defineComponent({
       dataList.value = dataList.value.concat(result.list);
       total.value = result.total;*/
 
-      dataList.value = [{companyName: '惠州市AA信息科技有限公司', statusName: "正在跟进",updateTime:'2023-12-11'},
-        {companyName: '惠州市BB信息科技有限公司', statusName: "正在跟进",updateTime:'2023-12-12'},{companyName: '惠州市CC信息科技有限公司', statusName: "正在跟进",updateTime:'2023-12-13'}];
+      /*dataList.value = [{companyName: '惠州市AA信息科技有限公司', statusName: "正在跟进",updateTime:'2023-12-11'},
+        {companyName: '惠州市BB信息科技有限公司', statusName: "正在跟进",updateTime:'2023-12-12'},{companyName: '惠州市CC信息科技有限公司', statusName: "正在跟进",updateTime:'2023-12-13'}];*/
       loading.value = false;
     }