Merge branch 'master' into develop

# Conflicts:
#	.dev.drone.yml
#	src/views/business/entrust/workOrder/historyMonth/index.vue
#	src/views/business/entrust/workOrderForFactory/history/index.vue
#	src/views/business/production/IndividualIncomeTaxIs/FormDialog.vue
#	src/views/business/production/financialReportTax/FormDialog.vue

.dev.drone.yml

@@ -22,7 +22,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
       - cp run.sh /home/nginx/html/yzbh/run.sh
       - cp nginx.conf /home/nginx/html/yzbh/nginx.conf
   - name: build-start
-    image: appleboy/drone-ssh #SSH工具镜像
+    image: appleboy/drone-ssh:1.7.7 #SSH工具镜像
     settings:
       host: 82.156.209.15 # 远程连接地址
       username:

.drone.yml

@@ -22,7 +22,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
       - cp run.sh /home/nginx/html/yzbh/run.sh
       - cp nginx.conf /home/nginx/html/yzbh/nginx.conf
   - name: build-start
-    image: appleboy/drone-ssh #SSH工具镜像
+    image: appleboy/drone-ssh:1.7.7 #SSH工具镜像
     settings:
       host: 124.70.62.143 # 远程连接地址
       username:

src/views/business/entrust/workOrder/historyMonth/index.vue

@@ -147,20 +147,20 @@
     const editStatus = {
         startMonth: false,
     };
-    // function disabledDate(time) {
-    //     const currentMonth = new Date().getMonth();
-    //     const selectedMonth = time.getMonth();
-    //     const currentYear = new Date().getFullYear();
-    //     const selectedYear = time.getFullYear();
-
-    //     // 禁用当前年份之后的所有月份
-    //     if (selectedYear > currentYear) {
-    //         return true;
-    //     }
-
-    //     // 如果选择的是当前年份，只能选择当前月份之前的月份
-    //     return selectedYear === currentYear && selectedMonth >= currentMonth;
-    // }
+    function disabledDate(time) {
+        const currentMonth = new Date().getMonth();
+        const selectedMonth = time.getMonth();
+        const currentYear = new Date().getFullYear();
+        const selectedYear = time.getFullYear();
+
+        // 禁用当前年份之后的所有月份
+        if (selectedYear > currentYear) {
+            return true;
+        }
+
+        // 如果选择的是当前年份，只能选择当前月份之前的月份
+        return selectedYear === currentYear && selectedMonth >= currentMonth;
+    }
 
     function checkCurrentMonthHandle() {
         checkCurrent().then((res) => {

src/views/business/entrust/workOrderForFactory/history/index.vue

@@ -143,20 +143,20 @@
   const editStatus = {
       startMonth: false,
   };
-//   function disabledDate(time) {
-//       const currentMonth = new Date().getMonth();
-//       const selectedMonth = time.getMonth();
-//       const currentYear = new Date().getFullYear();
-//       const selectedYear = time.getFullYear();
-
-//       // 禁用当前年份之后的所有月份
-//       if (selectedYear > currentYear) {
-//           return true;
-//       }
-
-//       // 如果选择的是当前年份，只能选择当前月份之前的月份
-//       return selectedYear === currentYear && selectedMonth >= currentMonth;
-//   }
+  function disabledDate(time) {
+      const currentMonth = new Date().getMonth();
+      const selectedMonth = time.getMonth();
+      const currentYear = new Date().getFullYear();
+      const selectedYear = time.getFullYear();
+
+      // 禁用当前年份之后的所有月份
+      if (selectedYear > currentYear) {
+          return true;
+      }
+
+      // 如果选择的是当前年份，只能选择当前月份之前的月份
+      return selectedYear === currentYear && selectedMonth >= currentMonth;
+  }
 
   function checkCurrentMonthHandle() {
       checkCurrent().then((res) => {

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

@@ -22,6 +22,7 @@
             <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;
@@ -53,6 +54,7 @@
                   <div v-else>
                   </div>
                   <!-- <el-upload
+
                       v-if="!isView"
                       action="#"
                       :http-request="upload"
@@ -139,6 +141,7 @@
         </div>
       </div>
 
+
     </div>
   </el-dialog>
 </template>

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

@@ -251,13 +251,13 @@
         <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"
+        <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">
-          <el-button  type="warning" size="small" style="float: right;" icon="back"
+        <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']">
           退回