瀏覽代碼

解决转译遗留下来的问题

Lijy 2 年之前
父節點
當前提交
f267bf01d5

+ 8 - 2
fhKeeper/formulahousekeeper/timesheet/src/components/select.vue

@@ -126,7 +126,12 @@ export default {
         other: {
             type: [String, Number, Boolean],
             default: false
-        }
+        },
+        // 是否执行到日报单独的函数
+        flgs: {
+            type: Boolean,
+            default: false
+        },
     },
     components: {
         selectWidth: '150',
@@ -281,7 +286,8 @@ export default {
         liClick(item, itemIndex) {
             let nameId = item.id || item.auditorId
             if(!this.multiSelect) {
-                if(this.flg) {
+                console.log('我进来了', this.flg)
+                if(this.flgs) {
                     let obj = {
                         id: nameId,
                         idx: this.dailyListIndex

+ 5 - 2
fhKeeper/formulahousekeeper/timesheet/src/i18n/en.json

@@ -42,7 +42,7 @@
     "approvedProject": "Approved project daily review",
     "allState": "All state",
     "DidNotFillIn": "Did not fill in",
-    "missFillReport":"Missing",
+    "missFillReport": "Missing",
     "alreadyPassed": "already passed",
     "WaitingAudit": "Waiting audit",
     "notThrough": "Not through",
@@ -1394,5 +1394,8 @@
   "dao-chu-qing-jia-dan": "Export leave request",
   "suixiangmuzidongchuangjian": "Automatically created with project",
   "ren-wu-lie-biao-ming-cheng": "task list name",
-  "yu-suan-gong-shi": "budgeted hours"
+  "yu-suan-gong-shi": "budgeted hours",
+  "fan-hui": "return",
+  "jie-duan": "phase",
+  "xiang-mu-cheng-ben": "project cost"
 }

+ 5 - 2
fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.json

@@ -42,7 +42,7 @@
     "approvedProject": "项目日报审核通过",
     "allState": "全部状态",
     "DidNotFillIn": "未填报",
-    "missFillReport":"漏填",
+    "missFillReport": "漏填",
     "alreadyPassed": "已通过",
     "WaitingAudit": "待审核",
     "notThrough": "不通过",
@@ -1394,5 +1394,8 @@
   "dao-chu-qing-jia-dan": "导出请假单",
   "suixiangmuzidongchuangjian": "随项目自动创建",
   "ren-wu-lie-biao-ming-cheng": "任务列表名称",
-  "yu-suan-gong-shi": "预算工时"
+  "yu-suan-gong-shi": "预算工时",
+  "fan-hui": "返回",
+  "xiang-mu-cheng-ben": "项目成本",
+  "jie-duan": "阶段"
 }

+ 133 - 85
fhKeeper/formulahousekeeper/timesheet/src/views/project/detail.vue

@@ -4,23 +4,23 @@
         <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
             <el-form :inline="true">
                 <el-form-item>
-                    <el-button type="text" @click="backToList" icon="el-icon-back" class="back">返回</el-button>
+                    <el-button type="text" @click="backToList" icon="el-icon-back" class="back">{{ $t('fan-hui') }}</el-button>
                 </el-form-item>
                 <el-form-item class="divLine"></el-form-item>
                 <el-form-item>
                     <span class="workName">{{detailName}}</span>
                 </el-form-item>
                 <el-form-item style="float:right;">
-                    <span style="font-size:18px;">项目成本:<span style="color:#20a0ff;">{{cost.toFixed(2)}}元</span></span>
+                    <span style="font-size:18px;">{{ $t('xiang-mu-cheng-ben') }}:<span style="color:#20a0ff;">{{cost.toFixed(2)}}{{ $t('yuan') }}</span></span>
                 </el-form-item>
             </el-form>
         </el-col>
         <el-col :span="24"  style="margin-top:10px;padding-bottom: 0px;text-align:center;">
             <el-radio-group v-model="radio" @change="getList">
-                <el-radio-button label="人员"></el-radio-button>
-                <el-radio-button label="任务分组" v-if="user.company.packageProject != 0"></el-radio-button>
-                <el-radio-button label="子项目" v-if="user.timeType.mainProjectState != '1'"></el-radio-button>
-                <el-radio-button label="阶段" v-if="user.company.packageProject != 0"></el-radio-button>
+                <el-radio-button :label="$t('ren-yuan')"></el-radio-button>
+                <el-radio-button :label="$t('other.taskGroup')" v-if="user.company.packageProject != 0"></el-radio-button>
+                <el-radio-button :label="$t('lable.subproject')" v-if="user.timeType.mainProjectState != '1'"></el-radio-button>
+                <el-radio-button :label="$t('jie-duan')" v-if="user.company.packageProject != 0"></el-radio-button>
             </el-radio-group>
         </el-col>
         <div id="clearfix" :style="'overflow-x: auto;width:100%;padding-bottom: 0px; position: relative; height:'+containerHeight+'px;'">
@@ -40,7 +40,7 @@
                 endDate: null,
                 detailId: this.$route.params.id,
                 detailName: this.$route.params.name,
-                radio:"人员",
+                radio:this.$t('ren-yuan'),
                 user: JSON.parse(sessionStorage.getItem("user")),
 
                 cost: 0,
@@ -64,11 +64,11 @@
             getList() {
                 this.listLoading = true;
                 var url = "";
-                if (this.radio=='人员') {
+                if (this.radio==this.$t('ren-yuan')) {
                     url = this.port.project.projectCost;
-                } else if (this.radio=='任务分组') {
+                } else if (this.radio==this.$t('other.taskGroup')) {
                     url = '/project/getCostByGroup';
-                } else if (this.radio=='子项目') {
+                } else if (this.radio==this.$t('lable.subproject')) {
                     url = '/sub-project/getTimeCost';
                 } else {
                     url = "/project/getCostInStage";
@@ -91,83 +91,19 @@
                     this.listLoading = false;
                     var _this = this;
                     if (res.code == "ok") {
-                        var xList = [],yList = [] , list = res.data.costList;
-                        this.cost = res.data.totalMoneyCost;
-                        for(var i in list) {
-                            if(this.radio == '任务分组'){
-                                xList.push(list[i].GroupName);
-                            }else{
-                                xList.push(list[i].name);
+                        if(this.user.userNameNeedTranslate == 1 && this.radio == this.$t('ren-yuan')) {
+                            let arr = []
+                            for(var i in res.data.costList) {
+                                let obj = {}
+                                obj.type = 'userName'
+                                obj.id = res.data.costList[i].name
+                                arr.push(obj)
                             }
-                            yList.push({
-                                "value": this.yAxisValue==0?list[i].costMoney:list[i].cost,
-                                "cost": list[i].cost,
-                                "money": list[i].costMoney,
-                            });
+                            this.dealWithTranslation(arr, res.data.costList, res.data.totalMoneyCost)
+                            // this.pullAway(res.data.costList, res.data.totalMoneyCost)
+                        } else {
+                            this.pullAway(res.data.costList, res.data.totalMoneyCost)
                         }
-
-                        var myChart = echarts.init(document.getElementById("container"));
-                        // 设置宽度
-                        myChart.resize({
-                            width: this.widthHtval
-                        })
-                        _this.myChart = myChart;
-                        var option = {
-                            // 工具箱
-                            toolbox: {
-                                show: true,
-                                feature:{
-                                    saveAsImage:{
-                                        show:true
-                                    },
-                                    restore:{
-                                        show:true
-                                    },
-                                    dataView:{
-                                        show:true
-                                    },
-                                    dataZoom:{
-                                        show:true
-                                    },
-                                    magicType:{
-                                        type:['line','bar']
-                                    }
-                                }
-                            },
-                            grid : {
-                                top : 80,    //距离容器上边界40像素
-                                bottom: 100,   //距离容器下边界30像素
-                                left: 150,
-                                right: 150
-                            },
-                            tooltip:{
-                                trigger:'axis',
-                                formatter: function (params,ticket,callback) {
-                                    var res = params[0].name + "<br/>工作成本"+" : " + params[0].data.money 
-                                    + "元 <br/>工作时长"+" : " + params[0].data.cost + "小时";
-                                    return res;
-                                }
-                            },
-                            xAxis: {
-                                data: xList,
-                                axisLabel: {
-                                    interval:0,rotate:20
-                                }
-                            },
-                            yAxis: [{
-                                type : 'value',
-                                axisLabel: {
-                                    formatter:this.yAxisValue==0?'{value} (元)':'{value}(小时)'
-                                }
-                            }],
-                            series: [{
-                                name: this.yAxisValue==0?'工作成本(元)':'工作时长(小时)',
-                                type: 'bar',
-                                barMaxWidth: 30,
-                                data: yList,
-                            }]
-                        };
-                        myChart.setOption(option,{notMerge: true});
                     } else {
                         this.$message({
                         message: res.msg,
@@ -182,6 +118,118 @@
                         type: "error"
                     });
                 });
+            },
+            dealWithTranslation(items, dataArr, cosess) {
+                if (WWOpenData.initCanvas) {
+                    WWOpenData.initCanvas()
+                }
+                const myFunOne = async () => {
+                    const result = await new Promise((resolve, reject) => {
+                        if(WWOpenData.prefetch) {
+                             WWOpenData.prefetch({ items }, (err, data) => {
+                                if (err) { return reject(err) }
+                                resolve(data)
+                            })
+                        }
+                       
+                    })
+                    for(var i in dataArr) {
+                        dataArr[i].name = result.items[i].data
+                    }
+                    this.pullAway(dataArr, cosess)
+                }
+                
+                myFunOne()
+            },
+            // 抽离出来的方法
+            pullAway(datalist, cosess) {
+                // var xList = [],yList = [] , list = res.data.costList;
+                var _this = this;
+                var xList = [],yList = [] , list = datalist;
+                // this.cost = res.data.totalMoneyCost;
+                this.cost = cosess;
+                for(var i in list) {
+                    if(this.radio == this.$t('other.taskGroup')){
+                        xList.push(list[i].GroupName);
+                    }else{
+                        xList.push(list[i].name);
+                    }
+                    yList.push({
+                        "value": this.yAxisValue==0?list[i].costMoney:list[i].cost,
+                        "cost": list[i].cost,
+                        "money": list[i].costMoney,
+                    });
+                }
+
+                var myChart = echarts.init(document.getElementById("container"));
+                // 设置宽度
+                myChart.resize({
+                    width: this.widthHtval
+                })
+                _this.myChart = myChart;
+                var option = {
+                    // 工具箱
+                    toolbox: {
+                        show: true,
+                        feature:{
+                            saveAsImage:{
+                                show:true
+                            },
+                            restore:{
+                                show:true
+                            },
+                            dataView:{
+                                show:true
+                            },
+                            dataZoom:{
+                                show:true
+                            },
+                            magicType:{
+                                type:['line','bar']
+                            }
+                        }
+                    },
+                    grid : {
+                        top : 80,    //距离容器上边界40像素
+                        bottom: 100,   //距离容器下边界30像素
+                        left: 150,
+                        right: 150
+                    },
+                    tooltip:{
+                        trigger:'axis',
+                        formatter: function (params,ticket,callback) {
+                            var res
+                            if(_this.user.userNameNeedTranslate == 1 && _this.radio == _this.$t('ren-yuan')) {
+                                res = '' + "<br/>"+_this.$t('workcost')+" : " + params[0].data.money 
+                                + _this.$t('yuan')+"<br/>"+_this.$t('screening.workTime')+" : " + params[0].data.cost + _this.$t('time.hour');
+                            } else {
+                                res = params[0].name + "<br/>"+_this.$t('workcost')+" : " + params[0].data.money 
+                                + _this.$t('yuan')+"<br/>"+_this.$t('screening.workTime')+" : " + params[0].data.cost + _this.$t('time.hour');
+                            }
+                            
+                            return res;
+                        }
+                    },
+                    xAxis: {
+                        data: xList,
+                        axisLabel: {
+                            interval:0,rotate:20
+                        }
+                    },
+                    yAxis: [{
+                        type : 'value',
+                        axisLabel: {
+                            formatter:this.yAxisValue==0?'{value} (元)':'{value}(小时)'
+                        }
+                    }],
+                    series: [{
+                        name: this.yAxisValue==0?_this.$t('workcost')+'('+_this.$t('yuan')+')':_this.$t('screening.workTime')+'('+_this.$t('time.hour')+')',
+                        type: 'bar',
+                        barMaxWidth: 30,
+                        data: yList,
+                    }]
+                };
+                myChart.setOption(option,{notMerge: true});
             },
              // 左右滚动
             scrollFunction () {

+ 19 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/detailDep.vue

@@ -10,8 +10,11 @@
                 <el-form-item style="width: 500px">
                     <!-- <div class="dipali"> -->
                         <!-- <span class="workName">{{detailName}}</span> -->
-                        <el-cascader v-model="departmentId" placeholder="请选择部门" style="width: 180px;margin-left:10px;" @change="getList"
+
+                        <el-cascader v-if="user.userNameNeedTranslate != '1'" v-model="departmentId" placeholder="请选择部门" style="width: 180px;margin-left:10px;" @change="getList"
                         :options="option" :props="{ checkStrictly: true }" :show-all-levels="false"></el-cascader>
+
+                        <vueCascader v-if="user.userNameNeedTranslate == '1'" :size="'medium'" :widthStr="'180'" :clearable="true" :subject="option" :radios="true" :distinction="'1'" @vueCasader="vueCasader" :selectNameChuan="$t('qing-xuan-ze-bu-men')"></vueCascader>
                     <!-- </div> -->
                 </el-form-item>
                 <el-form-item >
@@ -31,7 +34,13 @@
 <script>
     import util from "../../common/js/util";
 
+    // 引入自定义级联组件
+    import vueCascader from "@/components/cascader.vue"
+
     export default {
+        components: {
+            vueCascader
+        },
         data() {
             return {
                 yAxisValue: localStorage.yAxisValue,
@@ -297,6 +306,15 @@
                 event.preventDefault() // 阻止浏览器默认事件
                 this.domObj.scrollLeft = this.domObj.scrollLeft + step
             },
+            // 自定义事件
+            vueCasader(obj) {
+                if(obj.distinction == 1) {
+                    let arr = []
+                    arr.push(obj.id)
+                    this.departmentId = arr
+                    this.getList()
+                }
+            }
         },
         created() {
             let height = window.innerHeight;

+ 13 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -448,7 +448,18 @@
 
                         <div class="remind" ref="addRem" style="display: none">
                             <el-checkbox-group v-model="checkboxGrounp" v-for="item in users" :key="item.id">
-                                <p><el-checkbox :label="item.name" @change="kkk(item)"></el-checkbox></p>
+                                <p>
+                                    <el-checkbox :label="item.name" @change="kkk(item)">
+                                        <span>
+                                            <span v-if="user.userNameNeedTranslate != '1'">
+                                                {{item.name}}
+                                            </span>
+                                            <span v-if="user.userNameNeedTranslate == '1'">
+                                                <ww-open-data type='userName' :openid='item.name'></ww-open-data>
+                                            </span>
+                                        </span>
+                                    </el-checkbox>
+                                </p>
                             </el-checkbox-group>
                         </div>
                         <div class="ssp" @click="sss"></div>
@@ -634,7 +645,7 @@
                             <div>
                                 <span v-if="user.userNameNeedTranslate != 1">{{scope.row.creatorName}}</span>
                                 <span v-if="user.userNameNeedTranslate == 1">
-                                    <ww-open-data type='departmentName' :openid='scope.row.creatorName'></ww-open-data>
+                                    <ww-open-data type='userName' :openid='scope.row.creatorName'></ww-open-data>
                                 </span>
                             </div>
                         </template>

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/project_gantt.vue

@@ -77,7 +77,7 @@
     </div>
 
     <gantt v-if="isDataLoaded" ref="ganttTable1" class="left-container" :tasks="tasks" 
-    :stafforpro="radio1" 
+    :stafforpro="radio1"
     :valueDate="valueDate"
     :key="updatakey1"></gantt>
 

+ 112 - 66
fhKeeper/formulahousekeeper/timesheet/src/views/project/summary.vue

@@ -417,73 +417,20 @@
                 }
                 this.http.post(url, {projectId: this.curProjectId},
                 res => {
-                    if (res.code == "ok") {
-                        var xList = [], yList = [], list = res.data;
-                        for(var i in list) {
-                            xList.push(list[i].executorName);
-                            yList.push({
-                                "value": _this.sumListRadio == this.$t('plantime') ? list[i].taskHours : list[i].taskCount,
-                                "id": list[i].executorId
-                            });
+                    if (res.code == "ok") { 
+                        if(this.user.userNameNeedTranslate != 1) {
+                            this.pulledOut(res.data)
+                        } else {
+                            let arrList = []
+                            let textList = [] // 是否有待认领的文字
+                            for(var i in res.data) {
+                                let obj = {}
+                                obj.type = res.data[i].type
+                                obj.id = res.data[i].executorName
+                                arrList.push(obj)
+                            }
+                            this.dealWithTranslation(arrList, res.data)
                         }
-                        var myChart = echarts.init(document.getElementById("executorPanel"));
-                        _this.executorChart = myChart;
-                        var option = {
-                            color: ["#409EFF","#71C671"],
-                            title: {
-                                show:list.length == 0,
-                                textStyle: {
-                                    color: "#666666",
-                                    fontSize: 18,
-                                    fontWeight: 'normal',
-                                 },
-                              text: list.length == 0?this.$t('nodata'):this.$t('zhi-hang-ren-fen-pei-tu'),
-                              left: "center",
-                              top: "center"
-                            },
-                            toolbox: {
-                                show: true,
-                                feature:{
-                                    saveAsImage:{
-                                        show:true
-                                    },
-                                    restore:{
-                                        show:true
-                                    },
-                                    magicType:{
-                                        type:['line','bar']
-                                    },
-                                }
-                            },
-                            tooltip:{
-                                trigger:'axis',
-                                formatter: function (params,ticket,callback) {
-                                    var res = params[0].name + ""+" : " + params[0].data.value 
-                                    + (_this.sumListRadio == this.$t('plantime') ? this.$t('time.hour') : this.$t('ge'));
-                                    _this.params = params;
-                                    return res;
-                                }
-                            },
-                            xAxis: {
-                                data: xList,
-                                axisLabel: {
-                                    interval:0,rotate:20
-                                }
-                            },
-                            yAxis: [{
-                                type : 'value',
-                                axisLabel: {
-                                    formatter:'{value} '
-                                }
-                            }],
-                            series: [{
-                                name: _this.sumListRadio == this.$t('plantime') ? this.$t('xiaoshijihua') : this.$t('rwushuliang'),
-                                type: 'bar',
-                                barMaxWidth: 30,
-                                data: yList,
-                            }]
-                        };
-                        myChart.setOption(option,{notMerge: true});
                     } else {
                         this.$message({
                             message: res.msg,
@@ -498,6 +445,105 @@
                     });
                 });
             },
+
+            dealWithTranslation(items, dataArr) {
+                console.log('过来的值')
+                console.log(items, dataArr)
+                if (WWOpenData.initCanvas) {
+                    WWOpenData.initCanvas()
+                }
+                const myFunOne = async () => {
+                    const result = await new Promise((resolve, reject) => {
+                        if(WWOpenData.prefetch) {
+                             WWOpenData.prefetch({ items }, (err, data) => {
+                                if (err) { return reject(err) }
+                                resolve(data)
+                            })
+                        }
+                       
+                    })
+                    console.log(result, '出来的值')
+                    for(let i in dataArr) {
+                        dataArr[i].executorName = result.items[i].data
+                    }
+                    console.log('将要传过去的值', dataArr)
+                    this.pulledOut(dataArr)
+                }
+                
+                myFunOne()
+            },
+            // 单独抽离出来
+            pulledOut(dataList) {
+                console.log(dataList, '过来的值')
+                // var xList = [], yList = [], list = res.data;
+                let _this = this;
+                var xList = [], yList = [], list = dataList;
+                for(var i in list) {
+                    xList.push(list[i].executorName);
+                    yList.push({
+                        "value": _this.sumListRadio == this.$t('plantime') ? list[i].taskHours : list[i].taskCount,
+                        "id": list[i].executorId
+                    });
+                }
+                var myChart = echarts.init(document.getElementById("executorPanel"));
+                _this.executorChart = myChart;
+                var option = {
+                    color: ["#409EFF","#71C671"],
+                    title: {
+                        show:list.length == 0,
+                        textStyle: {
+                            color: "#666666",
+                            fontSize: 18,
+                            fontWeight: 'normal',
+                         },
+                      text: list.length == 0?this.$t('nodata'):this.$t('zhi-hang-ren-fen-pei-tu'),
+                      left: "center",
+                      top: "center"
+                    },
+                    toolbox: {
+                        show: true,
+                        feature:{
+                            saveAsImage:{
+                                show:true
+                            },
+                            restore:{
+                                show:true
+                            },
+                            magicType:{
+                                type:['line','bar']
+                            },
+                        }
+                    },
+                    tooltip:{
+                        trigger:'axis',
+                        formatter: function (params,ticket,callback) {
+                            var res = params[0].name + ""+" : " + params[0].data.value 
+                            + (_this.sumListRadio == this.$t('plantime') ? this.$t('time.hour') : this.$t('ge'));
+                            _this.params = params;
+                            return res;
+                        }
+                    },
+                    xAxis: {
+                        data: xList,
+                        axisLabel: {
+                            interval:0,rotate:20
+                        }
+                    },
+                    yAxis: [{
+                        type : 'value',
+                        axisLabel: {
+                            formatter:'{value} '
+                        }
+                    }],
+                    series: [{
+                        name: _this.sumListRadio == this.$t('plantime') ? this.$t('xiaoshijihua') : this.$t('rwushuliang'),
+                        type: 'bar',
+                        barMaxWidth: 30,
+                        data: yList,
+                    }]
+                };
+                myChart.setOption(option,{notMerge: true});
+            },
             getProjectTaskSum() {
                 this.http.post('/project/taskSum', {
                     id: this.curProjectId

+ 12 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/task/list.vue

@@ -307,7 +307,18 @@
 
                         <div class="remind" ref="addRem" style="display: none">
                             <el-checkbox-group v-model="checkboxGrounp" v-for="item in users" :key="item.id">
-                                <p><el-checkbox :label="item.name" @change="kkk(item)"></el-checkbox></p>
+                                <p>
+                                    <el-checkbox :label="item.name" @change="kkk(item)">
+                                        <span>
+                                            <span v-if="user.userNameNeedTranslate != '1'">
+                                                {{item.name}}
+                                            </span>
+                                            <span v-if="user.userNameNeedTranslate == '1'">
+                                                <ww-open-data type='userName' :openid='item.name'></ww-open-data>
+                                            </span>
+                                        </span>
+                                    </el-checkbox>
+                                </p>
                             </el-checkbox-group>
                         </div>
                         <div class="ssp" @click="sss"></div>

+ 23 - 6
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -177,7 +177,9 @@
                                                                 <!-- 待项目审核人 --> {{$t('other.waitForTheProjectReviewer')}}
                                                                 <span v-if="item2.projectAuditorName != null">(
                                                                     <!-- {{item2.projectAuditorName}} -->
-                                                                    <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item2.projectAuditorName'></ww-open-data></span>
+                                                                    <span v-if="user.userNameNeedTranslate == '1'">
+                                                                        <ww-open-data type='userName' :openid='item2.projectAuditorName'></ww-open-data>
+                                                                    </span>
                                                                     <span v-if="user.userNameNeedTranslate != '1'">{{item2.projectAuditorName}}</span>
                                                                     )</span> 
                                                                 <!-- 审核 --> {{$t('other.audit')}}
@@ -186,7 +188,9 @@
                                                                 <!-- 项目审核人 --> {{$t('other.projectAuditor')}}
                                                                 <span v-if="item2.projectAuditorName != null">(
                                                                     <!-- {{item2.projectAuditorName}} -->
-                                                                    <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item2.projectAuditorName'></ww-open-data></span>
+                                                                    <span v-if="user.userNameNeedTranslate == '1'">
+                                                                        <ww-open-data type='userName' :openid='item2.projectAuditorName'></ww-open-data>
+                                                                    </span>
                                                                     <span v-if="user.userNameNeedTranslate != '1'">{{item2.projectAuditorName}}</span>
                                                                     )</span>
                                                                 <!-- 审核通过 --> {{$t('state.approved')}}
@@ -195,7 +199,10 @@
                                                         <span v-else-if="item2.isDeptAudit==1">
                                                             <!-- {{($t('other.await') +' '+ item2.auditDeptName +' '+ $t('other.audit'))}} -->
                                                             ({{$t('other.await')}}
-                                                            <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='item2.auditDeptName'></ww-open-data></span>
+                                                            <span v-if="user.userNameNeedTranslate == '1'">
+                                                                <ww-open-data type='departmentName' :openid='item2.auditDeptName'></ww-open-data>
+
+                                                            </span>
                                                             <span v-if="user.userNameNeedTranslate != '1'">{{item2.auditDeptName}}</span>
                                                             {{$t('other.audit')}})
                                                         </span>
@@ -213,7 +220,16 @@
                                                         <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == -1">[ {{$t('other.importWaitingForReview')}} ]</span>
                                                         <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == 0 && item2.departmentAuditState == -1">[ {{$t('other.waitingForProfessionalReview')}} ]</span>
                                                         <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == 0 && item2.departmentAuditState == 0">[ {{$t('other.waitingForDepartmentReview')}} ]</span>
-                                                        <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == 0 && item2.departmentAuditState == 1">[ {{$t('other.waitForTheProjectReviewer')}}<span v-if="item2.projectAuditorName != null">({{item2.projectAuditorName}})</span>{{$t('other.audit')}} ]</span>
+                                                        <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == 0 && item2.departmentAuditState == 1">[ {{$t('other.waitForTheProjectReviewer')}}<span v-if="item2.projectAuditorName != null">
+                                                            (
+                                                                <span v-if="user.userNameNeedTranslate != 1">
+                                                                    {{item2.projectAuditorName}}
+                                                                </span>
+                                                                <span v-if="user.userNameNeedTranslate == 1">
+                                                                    <ww-open-data type='userName' :openid='item2.projectAuditorName'></ww-open-data>
+                                                                </span>
+                                                            )
+                                                        </span>{{$t('other.audit')}} ]</span>
                                                         <span style="margin-left:15px;color:#32CD32;" v-else-if="item2.state == 1">[ {{$t('state.alreadyPassed')}} ]</span>
                                                         <span style="margin-left:15px;color:#FF0000;" v-else-if="item2.state == 2">[ {{$t('state.rejected')}} ] {{$t('other.reason')}}:{{item2.rejectReason}}</span>
                                                         <span style="margin-left:15px;color:#FF0000;" v-else-if="item2.state == 3">[ {{$t('state.waitingsubmit')}} ]</span>
@@ -447,7 +463,7 @@
                             </el-option>
                         </el-select>
 
-                        <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'medium'" :subject="domain.auditUserList" :idx="index" :subjectId="domain.projectAuditorId" ref="selectCat" :flg="domain.projectAuditorId ? true : false" @selectCatCli="selectCatCli"></selectCat>
+                        <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'medium'" :subject="domain.auditUserList" :idx="index" :subjectId="domain.projectAuditorId" ref="selectCat" :flg="domain.projectAuditorId ? true : false" :flgs="true" @selectCatCli="selectCatCli"></selectCat>
 
                     </el-form-item>
                     <!-- 111111 -->
@@ -592,7 +608,7 @@
                                 </el-option>
                             </el-select>
 
-                            <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'small'" :subject="domain.auditUserList" :idx="index" :subjectId="domain.projectAuditorId" ref="selectCat" :flg="true" @selectCatCli="selectCatCli"></selectCat>
+                            <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'small'" :subject="domain.auditUserList" :idx="index" :subjectId="domain.projectAuditorId" ref="selectCat" :flg="true" :flgs="true" @selectCatCli="selectCatCli"></selectCat>
                         </el-form-item>
                         
 
@@ -5906,6 +5922,7 @@
             },
             // 触发 selectCat 组件更改他的值
             selectCatCli(obj) {
+                console.log(obj, '看看')
                 // obj.id 是 选中人员的id, obj.idx 是 当前的索引
                 this.workForm.domains[obj.idx].projectAuditorId = obj.id
             },