Browse Source

出差审批流

Lijy 2 years ago
parent
commit
0ec7d3a9ca

+ 15 - 3
fhKeeper/formulahousekeeper/timesheet/src/views/awayOffice/awayOffice.vue

@@ -426,7 +426,8 @@
                 <el-form label-width="140px">
                 <el-form label-width="140px">
                     <el-form-item :label="$t('selectdepartmentsdesignatepersonnel')" >
                     <el-form-item :label="$t('selectdepartmentsdesignatepersonnel')" >
                         <el-cascader filterable ref="deptCascader" v-model="curDeptId" :placeholder="$t('defaultText.pleaseChoose')" style="width: 100%" @change="chooseDept" v-if="user.userNameNeedTranslate != 1" :options="soption" :props="{ checkStrictly: true,expandTrigger: 'hover' }" :show-all-levels="false" clearable></el-cascader>
                         <el-cascader filterable ref="deptCascader" v-model="curDeptId" :placeholder="$t('defaultText.pleaseChoose')" style="width: 100%" @change="chooseDept" v-if="user.userNameNeedTranslate != 1" :options="soption" :props="{ checkStrictly: true,expandTrigger: 'hover' }" :show-all-levels="false" clearable></el-cascader>
-                        <vueCascader :size="'small'" :widthStr="'200'" :clearable="true" :subject="soption" :radios="true" :distinction="'1'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1"></vueCascader>
+                        <!-- <vueCascader :size="'small'" :widthStr="'200'" :clearable="true" :subjectId="this.selectedAuuid" :subject="soption" :radios="true" :distinction="'1'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1"></vueCascader> -->
+                        <vueCascader :size="'small'" :widthStr="'200'" :clearable="true" :userName="true" :subjectId="this.selectedAuuid" :subject="soption" :radios="true" :distinction="'1'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1"></vueCascader>
                     </el-form-item>
                     </el-form-item>
                 </el-form>
                 </el-form>
                 <div slot="footer" class="dialog-footer">
                 <div slot="footer" class="dialog-footer">
@@ -1819,8 +1820,19 @@ export default {
                 this.dataArray.splice(this.sindex, 0, nodes);
                 this.dataArray.splice(this.sindex, 0, nodes);
             } else {
             } else {
             //编辑
             //编辑
-                this.dataArray[this.sindex].auditDeptId = node.value;
-                this.dataArray[this.sindex].auditDeptName = node.label;
+                if(node.type == 'dep') {
+                  this.dataArray[this.sindex].auditDeptId = node.value;
+                  this.dataArray[this.sindex].auditDeptName = node.label;
+                  this.dataArray[this.sindex].auditorType = 1
+                  this.dataArray[this.sindex].userId = ''
+                  this.dataArray[this.sindex].userName = ''
+                } else {
+                  this.dataArray[this.sindex].userId = node.value;
+                  this.dataArray[this.sindex].userName = node.label;
+                  this.dataArray[this.sindex].auditDeptId = ''
+                  this.dataArray[this.sindex].auditDeptName = ''
+                  this.dataArray[this.sindex].auditorType = 2
+                }
             }
             }
         },
         },