Sfoglia il codice sorgente

Merge remote-tracking branch 'origin/v0.0.9' into v0.0.9

jingyuanchao 1 anno fa
parent
commit
d69d916bc9

+ 8 - 0
src/api/core/drill/drillTask.js

@@ -47,3 +47,11 @@ export function evaluateDrillTask(data) {
   })
 }
 
+export function singRehearsalTask(data) {
+  return request({
+    url: `/core/drill/task/sign`,
+    method: 'post',
+    data
+  })
+}
+

+ 9 - 0
src/api/core/edu/eduTask.js

@@ -43,6 +43,15 @@ export function delEduTask(id) {
   })
 }
 
+//编辑任务登记
+export function signTrainingInfo(data) {
+  return request({
+    url: `/core/eduTask/sign`,
+
+    method: 'post',
+    data
+  })
+}
 // 查询详细教育任务
 // export function recordEduTask(id) {
 //   return request({

+ 65 - 3
src/views/core/drill/task/dialog.info.vue

@@ -85,6 +85,21 @@
             {{ formData.comment }}
           </span>
           </el-descriptions-item>
+<!--          <el-descriptions-item
+            labelClassName="gx_info_label"
+            span="2"
+            label="演练图片"
+          >
+            <ImageListPreview v-model="formData.imageList"></ImageListPreview>
+          </el-descriptions-item>
+          <el-descriptions-item
+            labelClassName="gx_info_label"
+            span="2"
+            label="参演人员签名"
+          >
+            <ImageListPreview :value="signImageListValue" v-model="formData.signImageList"></ImageListPreview>
+            <el-button v-if="(showSignBtn && isSignType)" type="primary" @click="getSignatureSeal">引入</el-button>
+          </el-descriptions-item>-->
 
         </el-descriptions>
 
@@ -227,6 +242,10 @@
         </el-form> -->
       </div>
 
+<!--      <div v-if="(showSignBtn && isSignType)" slot="footer" class="dialog-footer">-->
+<!--        <el-button type="primary" @click="submitSign">确定</el-button>-->
+<!--        <el-button @click="onHide">取消</el-button>-->
+<!--      </div>-->
       <div slot="footer" class="dialog-footer">
         <el-button @click="onHide">关闭</el-button>
       </div>
@@ -236,11 +255,11 @@
 
 <script>
 import { mapState, mapMutations } from "vuex";
-import { getEduTask } from "@/api/core/edu/eduTask";
-import { getDrillTask } from "@/api/core/drill/drillTask";
+import { getDrillTask, singRehearsalTask } from "@/api/core/drill/drillTask";
 import { initList } from "@/api/core/drill/drillDictionary";
 import KFileUpload from "@/components/K-FileUpload/index.vue";
 import { getLabel } from "@/views/commonOption";
+import {getInfo} from "@/api/login";
 export default {
   components: { KFileUpload },
   dicts: ["drill_task_status", "core_drill_type"],
@@ -249,9 +268,13 @@ export default {
     return {
       id: params ? params.id : null,
       isShow: false,
+      // showSignBtn: false,
+      // isSignType: false,
+      // signImg: null,
       formData: this.reset(),
       drillTypeOptions: [],
       formFileListDefualtValue: [],
+      // signImageListValue: null,
       labelStyle: {
         color: "#000",
         "text-align": "center",
@@ -301,12 +324,15 @@ export default {
           this.formData = response.data;
           this.formFileListDefualtValue = response.data.fileList;
           this.formData.signImageList = this.getSingImageList();
+          // this.signImageListValue = this.formData.signImageList;
           this.loading = false;
         });
       }
     },
-    async show(id, other = {}) {
+    async show(id, showSignBtn, isSignType,other = {}) {
       this.id = id;
+      // this.isSignType = isSignType;
+      // this.showSignBtn = showSignBtn;
       await this.refresh(id, other);
       this.isShow = true;
     },
@@ -346,6 +372,42 @@ export default {
         this.drillTypeOptions = response;
       });
     },
