解决冲突

src/api/business/project.js

@@ -108,6 +108,14 @@ export function projectApi() {
                 method: 'GET',
                 params
             })
+        },
+        // 树结构查询部门--用户列表
+        deptUserTreeSelect(query) {
+            return request({
+                url: '/system/dept/deptUserTreeSelect',
+                method: 'get',
+                params: query
+            })
         }
         
     }

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

@@ -46,6 +46,23 @@
     :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
   >
     <template #default>
+      <view class="projectSearchBox" >
+        <u-input v-model="projectTypeName" disabledColor="#fff" disabled clearable  @click="handleAction('项目类型',project_type)" placeholder="项目类型" suffixIcon="arrow-down" suffixIconStyle="color: #909399" />        
+        <u-input v-model="projectName" placeholder="请输入项目名称"  clearable prefixIcon="search" size="small" />
+        <!-- <u-button   type="primary" @click="selectListApi">搜索</u-button> -->
+        <u-picker
+          :show="actionShow"
+          :columns="projectTypeList"
+          title="请选择项目类型"
+          keyName="label"
+          visibleItemCount="6"
+          :closeOnClickOverlay="true"
+          @close="actionShow = false"
+          @cancel="actionShow = false"
+          @confirm="selectAction"
+        ></u-picker>
+
+      </view>      		
       <view class="menu-list m0">
         <view class="list-cell" style="color: #666666; line-height: 25px" v-for="(base, index) in dataList" :key="index">
           <view class="content-area-top menu-item">
@@ -171,7 +188,7 @@
 <script setup>
 /*----------------------------------依赖引入-----------------------------------*/
 import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
-import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
+import { ref, reactive, computed, getCurrentInstance, toRefs, inject,watchEffect} from "vue";
 /*----------------------------------接口引入-----------------------------------*/
 import { projectApi } from "@/api/business/project.js";
 import { dUserList } from "@/api/system/user.js";
@@ -182,6 +199,7 @@ import { useStores } from "@/store/modules/index";
 /*----------------------------------公共变量-----------------------------------*/
 const { proxy } = getCurrentInstance();
 const useStore = useStores();
