h5app/src/views/pages/work/log/detail.vue

@@ -5,7 +5,7 @@
         <ion-buttons slot="start">
           <ion-icon :icon="arrowBackOutline" @click="onCancel"></ion-icon>
         </ion-buttons>
-        <ion-title>工作日志详情</ion-title>
+        <ion-title>工作备忘详情</ion-title>
       </ion-toolbar>
     </ion-header>
     <ion-content>
@@ -13,15 +13,15 @@
       <div class="bw-vue-form">
         <div class="form-title">基本信息</div>
         <div class="form-detail">
-          <ion-label>工作日志日期</ion-label>
+          <ion-label>工作备忘日期</ion-label>
           <ion-text>{{ workLogData.dataModel.workTime }}</ion-text>
         </div>
         <div class="form-detail">
-          <ion-label>日志类型</ion-label>
+          <ion-label>备忘类型</ion-label>
           <ion-text>{{ workLogData.dataModel.logTypeName }}</ion-text>
         </div>
         <div class="form-detail">
-          <ion-label>工作内容</ion-label>
+          <ion-label>工作备忘内容</ion-label>
           <ion-text>{{ workLogData.dataModel.workContent }}</ion-text>
         </div>
         <div class="form-detail">

h5app/src/views/pages/work/log/edit.vue

@@ -5,7 +5,7 @@
         <ion-buttons slot="start">
           <ion-icon :icon="arrowBackOutline" @click="onCancel"></ion-icon>
         </ion-buttons>
-        <ion-title>工作日志编辑</ion-title>
+        <ion-title>工作备忘编辑</ion-title>
       </ion-toolbar>
     </ion-header>
     <ion-content>
@@ -15,7 +15,7 @@
           <div class="form-title">基本信息</div>
           <div class="form-input">
             <ion-label>
-              工作日志日期
+              工作备忘日期
               <span class="danger">*</span>
             </ion-label>
             <div class="dateTimeBox">
@@ -31,7 +31,7 @@
           </div>
           <div class="form-select">
             <ion-label>
-              日志类型
+              备忘类型
               <span class="danger">*</span>
             </ion-label>
             <ion-select name="doTypeID" id="doTypeID" interface="action-sheet" okText="确定" cancelText="取消" v-model="dataModel.doTypeID" placeholder="请选择日志类型">
@@ -42,10 +42,10 @@
           </div>
           <div class="form-input">
             <ion-label>
-              工作内容
+              工作备忘内容
               <span class="danger">*</span>
             </ion-label>
-            <ion-textarea name="workContent" id="workContent" placeholder="请输入工作内容" :rows="3" v-model="dataModel.workContent"></ion-textarea>
+            <ion-textarea name="workContent" id="workContent" placeholder="请输入工作备忘内容" :rows="3" v-model="dataModel.workContent"></ion-textarea>
           </div>
           <div class="form-input">
             <ion-label>

h5app/src/views/pages/work/log/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-buttons slot="end">
           <ion-icon :icon="addCircleOutline" @click="onAdd"></ion-icon>
         </ion-buttons>
@@ -46,7 +46,7 @@
                       <ion-col>
                         <ion-label style="display: flex;justify-content: space-between;">
                           <ion-text>
-                            {{ record.workTime }}工作日志
+                            {{ record.workTime }}工作备忘
                           </ion-text>
                         </ion-label>
                       </ion-col>
@@ -55,7 +55,7 @@
                       <ion-col>
                         <ion-label>
                           <p>
-                            日志类型：{{ record.logTypeName }}
+                            备忘类型：{{ record.logTypeName }}
                           </p>
                         </ion-label>
                       </ion-col>
@@ -87,7 +87,7 @@
     <ion-alert
         :is-open="delAlertOpen"
         header="删除确认"
-        message="确定要删除该工作日志吗？"
+        message="确定要删除该工作备忘吗？"
         :buttons="delAlertButtons"
         @didDismiss="setDelAlertOpen(false, null)"
     ></ion-alert>

h5app/src/views/sapp/tabMain.vue

@@ -56,11 +56,11 @@
 
 
           <a class="tool-item box-line"
-             @click="saveSysLog('工作日志（APP）', '/tabs/tabMain/workLog/list', '点击菜单', router.push('/tabs/tabMain/workLog/list'))">
+             @click="saveSysLog('工作备忘（APP）', '/tabs/tabMain/workLog/list', '点击菜单', router.push('/tabs/tabMain/workLog/list'))">
             <div class="tool-img">
               <img src="@/assets/icon/gzrz.png">
             </div>
-            <div class="tool-title">工作日志</div>
+            <div class="tool-title">工作备忘</div>
           </a>
         </div>
         <div class="panel">

h5app/src/views/sapp/tabWork.vue

@@ -128,11 +128,11 @@
                <div class="tool-title">工作任务</div>
              </a>
              <a class="tool-item box-line"
-                @click="saveSysLog('工作日志（APP）', '/tabs/tabMain/workLog/list', '点击菜单', router.push('/tabs/tabMain/workLog/list'))">
+                @click="saveSysLog('工作备忘（APP）', '/tabs/tabMain/workLog/list', '点击菜单', router.push('/tabs/tabMain/workLog/list'))">
                <div class="tool-img">
                  <img src="@/assets/icon/gzrz.png">
                </div>
