Merge branch 'master' into develop

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

@@ -245,9 +245,10 @@
   }
 
   function getTaxId(mainRow, id) {
-    loading.value = true
+    
     console.log("获取", mainRow);
     if (mainRow.detail != null) {
+      loading.value = true
       getTax(mainInfo.value.id, monthInfo.value.year, monthInfo.value.month).then((res) => {
         if (res.code === 200) {
           console.log("查询成功");

src/views/business/service/loop/socialSecurityView.vue

@@ -39,7 +39,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-divider content-position="left">社保人员信息<1/el-divider>
+          <el-divider content-position="left">社保人员信息</el-divider>
           <el-col :span="24" class="details-container">
             <!--操作按钮 开始-->
             <div class="details-head"></div>