yuansh 2 years ago
parent
commit
e846fc3057

+ 2 - 1
src/views/activiti/form/demoForm2.vue

@@ -38,7 +38,8 @@
         @submit="handleSubmit"
       />
       <div v-if="printTitle" style="text-align: right;margin-right: 13%">
-        <img v-print="'#printContent'" ghost style="margin-top: -30px;"  width="170px" height="80px" src="http://www.myfitt.cn:18087/jeecg-boot/sys/common/static/temp/20230310100319_1678417947827.png"/>
+        <!-- <img v-print="'#printContent'" ghost style="margin-top: -30px;"  width="170px" height="80px" src="http://www.myfitt.cn:18087/jeecg-boot/sys/common/static/temp/20230310100319_1678417947827.png"/> -->
+        <img v-print="'#printContent'" ghost style="margin-top: -30px;"  width="340px" height="160px" src="http://www.myfitt.cn:18087/jeecg-boot/sys/common/static/temp/20230310100319_1678417947827.png"/>
       </div>
       </section>
       <div style="text-align:center">

+ 6 - 0
src/views/activiti/operation/todoManageOperation.vue

@@ -334,6 +334,12 @@ export default {
           })
         }
       } else if (formData.type == 1) {
+        
+        if(formData.comment.replace(/\s*/g,"") == '' || formData.comment.replace(/\s*/g,"") == null){
+          this.$message.error('请填写驳回意见')
+          this.submitLoading = false
+          return
+        }
         // 驳回
         if (formData.backTaskKey == '-1') {
           // 驳回至发起人