-               <div class="tool-title">工作日志</div>
+               <div class="tool-title">工作备忘</div>
              </a>
 
 

vue/src/views/taskAndLog/dowork/detail.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="card-edit">
-    <a-divider orientation="left">工作日志信息</a-divider>
+    <a-divider orientation="left">工作备忘信息</a-divider>
     <a-descriptions bordered>
       <a-descriptions-item label="姓名">{{ workInfo.userName }}</a-descriptions-item>
-      <a-descriptions-item label="日志类型">{{ workInfo.logTypeName }}</a-descriptions-item>
+      <a-descriptions-item label="备忘类型">{{ workInfo.logTypeName }}</a-descriptions-item>
       <a-descriptions-item label="完成时间">{{ workInfo.workTime }}</a-descriptions-item>
       <a-descriptions-item label="所属县区">{{ workInfo.regionName }}</a-descriptions-item>
       <a-descriptions-item :span="2" label="所属街道">{{ workInfo.streetName }}</a-descriptions-item>
-      <a-descriptions-item label="工作情况">{{ workInfo.workContent }}</a-descriptions-item>
+      <a-descriptions-item label="工作备忘情况">{{ workInfo.workContent }}</a-descriptions-item>
       <a-descriptions-item label="最后更新人">{{ workInfo.modifyUserName }}</a-descriptions-item>
       <a-descriptions-item label="最后更新时间">
         {{ workInfo.modifyTime ? dayjs(workInfo.modifyTime).format('YYYY-MM-DD') : '' }}

vue/src/views/taskAndLog/dowork/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="card-edit">
     <a-form :model="dataModel" autocomplete="off" @finish="onFinish">
-      <a-divider orientation="left">工作日志信息</a-divider>
+      <a-divider orientation="left">工作备忘信息</a-divider>
       <a-row type="flex">
         <a-col :span="7">
           <a-form-item label="姓名" name="userId" :label-col="{span:7}"
@@ -17,7 +17,7 @@
           </a-form-item>
         </a-col>
         <a-col :span="8">
-            <a-form-item label="日志类型" name="doTypeID" :label-col="{span:8}" :rules="[{ required: true, message: '请选择日志类型!' }]">
+            <a-form-item label="备忘类型" name="doTypeID" :label-col="{span:8}" :rules="[{ required: true, message: '请选择日志类型!' }]">
             <label v-if="opCategory==3">{{dataModel.logTypeName }}</label>
               <a-select ref="select" v-model:value="dataModel.doTypeID" :options="logTypeList"
                         :field-names="{ label: 'name', value: 'value' }" :allow-clear="false" > </a-select>
@@ -68,7 +68,7 @@
       <a-row :gutter="24">
         <a-col :span="24">
           <a-form-item
-            label="工作内容"
+            label="工作备忘内容"
             :label-col="{ span: 24 }"
             name="workContent"
           >

vue/src/views/taskAndLog/dowork/index.vue

@@ -8,13 +8,13 @@
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item :label-col="{span:6}" label="工作日期" name="workDate">
+          <a-form-item :label-col="{span:6}" label="备忘日期" name="workDate">
             <a-range-picker v-model:value="workDate" :placeholder="['开始日期', '结束日期']"
                             format="YYYY-MM-DD" @change="onRangeChange"/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item :label-col="{span:6}" label="日志类型" name="doTypeID">
+          <a-form-item :label-col="{span:6}" label="备忘类型" name="doTypeID">
             <a-select ref="select"
                       v-model:value="searchParams.doTypeID" :allow-clear="true"
                       :field-names="{ label: 'name', value: 'value' }" :options="logTypeList" @change="onSearch">
@@ -93,7 +93,7 @@
           </div>
           <div>
             <a-button functioncode="T01040202" html-type="submit" type="primary" @click='onAdd'>新增</a-button>
-            <BExportExcel :filename="'工作日志信息'"
+            <BExportExcel :filename="'备忘信息'"
                           :params="{...exportSearchParams, rows:100000,doWorkIDList:formState.selectedRowKeys.join(',')}"
                           :title="'导出'"
                           :url="'taskAndLog/doWork/export'"></BExportExcel>
@@ -205,13 +205,13 @@ export default defineComponent({
       },
       {title: '姓名', dataIndex: 'userName', key: 'userName', align: "center"},
       {
-        title: '工作日期', dataIndex: 'workTime', key: 'workTime', width: 120, align: "center",
+        title: '工作备忘日期', dataIndex: 'workTime', key: 'workTime', width: 120, align: "center",
         customRender: (item) => {
           return item.record.workTime == null ? "" : (dayjs(item.record.workTime).format('YYYY-MM-DD'))
         },
       },
-      {title: '日志类型', dataIndex: 'logTypeName', key: 'logTypeName', align: "center"},
-      {title: '工作情况', dataIndex: 'workContent', key: 'workContent', align: "center"},
+      {title: '备忘类型', dataIndex: 'logTypeName', key: 'logTypeName', align: "center"},
+      {title: '工作备忘情况', dataIndex: 'workContent', key: 'workContent', align: "center"},
       {title: '所属驿站', dataIndex: 'siteName', key: 'siteName', align: "center"},
       {title: '所属县区', dataIndex: 'regionName', key: 'regionName', align: "center"},
       {title: '所属街道', dataIndex: 'streetName', key: 'streetName', align: "center", isDefaultClose: true},