|
@@ -588,12 +588,12 @@
|
|
|
|
|
|
<!-- 增加BU字段 绎维固定字段 -->
|
|
|
<el-form-item label="BU" v-if="user.companyId == '862'">
|
|
|
- <el-cascader ref="deptCascader" v-model="addForm.bu" style="width: 250px" @change="chooseDept"
|
|
|
- :options="buOption" :props="{ checkStrictly: true,expandTrigger: 'hover' }" :show-all-levels="false" clearable v-show="user.userNameNeedTranslate != 1"></el-cascader>
|
|
|
- <vueCascader :size="'small'" :subjectId="addForm.bu" :widthStr="'200'" :clearable="true" :subject="option" :radios="true" :distinction="'32'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1"></vueCascader>
|
|
|
+ <el-cascader ref="deptCascader" v-model="addForm.bu" style="width: 250px" :show-all-levels="false"
|
|
|
+ :options="buOption" :props="{ checkStrictly: true, expandTrigger: 'hover' }" clearable v-show="user.userNameNeedTranslate != 1"></el-cascader>
|
|
|
+ <vueCascader :size="'small'" :subjectId="addForm.bu" :widthStr="'200'" :clearable="true" :subject="buOption" :radios="true" :distinction="'32'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1"></vueCascader>
|
|
|
</el-form-item>
|
|
|
|
|
|
- <el-form-item :label="$t('projectoutput')" prop="outputValue" v-if="user.timeType.outputValueStatus == 1">
|
|
|
+ <el-form-item :label="$t('projectoutput')" prop="outputValue" v-if="user.timeType.outputValueStatus == 1">
|
|
|
<el-input id="outputValue" v-model="addForm.outputValue" style="width:32%;"
|
|
|
placeholder="" clearable @keyup.native="restrictNumber('outputValue')">
|
|
|
</el-input><span style="margin-left:10px;">{{ $t('yuan') }}</span>
|
|
@@ -2799,8 +2799,6 @@ a {
|
|
|
|
|
|
//用于筛选过滤
|
|
|
this.allMembData = JSON.parse(JSON.stringify(this.deptMembData));
|
|
|
- // this.buOption = this.allMembData;
|
|
|
- console.log(this.buOption, '递归的数据')
|
|
|
} else {
|
|
|
this.$message({
|
|
|
message: res.msg,
|
|
@@ -2818,17 +2816,11 @@ a {
|
|
|
// 获取部门列表
|
|
|
getDepartment2() {
|
|
|
this.http.post(
|
|
|
- this.port.manage.depList,
|
|
|
- {},
|
|
|
+ this.port.manage.depList,{},
|
|
|
(res) => {
|
|
|
if (res.code == "ok") {
|
|
|
- var list = res.data,
|
|
|
- list1 = JSON.parse(JSON.stringify(res.data));
|
|
|
- this.data = list;
|
|
|
- this.dataRepeat = JSON.parse(JSON.stringify(list))
|
|
|
- console.log(list, "部门数据")
|
|
|
- this.option = this.changeArr(list1);
|
|
|
- this.buOption = this.dataRepeat;
|
|
|
+ var list = res.data
|
|
|
+ this.buOption = this.changeArr(JSON.parse(JSON.stringify(list)));
|
|
|
} else {
|
|
|
this.$message({
|
|
|
message: res.msg,
|
|
@@ -3693,6 +3685,7 @@ a {
|
|
|
creatorId: this.user.id,
|
|
|
projectMainId: '',
|
|
|
outputValue: '',
|
|
|
+ bu: []
|
|
|
// deptId: []
|
|
|
}
|
|
|
|
|
@@ -3756,6 +3749,14 @@ a {
|
|
|
for (var i in arrList) {
|
|
|
array.push(parseInt(arrList[i]));
|
|
|
}
|
|
|
+ let buascaderList = []
|
|
|
+ if(item.buId) {
|
|
|
+ let buArrList = item.buId.split(',')
|
|
|
+ for(var i in buArrList) {
|
|
|
+ buArrList[i] = +buArrList[i]
|
|
|
+ }
|
|
|
+ buascaderList = buArrList
|
|
|
+ }
|
|
|
// console.log(array, '转换', listList)
|
|
|
this.addForm = {
|
|
|
id: item.id,
|
|
@@ -3782,7 +3783,8 @@ a {
|
|
|
creatorId: item.creatorId,
|
|
|
outputValue: item.outputValue,
|
|
|
// deptId: array.reverse(),
|
|
|
- changeContractReason: ''
|
|
|
+ changeContractReason: '',
|
|
|
+ bu: buascaderList
|
|
|
}
|
|
|
this.contractAmountOld = item.contractAmount ? item.contractAmount : 0
|
|
|
// console.log(this.addForm, '数据')
|