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

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

@@ -761,7 +761,10 @@
                   <template slot-scope="scope">
                     <div>
                       <span v-if="user.userNameNeedTranslate == '1'">
-                        <ww-open-data type='departmentName' :openid='scope.row.deptName'></ww-open-data>
+                        <span v-for="item, index in scope.row.deptName" :key='index'>
+                          <ww-open-data type='departmentName' :openid='item'></ww-open-data>
+                          <span v-if="index < scope.row.deptName.length - 1">/</span>
+                        </span>
                       </span>
                       <span v-if="user.userNameNeedTranslate != '1'">
                         {{scope.row.deptName}}
@@ -1047,7 +1050,7 @@ export default {
       this.$t('ren-yuan-yue-du-gong-shi-biao'), this.$t('bumenchanyuqingkuang')],
 
       shuzArr: [this.$t('projectreport'),this.$t('projectTaskReport'),this.$t('projectcoststatement'),
-      this.$t('projectbalancesheet'),this.$t('customerprojectprofitstatement'),this.$t('projectphasetimesheet'),
+      this.$t('projectbalancesheet'),this.$t('customerprojectincomestatement'),this.$t('projectphasetimesheet'),
       this.$t('statisticsofovertimework'),this.$t('timecostearlywarningtable'),this.$t('personneltimeallocationtable'),
       this.$t('employeereporttimelinessrate'),this.$t('dailyreporttobereviewedstatistics'),this.$t('statisticsofpersonnelhours'),this.$t('taskgrouptimesheet'),this.$t('projectcostbaselinetable'),
       this.$t('ren-yuan-yue-du-gong-shi-biao'), this.$t('bumenchanyuqingkuang')],
