Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

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

@@ -17,7 +17,7 @@
                     <ww-open-data type='departmentName' :openid='selectName'></ww-open-data>
                 </span>
             </div>
-            <i :class=" move ? 'el-icon-arrow-down iostu iostuHover' : 'el-icon-arrow-down iostu'" v-if="!moveIon"></i>
+            <i :class="move ? 'el-icon-arrow-down iostu iostuHover' : 'el-icon-arrow-down iostu'" v-if="!moveIon"></i>
             <i v-if="moveIon" class="el-icon-circle-close iostu" @click.stop="clearDelete"></i>
         </div>
     </div>
@@ -254,12 +254,17 @@ export default {
     methods: {
         // 循环取值
         traverseArr(arr, idd){
-            let id = idd[0]
+            let id = null
+            if(Array.isArray(idd)) {
+                id = idd[idd.length - 1]
+            } else {
+                id = idd[0]
+            }
             if(arr) {
                 for(var i in arr) {
-                    console.log(arr[i].value, idd)
+                    console.log(arr[i].value, idd, id)
                     if(arr[i].label != this.$t('lable.department') && arr[i].label != this.$t('designatedpersonnel')) {
-                        if(arr[i].value == idd) {
+                        if(arr[i].value == id) {
                             console.log('将要付给的值', arr[i])
                             this.selectName = arr[i].label
                             if(arr[i].type) {

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

@@ -128,7 +128,7 @@
                         </el-option>
                     </el-select>
 
-                    <selectCat v-if="user.userNameNeedTranslate == 1" :size="'mini'" :subject="users" :subjectId="inchagerId" :distinction="'2'" :clearable="true" @selectCal="selectCal"></selectCat>
+                    <selectCat v-if="user.userNameNeedTranslate == 1" :size="'mini'" :subject="users" :subjectId="participationId" :distinction="'2'" :clearable="true" @selectCal="selectCal"></selectCat>
 
                 </el-form-item>
                 <!-- 部门筛选 -->

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -377,7 +377,7 @@
                       <el-cascader v-model="insertForm.departmentId" :placeholder="$t('qing-xuan-ze-bu-men')" style="width: 100%"
                       :options="option" :props="{ checkStrictly: true,expandTrigger: 'hover' }" :show-all-levels="false"  clearable v-if="user.userNameNeedTranslate != 1"></el-cascader>
 
-                      <vueCascader :size="'medium'" :widthStr="'430'" :clearable="true" :subject="option" :subjectId="insertForm.departmentId" :radios="true" :distinction="'2'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1"></vueCascader>
+                      <vueCascader :size="'medium'" :widthStr="'430'" :clearable="true && user.userNameNeedTranslate != 1" :subject="option" :subjectId="insertForm.departmentId" :radios="true" :distinction="'2'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1" :disabled="user.userNameNeedTranslate == 1"></vueCascader>
 
                   </el-form-item>
                   <!-- <el-form-item :label="$t('immediatesuperior')">