+const {  project_type } = proxy.useDict("project_type");
 /*----------------------------------变量声明-----------------------------------*/
 const state = reactive({
   loading: false,
@@ -207,9 +225,35 @@ const state = reactive({
     content: "", //提示信息
   },
   eventList: {}, //数据存储
+  projectName:'',
+  projectTypeName: "", //项目类型名称
+  actionShow: false,
+  projectType: "", //项目类型
+  projectTypeList:[[]],    
 });
 
-const { tabsList, tabsCurrent, dataList, pageSize, current, total, userDate, popup, modal, eventList } = toRefs(state);
+const { tabsList, tabsCurrent, dataList, pageSize, current, total, userDate, popup, modal, eventList,array,index,projectTypeName,actionShow,projectType,projectTypeList,projectName} = toRefs(state);
+
+
+/**
+ * @action弹出框点击事件
+ */
+ function handleAction(value,event, index, ind) {
+  if (value == "项目类型") {
+    state.projectTypeList[0] = event
+  }
+
+  state.actionShow = true;
+}
+
+/**
+ * @action弹出框选择事件
+ */
+ function selectAction(e) {
+   state.projectType = e.value[0].value;
+   state.projectTypeName = e.value[0].label;
+   state.actionShow = false;
+}
 
 /**
  * @页面初始化
@@ -292,6 +336,8 @@ function selectListApi() {
       projectAscription: state.tabsList[state.tabsCurrent].value,
       pageNum: state.current,
       pageSize: state.pageSize,
+      projectType: state.projectType,
+      projectName: state.projectName,
     })
     .then((requset) => {
       state.dataList = requset.data.records;
@@ -324,6 +370,9 @@ function refresh() {
  */
 function tabsClick(e) {
   state.tabsCurrent = e.index;
+  state.projectName='';
+  state.projectType='';
+  state.projectTypeName=''
   init();
 }
 /**
@@ -342,6 +391,10 @@ onShow(() => {
   proxy.$settingStore.systemThemeColor([1]);
 });
 
+watchEffect(() => {
+  selectListApi();
+});
+
 onLoad((options) => {});
 </script>
 <style lang="scss" scoped>
@@ -351,6 +404,55 @@ onLoad((options) => {});
 }
 </style>
 <style lang="scss" scoped>
+.projectSearchBox {
+  margin:20px 4% ;width:92%;vertical-align:middle;
+  position:relative;
+  display:flex;
+  :deep(.u-input--radius, .u-input--square){
+      border-radius:0
+    }
+  
+  .u-input{
+   display:inline-block;background:#fff;height:34px;line-height:34px;padding:0 5px;
+    .uni-input-input{
+      font-size:12px!important;
+    }
+    :deep(.u-input__content__prefix-icon){
+      position:absolute;
+      right:8px;
+       .uicon-search{
+        font-size:16px
+      }
+    }
+  }
+  .u-input:first-child{
+    flex:2;
+    border-top-left-radius: 20px;
+    border-bottom-left-radius: 20px;
+    border-right:none;
+  }
+  .u-input:nth-child(2){
+    flex:4;
+    // width:70%;
+    border-top-right-radius: 20px;
+    border-bottom-right-radius: 20px;
+    // border-left:none
+  }
+  .u-popup{
+    flex:0;
+  }
+  .u-button{
+    width:50px;
+    position:absolute;
+    right:0px;
+    top:0;
+    height:32px;
+    line-height:32px;
+   
+
+  }
+  
+}
 .list-container {
   .content-area {
     &-top {

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

@@ -62,8 +62,12 @@
           <view class="content-area-center-top">抄送人 </view>
           <u-text :text="item.ccTo" color="#000000" size="14"></u-text>
         </view>
+
+
       </view>
     </template>
+
+    
   </oa-scroll>
 </template>
 
@@ -92,7 +96,8 @@ const state = reactive({
   },
 });
 
-const { dataList, pageSize, current, total } = toRefs(state);
+const { dataList, pageSize, current, total} = toRefs(state);
+
 
 /**
  * @初始化

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

@@ -59,7 +59,7 @@
         <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="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> -->
           </view>
@@ -103,6 +103,7 @@
     >
      
       <u-button
+        v-if="state.tabsCurrent ==1"
         class="custom-style"
         type="info"
         size="normal"
@@ -117,6 +118,21 @@
         @click="handleSubmit('update', eventList)"
       ></u-button>
       <u-button
+        class="custom-style"
+        type="info"
+        size="normal"
+        text="一键复制"
+        :customStyle="{
+          height: '50px',
+          color: '#3c9cff',
+          borderWidth: 0,
+          borderRadius: 0,
+          borderBottomWidth: '1px',
+        }"
+        @click="handleSubmit('copy', eventList)"
+      ></u-button>
+      <u-button
+        v-if="state.tabsCurrent ==1"
         class="custom-style"
         type="info"
         size="normal"
@@ -218,10 +234,11 @@ const state = reactive({
     data:{},//带入数据
     operation:undefined,//操作类型
   },
-  timedList:[]
+  timedList:[],
+  tree:[]
 });
 
-const { tabsList, tabsCurrent, dataList, pageSize, current, total,popup,eventList,modal,timedList} = toRefs(state);
+const { tabsList, tabsCurrent, dataList, pageSize, current, total,popup,eventList,modal,timedList,tree} = toRefs(state);
 /**
  * 操作弹框提醒
  * @param type  弹框类型
@@ -244,6 +261,9 @@ function dialogConfirm(){
   if(state.tip.operation=='exit'){
     handleSubmit('exit',state.tip.data)
   }
+  if(state.tip.operation=='copy'){
+    handleSubmit('copy',state.tip.data)
+  }
 }
 /**
  * @初始化
@@ -340,6 +360,59 @@ 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 === "copy") {
+    var workLongString=''
+    item.workContents.forEach((item) => {
+      workLongString+=item.projectName+':'+item.workTime+ "h\n"+item.workContent+ "\n"
+    })
+    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,
+            });
+          },
+        });
+        state.popup.show = false;
+     })
+    .catch((err) => {
+    })
+    
+
   } else if (type === "delete") {
     projectApi()
       .ReportDelete(item.id)

src/pages/business/mhxf/informationSelect/index.vue

@@ -112,6 +112,7 @@ function touchChange(e) {
 }
 
 function blur(e) {
+  console.log(1)
   if (state.dataInput) {
     goSearch();
   }

src/plugins/common.plugins.js

@@ -71,6 +71,31 @@ export default {
       }
     });
   },
+
+
+    /**
+   * 树结构过滤
+   * @param {*} treeData 
+   * @param {*} ids 
+   * @returns 
+   */
+    findTreeNodes(treeData, ids) {
+      const result = [];
+      const findNodes_ = (nodes, idArray) => {
+        nodes.forEach(node => {
+          if (idArray.includes(node.id)) {
+            result.push(node);
+          }
+          if (node.children && node.children.length > 0) {
+            findNodes_(node.children, idArray);
+          }
+        });
+      };
+     
+      findNodes_(treeData, ids);
+      return result;
+    },
+  
   /**
    * @复制粘贴板
    * @param {传入值} content