@@ -1229,8 +1232,9 @@ export default {
 
 
     getUserList() {
+      console.log(this.shuzArr[this.ins])
       this.http.post('/user/getUserListByRole', {
-        tableName: this.shuzArr[this.ins]
+        tableName: this.shuzArr[this.ins] || '加班情况统计表'
       },
       res => {
           if (res.code == "ok") {
@@ -1775,6 +1779,12 @@ export default {
       res => {
       this.listLoading = false
         if(res.code == 'ok'){
+          if(this.user.userNameNeedTranslate == 1) {
+            for(var i in res.data.resultList) {
+              let arrDemant = res.data.resultList[i].deptName.split('/')
+              res.data.resultList[i].deptName = arrDemant
+            }
+          }
           this.tableList = res.data.resultList
           this.total = res.data.total
         }else {

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

@@ -483,7 +483,8 @@
         <!--修改工程专业界面-->
         <el-dialog :title="$t('engineering')" v-if="editProfessionDialog" :visible.sync="editProfessionDialog" 
         :close-on-click-modal="false" customClass="customWidth" width="1000px">
-            <el-table :data="projectProfessionList" size="small" max-height="400" :key="Math.random()">
+        <div class="gongcheng">
+            <el-table :data="projectProfessionList" size="small" height="500" :key="Math.random()">
                 <el-table-column prop="professionId" width="200">
                                    <template slot-scope="scope">
                                        <el-select v-model="scope.row.professionId" >
@@ -513,12 +514,13 @@
                                        </el-link>
                                    </template>
                                </el-table-column>
-                               <el-table-column prop="inchargerName" width="120" :label="$t('head')">
+                               <el-table-column prop="inchargerName" width="200" :label="$t('head')">
                                    <template slot-scope="scope">
-                                       <el-select v-model="scope.row.inchargerId" >
+                                       <el-select v-model="scope.row.inchargerId" v-if="user.userNameNeedTranslate != 1">
                                            <el-option v-for="item in participator" :key="item.id" :label="item.name" :value="item.id">
                                            </el-option>
                                        </el-select>
+                                       <selectCat v-if="user.userNameNeedTranslate == 1" :size="'mini'" :subject="participator" :subjectId="scope.row.inchargerId" :other="scope.$index" :distinction="'2'" @selectCal="selectCal"></selectCat>
                                    </template>
                                </el-table-column>
                                <el-table-column  width="80">
@@ -534,17 +536,20 @@
                 <el-button @click.native="editProfessionDialog = false">{{ $t('btn.cancel') }}</el-button>
                 <el-button type="primary" @click="saveProjectProfessions" :loading="addLoading">{{ $t('btn.submit') }}</el-button>
             </div>
+        </div>
         </el-dialog>
 
         <!-- 项目专业人员的设置 -->
         <el-dialog :title="$t('setupprojectprofessionals')"  v-if="editPpMembDialog" :visible.sync="editPpMembDialog" :close-on-click-modal="false" customClass="customWidth" width="600px">
+            <div class="gongcheng">
             <el-table :data="curProfessionRow.membList" height="400">
                 <el-table-column prop="name" :label="$t('professionals')">
                     <template slot-scope="scope">
-                        <el-select v-model="scope.row.membId"  filterable :placeholder="$t('professionaladdsparticipant')" style="width:100%;" >
+                        <el-select v-if="user.userNameNeedTranslate != 1" v-model="scope.row.membId"  filterable :placeholder="$t('professionaladdsparticipant')" style="width:100%;" >
                             <el-option v-for="item in participator" :key="item.id" :label="item.name" :value="item.id">
                             </el-option>
                         </el-select>
+                        <selectCat v-if="user.userNameNeedTranslate == 1" :size="'medium'" :subject="participator" :subjectId="scope.row.membId" :distinction="'3'" :other="scope.$index" @selectCal="selectCal"></selectCat>
                     </template>
                 </el-table-column>
                 <el-table-column prop="percentage" width="120" :label="$t('zhan-bi')">
@@ -565,6 +570,7 @@
                 <el-button  @click="editPpMembDialog = false" >{{ $t('btn.cancel') }}</el-button>
                 <el-button type="primary" @click="addPpMemb" >{{ $t('btn.determine') }}</el-button>
             </div>
+            </div>
         </el-dialog>
         <!-- 编辑项目关键节点 -->
         <el-dialog :title="$t('editkeyprojectnodes')" :visible.sync="keyNodeIsShow" width="960px" :before-close="handleClose">
@@ -1987,6 +1993,11 @@
             selectCal(obj) {
                 if(obj.distinction == '1' ) {
                     this.addForm.inchargerId = obj.id
+                } else if(obj.distinction == '2') {
+                    this.projectProfessionList[obj.other].inchargerId = obj.id
+                } else if(obj.distinction == '3') {
+                    let userList = obj.id
+                    this.curProfessionRow.membList[obj.other].membId = userList
                 }
             }
         },

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

@@ -1080,7 +1080,7 @@
             <el-table :data="curProfessionRow.membList" height="400">
                 <el-table-column prop="name" :label="$t('professionals')">
                     <template slot-scope="scope">
-                        <el-select v-model="scope.row.membId"  filterable :placeholder="$t('professionaladdsparticipant')" style="width:100%;" >
+                        <el-select v-model="scope.row.membId" v-if="user.userNameNeedTranslate != 1"  filterable :placeholder="$t('professionaladdsparticipant')" style="width:100%;" >
                             <el-option v-for="item in participator" :key="item.id" :label="item.name" :value="item.id">
                             </el-option>
                         </el-select>

fhKeeper/formulahousekeeper/timesheet/src/views/workflow/report.vue

@@ -67,7 +67,8 @@
               <el-form label-width="80px">
               <el-form-item :label="$t('other.selectdepartment')" >
                   <el-cascader ref="deptCascader"  v-model="curDeptId" :placeholder="$t('qing-xuan-ze-bu-men')" style="width: 100%" @change="chooseDept"
-                    :options="option" :props="{ checkStrictly: true,expandTrigger: 'hover' }" :show-all-levels="false" clearable></el-cascader>
+                    :options="option" :props="{ checkStrictly: true,expandTrigger: 'hover' }" :show-all-levels="false" clearable v-show="user.userNameNeedTranslate != 1"></el-cascader>
+                <vueCascader :size="'small'" :subjectId="curDeptId" :widthStr="'200'" :clearable="true" :subject="option" :radios="true" :distinction="'3'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1"></vueCascader>
               </el-form-item>
               </el-form>
             <div slot="footer" class="dialog-footer">
@@ -93,7 +94,8 @@
 </template>
 <script>
     import util from "../../common/js/util";
-
+    // 引入自定义级联组件
+    import vueCascader from "@/components/cascader.vue"
     export default {
         data() {
             return {
@@ -124,6 +126,9 @@
                 sysAuditUSer:{}
             };
         },
+        components: {
+            vueCascader
+        },
         methods: {
             setAuditUser() {
                 this.http.post('/audit-workflow-time-setting/setAuditSysUser',{userId: this.auditManagerId},
@@ -337,6 +342,14 @@
                     );
             },
 
+            vueCasader(obj) {
+                if(obj.distinction == '3') {
+                    let arr = []
+                    arr.push(obj.id)
+                    this.curDeptId = arr
+                }
+            }
+
         },
         created() {
             let height = window.innerHeight;