|
@@ -24,7 +24,7 @@
|
|
|
<el-option v-for="item in personnelList" :key="item.id" :label="item.personnelName" :value="item.id"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="委托方" prop="clientId" >
|
|
|
+ <el-form-item label="委托方" prop="clientId" v-if="tenantType == 1">
|
|
|
<el-select v-model="form.clientId" placeholder="请选择委托方" filterable :popper-append-to-body="false">
|
|
|
<el-option v-for="item in clientList" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
|
</el-select>
|
|
@@ -177,7 +177,19 @@ export default {
|
|
|
callback(new Error('请选择时间'))
|
|
|
}
|
|
|
}
|
|
|
+ const isClientId = (rule,value,callback)=>{
|
|
|
+ if(this.tenantType == 1){
|
|
|
+ if(value){
|
|
|
+ callback()
|
|
|
+ }else{
|
|
|
+ callback(new Error('请选择委托方'))
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ callback()
|
|
|
+ }
|
|
|
+ }
|
|
|
return {
|
|
|
+ tenantType:'',
|
|
|
customColors: [
|
|
|
{color: '#f56c6c', percentage: 20},
|
|
|
{color: '#e6a23c', percentage: 40},
|
|
@@ -209,7 +221,7 @@ export default {
|
|
|
name: [{ required: true, message: '请输入报告名称', trigger: 'blur' },],
|
|
|
signPatentNo: [{ required: true, validator:isExist, trigger: 'blur' },],
|
|
|
personId: [{ required: true, message: '请选择负责人', trigger: 'change' },],
|
|
|
- clientId: [{ required: true, message: '请选择委托方', trigger: 'change' },],
|
|
|
+ clientId: [{ required: true, validator:isClientId, trigger: 'change' },],
|
|
|
departmentId: [{ required: true, validator:isDepartmentId, trigger: 'change' },],
|
|
|
},
|
|
|
TaskRules:{
|
|
@@ -226,10 +238,13 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
|
- ...mapGetters(['webSocket', 'userinfo']),
|
|
|
+ ...mapGetters(['webSocket',]),
|
|
|
dictMessage() {
|
|
|
return this.$store.state.dictMessage.dictMessage
|
|
|
},
|
|
|
+ userinfo() {
|
|
|
+ return this.$store.state.admin.userinfo
|
|
|
+ },
|
|
|
},
|
|
|
|
|
|
mounted() {
|
|
@@ -440,7 +455,7 @@ export default {
|
|
|
},
|
|
|
//获取全部人员
|
|
|
getAllPersonnelList(){
|
|
|
- this.$api.getAllPersonnel().then(response=>{
|
|
|
+ this.$api.getTenantPersonnel().then(response=>{
|
|
|
// console.log(response)
|
|
|
this.personnelList = response.data
|
|
|
})
|
|
@@ -453,7 +468,7 @@ export default {
|
|
|
},
|
|
|
//获取全部部门
|
|
|
getAllDepartmentList(){
|
|
|
- this.$api.getAllDepartment().then(response=>{
|
|
|
+ this.$api.getTenantDepartments().then(response=>{
|
|
|
// console.log(response)
|
|
|
this.departmentList = response.data
|
|
|
})
|
|
@@ -467,6 +482,7 @@ export default {
|
|
|
},
|
|
|
//接收创建报告类型
|
|
|
open(row,dictMessage) {
|
|
|
+ this.tenantType = this.userinfo.tenantType
|
|
|
this.verify=true
|
|
|
var a = ''
|
|
|
this.form = row
|