工作报告，新增 编辑 删除 逻辑优化

src/config.js

@@ -5,7 +5,7 @@ export default {
   //#endif
 
   //#ifdef H5
-  baseUrl: import.meta.env.MODE === "production" ? `https://${window.location.host}/prod-api` : `http://172.16.120.165:13200/dev-api`,
+  baseUrl: import.meta.env.MODE === "production" ? `https://${window.location.host}/prod-api` : `http://172.16.120.165:801/dev-api`,
   //#endif
 
   websiteUrl: "https://qhome.usky.cn",

src/pages.json

@@ -675,7 +675,7 @@
         {
           "path": "projectMange/write/insert",
           "style": {
-            "navigationBarTitleText": "报告填写",
+            "navigationBarTitleText": "",
             "enablePullDownRefresh": false,
             "navigationStyle": "custom",
             "app-plus": {

src/pages/business/common/projectMange/record/index.vue

@@ -48,8 +48,9 @@
         <view class="content-area-center bg-white" v-for="(el, ind) in group" :key="ind">
           <view class="content-area-top menu-item" style="float:right;padding:10px 0px">
             <view class="content-area-top-time"> </view>
+            <u-icon v-if="state.tabsCurrent ==1" class="content-area-top-icon" name="more-dot-fill" size="20" color="#000" @click="moreClick(el)"></u-icon>
             <!-- <u-icon class="content-area-top-icon" name="edit-pen" size="20" color="rgb(20, 158, 255)" @click="handleSubmit('update',el)" v-if="state.tabsCurrent ==1" style="display:inline-block;margin-right:30px;"></u-icon> -->
-            <u-icon class="content-area-top-icon" name="trash" size="20" color="red" @click="tips('error',`确认删除时间为 '${el.submitDate}' 的日报吗？`,el,'delete')" v-if="state.tabsCurrent ==1" style="display:inline-block;"></u-icon>
+            <!-- <u-icon class="content-area-top-icon" name="trash" size="20" color="red" @click="tips('error',`确认删除时间为 '${el.submitDate}' 的日报吗？`,el,'delete')" v-if="state.tabsCurrent ==1" style="display:inline-block;"></u-icon> -->
           </view>
           <view class="flex mb10" @click="goContentDetails(el)">
             <u-avatar
@@ -80,10 +81,80 @@
   </oa-scroll>
 
   <oa-tabbar :tabbarValue="0" :tabbarList="proxy.$constData.projectTabbar" :isSwitchTab="false"></oa-tabbar>
+
+  <u-popup :show="popup.show" mode="bottom" bgColor="#fff" :round="10" @close="popup.show = false">
+    <view
+      :style="{
+        borderTopLeftRadius: '10px',
+        borderTopRightRadius: '10px',
+        overflow: 'hidden',
+      }"
+    >
+     
+      <u-button
+        class="custom-style"
+        type="info"
+        size="normal"
+        text="编辑"
+        :customStyle="{
+          height: '50px',
+          color: '#3c9cff',
+          borderWidth: 0,
+          borderRadius: 0,
+          borderBottomWidth: '1px',
+        }"
+        @click="handleSubmit('update', eventList)"
+      ></u-button>
+      <u-button
+        class="custom-style"
+        type="info"
+        size="normal"
+        text="删除"
+        :customStyle="{
+          height: '50px',
+          color: '#f56c6c',
+          borderWidth: 0,
+          borderRadius: 0,
+          borderBottomWidth: '3px',
+        }"
+        @click="handleModal('delete', `确认删除“ ${eventList.createBy} ” 的“ ${eventList.reportDate} ” 的日报？`)"
+      ></u-button>
+      <u-button
+        class="custom-style"
+        type="info"
+        size="normal"
+        text="取消"
+        :customStyle="{
+          height: '50px',
+          color: '#3c9cff',
+          border: 'none',
+          borderRadius: 0,
+        }"
+        @click="popup.show = false"
+      ></u-button>
+    </view>
+  </u-popup>
+
+  
+
+
+
   <uni-popup ref="alertDialog" type="dialog">
     <uni-popup-dialog :type="state.tip.type" cancelText="取消" confirmText="确定" title="操作提醒" :content="state.tip.content" @confirm="dialogConfirm"
       @close="dialogClose"></uni-popup-dialog>
   </uni-popup>
+
+  <u-modal
+    :show="modal.show"
+    title="操作提醒"
+    :content="modal.content"
+    :showCancelButton="true"
+    :closeOnClickOverlay="true"
+    @confirm="handleSubmit(state.modal.type, eventList)"
+    @cancel="modal.show = false"
+    @close="modal.show = false"
+  ></u-modal>
+
 </template>
 
 <script setup>
