前后:撤回判断

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertappend.go

@@ -1222,6 +1222,11 @@ func (this *OilSupplierCertAppendController) RecallApply() {
 		panic("权限错误，仅申请人可撤回当前申请！")
 	}
 
+	date := supplierCertAppendEntity.CreateOn.Format("2006-01-02 15:04:05")
+	if date < "2021-03-05 00:00:00" {
+		panic("当前申请不可撤回！")
+	}
+
 	svcPaymentInfo := paymentinfo.GetPaymentService(utils.DBE)
 	var paymentInfo paymentinfo.OilPaymentInfo
 	wherePay := " SrcId=" + appendId + " and SupplierId=" + strconv.Itoa(supplierCertAppendEntity.SupplierId) + " and SupplierCertId=" + strconv.Itoa(supplierCertAppendEntity.SupplierCertId)

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/basisedit.vue

@@ -1987,7 +1987,7 @@ export default {
         } else {
           this.$message({
             type: 'warning',
-            message: '申请撤回失败！'
+            message: res.data.message
           })
           this.recallApplyBtn = false
         }

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -2068,7 +2068,7 @@ export default {
         } else {
           this.$message({
             type: 'warning',
-            message: '申请撤回失败！'
+            message: res.data.message
           })
           this.recallApplyBtn = false
         }

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -49,7 +49,7 @@
           <el-button v-if="parseInt(IsCompanyUser) !== 1 && formData.Status <= 0" type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()">
             提交审批
           </el-button>
-          <el-button v-if="parseInt(totalTab) >= 3 && formData.Status == 6" type="primary" size="mini" style="float: right;margin-left: 25px" @click="recallApplyClick()" :loading="recallApplyBtn">
+          <el-button  type="primary" size="mini" style="float: right;margin-left: 25px" @click="recallApplyClick()" :loading="recallApplyBtn">
             撤回
           </el-button>
         </span>
@@ -1993,7 +1993,7 @@ export default {
         } else {
           this.$message({
             type: 'warning',
-            message: '申请撤回失败！'
+            message: res.data.message
           })
           this.recallApplyBtn = false
         }