no message

src/views/business/housingFund/declare/form.vue

@@ -166,13 +166,13 @@
           </el-row>
         </el-form>
       </div>
-      <div class="form-btns-container" style="height: 40px">
+      <div class="form-btns-container" style="height: 40px" v-if="!stopUseBack">
         <el-button size="small" icon="close" v-if="form.status !== 3"
           style="float: right; margin-left: 12px; margin-right: 12px" @click="close">取消</el-button>
         <el-button type="primary" style="float: right" size="small" v-if="form.status !== 3" icon="Finished"
           @click="handleSave">
           保存</el-button>
-        <el-button v-hasPermi="['business:housingFundDeclare:verify']" v-if="!stopUseBack" style="float: right;"
+        <el-button v-hasPermi="['business:housingFundDeclare:verify']" style="float: right;"
           icon="back" size="small" type="warning" :disabled="
     form == null || form.status !== 3
   " @click="turnBack(form)">退回</el-button>

src/views/business/housingFund/declare/view.vue

@@ -134,12 +134,12 @@
           </el-row>
         </el-form>
       </div>
-      <div class="form-btns-container" style="height: 40px">
+      <div class="form-btns-container" style="height: 40px" v-if="!stopUseBack">
         <el-button size="small" icon="close" v-if="form.status !== 3" style="float: right; margin-left: 12px; margin-right: 12px"
           @click="close">取消</el-button>
         <el-button type="primary" style="float: right" size="small" v-if="form.status !== 3" icon="Finished" @click="handleSave">
           保存</el-button>
-          <el-button v-hasPermi="['business:housingFundDeclare:return']" v-if="!stopUseBack" style="float: right;" icon="back" size="small"
+          <el-button v-hasPermi="['business:housingFundDeclare:return']"  style="float: right;" icon="back" size="small"
           type="warning" :disabled="
       form == null || form.status !== 3
     " @click="turnBack(form)">退回</el-button>

src/views/business/production/IndividualIncomeTaxIs/FormDialog.vue

@@ -120,24 +120,21 @@
         </el-form>
 
 
-        <div class="form-btns-container" style="height: 40px">
+        <div class="form-btns-container" style="height: 40px" v-if="!stopUseBack">
           <el-button size="small" icon="close" v-if="!isView || emptyForm.status !== 3"
             style="float: right; margin-left: 12px; margin-right: 12px" @click="close">
             取消
           </el-button>
-          <div v-if="!isView || emptyForm.status !== 3">
-            <el-button type="primary" size="small" icon="Finished"
+      
+            <el-button type="primary" size="small" icon="Finished"  v-if="!isView || emptyForm.status !== 3"
               v-hasPermi="['business:individualIncomeTaxDetail:saveDetail']" style="float: right" @click="handleSave">
               保存
             </el-button>
-          </div>
-          <div v-if="!stopUseBack" >
-            <el-button v-hasPermi="['business:individualIncomeTaxDetail:deductionTurnBack']"  icon="back" type="warning" size="small"
-              style="float: right;" :disabled="(emptyForm == null || emptyForm.status !== 3)  "
-              @click="turnBack(emptyForm)">
-              退回
-            </el-button>
-          </div>
+          <el-button v-hasPermi="['business:individualIncomeTaxDetail:deductionTurnBack']" icon="back" type="warning"
+            size="small" style="float: right;" :disabled="(emptyForm == null || emptyForm.status !== 3)  "
+            @click="turnBack(emptyForm)">
+            退回
+          </el-button>
         </div>
       </div>
 
@@ -272,8 +269,6 @@
       mainInfo.value.detail = response.data;
       reportFiles.value = response.data.reportFiles;
       emptyForm.value = response.data;
-
-      console.log(123, emptyForm.value.status);
       loadData(id);
     });
   }