@@ -116,6 +187,19 @@ const state = reactive({
   modalShow: false,
   modalType: "",
   modalEvent: {},
+
+  popup: {
+    show: false, //弹窗显示
+    content: "", //提示信息
+  },
+  modal: {
+    type: "", //操作类型
+    show: false, //弹窗显示
+    content: "", //提示信息
+  },
+  eventList: {}, //数据存储
+
+
   reportData:{},
   tip:{
     type:undefined,//弹框类型
@@ -125,7 +209,7 @@ const state = reactive({
   }
 });
 
-const { tabsList, tabsCurrent, dataList, pageSize, current, total} = toRefs(state);
+const { tabsList, tabsCurrent, dataList, pageSize, current, total,popup,eventList,modal} = toRefs(state);
 /**
  * 操作弹框提醒
  * @param type  弹框类型
@@ -208,22 +292,30 @@ function tabsClick(e) {
   init();
 }
 /** 更多按钮点击事件 */
-function moreClick(type, event) {
-  state.modalShow = true;
-  state.modalType = type;
-  state.modalEvent = event;
-  state.reportData = event;
+function moreClick(event) {
+  state.popup.show = true;
+  state.eventList = event;
+}
+
 
+function handleModal(type, content) {
+  state.modal.show = true;
+  state.modal.type = type;
+  state.modal.content = content;
 }
+
 /** 编辑、删除日报*/
 function handleSubmit(type,item) {
   if (type === "update") {
     proxy.$tab.navigateTo(`/pages/business/common/projectMange/write/insert?templateId=1&id=${item.id}`);
+    state.modal.show = false;
   } else if (type === "delete") {
     projectApi()
       .ReportDelete(item.id)
       .then(() => {
         proxy.$modal.msg("日报删除成功！");
+        state.modal.show = false;
+        state.popup.show = false;
         init();
       })
       .catch((errors) => {

src/pages/business/common/projectMange/write/components/template1.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="content-area">
-    <view class="content-area-title font12 mtb5 plr10">实时保存，保存时间 {{ saveTime }}</view>
+    <!-- <view class="content-area-title font12 mtb5 plr10">实时保存，保存时间 {{ saveTime }}</view> -->
 
     <view class="content-area-item p10 bg-white">
       <view class="font14 weight mb10 required">工作内容</view>
@@ -68,7 +68,7 @@
     <view class="content-area-item mt10 p10 bg-white">
       <view class="font14 weight mb10">抄送到人</view>
       <avatarList :userList="userList" @deleteUsers="deleteUsers" />
-      <u-button class="mt20" type="primary" style="width: 100px; height: 25px" @click="insertUsers()" shape="circle" icon="plus" size="mini"> 选择人员 </u-button>
+      <u-button class="mt20" type="primary" style="width: 100px; height: 25px" @click="insertUsers()" shape="circle" icon="plus" size="mini" :disabled="form.reportStatus==1"> 选择人员 </u-button>
     </view>
     <view class="content-area-item mt10 p10 bg-white">
       <view class="flex">
@@ -78,13 +78,14 @@
           :modelValue="form.sendDingTalk == 0 ? false : true"
           :ctiveColor="proxy.$settingStore.themeColor.color"
           size="20"
+          :disabled="form.reportStatus==1"
           @change="(event) => switchChage(event, 'sendDingTalk')"
           asyncChange
         ></u-switch>
       </view>
       <view class="flex"> </view>
     </view>
-    <view class="content-area-item mt10 p10 bg-white">
+    <view class="content-area-item mt10 p10 bg-white"  v-if="form.reportStatus != 1">
       <view class="flex">
         <view class="font14 weight">定时发送</view>
         <u-switch
@@ -178,7 +179,7 @@ const state = reactive({
     sendDingTalk: 1,
     isRegularlySend: 0,
     timingTime: null,
-    reportStatus: null,
+    // reportStatus: null,
   },
   projectsCheck: [],
   projectsList: [],
@@ -228,6 +229,10 @@ function insertUsers() {
 
 /** 删除人员按钮事件 */
 function deleteUsers(index) {
+  if(state.form.reportStatus==1){
+    console.log('已发送不可修改抄送人')
+    return
+  }
   state.userList.splice(index, 1);
   realTimeSaving();
 }
@@ -272,12 +277,13 @@ function modalConfirm() {
 
 /** 提交 */
 function handleSubmit() {
+  state.form.sendDingTalk==true?1:0;
+  state.form.id=state.form.id?Number(state.form.id):'';
   state.form.ccTo = state.userList.map((obj) => `${obj.id}`).join(",");
   state.form.reportDate = proxy.$time.formatterDate(new Date(), "yyyy-MM-dd");
   state.form.workContents.forEach((e) => {
     e.workTime = Number(e.workTime);
   });
-
   projectApi()
     .ReportInsert(state.form)
     .then((requset) => {
@@ -305,26 +311,28 @@ watch(
     state.form.workContents.forEach((e) => {
       state.projectsCheck.push(e.projectId);
     });
-
-    var ccTo = state.form.ccTo.length > 0 ? state.form.ccTo.split(",").map((num) => Number(num)) : [];
-    state.userDate.forEach((e) => {
-      if (ccTo.includes(e.userId)) {
-        state.userList.push({
-          address: e.address,
-          avatar: e.avatar,
-          deptId: e.deptId,
-          email: e.email,
-          id: e.userId,
-          label: e.nickName,
-          nickName: e.nickName,
-          phonenumber: e.phonenumber,
-          post: e.post,
-          sex: e.sex,
-          userId: e.userId,
-          userName: e.userName,
-        });
-      }
-    });
+    var ccTo = state.form.ccTo.length > 0 ? state.form.ccTo.split(",").map((num) => Number(num)) : []; 
+    setTimeout(function(){
+      state.userDate.forEach((e) => {
+        if (ccTo.includes(e.userId)) {
+          state.userList.push({
+            address: e.address,
+            avatar: e.avatar,
+            deptId: e.deptId,
+            email: e.email,
+            id: e.userId,
+            label: e.nickName,
+            nickName: e.nickName,
+            phonenumber: e.phonenumber,
+            post: e.post,
+            sex: e.sex,
+            userId: e.userId,
+            userName: e.userName,
+          });
+        }
+      });
+    },300)
+    
 
     projectApi()
       .ProjectsSelect()
@@ -340,20 +348,30 @@ onReady(() => {});
 
 onShow(() => {
   //循环将缓存数据遍历
-  var storages = storageSystem.get("project");
-  Object.keys(storages).forEach((key) => {
-    state[key] = storages[key];
-  });
+  // var storages = storageSystem.get("project");
+  // Object.keys(storages).forEach((key) => {
+  //   state[key] = storages[key];
+  // });
 
   //监听组件返回数据
-  uni.$on("UserMall", function (value) {
-    state.userList = value;
-    realTimeSaving();
-  });
+  // uni.$on("UserMall", function (value) {
+  //   state.userList = value;
+  //   realTimeSaving();
+  // });
 });
 
 onLoad((options) => {
   init();
+  if(options.id){
+    state.form.id=options.id
+  }else{
+    state.form.id=''
+  }
+
+
+
+
+
 });
 
 onUnload(() => {

src/pages/business/common/projectMange/write/insert.vue

@@ -1,6 +1,6 @@
 <template>
   <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
-    <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" title="报告填写" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
+    <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" :title="pageTitle" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
       <template #left>
         <view class="u-navbar__content__left__item">
           <u-icon name="arrow-left" size="20" color="#000"></u-icon>
@@ -65,13 +65,34 @@ var pages = getCurrentPages(); //获取当前页面栈的实例；
 const state = reactive({
   modalShow: false,
   newProjectList: {},
+  pageTitle: "",
 });
-const { modalShow, newProjectList } = toRefs(state);
+const { modalShow, newProjectList,pageTitle } = toRefs(state);
 
 function moreClick() {
   state.modalShow = true;
 }
 
+
+/**
+ * @列表查询
+ * @api接口查询
+ */
+ function selectListApi() {
+  projectApi()
+    .ProjectsWeekList({
+      id: parseInt(props.id),
+    })
+    .then((requset) => {
+      if (requset.data.length > 0) {
+        const data = requset.data[1].weekData[0];
+        state.newProjectList =data
+        console.log(state.newProjectList)
+      }
+    })
+    .catch((err) => {});
+}
+
 function handleSubmit(type, id) {
   if (type === "importPrevious") {
     projectApi()
@@ -126,7 +147,16 @@ onShow(() => {
   proxy.$settingStore.systemThemeColor([1]);
 });
 
-onLoad((options) => {});
+onLoad((options) => {
+  if ("id" in options) {
+    state.pageTitle = "报告编辑";
+    selectListApi();
+  } else {
+    state.pageTitle = "报告填写";
+    state.newProjectList={}
+  }
+
+});
 
 onUnload(() => {});
 </script>