Merge branch 'dev-yf'' into 'develop'

Dev yf'

See merge request !31

src/views/riskProject/add/addPresent.vue

@@ -158,14 +158,15 @@
           />
           已采取的管控措施
         </div>
-        <van-field 
-              label="技术措施" 
-              v-model="form.measuresProject"
-              name="measuresProject"
-              type="textarea"
-              rows="3"
-              autosize
-              placeholder="请输入">
+        <van-field
+          label="技术措施"
+          v-model="form.measuresProject"
+          name="measuresProject"
+          type="textarea"
+          rows="3"
+          autosize
+          placeholder="请输入"
+        >
         </van-field>
         <van-field name="measuresProjectFile[]" label="技术措施附件">
           <template #input>
@@ -200,13 +201,15 @@
             </van-uploader>
           </template>
         </van-field>
-        <van-field label="管理措施" 
-              v-model="form.measuresAdministration"
-              name="measuresAdministration"
-              type="textarea"
-              rows="3"
-              autosize
-              placeholder="请输入">
+        <van-field
+          label="管理措施"
+          v-model="form.measuresAdministration"
+          name="measuresAdministration"
+          type="textarea"
+          rows="3"
+          autosize
+          placeholder="请输入"
+        >
         </van-field>
         <van-field name="measuresAdministrationFile[]" label="管理措施附件">
           <template #input>
@@ -241,13 +244,15 @@
             </van-uploader>
           </template>
         </van-field>
-        <van-field label="应急措施"  
-              v-model="form.measuresEmergency"
-              name="measuresEmergency"
-              type="textarea"
-              rows="3"
-              autosize
-              placeholder="请输入">
+        <van-field
+          label="应急措施"
+          v-model="form.measuresEmergency"
+          name="measuresEmergency"
+          type="textarea"
+          rows="3"
+          autosize
+          placeholder="请输入"
+        >
         </van-field>
         <van-field name="measuresEmergencyFile[]" label="应急措施附件">
           <template #input>
@@ -655,14 +660,13 @@ export default {
     this.existingId = this.$route.params.existingId;
     this.inherentId = this.form.inherentId =
       this.$route.params.inherentId || sessionStorage.getItem("inherentId");
-     
   },
   mounted() {
     if (sessionStorage.getItem("presentForm")) {
       this.form = JSON.parse(sessionStorage.getItem("presentForm"));
       this.form.level = sessionStorage.getItem("level");
-      sessionStorage.removeItem('presentForm')
-    }else{
+      sessionStorage.removeItem("presentForm");
+    } else {
       this.postReturnEcho();
     }
   },
