Merge branch 'master' of https://git.agilestar.cn/spfm-group/spfm-market-front

src/pages/main/performance/components/sheet.vue

@@ -2,7 +2,7 @@
  * @Author       : yuanrunwei
  * @Date         : 2021-12-04 14:23:58
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2022-01-10 18:06:54
+ * @LastEditTime: 2022-01-11 09:07:08
  * @FilePath     : \spfm-market-front\src\pages\main\performance\components\sheet.vue
 -->
 
@@ -268,7 +268,7 @@ export default {
         row_end: "",
       },
       // 可提交标志
-      addFlag: null,
+      addFlag: '0',
       isDisable: true,
       issued_id: null,
       template_id: null,

src/pages/main/performance/department.vue

@@ -80,7 +80,8 @@
           :id="edit_form.id"
           :type="
             edit_visible &&
-            ((edit_form.status === '2' && duty === '9') ||
+            (((edit_form.status === '1' || edit_form.status === '2') &&
+              duty === '9') ||
               edit_form.status === '0')
               ? 'edit'
               : 'view'
@@ -99,6 +100,7 @@
       :visible="approve_visible"
       :reload="reload"
       width="500px"
+      class="approve"
       @cancel="handleCancel('approve_visible')"
     >
       <el-form :model="approveForm" ref="approveForm"
@@ -852,6 +854,7 @@ export default {
             });
           } else if (desc === "存在未提交,是否还要审核") {
             this.$confirm(desc, {
+              distinguishCancelAndClose: false,
               confirmButtonText: "确定",
               cancelButtonText: "取消",
               type: "warning",
@@ -877,11 +880,29 @@ export default {
                       page: this.page,
                       pageSize: this.rows,
                     });
+                  } else {
+                    this.$message({
+                      type: "error",
+                      message: desc,
+                    });
+                    this.handleCancel("visible");
+                    this.handleCancel("approve_visible");
+                    this.handleInit({
+                      ...this.table_search,
+                      page: this.page,
+                      pageSize: this.rows,
+                    });
                   }
                 });
               })
               .catch((error) => {
-                console.log(error);
+                this.handleCancel("visible");
+                this.handleCancel("approve_visible");
+                this.handleInit({
+                  ...this.table_search,
+                  page: this.page,
+                  pageSize: this.rows,
+                });
               });
           }
         });
@@ -1023,5 +1044,10 @@ export default {
 };
 </script>
 
-<style c>
+<style lang="scss" scope>
+.approve {
+  .v-modal {
+    display: none !important;
+  }
+}
 </style>

src/pages/main/performance/mould.vue

@@ -61,7 +61,7 @@
             trigger: 'change',
           }"
         >
-          <el-date-picker v-model="issue_form.endTime" type="datetime" format="yyyy-MM-dd HH">
+          <el-date-picker v-model="issue_form.endTime" type="datetime" format="yyyy-MM-dd HH:00:00">
           </el-date-picker>
         </el-form-item>
       </el-form>