调整任务问题

fhKeeper/formulahousekeeper/timesheet/src/components/select.vue

@@ -36,11 +36,11 @@
     <transition name="el-zoom-in-top">
       <div v-show="show" style="position: relative;z-index: 999;"> 
         <!-- 搜索框 -->
-        <div class="searchBox">
+        <!-- <div class="searchBox">
             <el-input :placeholder="$t('peaseenterthe')" size="mini" v-model="searchTex" style="width: 150px" @focus="searchBox()">
                 <el-button slot="append" icon="el-icon-search" size="mini" @click="searchLick()"></el-button>
             </el-input>
-        </div>
+        </div> -->
         <div class="transitionBox" :style="filterable ? 'margin: 30px 0;' : ''">
             <ul class="transitionBoxUl">
                 <li :class="transitionBoxLiIdx == index ? 'liHover' : ''" v-for="(item, index) in options" :key="index" @mouseover="liMouseOver(index)" @click="liClick(item, index)"> 

fhKeeper/formulahousekeeper/timesheet/src/views/awayOffice/awayOffice.vue

@@ -418,7 +418,7 @@
                             <div style="width:100%;margin:0 auto;margin-bottom:30px;position: absolute;bottom: 0px;text-align: center; ">
                                 <el-button type="primary" @click="submitInsert">{{ $t('save') }}</el-button>
                             </div>
-                        </div>
+                        </div> 
                     </el-scrollbar>
                 </el-col>
             </div>
