Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HManagement/task/modules/add.vue

@@ -12,6 +12,7 @@
 					v-model="form.starttime"
 					type="date"
 					placeholder="选择日期"
+					value-format="yyyy-MM-dd"
 					size="mini">
 				</el-date-picker>
 				&emsp;- &emsp;
@@ -20,14 +21,26 @@
 					v-model="form.endtime"
 					type="date"
 					placeholder="选择日期"
+					value-format="yyyy-MM-dd"
 					size="mini">
 				</el-date-picker>
 			</div>
+			<div class="normal-margin flex-align-center">
+				<p class="task__label"><i class="el-icon-bell"></i>&emsp;提醒时间&emsp;</p>
+				<el-input :disabled="!form.endtime" v-model="form.remindday" size="mini" style="width:90px"></el-input>
+				<p>&emsp;天</p>
+			</div>
 			<div class="normal-margin">
 				<p class="task__label"><i class="el-icon-upload2"></i>&emsp;上传附件</p>
-				<upload type="button"></upload>
+				<upload
+					ref="upload"
+					:folderid="folderid"
+					@onSuccess="onSuccess"
+					:bindData="bindData"
+					type="button">
+				</upload>
 			</div>
-			<div class="normal-margin">
+			<!-- <div class="normal-margin">
 				<p class="mt-10 task__label">关联项目/客户</p>
 				<el-input placeholder="请输入内容" disabled v-model="input3" class="input-with-select" size="small">
 					<el-select v-model="form.nat" slot="prepend" style="width:100px" placeholder="请选择">
@@ -36,8 +49,8 @@
 						<el-option label="客户" value="3"></el-option>
 					</el-select>
 				</el-input>
-			</div>
-			<div>
+			</div> -->
+			<!-- <div>
 				<p class="mt-10 task__label">执行人员</p>
 				<div class="flex-align-center flex-between">
 					<el-input placeholder="请输入内容" v-model="input3" class="input-with-select" size="small">
@@ -48,7 +61,7 @@
 						<p slot="prepend">协 办</p>
 					</el-input>
 				</div>
-			</div>
+			</div> -->
 			<div slot="footer" class="dialog-footer">
         <el-button size="small" style="width:120px" @click="dialogTableVisible = false">取 消</el-button>
         <el-button type="warning" size="small" style="width:120px" @click="submit">创 建</el-button>
@@ -66,27 +79,44 @@ export default {
 	data () {
 		return {
 			dialogTableVisible:false,
+			folderid:JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
 			form:{
 				"sys_taskid":0,
         "title":"任务标题",
         "remarks":"任务说明",
         "starttime":"",
         "remindday":1,
-        "ownertable":"归属表",
+        "ownertable":"",
         "ownerid":0,
-        "endtime":"",
-				"nat":'1'
+        "endtime":""
 			}
 		}
 	},
 	methods:{
-		submit () {}
+		async submit () {
+			const res = await this.$api.requested({
+        "id": 20221211112101,
+        "content":this.form
+      })
+      this.tool.showMessage(res,()=>{
+        this.bindData = {
+          "ownertable": 'sys_task',
+          "ownerid": res.data.sys_taskid,
+          "usetype": 'default',
+        }
+        this.dialogFormVisible = false
+        this.$refs['form'].resetFields();
+          
+        this.$refs['upload'].toUpload()
+        this.$emit('onSuccess')
+      })
+		}
 	}
 }
 
 </script>
 <style scoped>
 .task__label{
-	color:rgb(173, 172, 172)
+	color:rgb(173, 172, 172);
 }
 </style>

src/components/normal-basic-layout/details/modules/task/addTask.vue

@@ -76,7 +76,8 @@ export default {
         "ownerid":0,
         "endtime":"",
 				"nat":'1'
-			}
+			},
+			input3:''
 		}
 	},
 	methods:{