Merge branch '165' of http://47.111.81.118:3000/uskycloud/usky-web-mobile into wangtao

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

@@ -46,7 +46,7 @@
       <view v-if="timedList.length>0" class="list-cell list-cell-arrow"  style="margin:20px 0;color:rgb(20, 158, 255);background-color: rgba(20, 158, 255,.1)"  >
           <view style="width: calc(100% - 51px); display: flex; ; padding-right: 10px">
             <u-icon name="info-circle" color="#2979ff" size="18" style="margin-right: 5px"></u-icon>
-            <view v-if="timedList.length==1" @click="goTimingPage()"> 你有1条定时日志将于 {{timedList[0].timingTime.slice(0,16)}} 发布</view>
+            <view v-if="timedList.length==1" @click="goTimingPage()">您有1条定时日志将于{{timedList[0].timingTime.slice(0,16)}}发布</view>
 
             <view v-else  @click="goTimingPage()">你有{{timedList.length}}条定时日志将于指定时间发布</view>
           </view>
@@ -368,49 +368,31 @@ function handleSubmit(type,item) {
     item.ccTo1 = item.ccTo.split(",").map(function (value, index) {
       return Number(value);
     });
-    
 
      /** 查询树结构用户列表  回显抄送人*/
 
-    projectApi()
-    .deptUserTreeSelect({
-     }).then((requset) => {
-        state.tree = requset.data;
-        item.treeSelectNodes = proxy.$common.findTreeNodes(state.tree, item.ccTo1);
-        var ccToString=''
-        item.treeSelectNodes.forEach((aa,index) => {
-          if(index==item.treeSelectNodes.length-1){
-            ccToString+=aa.nickName+''
-          }else{
-            ccToString+=aa.nickName+','
-          }
-          
-        })
-        item.tomorrowPlan=item.tomorrowPlan?item.tomorrowPlan:'-';
-        item.coordinateWork=item.coordinateWork?item.coordinateWork:'-'
-        // 触发方法
-          proxy.$common.uniCopy({
-          content: workLongString+ "\n" +
-                  "明日计划:\n" + item.tomorrowPlan + "\n" +
-                  "工作协调:\n" + item.coordinateWork,
-          success: (res) => {
-            uni.showToast({
-              title: res,
-              icon: "none",
-            });
-          },
-          error: (e) => {
-            uni.showToast({
-              title: e,
-              icon: "none",
-              duration: 3000,
-            });
-          },
+     item.tomorrowPlan=item.tomorrowPlan?item.tomorrowPlan:'-';
+     item.coordinateWork=item.coordinateWork?item.coordinateWork:'-'
+    // 触发方法
+      proxy.$common.uniCopy({
+      content: workLongString+ "\n" +
+              "明日计划:\n" + item.tomorrowPlan + "\n" +
+              "工作协调:\n" + item.coordinateWork,
+      success: (res) => {
+        uni.showToast({
+          title: res,
+          icon: "none",
         });
-        state.popup.show = false;
-     })
-    .catch((err) => {
-    })
+      },
+      error: (e) => {
+        uni.showToast({
+          title: e,
+          icon: "none",
+          duration: 3000,
+        });
+      },
+    });
+    state.popup.show = false;
     
 
   } else if (type === "delete") {

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

@@ -125,7 +125,43 @@
 
   <u-modal :show="modalShow" title="" :confirmText="'确定'" :cancelText="'取消'" :zoom="false" :showCancelButton="true" @confirm="modalConfirm" @cancel="modalShow = false">
     <view class="slot-content" style="max-height: 80vh">
-      <u-checkbox-group v-model="projectsCheck" placement="row" :size="14" v-if="projectsList.length > 0" style="max-height: 100%; overflow: auto">
+     
+    <view v-if="projectsList.length > 0">
+    
+      <u-checkbox-group v-model="projectsCheck" placement="row" :size="14" style="max-height: 100%; overflow: auto">
+        <view class="checkbox-group-title">最近使用</view>
+        <block  v-for="(item, index) in projectsList">
+          <u-checkbox v-if="item.submissions>0"
+            :customStyle="{ marginBottom: '8px', width: '50%' }"
+            :label="item.projectName+' ('+item.submissions+'次)'"
+            :name="item.id"
+            :activeColor="proxy.$settingStore.themeColor.color"
+          >
+          </u-checkbox>
+        </block>
+				<u-line class="u-line"  color="info" style="margin:10px 0"></u-line>
+
+
+        <view  class="checkbox-group-title">其他</view>
+  
+        <block  v-for="(item, index) in projectsList">
+          <u-checkbox v-if="!item.submissions"
+            :customStyle="{ marginBottom: '8px', width: '50%' }"
+            :label="item.projectName"
+            :name="item.id"
+            :activeColor="proxy.$settingStore.themeColor.color"
+          >
+        </u-checkbox>
+       
+  
+           
+       
+        </block>
+
+       
+      </u-checkbox-group>
+ 
+      <!-- <u-checkbox-group v-else v-model="projectsCheck" placement="row" :size="14"  style="max-height: 100%; overflow: auto">
         <u-checkbox
           :customStyle="{ marginBottom: '8px', width: '50%' }"
           v-for="(item, index) in projectsList"
@@ -135,7 +171,9 @@
           :activeColor="proxy.$settingStore.themeColor.color"
         >
         </u-checkbox>
-      </u-checkbox-group>
+      </u-checkbox-group> -->
+    </view>
+      
       <view v-else>请联系项目管理人员给您分配项目后重试！</view>
     </view>
   </u-modal>
@@ -224,6 +262,7 @@ function switchChage(e, key) {
 function insertUsers() {
   //将人员选中数据传入store中
   systemStore.mallList.activeUserList = state.userList;
+ 
   proxy.$tab.navigateTo(`/pages/business/common/projectMange/mall/index?number=200&type=3`);
 }
 
@@ -240,6 +279,11 @@ function deleteUsers(index) {
 /** 添加项目按钮事件 */
 function insertProjects() {
   modal.modalShow = true;
+  projectApi()
+    .ProjectsSelect()
+    .then((requset) => {
+      state.projectsList = requset.data;
+    });
 }
 
 /** 实时保存填写数据 */
@@ -349,6 +393,10 @@ watch(
 onReady(() => {});
 
 onShow(() => {
+
+  init();
+
+
   //循环将缓存数据遍历
 
   if(!state.form.id){
@@ -357,7 +405,8 @@ onShow(() => {
       state[key] = storages[key];
     });
   }
- 
+  
+  
 
   // 监听组件返回数据
   uni.$on("UserMall", function (value) {
@@ -384,6 +433,13 @@ onUnload(() => {
 </script>
 
 <style lang="scss" scoped>
+.checkbox-group-title{
+  display:block;width:100%;
+  font-size:16px;
+  font-weight:bold;
+  note-color: #909399;
+  margin-bottom:10px;
+}
 :deep() {
   .u-cell__body {
     color: #000000;