+    // getSignatureSeal(){
+    //   getInfo()
+    //     .then((res) => {
+    //       const user = res.user;
+    //       if (user.signatureSeal ==='' || user.signatureSeal === null){
+    //         this.$modal.msgWarning("你还未维护签名印章,请到APP端“我的”页面上传个人印章");
+    //         return;
+    //       }
+    //       if (this.formData.signImageList){
+    //         if (!(this.formData.signImageList.indexOf(user.signatureSeal) !== -1)){
+    //           this.formData.signImageList = this.formData.signImageList + "," + user.signatureSeal;
+    //         }
+    //       }else {
+    //         this.formData.signImageList = user.signatureSeal;
+    //       }
+    //       this.signImageListValue = this.formData.signImageList;
+    //       this.signImg = user.signatureSeal;
+    //     })
+    //     .catch((error) => {
+    //       //reject(error);
+    //     });
+    // },
+    // submitSign(){
+    //   if (this.signImg === '' ||this.signImg === null){
+    //     this.$modal.alert("请引入个人签名印章");
+    //     return;
+    //   }
+    //   singRehearsalTask({
+    //     id: this.id,
+    //     signImage: this.signImg
+    //   }).then(res => {
+    //     this.$emit("success", this.formData);
+    //     this.onHide();
+    //     this.$modal.msgSuccess("操作成功");
+    //   })
+    // }
     // 事件
     //apimark//
   },

+ 43 - 4
src/views/core/drill/task/index.vue

@@ -246,10 +246,18 @@
                   size="mini"
                   type="text"
                   icon="el-icon-view"
-                  @click="handleDetail(scope.row.id)"
+                  @click="handleDetail(scope.row,scope.row.id,false)"
                   v-hasPermi="['core:drillTask:query']"
                   >详情
                 </el-button>
+<!--                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  v-if="isSignature(scope.row)"
+                  @click="handleDetail(scope.row,scope.row.id,true)"
+                >签名
+                </el-button>-->
                 <el-button
                   size="mini"
                   type="text"