@@ -856,6 +856,7 @@ export default {
         this.getProjectList()
         this.getDepartment()
         this.getAuditWorkflow();
+        this.getUsers()
     },
     methods: {
         // 自定义事件
@@ -1655,8 +1656,8 @@ export default {
                     var list = res.data , list1 = JSON.parse(JSON.stringify(res.data));
                     this.sdata = list;
                     this.soption = [
-                        {value: 1 , label : this.$t('lable.department') , children : this.changeArr(list1)},
-                        {value: 2 , label : this.$t('designatedpersonnel'),children : this.susers}
+                        {value: 1 , label : this.$t('lable.department') , children : this.changeArr(list1), type: 'dep'},
+                        {value: 2 , label : this.$t('designatedpersonnel'),children : this.susers, type: 'user'}
                     ]
                 } else {
                     this.$message({
@@ -1783,7 +1784,14 @@ export default {
             this.dialogVisible = false;
             if (this.curDeptId == null) return;
 
-            var node = this.user.userNameNeedTranslate != '1' ? this.vueCasaderItem : this.$refs.deptCascader.getCheckedNodes()[0];
+            // var node = this.user.userNameNeedTranslate != '1' ? this.vueCasaderItem : this.$refs.deptCascader.getCheckedNodes()[0];
+            var node = ''
+            if(this.user.userNameNeedTranslate != 1) {
+              // node = this.user.userNameNeedTranslate != '1' ? this.vueCasaderItem : this.$refs.deptCascader.getCheckedNodes()[0];
+              node = this.$refs.deptCascader.getCheckedNodes()[0];
+            } else {
+              node = this.addNodeObj
+            }
 
             // var node = this.$refs.deptCascader.getCheckedNodes()[0];
             if (this.isAdd) {
@@ -1818,12 +1826,6 @@ export default {
 
 
         getUsers() {
-            // this.http.post(this.port.manage.list, {
-            //     departmentId: -1,
-            //     pageIndex: 1,
-            //     // pageSize: 99999
-            //     pageSize: -1
-            // },
             this.http.post('/user/getSimpleActiveUserList', {},
             res => {
                 if (res.code == "ok") {
@@ -1831,7 +1833,8 @@ export default {
                     // this.users = res.data.records;
                     this.users = res.data;
                     for (let i = 0; i < this.users.length; i++) {
-                        this.susers.push({value:this.users[i].id,label:this.users[i].name})
+                        // this.susers.push({value:this.users[i].id,label:this.users[i].name})
+                        this.susers.push({value:this.users[i].id,label:this.users[i].name,type: 'user'})
                     }
                     // if (this.user.role == 0) {
                     //     this.editItemForm.ownerId = this.user.id;
@@ -1922,6 +1925,16 @@ export default {
                     }
                 );
             },
+            vueCasader(obj) {
+                if(obj.distinction == 1) {
+                    let arr = []
+                    arr.push(obj.id)
+                    this.curDeptId = arr
+                    this.vueCasaderItem = obj.item
+                    this.addNodeObj = obj.item
+                    console.log(obj, '选中的')
+                }
+            }
         //获取项目列表
             // getProjectList() {
             //     this.listLoading = true;

fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

@@ -130,7 +130,7 @@
                     <el-input ref="ipts" v-model="addForm.tel" :placeholder="$t('peaseenterthe')" style="width: 250px"></el-input>
                 </el-form-item>
                 <!-- 单选 -->
-                <el-form-item style="display: inline-block;width:300px" :label="$t('lengthunit')">
+                <el-form-item style="display: inline-block;width:300px;margin-right: 400px" :label="$t('lengthunit')">
                     <el-radio-group v-model="addForm.timeType" @change="chanRadio()" style="display:inline-block;width:240px">
                         <el-radio label="0">{{ $t('accordingdays') }}</el-radio>
                         <el-radio label="1" v-if="addForm.leaveType != 6">{{ $t('leavehour') }}</el-radio>
@@ -950,10 +950,10 @@ export default {
       this.getUsers()
     }else{
       this.getUsers() // 获取人员信息
-    this.getDepartment();
-    this.getAl();
-    this.getApproverList();
-    this.getAuditWorkflow();
+      this.getDepartment();
+      this.getAl();
+      this.getApproverList();
+      this.getAuditWorkflow();
     }
   },
   filters: {},
@@ -1587,12 +1587,6 @@ export default {
         });
     },
     getUsers() {
-      // this.http.post(this.port.manage.list, {
-      //       departmentId: -1,
-      //       pageIndex: 1,
-      //       // pageSize: 99999
-      //       pageSize: -1
-      //   },
       this.http.post('/user/getSimpleActiveUserList', {},
         res => {
             if (res.code == "ok") {

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -1630,7 +1630,14 @@
         <el-dialog :title="$t('title.reviewProcess')" v-if="approvalProcessDialog" :visible.sync="approvalProcessDialog" customClass="customWidth" width="400px">
             <div style="padding:20px 40px 20px 0">
                 <el-timeline :reverse="false">
-                    <el-timeline-item v-for="item in approvalProcessData" :key="item.id" :timestamp="item.operateDate">{{item.msg}}</el-timeline-item>
+                    <el-timeline-item v-for="item in approvalProcessData" :key="item.id" :timestamp="item.operateDate">
+                        {{item.msg}}
+                        <span v-if="user.userNameNeedTranslate != 1">{{msg}}</span>
+                        <span v-if="user.userNameNeedTranslate == 1">
+                            <span><ww-open-data type='userName' :openid='msgCon.one'></ww-open-data></span>
+                            <span>{{msgCon.two}}</span>
+                        </span>
+                    </el-timeline-item>
                 </el-timeline>
             </div>
         </el-dialog>
@@ -2100,6 +2107,15 @@
                 },res => {
                     if(res.code == 'ok'){
                         this.approvalProcessDialog = true
+                        if(this.user.userNameNeedTranslate == 1) {
+                            for(var i in res.data) {
+                                let obj = {
+                                    one: res.data[i].msg.split('$userName=')[1].split('$')[0],
+                                    two: res.data[i].msg.split('$userName=')[1].split('$')[1],
+                                }
+                                res.data[i].msgCon = obj
+                            }
+                        }
                         this.approvalProcessData = res.data
                     }else{
                         this.$message({