소스 검색

no message

ly 1 년 전
부모
커밋
397e45ed0d

+ 3 - 2
src/views/business/entrust/workOrder/currentMonth/index.vue

@@ -262,7 +262,8 @@
   }
 
   function setCurrentMonth(month) {
-    currentMonth.value = month;
+    // currentMonth.value = month;
+    currentMonth.value = proxy.moment().format("YYYY-MM")+"-01";
   }
 
   function setEntrustHandle() {
@@ -274,7 +275,7 @@
 
   function delEntrustHandle() {
     const entrust = {
-      workMonth: currentMonth.value,
+      currentMonth: currentMonth.value,
       workOrderIds: ids.value,
     };
     proxy.$modal.confirm("是否确认取消委托?").then(() => {

+ 1 - 1
src/views/business/entrust/workOrder/nextMonth/index.vue

@@ -352,7 +352,7 @@ function setEntrustHandle() {
 
 function delEntrustHandle() {
   const entrust = {
-    workMonth: currentMonth.value,
+    currentMonth: currentMonth.value,
     workOrderIds: ids.value,
   };
   proxy.$modal.confirm("是否确认取消委托?").then(() => {

+ 114 - 120
src/views/business/production/IndividualIncomeTaxIs/FormDialog.vue

@@ -1,66 +1,58 @@
 <template>
   <!-- 添加或修改菜单对话框 -->
-  <el-dialog
-    title="个税信息"
-    v-model="visible"
-    width="800px"
-    append-to-body
-    draggable
-    @close="close"
-    :close-on-click-modal = "false"
-  >
+  <el-dialog title="个税信息" v-model="visible" width="800px" append-to-body draggable @close="close"
+    :close-on-click-modal="false">
     <div v-loading="loading">
-      <div>
-        <div style="padding: 8px 24px 16px 24px">
-          <el-form size="small" label-width="110px">
-            <el-row :gutter="30">
-              <el-col :span="24">
-                <el-form-item label="客户名称">
-                  <div>{{ currentMember }}</div>
-                </el-form-item>
-                <el-form-item label="所属月份">
-                  <!-- <div>{{ year }}-{{ month }}</div> -->
-                  <el-date-picker v-model="currentMonth" type="month" placeholder="请选择时间" format="YYYY-MM"
+      <div style="padding: 8px 24px 16px 24px">
+        <el-form size="small" label-width="110px">
+          <el-row :gutter="30">
+            <el-col :span="24">
+              <el-form-item label="客户名称">
+                <div>{{ currentMember }}</div>
+              </el-form-item>
+              <el-form-item label="所属月份">
+                <!-- <div>{{ year }}-{{ month }}</div> -->
+                <el-date-picker v-model="currentMonth" type="month" placeholder="请选择时间" format="YYYY-MM"
                   @change="changeMonthHandle" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-divider />
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="个税金额">
-                  <el-input-number v-if="!isView" placeholder="个税金额" v-model="emptyForm.amount" :precision="2" style="
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-divider />
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="个税金额">
+                <el-input-number v-if="!isView" placeholder="个税金额" v-model="emptyForm.amount" :precision="2" style="
                       display: flex;
                       align-items: center;
                       justify-content: center;
                     " :controls="false" @keypress.enter.prevent />
-                  <div v-else>{{ rowNum(emptyForm.amount) }}</div>
-                </el-form-item>
-              </el-col>
-  
-              <el-col :span="12">
-                <el-form-item label="备注:">
-                  <el-input v-if="!isView" type="textarea" rows="2" maxlength="200" show-word-limit
-                    v-model="emptyForm.remark" />
-                  <span v-else>{{ emptyForm.remark }}</span>
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <div class="details-btns-container">
-                  <el-form-item label="凭证文件" prop="evidenceFile" required>
-                    <dragUpload :accept="accept" style="width:100%" @file="upload"
-                      v-if="emptyForm.evidenceFile == null || emptyForm.evidenceFile == ''" />
-                    <img v-else style="height: 148px; width: 148px" :src="`${baseUrl}/${emptyForm.evidenceFile}`"
-                      class="avatar" @click="openEvidience('evidenceFile')" />
-                      <div v-if="!isView|| emptyForm.status !== 3">
-                        <el-icon :size="20" v-if="emptyForm.evidenceFile !== '' ||emptyForm.evidenceFile == null " @click="emptyForm.evidenceFile = ''"
-                        class="delete-button" >
-                        <Delete />
-                      </el-icon>
-                      </div>
-                      <div v-else>
-                      </div>
-                    <!-- <el-upload
+                <div v-else>{{ rowNum(emptyForm.amount) }}</div>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input v-if="!isView" type="textarea" rows="2" maxlength="200" show-word-limit
+                  v-model="emptyForm.remark" />
+                <span v-else>{{ emptyForm.remark }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <div class="details-btns-container">
+                <el-form-item label="凭证文件" prop="evidenceFile" required>
+                  <dragUpload :accept="accept" style="width:100%" @file="upload"
+                    v-if="emptyForm.evidenceFile == null || emptyForm.evidenceFile == ''" />
+                  <img v-else style="height: 148px; width: 148px" :src="`${baseUrl}/${emptyForm.evidenceFile}`"
+                    class="avatar" @click="openEvidience('evidenceFile')" />
+                  <div v-if="!isView|| emptyForm.status !== 3">
+                    <el-icon :size="20" v-if="emptyForm.evidenceFile !== '' ||emptyForm.evidenceFile == null "
+                      @click="emptyForm.evidenceFile = ''" class="delete-button">
+                      <Delete />
+                    </el-icon>
+                  </div>
+                  <div v-else>
+                  </div>
+                  <!-- <el-upload
                       v-if="!isView"
                       action="#"
                       :http-request="upload"
@@ -80,7 +72,7 @@
                       />
                       <i v-else class="el-icon-plus avatar-uploader-icon" />
                     </el-upload> -->
-                    <!-- <img
+                  <!-- <img
                       v-else-if="
                         emptyForm.evidenceFile != null &&
                         emptyForm.evidenceFile !== ''
@@ -90,59 +82,63 @@
                       class="avatar"
                       @click="openEvidience('evidenceFile')"
                     /> -->
-                  </el-form-item>
-                  <!-- 删除按钮 -->
-           
-                </div>
-              </el-col>
-              <el-col :span="24" style="padding: 15px 15px 16px 15px">
-                <div class="details-btns-container">
-                  <el-form-item label="报表文件" prop="reportFile" required>
-                    <el-upload v-if="!isView || emptyForm.status !== 3" action="#" :http-request="uploadextFile" :with-credentials="true"
-                      :show-file-list="false" multiple>
-                      <el-button size="small" type="primary" icon="Upload">点击上传</el-button>
-                    </el-upload>
-                  </el-form-item>
-                </div>
-                <div class="details-body" style="height: 100px">
-                  <el-table ref="filesTable" :data="reportFiles" size="small" height="100%" border
-                    header-row-class-name="list-header-row">
-                    <el-table-column label="文件名" prop="fileName" align="center">
-                      <template #default="scope">
-                        <el-button @click="openEvidenceFile(scope.row)" type="primary" link>
-                          {{ scope.row.fileName }}
-                        </el-button>
-                      </template>
-                    </el-table-column>
-                    <el-table-column v-if="!isView || emptyForm.status !== 3" label="操作" width="50" align="center">
-                      <template #default="scope">
-                        <el-button size="small" link type="danger" @click="handleDelFile(scope.$index)">删除</el-button>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                </div>
-              </el-col>
-            </el-row>
-          </el-form>
+                </el-form-item>
+                <!-- 删除按钮 -->
+
+              </div>
+            </el-col>
+            <el-col :span="24" style="padding: 15px 15px 16px 15px">
+              <div class="details-btns-container">
+                <el-form-item label="报表文件" prop="reportFile" required>
+                  <el-upload v-if="!isView || emptyForm.status !== 3" action="#" :http-request="uploadextFile"
+                    :with-credentials="true" :show-file-list="false" multiple>
+                    <el-button size="small" type="primary" icon="Upload">点击上传</el-button>
+                  </el-upload>
+                </el-form-item>
+              </div>
+              <div class="details-body" style="height: 100px">
+                <el-table ref="filesTable" :data="reportFiles" size="small" height="100%" border
+                  header-row-class-name="list-header-row">
+                  <el-table-column label="文件名" prop="fileName" align="center">
+                    <template #default="scope">
+                      <el-button @click="openEvidenceFile(scope.row)" type="primary" link>
+                        {{ scope.row.fileName }}
+                      </el-button>
+                    </template>
+                  </el-table-column>
+                  <el-table-column v-if="!isView || emptyForm.status !== 3" label="操作" width="50" align="center">
+                    <template #default="scope">
+                      <el-button size="small" link type="danger" @click="handleDelFile(scope.$index)">删除</el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+            </el-col>
+          </el-row>
+        </el-form>
+
+
+        <div class="form-btns-container" style="height: 40px">
+          <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"
+              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>
         </div>
       </div>
-      <div class="form-btns-container"  style="height: 40px">
-        <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 type="primary" size="small" icon="Finished" v-if="!isView || emptyForm.status !== 3"
-          v-hasPermi="['business:individualIncomeTaxDetail:saveDetail']" style="float: right" @click="handleSave">
-          保存
-        </el-button>
-        <el-button 
-        v-if="!stopUseBack" icon="back"
-        type="warning" size="small" 
-        style="float: right;" 
-        :disabled="(emptyForm == null || emptyForm.status !== 3)  " 
-        @click="turnBack(emptyForm)" v-hasPermi="['business:individualIncomeTaxDetail:deductionTurnBack']">
-        退回
-      </el-button>
-      </div>
+
     </div>
   </el-dialog>
 </template>
@@ -274,7 +270,7 @@
       reportFiles.value = response.data.reportFiles;
       emptyForm.value = response.data;
 
-      console.log(123,emptyForm.value.status);
+      console.log(123, emptyForm.value.status);
       loadData(id);
     });
   }
@@ -300,8 +296,8 @@
       }
     }
   }
-    /** 退回按钮操作 */
-    function turnBack(row) {
+  /** 退回按钮操作 */
+  function turnBack(row) {
     loading.value = true
     emptyForm.value.status = 1;
     // emptyForm.value.workOrderId = workOrderId;
@@ -314,19 +310,19 @@
     visible.value = false;
   }
   function changeMonthHandle(parentId) {
-    isView.value =true
+    isView.value = true
     const nowDate = ref(
-    proxy.moment().subtract(1, "month").format("YYYY-MM-01")
+      proxy.moment().subtract(1, "month").format("YYYY-MM-01")
     );
     let nowyear = proxy.moment(nowDate.value).format("YYYY");
     let nowmonth = proxy.moment(nowDate.value).format("MM");
     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 (nowyear + nowmonth == year + month) {
+      isView.value = false
       stopUseBack.value = false
-    }else{
+    } else {
       stopUseBack.value = true
     }
     getInfo(mainInfo.value.id, year, month).then((response) => {
@@ -395,7 +391,7 @@
           console.log(res);
           proxy.$modal.msgSuccess("保存成功!");
           visible.value = false;
-         
+
           getList.value();
         })
         .catch((err) => {
@@ -456,7 +452,6 @@
 
   /** 关闭 */
   function close() {
-    visible.value = true;
     emptyForm.value = {};
     reportFiles.value = [];
     getList.value();
@@ -474,9 +469,8 @@
   });
 </script>
 
-<style  scoped>
-
-.delete-button {
+<style scoped>
+  .delete-button {
     margin-left: 20px;
     cursor: pointer;
   }

+ 7 - 2
src/views/business/production/financialReportTax/FormDialog.vue

@@ -251,14 +251,19 @@
         <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 type="primary" size="small" v-if="!isView || emptyForm.status !== 3" icon="Finished"
+        <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>
-        <el-button v-if="!stopUseBack" type="warning" size="small" style="float: right;" icon="back"
+        </div>
+        <div v-if="!stopUseBack">
+          <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']">
           退回
         </el-button>
+        </div>
+       
       </div>
     </div>
   </el-dialog>

+ 2 - 2
src/views/business/production/salaryZero/view.vue

@@ -557,12 +557,12 @@ function showVerify() {
 function verifiable() {
 
   return (
-    permissions.includes("business:salary:verify")||permissions.includes(all_permission) );
+    permissions.includes("business:salaryZero:verify")||permissions.includes(all_permission) );
 }
 function blackButton() {
 
   return (
-    permissions.includes("business:salary:back")|| permissions.includes(all_permission) 
+    permissions.includes("business:salaryZero:back")|| permissions.includes(all_permission) 
   );
 }
 function handleCurrentChange(row) {