@@ -751,7 +755,15 @@ export default {
             this.form.planId = res.data.planId;
 
             /* 下面这些值还要可以输入，用上面的方法赋值后没有办法输入新的值！还不知道为啥 */
-            const {measuresProject,measuresEmergency,measuresAdministration,measuresDeptName,measuresUserName,measuresUserPhone,presenceLocation} =  res.data
+            const {
+              measuresProject,
+              measuresEmergency,
+              measuresAdministration,
+              measuresDeptName,
+              measuresUserName,
+              measuresUserPhone,
+              presenceLocation
+            } = res.data;
             const formValue = {
               measuresProject,
               measuresEmergency,
@@ -760,11 +772,11 @@ export default {
               measuresUserName,
               measuresUserPhone,
               presenceLocation
-            }
+            };
             this.form = {
               ...this.form,
               ...formValue
-            }
+            };
           })
           .catch(() => {
             this.$toast.clear();

src/views/riskProject/add/index.vue

@@ -43,18 +43,18 @@
         placeholder="请输入"
         :rules="[{ required: true, message: '任务名称不能为空' }]"
       />
-     
+
       <div style="display: flex;">
         <van-field
-            required
-            readonly
-            name="projectName"
-            :value="form.projectName"
-            label="关联项目"
-            placeholder="请选择"
-            @click="show = true"
-            :rules="[{ required: true, message: '关联项目不能为空' }]"
-          />
+          required
+          readonly
+          name="projectName"
+          :value="form.projectName"
+          label="关联项目"
+          placeholder="请选择"
+          @click="show = true"
+          :rules="[{ required: true, message: '关联项目不能为空' }]"
+        />
         <van-button
           style="color: #cccc;background-color: #f0f1f5;"
           icon="plus"
@@ -74,15 +74,15 @@
       </van-popup> -->
       <div style="display: flex;">
         <van-field
-        required
-        readonly
-        name="buildingNames"
-        :value="form.buildingNames"
-        label="评估楼栋"
-        placeholder="请输入"
-        @click="getRiskList()"
-        :rules="[{ required: true, message: '评估楼栋不能为空' }]"
-      />
+          required
+          readonly
+          name="buildingNames"
+          :value="form.buildingNames"
+          label="评估楼栋"
+          placeholder="请输入"
+          @click="getRiskList()"
+          :rules="[{ required: true, message: '评估楼栋不能为空' }]"
+        />
         <van-button
           style="color: #cccc;background-color: #f0f1f5;"
           icon="plus"
@@ -296,19 +296,19 @@
         >取消</van-button
       >
     </div>
-    <CreateComponent 
-      v-if="createComponentData.visible" 
-        @close="createComponentData.close"
-        @confirm="createComponentData.confirm"
-        :type="createComponentData.type"
-        :projectId="createComponentData.projectId"
-        />
+    <CreateComponent
+      v-if="createComponentData.visible"
+      @close="createComponentData.close"
+      @confirm="createComponentData.confirm"
+      :type="createComponentData.type"
+      :projectId="createComponentData.projectId"
+    />
   </div>
 </template>
 
 <script>
 import LHeader from "@/components/header.vue";
-import CreateComponent from './addProject.vue'
+import CreateComponent from "./addProject.vue";
 import selectDept from "@/components/selectDept/index.vue";
 import selectPeople from "@/views/riskProject/add/projectList.vue";
 import { timestampToTime, generateId } from "@/utils/format";
@@ -317,7 +317,7 @@ import {
   getLocalUserInfo,
   setLocalUserInfo
 } from "@/utils/userInfo";
-import { getFun, postFun,putFun } from "@/service/table.js";
+import { getFun, postFun, putFun } from "@/service/table.js";
 
 export default {
   name: "risk-add",
@@ -334,11 +334,11 @@ export default {
   },
   data() {
     return {
-      createComponentData:{
-        visible:false,
-        type:'',
-        close:this.projectComponentClose,
-        confirm:this.projectComponentConfirm
+      createComponentData: {
+        visible: false,
+        type: "",
+        close: this.projectComponentClose,
+        confirm: this.projectComponentConfirm
       },
       loadingStatus: false,
       loadingText: "提交...",
@@ -401,16 +401,16 @@ export default {
     };
   },
   created() {
-    if(this.$route.query.id){
-      this.text = '编辑'
-      this.getDetail(this.$route.query.id)
-    }else{
+    if (this.$route.query.id) {
+      this.text = "编辑";
+      this.getDetail(this.$route.query.id);
+    } else {
       var userInfo = getUserInfo();
       this.form.userId = userInfo.userId;
       this.form.userName = userInfo.nickName;
       this.form.deptId = userInfo.dept.deptId;
       this.form.deptName = userInfo.dept.deptName;
-      this.form.createDeptName = userInfo.dept.deptName
+      this.form.createDeptName = userInfo.dept.deptName;
     }
     getFun(`/risk/plan/project/list`).then(res => {
       this.columnsSource = res.data;
@@ -418,13 +418,13 @@ export default {
   },
   methods: {
     /* 创建项目 */
-    createProject(){
+    createProject() {
       this.createComponentData.visible = true;
-      this.createComponentData.type = 'project'
+      this.createComponentData.type = "project";
     },
     /* 创建 */
-    createBuilding(){
-       if (!this.form.projectId) {
+    createBuilding() {
+      if (!this.form.projectId) {
         this.$toast({
           title: "提示",
           message: "请选择关联项目!"
@@ -432,19 +432,19 @@ export default {
         return false;
       }
       this.createComponentData.visible = true;
-      this.createComponentData.type = 'building'
-      this.createComponentData.projectId = this.form.projectId
+      this.createComponentData.type = "building";
+      this.createComponentData.projectId = this.form.projectId;
     },
-    projectComponentClose(){
+    projectComponentClose() {
       this.createComponentData.visible = false;
-      this.createComponentData.type = ''
+      this.createComponentData.type = "";
     },
-    projectComponentConfirm(data){
+    projectComponentConfirm(data) {
       // this.createComponentData.visible = false;
       // this.createComponentData.type = '';
     },
-    getDetail(id){
-       this.$toast.loading({
+    getDetail(id) {
+      this.$toast.loading({
         message: "加载中...",
         forbidClick: true,
         loadingType: "spinner",
@@ -452,12 +452,12 @@ export default {
       });
       getFun(`/risk/plan/details/${id}`)
         .then(res => {
-         this.$toast.clear()
+          this.$toast.clear();
           this.form = res.data.detailsDto;
-          this.form.userName= this.form.createUserName
+          this.form.userName = this.form.createUserName;
         })
         .catch(() => {
-          this.$toast.clear()
+          this.$toast.clear();
           this.$toast.fail("加载失败,请稍后再试");
         });
     },
@@ -605,14 +605,14 @@ export default {
       // });
       this.loadingStatus = true;
       let url = "/risk/plan";
-      const fetch = ()=>{
-       if(this.$route.query.id){
-         return putFun(url,this.form)
-       }else{
-         delete this.form.createDeptName
-         return postFun(url,this.form)
-       }
+      const fetch = () => {
+        if (this.$route.query.id) {
+          return putFun(url, this.form);
+        } else {
+          delete this.form.createDeptName;
+          return postFun(url, this.form);
         }
+      };
       fetch()
         .then(res => {
           this.$toast.clear();