...

src/views/companyManagement/index.vue

@@ -309,7 +309,7 @@
 					</div>
 				</el-drawer>
 			</el-drawer>
-			<el-drawer :title="title" :append-to-body="true" :visible.sync="innerDrawer" size="50%">
+			<el-drawer :title="title" :append-to-body="true" :visible.sync="innerDrawer">
 				<div style="padding: 20px;">
 					<el-form :model="form1" :rules="rules1" ref="ruleForm1">
 						<el-form-item label="任务名称" label-width="80px" prop="T_name">
@@ -317,21 +317,25 @@
 						</el-form-item>
 						<el-form-item label="截至时间" label-width="80px" prop="T_deadline">
 							<el-date-picker type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"
-								v-model="form1.T_deadline" style="width: 100%;">
+								v-model="form1.T_deadline">
 							</el-date-picker>
 						</el-form-item>
-						<el-form-item label="任务模板" label-width="80px" prop="T_VerifyTemplate_id">
+						<el-form-item label="任务模板" label-width="80px">
 							<div style="display: flex;align-items: center;">
-								<el-cascader v-model="cascaderData" @focus="getTempApi" clearable :props="optionProps"
-									:options="optionsData" @change="GetTempListApi" style="margin-right: 10px;">
-								</el-cascader>
-								<el-select :disabled="cascaderData==''?true:false" v-model="form1.T_VerifyTemplate_id"
-									placeholder="请选择任务模板">
-									<el-option :label="item.T_name" :value="item.T_VerifyTemplate_id"
-										v-for="(item,index) in optionsRw" :key="index"></el-option>
-								</el-select>
+								<el-form-item prop="T_VerifyTemplate_class">
+									<el-cascader v-model="form1.T_VerifyTemplate_class" :props="optionProps" placeholder="请选择模板分类"
+										:options="optionsData" @change="casChange" style="margin-right: 10px;">
+									</el-cascader>
+								</el-form-item>
+								<el-form-item prop="T_VerifyTemplate_id">
+									<el-select v-model="form1.T_VerifyTemplate_id"
+										placeholder="先选择模板分类/选择任务模板">
+										<el-option :label="item.T_name" :value="item.T_VerifyTemplate_id"
+											v-for="(item,index) in optionsRw" :key="index"></el-option>
+									</el-select>
+								</el-form-item>
 							</div>
-						</el-form-item>
+						</el-form-item>	
 						<el-form-item label="实施方案" label-width="80px" prop="T_scheme">
 							<el-select v-model="form1.T_scheme" placeholder="请选择实施方案">
 								<el-option :label="item.T_name+'('+item.T_power_name+')'" :value="item.T_uuid"
@@ -418,7 +422,6 @@
 					children: 'Children',
 					checkStrictly: true
 				},
-				cascaderData: '',
 				optionsData: [],
 				TimeValue: '',
 				form: {
@@ -460,6 +463,7 @@
 					}],
 				},
 				form1: {
+					T_VerifyTemplate_class:[],
 					T_name: '', // 任务名称
 					T_uuid: '', // 用户的 UUID
 					T_VerifyTemplate_id: '', // 任务模板id
@@ -480,10 +484,15 @@
 						message: '请选择截止时间',
 						trigger: 'blur'
 					}],
+					T_VerifyTemplate_class:[{
+						required: true,
+						message: '请选择模板分类',
+						trigger: 'change'
+					}],
 					T_VerifyTemplate_id: [{
 						required: true,
 						message: '请选择任务模板',
-						trigger: 'blur'
+						trigger: 'change'
 					}],
 					T_scheme: [{
 						required: true,
@@ -550,6 +559,20 @@
 				radio1: '',
 			}
 		},
