Merge branch 'develop' of http://git.censoft.com.cn/BCDH-HSE/bcdh-app into develop

src/views/danger/addDanger/addDanger.vue

@@ -130,7 +130,7 @@
           type="datetime"
           @confirm="onConFindTime"
           @cancel="showFindTime = false"
-          v-model="findDateTime"
+          v-model="currentDate"
         />
       </van-popup>
 
@@ -230,6 +230,7 @@
       <van-popup v-model="showExpireTime" position="bottom">
         <van-datetime-picker
           type="datetime"
+          v-model="currentDate"
           @confirm="onConExpireTime"
           @cancel="showExpireTime = false"
         />
@@ -379,7 +380,7 @@ export default {
       columnsRecPeople: [],
       isShowreturnCause: false,
       returnCause: "", // 退回原因
-      findDateTime : new Date()
+      currentDate : new Date()
     };
   },
   created() {

src/views/danger/changeDanger/delayInfo.vue

@@ -20,6 +20,7 @@
       <van-popup v-model="showDelayTime" position="bottom">
         <van-datetime-picker
           type="datetime"
+          v-model="currentDate"
           @confirm="onConDelayTime"
           @cancel="showDelayTime = false"
         />
@@ -64,6 +65,7 @@ export default {
       delayTime: "", // 延迟时间
       showDelayTime: false,
       delayApply: "", // 延迟理由
+      currentDate: new Date(),
 
     };
   },

src/views/danger/confirmeDanger/confirmeDanger.vue

@@ -67,7 +67,7 @@
             type="datetime"
             @confirm="onConfirm"
             @cancel="showCalendar = false"
-            v-model="endDateTime"
+            v-model="currentDate"
           />
         </van-popup>
 
@@ -176,7 +176,7 @@ export default {
       showPickerReview: false,
       valueIdea: "",
       returnReason: "",
-      endDateTime: new Date()
+      currentDate: new Date()
     };
   },
 

src/views/danger/managerDanger/managerSurvey.vue

@@ -66,6 +66,7 @@ export default {
   data() {
     return {
       taskId: "",
+      pid:"",
       messageList: [],
       text: "项目经理督办批示",
       opinion: ""
@@ -76,7 +77,9 @@ export default {
       if (from.name === "manager-danger") {
         vm.messageList = [];
         let paramsData = to.params.data;
+        console.log(paramsData);
         vm.taskId = paramsData.taskId;
+        vm.pid = paramsData.pid;
         vm.messageList.push(paramsData);
         vm.opinion = "";
       }
@@ -94,6 +97,7 @@ export default {
       });
       let formdata = new FormData();
       formdata.append("instructionsContent", values.instructionsContent);
+      formdata.append("pid", this.pid);
       superviseAdd(`/instructions/add`, formdata)
         .then(res => {
           this.$toast.clear();