@@ -323,7 +318,11 @@
     const month = proxy.moment(currentMonth.value).format("MM");
 
     if (nowyear + nowmonth == year + month) {
-      isView.value = false
+      if(emptyForm.value.status === 3 ){
+        isView.value =true
+      }else{
+        isView.value =false
+      }
       stopUseBack.value = false
     } else {
       stopUseBack.value = true

src/views/business/production/IndividualIncomeTaxIsZero/FormDialog.vue

@@ -80,7 +80,7 @@
           </el-form>
         </div>
       </div>
-      <div class="form-btns-container" style="height: 40px">
+      <div class="form-btns-container" style="height: 40px" v-if="!stopUseBack">
         <el-button size="small" icon="close" v-if="!isView || emptyForm.status !== 3"
           style="float: right; margin-left: 12px; margin-right: 12px" @click="close">
           取消
@@ -89,15 +89,14 @@
           style="float: right" @click="handleSave">
           保存</el-button>
         <el-button 
-        v-if="!stopUseBack"
         type="warning" size="small" 
         style="float: right;" 
         :disabled="emptyForm == null || emptyForm.status !== 3 " 
         @click="turnBack(emptyForm)" v-hasPermi="['business:tax:saveDetail']">
         退回
       </el-button>
-      </div>
     </div>
+  </div>
   </el-dialog>
 </template>
 
@@ -209,7 +208,7 @@
       loadData(id);
     } else if (id == null || mainRow.detail.status == 3) {
       isView.value = true;
-      console.log("查看");
+      
       getInfoId(id);
     } else {
       console.log("修改");
@@ -250,7 +249,11 @@
     const year = proxy.moment(currentMonth.value).format("YYYY");
     const month = proxy.moment(currentMonth.value).format("MM");
     if(nowyear+nowmonth == year+month){
-      isView.value =false
+      if(emptyForm.value.status === 3 ){
+        isView.value =true
+      }else{
+        isView.value =false
+      }
       stopUseBack.value = false
     }else{
       stopUseBack.value = true
@@ -266,7 +269,8 @@
 
 
   function loadData(id) {
-    console.log("monthInfo", mainInfo.value);
+    console.log(123,emptyForm.value);
+    
     year.value = monthInfo.value.year;
     month.value = monthInfo.value.month;
     currentMember.value = mainInfo.value.companyName;

src/views/business/production/financialReportTax/FormDialog.vue

@@ -247,16 +247,17 @@
           </el-form>
         </div>
       </div>
-      <div class="form-btns-container" style="height: 40px">
+      <p>stp:{{stopUseBack}}</p>
+      <div class="form-btns-container" style="height: 40px" v-if="!stopUseBack" >
         <el-button size="small" icon="close" v-if="!isView || emptyForm.status !== 3"
           style="float: right; margin-left: 12px; margin-right: 12px" @click="close">取消
         </el-button>
-        <div  v-if="!isView || emptyForm.status !== 3">
+        <div  v-if="!isView || emptyForm.status !== 3" >
           <el-button type="primary" size="small" icon="Finished"
           @click="handleSave" v-hasPermi="['business:financialReportTax:saveDetail']" style="float: right">
           保存</el-button>
         </div>
-        <div v-if="!stopUseBack" >
+        <div >
           <el-button type="warning" size="small" style="float: right;" icon="back"
           :disabled="emptyForm == null || emptyForm.status !== 3 " @click="turnBack(emptyForm)"
           v-hasPermi="['business:financialReportTaxNonZero:back']">
@@ -402,7 +403,11 @@
     const year = proxy.moment(currentMonth.value).format("YYYY");
     const month = proxy.moment(currentMonth.value).format("MM");
     if (nowyear + nowmonth == year + month) {
-      isView.value = false
+      if(emptyForm.value.status === 3 ){
+        isView.value =true
+      }else{
+        isView.value =false
+      }
       stopUseBack.value = false
     } else {
       stopUseBack.value = true

src/views/business/production/financialReportTaxIsZero/FormDialog.vue

@@ -120,14 +120,14 @@
           </el-form>
         </div>
       </div>
-      <div class="form-btns-container" style="height: 40px">
+      <div class="form-btns-container" style="height: 40px"  v-if="!stopUseBack">
         <el-button size="small" icon="close" v-if="!isView || emptyForm.status !== 3"
           style="float: right; margin-left: 12px; margin-right: 12px" @click="close">取消
         </el-button>
         <el-button size="small" type="primary" v-if="!isView || emptyForm.status !== 3" style="float: right"
           icon="Finished" @click="handleSave">
           保存</el-button>
-        <el-button v-if="!stopUseBack" type="warning" icon="back" size="small" style="float: right;"
+        <el-button type="warning" icon="back" size="small" style="float: right;"
           :disabled="emptyForm == null || emptyForm.status !== 3 " @click="turnBack(emptyForm)"
           v-hasPermi="['business:financialReportTax:back']">
           退回
@@ -275,7 +275,11 @@
     const year = proxy.moment(currentMonth.value).format("YYYY");
     const month = proxy.moment(currentMonth.value).format("MM");
     if (nowyear + nowmonth == year + month) {
-      isView.value = false
+      if(emptyForm.value.status === 3 ){
+        isView.value =true
+      }else{
+        isView.value =false
+      }
       stopUseBack.value = false
     } else {
         stopUseBack.value = true

src/views/business/socialSecurity/declare/form.vue

@@ -70,7 +70,7 @@
             <el-col :span="12">
               <el-form-item label="单位工伤险比例:" required  label-width="130px">
                 <div v-if="form.status !== 3">
-                  <el-input-number v-model="form.injuryRadio" size="small" placeholder="单位医疗险" :precision="2"
+                  <el-input-number v-model="form.injuryRadio" size="small" placeholder="单位工伤险比例" :precision="2"
                     :controls="false" style="width: 80%;" @change="changeUnitInjuryRadio" />
                   <span style="margin-left: 5px;">%</span>
                 </div>
@@ -356,14 +356,14 @@
           </el-row>
         </el-form>
       </div>
-      <div class="form-btns-container" style="height: 40px">
+      <div class="form-btns-container" style="height: 40px" v-if="!stopUseBack">
         <el-button size="small" v-if="form.status !== 3" icon="close"
           style="float: right; margin-left: 12px; margin-right: 12px" @click="close">
           取消</el-button>
         <el-button type="primary" v-if="form.status !== 3" size="small" icon="Finished" style="float: right"
           @click="handleSave">
           保存</el-button>
-        <el-button v-hasPermi="['business:socialSecurityDeclare:edit']" style="float: right;" v-if="!stopUseBack"
+        <el-button v-hasPermi="['business:socialSecurityDeclare:edit']" style="float: right;" 
           icon="back" size="small" type="warning" :disabled="
       form == null || form.status !== 3
     " @click="turnBack(form)">退回</el-button>
@@ -568,7 +568,11 @@
     const year = proxy.moment(currentMonth.value).format("YYYY");
     const month = proxy.moment(currentMonth.value).format("MM");
     if (nowyear + nowmonth == year + month) {
-      // isView.value = false
+      // if(emptyForm.value.status === 3 ){
+      //   isView.value =true
+      // }else{
+      //   isView.value =false
+      // }
       stopUseBack.value = false
     } else {
       stopUseBack.value = true