ly 1 vuosi sitten
vanhempi
säilyke
e19ba0132d

+ 9 - 6
src/views/business/housingFund/confirm/view.vue

@@ -195,7 +195,7 @@
         驳回</el-button>
       <el-button v-show="showVerify()" type="primary" size="small" icon="check" style="float: right; margin-left: 12px"
         @click="handleVerify(3)">审核通过</el-button>
-      <el-button v-show="verifiable() && form.status === 3" type="warning" size="small" icon="back"
+      <el-button v-show="verifiableDelete() && form.status === 3" type="warning" size="small" icon="back"
         style="float: right; margin-left: 12px" @click="returnStatus()">退回</el-button>
     </div>
     <feedback-dialog ref="feedbackDialogView" :verify="verify" />
@@ -350,16 +350,19 @@
       return false;
     }
   }
-
-  function verifiable() {
-    // console.log(permissions)
-    // console.log(permissions)
+  function verifiableDelete(){
     return (
       permissions.includes(all_permission) ||
-      // permissions.includes("business:housingFundConfirm:verify")
       permissions.includes("business:housingFundConfirm:return")
     );
   }
+  function verifiable() {
+  
+    return (
+      permissions.includes(all_permission) ||
+      permissions.includes("business:housingFundConfirm:verify")
+    );
+  }
 
   function handleCurrentChange(row) {
     currentSource.value = row;

+ 1 - 0
src/views/business/production/keepAccount/form.vue

@@ -127,6 +127,7 @@
         </el-row>
       </el-form>
     </div>
+    <div></div>
     <div class="form-btns-container" style="height: 40px">
       <el-button
         size="small"

+ 8 - 4
src/views/business/production/keepAccount/view.vue

@@ -71,7 +71,7 @@
     </div>
     <div class="form-btns-container" style="height: 40px">
       <el-button
-        v-if="verifiable() && form.status === 3"
+        v-if="verifiableDeleted() && form.status === 3"
         type="warning"
         icon="back"
         size="small"
@@ -251,14 +251,18 @@ function showVerify() {
     return false;
   }
 }
-
-function verifiable() {
+function verifiableDeleted(){
   return (
     permissions.includes(all_permission) ||
-    // permissions.includes("business:keepAccount:verify")
     permissions.includes("business:keepAccount:return")
   );
 }
+function verifiable() {
+  return (
+    permissions.includes(all_permission) ||
+    permissions.includes("business:keepAccount:verify")
+  );
+}
 
 function handleCurrentChange(row) {
   currentSource.value = row;

+ 9 - 4
src/views/business/socialSecurity/confirm/view.vue

@@ -235,7 +235,7 @@
         驳回</el-button>
       <el-button v-if="showVerify()" type="primary" size="small" icon="check" style="float: right; margin-left: 12px"
         @click="handleVerify(3)">审核通过</el-button>
-      <el-button v-if="verifiable() && form.status === 3" type="warning" size="small" icon="back"
+      <el-button v-if="showVerifyDelete() && form.status === 3" type="warning" size="small" icon="back"
         style="float: right; margin-left: 12px" @click="returnStatus()">退回</el-button>
     </div>
     <feedback-dialog ref="feedbackDialogView" :verify="verify" />
@@ -391,14 +391,19 @@
       return false;
     }
   }
-
-  function verifiable() {
+  function showVerifyDelete() {
     return (
       permissions.includes(all_permission) ||
-      // permissions.includes("business:socialSecurityConfirm:verify")
       permissions.includes("business:socialSecurityConfirm:return")
     );
   }
+  
+  function verifiable() {
+    return (
+      permissions.includes(all_permission) ||
+      permissions.includes("business:socialSecurityConfirm:verify")
+    );
+  }
 
   function handleCurrentChange(row) {
     currentSource.value = row;