@@ -398,7 +406,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(["orgId", "orgName"]),
+    ...mapGetters(["orgId", "orgName", "userId"]),
   },
   methods: {
     dayjs,
@@ -489,8 +497,9 @@ export default {
     //   this.title = "添加教育任务";
     // },
     /** 修改按钮操作 */
-    handleDetail(id) {
-      this.$refs["infoDialog"].show(id, {});
+    handleDetail(row,id,isSignType) {
+      //this.$refs["infoDialog"].show(id, {});
+      this.$refs["infoDialog"].show(id, false, isSignType,{});
     },
 
     /** 培训登记按钮操作 */
@@ -583,6 +592,36 @@ export default {
         }-${this.$tab.getCurrentTabName()}-${dayjs().format("YYYYMMDD")}.xlsx`
       );
     },
+    // isSignature(list) {
+    //   console.log("111111111111")
+    //   let falg = false
+    //   let timefalg = false
+    //   //value1 当前登陆用户ID
+    //   //当前时间再时间范围内且签名是待签名状态且签名列表存在当前登录人未签名的情况才可以进行签名
+    //   if (list.startDate && list.endDate && list.status == 1) {
+    //     let date = new Date().getTime()
+    //     let startDate = Date.parse(new Date(list.startDate));// Date.parse(new Date(list.startDate))
+    //     let endDate = Date.parse(new Date(list.endDate));// Date.parse(new Date(list.endDate))
+    //
+    //     if (date >= startDate && date <= endDate) {
+    //       timefalg = true
+    //     }
+    //     if (!list.planId) {
+    //       timefalg = true
+    //     }
+    //   }
+    //   if (list.userList && list.userList.length > 0) {
+    //     list.userList.forEach(item => {
+    //       if (this.userId == item.userId && item.sign === 0 && item.type == 1) {
+    //         falg = true
+    //       }
+    //     })
+    //   }
+    //
+    //   if (falg && timefalg) {
+    //     return true
+    //   }
+    // },
   },
 };
 </script>

+ 55 - 4
src/views/core/edu/task/dialog.info.vue

@@ -78,6 +78,8 @@
           </el-descriptions-item>
           <el-descriptions-item span="2" labelClassName="gx_info_label" label="参会人员签名" >
             <ImageListPreview v-model="formData.signImageList"></ImageListPreview>
+<!--            <ImageListPreview :value="signImageListValue" v-model="formData.signImageList"></ImageListPreview>
+            <el-button v-if="(showSignBtn && isSignType)" type="primary" @click="getSignatureSeal">引入</el-button>-->
           </el-descriptions-item>
           <el-descriptions-item labelClassName="gx_info_label" label="资料文件" >
             <K-file-upload ref="upload" :isShowUploadBtn="false"
@@ -88,6 +90,10 @@
         </el-descriptions>
       </div>
 
+<!--      <div v-if="(showSignBtn && isSignType)" slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitSign">确定</el-button>
+        <el-button @click="onHide">取消</el-button>
+      </div>-->
       <div slot="footer" class="dialog-footer">
         <el-button @click="onHide">关闭</el-button>
       </div>
@@ -97,18 +103,24 @@
 
 <script>
   import { mapState, mapMutations } from "vuex";
-  import { getEduTask } from "@/api/core/edu/eduTask";
+  import { getEduTask,signTrainingInfo } from "@/api/core/edu/eduTask";
   import KFileUpload from "@/components/K-FileUpload/index.vue";
+  import ImageListPreview from "@/components/ImageListPreview/index.vue";
+  import { getInfo } from "@/api/login";
   export default {
-    components: {KFileUpload},
+    components: {KFileUpload,ImageListPreview},
     dicts: ['edu_type', 'edu_task_status'],
     data() {
       const params = this.$route.params;
       return {
         id: params ? params.id : null,
         isShow: false,
+        // showSignBtn: false,
+        // isSignType: false,
+        // signImg: null,
         formData: this.reset(),
         formFileListDefualtValue: [],
+        // signImageListValue: null,
         labelStyle: {
           'color': '#000',
           'text-align': 'center',
@@ -155,12 +167,15 @@
             this.formData = response.data;
             this.formFileListDefualtValue = response.data.fileList;
             this.formData.signImageList = this.getSingImageList();
+            // this.signImageListValue = this.formData.signImageList;
             this.loading = false;
           })
         }
       },
-      async show(id, other = {}) {
+      async show(id, showSignBtn, isSignType,other = {}) {
         this.id = id;
+        // this.isSignType = isSignType;
+        // this.showSignBtn = showSignBtn;
         await this.refresh(id, other);
         this.isShow = true;
       },
@@ -191,7 +206,6 @@
         xhr.send();
       },
       saveAs(blob, filename) {
-        console.log("saveAs", blob, filename)
         if (window.navigator.msSaveOrOpenBlob) {
           navigator.msSaveBlob(blob, filename);
         } else {
@@ -211,6 +225,43 @@
           window.URL.revokeObjectURL(link.href);
         }
       },
+      // getSignatureSeal(){
+      //   getInfo()
+      //     .then((res) => {
+      //       const user = res.user;
+      //       if (user.signatureSeal ==='' || user.signatureSeal === null){
+      //         this.$modal.msgWarning("你还未维护签名印章,请到APP端“我的”页面上传个人印章");
+      //         return;
+      //       }
+      //       if (this.formData.signImageList){
+      //         if (!(this.formData.signImageList.indexOf(user.signatureSeal) !== -1)){
+      //           this.formData.signImageList = this.formData.signImageList + "," + user.signatureSeal;
+      //         }
+      //       }else {
+      //         this.formData.signImageList = user.signatureSeal;
+      //       }
+      //       this.signImageListValue = this.formData.signImageList;
+      //       this.signImg = user.signatureSeal;
+      //     })
+      //     .catch((error) => {
+      //       //reject(error);
+      //     });
+      // },
+      // submitSign(){
+      //   if (this.signImg === '' ||this.signImg === null){
+      //     this.$modal.alert("请引入个人签名印章");
+      //     return;
+      //   }
+      //   console.log("signImg:"+this.signImg)
+      //   signTrainingInfo({
+      //     id: this.id,
+      //     signImage: this.signImg
+      //   }).then(res => {
+      //     this.$emit("success", this.formData);
+      //     this.onHide();
+      //     this.$modal.msgSuccess("操作成功");
+      //   })
+      // }
       // 事件
       //apimark//
     },

+ 43 - 4
src/views/core/edu/task/index.vue

@@ -255,10 +255,18 @@
                   size="mini"
                   type="text"
                   icon="el-icon-view"
-                  @click="handleDetail(scope.row.id)"
+                  @click="handleDetail(scope.row,scope.row.id,false)"
                   v-hasPermi="['core:eduTask:list']"
                   >详情
                 </el-button>
+<!--                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  v-if="isSignature(scope.row)"
+                  @click="handleDetail(scope.row,scope.row.id,true)"
+                >签名
+                </el-button>-->
                 <el-button
                   size="mini"
                   type="text"
@@ -393,7 +401,7 @@ export default {
     this.getList();
   },
   computed: {
-    ...mapGetters(["orgId", "orgName"]),
+    ...mapGetters(["orgId", "orgName", "userId"]),
   },
   methods: {
     dayjs,
@@ -484,9 +492,9 @@ export default {
         .catch(() => {});
     },
     /** 修改按钮操作 */
-    handleDetail(id) {
+    handleDetail(row,id,isSignType) {
       console.log("this.$refs", this.$refs["infoDialog"]);
-      this.$refs["infoDialog"].show(id, {});
+      this.$refs["infoDialog"].show(id, false, isSignType,{});
       // this.reset();
       // const id = row.id || this.ids
       // getEduTask(id).then(response => {
@@ -544,6 +552,37 @@ export default {
     async onDown(pdfUrl) {
       window.open(pdfUrl);
     },
+    //判断是否展示签名按钮
+    // isSignature(list) {
+    //   let falg = false
+    //   let timefalg = false
+    //   //value1 当前登陆用户ID
+    //   //当前时间再时间范围内且签名是待签名状态且签名列表存在当前登录人未签名的情况才可以进行签名
+    //   if (list.startDate && list.endDate && list.status == 1) {
+    //     let date = new Date().getTime()
+    //     let startDate = Date.parse(new Date(list.startDate));// Date.parse(new Date(list.startDate))
+    //     let endDate = Date.parse(new Date(list.endDate));// Date.parse(new Date(list.endDate))
+    //
+    //     if (date >= startDate && date <= endDate) {
+    //       console.log(list.id, 'ssss')
+    //       timefalg = true
+    //     }
+    //     if (!list.planId) {
+    //       timefalg = true
+    //     }
+    //   }
+    //   if (list.userList && list.userList.length > 0) {
+    //     list.userList.forEach(item => {
+    //       if (this.userId == item.userId && item.sign === 0 && item.type == 1) {
+    //         falg = true
+    //       }
+    //     })
+    //   }
+    //
+    //   if (falg && timefalg) {
+    //     return true
+    //   }
+    // },
   },
 };
 </script>

+ 32 - 29
src/views/core/outIn/approve/dialog.approve.letter.vue

@@ -40,13 +40,13 @@
               {{formData.startTimeStr}}
               </el-form-item>
             </el-col>
-           
+
             <el-col :span="12">
               <el-form-item  label="有效天数">
                 {{ formData.effectiveDays}}
               </el-form-item>
             </el-col>
-            
+
             <el-col :span="12">
               <el-form-item label="介绍信附件">
                 <K-file-upload ref="upload" :isShowUploadBtn="false"
@@ -58,7 +58,7 @@
               <el-form-item label="备注" prop="letterNo">
                 {{formData.letterDescription}}
               </el-form-item>
-            </el-col>          
+            </el-col>
           </el-row>
 
           <el-row :gutter="10" >
@@ -66,9 +66,9 @@
                 <h3>
                   <i class="el-icon-collection-tag"></i>
                   人员信息
-                </h3> 
-            </el-col>              
-          </el-row>   
+                </h3>
+            </el-col>
+          </el-row>
           <el-table border size="small" :data="formData.userInfos" height="300">
                   <el-table-column label="序号"  align="center"  type="index" width="70" />
                   <el-table-column label="来访单位" width="100" align="center" prop="companyName" />
@@ -81,28 +81,28 @@
                   <el-table-column label="证件号码" width="200" align="center" prop="idCard">
                   </el-table-column>
                   <el-table-column label="证件图片" align="center" prop="imgFile">
-                    <template slot-scope="scope">                      
-                            <ImageListPreview v-model="scope.row.imgFile"></ImageListPreview>                  
-                          </template> 
-                    </el-table-column>             
-          </el-table>      
+                    <template slot-scope="scope">
+                            <ImageListPreview v-model="scope.row.imgFile"></ImageListPreview>
+                          </template>
+                    </el-table-column>
+          </el-table>
           <el-row :gutter="10">
             <el-col :span="12">
                 <h3>
                   <i class="el-icon-collection-tag"></i>
                   审批信息
-                </h3> 
-            </el-col>              
-          </el-row>    
+                </h3>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="审批操作" prop="approveStatus">    
+              <el-form-item label="审批操作" prop="approveStatus">
                 <el-radio v-model="formData.approveStatus" label="1">同意</el-radio>
-                <el-radio v-model="formData.approveStatus" label="2">不同意</el-radio>           
+                <el-radio v-model="formData.approveStatus" label="2">不同意</el-radio>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="审批说明" prop="approveRemark"> 
+              <el-form-item label="审批说明" prop="approveRemark">
                 <el-input
                   v-model="formData.approveRemark"
                   placeholder="请输入审批说明"
@@ -141,7 +141,7 @@ export default {
       title: "来访事项审批",
       formData: this.reset(),
       formDataRules: {
-        approveStatus: [{ required: true, message: "请勾选审批结果" }],        
+        approveStatus: [{ required: true, message: "请勾选审批结果" }],
       },
       formFileListDefualtValue: [],
     };
@@ -157,6 +157,7 @@ export default {
     ...mapMutations([]),
     reset(other = {}) {
       return {
+        id: null,
         reasons: null,
         letterNo:null,
         receptionOrgIds: [],
@@ -167,6 +168,7 @@ export default {
         type:null,
         approveRemark:null,
         approveStatus:null,
+        approveSignImg:null,
         ...other,
       };
     },
@@ -176,9 +178,9 @@ export default {
     //   console.log("checkApprove value",value);
     //   console.log("checkApprove callback",callback);
     // },
-    async show(id, other = {}) {     
+    async show(id, signImg,other = {}) {
       if (id) {
-        this.title = "来访事项审批";   
+        this.title = "来访事项审批";
         this.isShow = true;
         getOutInRequest(id).then((response) => {
           // let tempRange=[];
@@ -186,14 +188,16 @@ export default {
           // tempRange.push(new Date(response.data.endTime));
           // response.data.range=tempRange;
           this.formData = response.data;
+          this.formData.approveStatus = "1";
+          this.formData.approveSignImg = signImg;
           this.formFileListDefualtValue=this.formData.letterFile;
-        });        
+        });
       }
-      else 
+      else
       {
         this.isShow = true;
         this.title = "录入介绍信";
-        this.formData = this.reset();       
+        this.formData = this.reset();
       }
     },
     handleAddUser() {
@@ -233,14 +237,13 @@ export default {
       this.formData = this.reset();
       this.$refs["upload"].clearFiles();
     },
-    
+
     submitForm() {
       this.$refs["form"].validate((valid) => {
-        if (valid) {         
-          let  {approveRemark,approveStatus,approveLog} = this.formData;
-          let tempRquest={approveRemark,approveStatus,id:approveLog.id};
+        if (valid) {
+          let  {approveRemark,approveStatus,id,approveSignImg} = this.formData;
+          let tempRquest={approveRemark,approveStatus,id:id,approveSignImg};
 
-          console.log("================",tempRquest );          
           approveLetter(tempRquest).then((response) => {
               this.$modal.msgSuccess("提交成功");
               this.isShow = false;
@@ -249,7 +252,7 @@ export default {
             });
         }
       });
-    },   
+    },
   },
   mounted() {},
 };

+ 14 - 3
src/views/core/outIn/approve/index.vue

@@ -99,7 +99,7 @@
               @click="handleDetailInfo(scope.row)"
             >详情
             </el-button>
-            <!-- <el-button
+             <el-button
               v-if="canApprove(scope.row)"
               v-hasPermi="['core:letter:approve']"
               icon="el-icon-check"
@@ -107,7 +107,7 @@
               type="text"
               @click="handleApproveLetter(scope.row)"
             >审批
-            </el-button> -->
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -132,6 +132,7 @@ import dialogApproveLetter from "./dialog.approve.letter";
 import DialogApproveLetterDetail from './dialog.approve.letter.detail.vue';
 import dayjs from 'dayjs';
 import KFileUpload from "@/components/K-FileUpload/index.vue";
+import {getInfo} from "@/api/login";
 
 export default {
   components: {dialogApproveLetter, DialogApproveLetterDetail, KFileUpload},
@@ -212,7 +213,17 @@ export default {
       this.handleQuery();
     },
     handleApproveLetter(row) {
-      this.$refs["dialogApproveLetter"].show(row.id, {});
+      getInfo().then((res) => {
+        const user = res.user;
+        if (user.signatureSeal ==='' || user.signatureSeal === null){
+          this.$modal.alert("你还未维护签名印章,请到APP端“我的”页面上传个人印章");
+        }else {
+          this.$refs["dialogApproveLetter"].show(row.id, user.signatureSeal,{});
+        }
+      })
+        .catch((error) => {
+          //reject(error);
+        });
     },
     canApprove(row) {
       console.log(row.status,row.approveStatus,'row')

+ 2 - 0
src/views/safetycheck/task/components/checkRegister.vue

@@ -257,6 +257,7 @@ export default {
         planStartTime: new Date(),
         checkTeam: null,
         checkList: [],
+        signImg:null
       },
       roleOptions: [],
       prevCheckOrgType: null, //上一个选中检查机构的类型
@@ -284,6 +285,7 @@ export default {
   mounted() {
     this.taskInfo.checkOrgId = this.orgId;
     this.taskInfo.checkRoleId = this.roleList[0].roleId;
+    this.taskInfo.signImg = this.$route.params.signImg;
   },
   methods: {
     dayjs,

+ 5 - 1
src/views/safetycheck/task/components/register.vue

@@ -170,7 +170,7 @@
                   >
                 </div>
                 </div>
-                
+
               </div>
             </div>
           </div>
@@ -213,6 +213,7 @@ export default {
   name: "safetyCheckRegister",
   data() {
     return {
+      signImg:null,
       taskInfo: {},
       exceptionRules: {
         remark: [{ required: true, message: "请输入情况描述" }],
@@ -247,6 +248,7 @@ export default {
     },
   },
   mounted() {
+    this.signImg = this.$route.params.signImg
     let id = this.$route.params.taskId;
     let request = api.info;
     request(id).then((r) => {
@@ -402,6 +404,7 @@ export default {
         return;
       }
       this.taskInfo.isSubmit = 0;
+      this.taskInfo.signImg = this.signImg;
       api.submit(this.taskInfo).then((r) => {
         this.$message.info("保存成功");
       });
@@ -449,6 +452,7 @@ export default {
         }
       }
       if (isOk) {
+        this.taskInfo.signImg = this.signImg;
         this.taskInfo.isSubmit = 1;
         api.submit(this.taskInfo).then((r) => {
           this.$message.info("提交成功");

+ 27 - 4
src/views/safetycheck/task/index.vue

@@ -459,6 +459,7 @@ import OrgTreeSelect from "@/components/orgTreeSelect";
 import { checkPermi } from "@/utils/permission.js";
 import dayjs from "dayjs";
 import { deptTreeSelect } from "@/api/system/public";
+import {getInfo} from "@/api/login";
 import request from "@/utils/request";
 import { newline } from "js-beautify/js/src/javascript/acorn";
 export default {
@@ -622,8 +623,19 @@ export default {
         return;
       }
 
-      let path = "/core/safetycheck/register/" + row.id;
-      this.$router.push(path);
+      getInfo().then((res) => {
+        const user = res.user;
+        if (user.signatureSeal ==='' || user.signatureSeal === null){
+          this.$modal.alert("你还未维护签名印章,请到APP端“我的”页面上传个人印章");
+        }else {
+          //let path = "/core/safetycheck/register/" + row.id;
+          //路由名称:safetyCheckRegister
+          this.$router.push({name:"safetyCheckRegister",params:{taskId:row.id,signImg:user.signatureSeal}});
+        }
+      })
+      .catch((error) => {
+        //reject(error);
+      });
     },
     getDefaultOrg(node) {
       // console.log("wwewe")
@@ -659,8 +671,19 @@ export default {
       this.refresh();
     },
     handleAdd() {
-      let path = "/safetycheck/tempregister/add";
-      this.$router.push(path);
+      getInfo().then((res) => {
+          const user = res.user;
+          if (user.signatureSeal ==='' || user.signatureSeal === null){
+            this.$modal.alert("你还未维护签名印章,请到APP端“我的”页面上传个人印章");
+          }else {
+            let path = "/safetycheck/tempregister/add/";
+            //路由名称:tempRegister
+            this.$router.push({ name:"tempRegister",params:{signImg:user.signatureSeal}});
+          }
+        })
+        .catch((error) => {
+          //reject(error);
+        });
     },
     handleDel(taskId) {
       this.$modal