代码提交

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

@@ -2,7 +2,7 @@
  * @Author       : yuanrunwei
  * @Date         : 2021-12-04 14:23:58
  * @LastEditors: daiqisheng
- * @LastEditTime: 2022-04-25 19:11:41
+ * @LastEditTime: 2022-05-10 11:24:05
  * @FilePath     : \spfm-market-front\src\pages\main\performance\components\sheet.vue
 -->
 <template>
@@ -448,10 +448,8 @@ export default {
             return time.getTime() > value.getTime();
           },
         };
-        if (
-          this.superviseForm.write &&
-          value.getTime() < this.superviseForm.write.getTime()
-        ) {
+        let write = new Date(this.superviseForm.write).getTime();
+        if (this.superviseForm.write && value.getTime() < write) {
           this.superviseForm.endTime = "";
         }
       } else {
@@ -532,6 +530,7 @@ export default {
           endTime: distributeEndTime, // 截止时间
         };
       }
+      console.log(this.superviseForm, "this.superviseForm");
       this.templateType = templateType;
       this.template_id = templateId;
       this.issued_id = issuedId;
@@ -626,7 +625,8 @@ export default {
             3;
         if (filled) {
           let time = new Date().getTime();
-          if (time > this.superviseForm.endTime.getTime()) {
+          let endTime = new Date(this.superviseForm.endTime).getTime();
+          if (time > endTime) {
             this.$message.error("截止时间不能小于当前时间");
             return;
           }
@@ -713,7 +713,7 @@ export default {
           ]) {
             if (!that.handleAllow({ row, column })) {
               that.$message.error("您没有编辑权限");
-              return false
+              return false;
             }
           },
           updated: function ({ range }) {

src/pages/main/performance/department.vue

@@ -828,7 +828,7 @@ export default {
         // 特殊权限
         console.log(permission_type, "permission_type");
         charge.forEach((el) => {
-          if (el.person && el.allowEditingColumns.length && el.rowNum.length) {
+          if (el.person && el.rowNum.length) {
             flag = flag * 1;
           } else {
             flag = flag * 0;
@@ -856,7 +856,9 @@ export default {
             } else if (this.permission_type === 2) {
               params.transferAuthority = charge.map((el) =>
                 JSON.stringify({
-                  allowEditingColumns: el.allowEditingColumns.join(","),
+                  allowEditingColumns: el.allowEditingColumns.length
+                    ? el.allowEditingColumns.join(",")
+                    : this.transfer_cols_orgin.join(","),
                   rowNum: el.rowNum.join(","),
                   principalId: el.person.split(",")[0],
                   principalName: el.person.split(",")[1],