Browse Source

fix: APP 工作日志添加照片上传

zhangying 10 months ago
parent
commit
726defb100

+ 9 - 2
h5app/src/views/pages/work/log/detail.vue

@@ -41,6 +41,13 @@
           <ion-text>{{ recordsCount.RecordsJobhuntNum }}</ion-text>
         </div>
       </div>
+      <div class="form-detail" style="margin-top: 5px">
+        <ion-label style="color: #8c8f93;margin-left: 10px;">
+          照片
+        </ion-label>
+        <b-image v-if="workLogData.dataModel.doWorkID" :file-ref-id="workLogData.dataModel.doWorkID" :readonly="true"
+                 :is-single="false"></b-image>
+      </div>
     </ion-content>
     <ion-loading
         :is-open="loading"
@@ -59,6 +66,7 @@ import {arrowBackOutline} from 'ionicons/icons';
 import {required} from "@vuelidate/validators";
 import {useVuelidate} from "@vuelidate/core";
 import dayjs from "dayjs";
+import BImage from "@/components/bImage.vue";
 
 interface workLogModel {
   dataModel:any
@@ -105,10 +113,9 @@ const loadData = async (doWorkID: any) => {
   await getWorkTypeList();
   const reqData = await getWorkLogById(doWorkID);
   workLogData.dataModel = reqData;
-  if(workLogData.dataModel.workTime==null){
+  if (workLogData.dataModel.workTime == null) {
     workLogData.dataModel.workTime = dayjs(new Date().toLocaleDateString()).format("YYYY-MM-DD")+"T00:00:00.000+08:00";
   }
-  console.log("初始化dataModel",workLogData.dataModel);
   // 查询当天登记业务数据数量
   await getRecordsCount(workLogData.dataModel.userId, workLogData.dataModel.workTime).then((res:any)=>{
     Object.keys(recordsCount).forEach((key)=>{

+ 12 - 5
h5app/src/views/pages/work/log/edit.vue

@@ -27,7 +27,6 @@
                               :show-default-buttons="true">
                 </ion-datetime>
               </ion-modal>
-<!--              <span style="margin-right: 5px; color: #02a6f1">选择</span>-->
             </div>
           </div>
           <div class="form-select">
@@ -48,6 +47,13 @@
             </ion-label>
             <ion-textarea name="workContent" id="workContent" placeholder="请输入工作内容" :rows="3" v-model="dataModel.workContent"></ion-textarea>
           </div>
+          <div class="form-input">
+            <ion-label>
+              照片
+            </ion-label>
+            <b-image v-if="dataModel.doWorkID" :file-ref-id="dataModel.doWorkID" :readonly="false"
+                     :is-single="false"></b-image>
+          </div>
         </div>
       </form>
     </ion-content>
@@ -71,6 +77,7 @@ import {arrowBackOutline} from 'ionicons/icons';
 import {required} from "@vuelidate/validators";
 import {useVuelidate} from "@vuelidate/core";
 import dayjs from "dayjs";
+import BImage from "@/components/bImage.vue";
 
 interface workLogModel {
   dataModel:any
@@ -82,6 +89,7 @@ interface SelectProps {
 
 export default defineComponent({
   name: 'WorkLogEdit',
+  components: {BImage},
   setup() {
     const router = useRouter();
     const route = useRoute();
@@ -90,7 +98,7 @@ export default defineComponent({
     const workLogData = reactive<workLogModel>({
       dataModel:{
         doWorkID: null,
-        workTime: dayjs().format("YYYY-MM-DD"),
+        workTime: null,
         doTypeID:null,
         workContent: null
     }});
@@ -152,10 +160,9 @@ export default defineComponent({
       await getWorkTypeList();
       const reqData = await getWorkLogById(doWorkID);
       workLogData.dataModel = reqData;
-      if(workLogData.dataModel.workTime==null){
-         workLogData.dataModel.workTime = dayjs(new Date().toLocaleDateString()).format("YYYY-MM-DD")+"T00:00:00.000+08:00";
+      if (workLogData.dataModel.workTime == null) {
+        workLogData.dataModel.workTime = dayjs(new Date().toLocaleDateString()).format("YYYY-MM-DD") + "T00:00:00.000+08:00";
       }
-      console.log("初始化dataModel",workLogData.dataModel);
       loading.value = false;
     };
 

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

@@ -40,7 +40,7 @@
           <ion-list>
             <div v-for="(record,key) in dataList" :key="key">
               <ion-item-sliding>
-                <ion-item detail @click="onDetail(record)">
+                <ion-item detail @click="onDetail(record.doWorkID)">
                   <ion-grid @click="onDetail(record.doWorkID)">
                     <ion-row>
                       <ion-col>