+		// watch:{
+		// 	innerDrawer(val){
+		// 		if(!val){
+		// 			// this.cascaderData = ''
+		// 			for(let obj in this.form1){
+		// 				console.log(obj)
+		// 				if(obj!='T_task_id'){
+		// 					this.form1[obj] = ''
+		// 				}
+		// 			}
+		// 		}
+		// 		console.log('变化',this.form1)
+		// 	}
+		// },
 		mounted() {
 			this.GetUserListApi()
 		},
@@ -580,8 +603,14 @@
 				}
 				return items
 			},
+			casChange(e){
+				this.form1.T_VerifyTemplate_id = ''
+				if (e != undefined) {
+					this.GetTempListApi(e)
+				}
+				console.log('选择发生变化',e,)
+			},
 			GetTempListApi(e) {
-				console.log('飒飒大苏打', e,this.cascaderData.join('/')+'/')
 				TempList({
 					T_class:e[e.length-1]
 				}).then(res => {
@@ -604,13 +633,17 @@
 				}
 			},
 			submitForm1(formName) {
+				let arrClass = {...this.form1}
+				if(arrClass.length != 0){
+					arrClass.T_VerifyTemplate_class = arrClass.T_VerifyTemplate_class.join('/')
+				}
+				console.log('提交11',arrClass)
 				this.$refs[formName].validate((valid) => {
 					if (valid) {
-						console.log('验证通过', this.form1)
 						if (this.blNum == 1) {
 							this.GetTaskAddApi()
 						} else {
-							TaskUp(this.form1).then(res => {
+							TaskUp(arrClass).then(res => {
 								if (res.data.Code === 200) {
 									this.$message.success('编辑成功')
 									this.innerDrawer = false
@@ -625,6 +658,11 @@
 				});
 			},
 			GetTaskAddApi() {
+				console.log('添加任务',this.form1)
+				let arrClass = {...this.form1}
+				if(arrClass.length != 0){
+					arrClass.T_VerifyTemplate_class = arrClass.T_VerifyTemplate_class.join('/')
+				}
 				TaskAdd(this.form1).then(res => {
 					console.log('添加', res)
 					if (res.data.Code === 200) {
@@ -641,8 +679,26 @@
 				}
 				this.innerDrawer = true
 				this.blNum = 1
-				this.form1 = this.$options.data().form
+				console.log('新增赋值',this.form1)
+				for (let obj in this.form1) {
+					if(obj=='T_task_id'){
+						console.log('T_task_id')
+					}else if(obj=='T_uuid'){
+						console.log('T_uuid')
+					}else{
+						if(obj=='T_VerifyTemplate_class'){
+							this.form1[obj] = []
+						}else{
+							this.form1[obj] = ''
+						}
+					}
+				}
+				this.optionsRw = []
+				console.log('新增赋值2',this.form1)
 				this.form1.T_uuid = this.pages1.T_uuid
+				// this.form1 = this.$options.data().form
+				this.getTempApi()
+				// console.log('新增8888', this.$options.data(), this.pages1)
 			},
 
 			GetAdminList_AllApi() {
@@ -767,6 +823,7 @@
 						if (this.$refs.ruleForm1 != undefined) {
 							this.$refs.ruleForm1.clearValidate()
 						}
+						this.getTempApi()
 						this.blNum = 2
 						this.form1.T_name = obj.T_name
 						this.form1.T_uuid = obj.T_uuid
@@ -777,7 +834,15 @@
 						this.form1.T_reporting = obj.T_reporting
 						this.form1.T_delivery = obj.T_delivery
 						this.form1.T_task_id = obj.T_task_id
+						if(obj.T_VerifyTemplate_class!=''){
+							let arr = obj.T_VerifyTemplate_class.split('/')
+							console.log('传值0',arr)
+							this.form1.T_VerifyTemplate_class = arr.map(Number) 
+							console.log('传值2',this.form1)
+							this.GetTempListApi(this.form1.T_VerifyTemplate_class)
+						}
 						this.innerDrawer = true
+						console.log('编辑999',obj,this.form1)
 						break
 					case 'c':
 						TaskGet({