Browse Source

演练/培训:修改计划编辑等操作提示语句与隐藏行社对省联社计划的编辑按钮

jingyuanchao 1 year ago
parent
commit
a1b871b63a
2 changed files with 10 additions and 10 deletions
  1. 4 4
      src/views/core/drill/plan/index.vue
  2. 6 6
      src/views/core/edu/plan/index.vue

+ 4 - 4
src/views/core/drill/plan/index.vue

@@ -670,7 +670,7 @@ export default {
     checkCanEdit(row) {
       console.log("checkCanEdit", this.$store.getters.orgId, row.belongOrgId)
       return (
-        row.belongOrgId == this.$store.getters.orgId
+        row.belongOrgId == this.$store.getters.orgId && row.createOrgId == this.$store.getters.orgId
       );
     },
     checkCanDel(row) {
@@ -913,8 +913,8 @@ export default {
       if (row.planCycle == 0) {
         this.$modal
           .confirm("无周期任务下发将会立即生成任务,是否确认下发?", {
-            confirmButtonText: "确认下发",
-            canelButtonText: "取消下发",
+            confirmButtonText: "确",
+            canelButtonText: "取消",
           })
           .then(() => {
             publishPlan(row.id, 1);
@@ -934,7 +934,7 @@ export default {
             {
               yesText: "立即生成",//1
               noText: "下周期",//0
-              cancelText: "取消下发",
+              cancelText: "取消",
             }
           );
         } else if (row.planStatus == 2) {

+ 6 - 6
src/views/core/edu/plan/index.vue

@@ -248,7 +248,7 @@
             <!--          <el-table-column label="备注" align="center" prop="remark"/>-->
             <el-table-column
               label="操作"
-              width="200"
+              width="210"
               align="center"
               fixed="right"
               class-name="small-padding fixed-width"
@@ -742,7 +742,7 @@ export default {
     //所属机构为当前用户登录机构或等于创建机构时才显示 “编辑、删除”按钮
     checkCanEdit(row) {
       return (
-        row.belongOrgId == this.$store.getters.orgId
+        row.belongOrgId == this.$store.getters.orgId && row.createOrgId == this.$store.getters.orgId
       );
     },
     checkCanDel(row) {
@@ -988,8 +988,8 @@ export default {
       if (row.planCycle == 0) {
         this.$modal
           .confirm("无周期任务下发将会立即生成任务,是否确认下发?", {
-            confirmButtonText: "确认下发",
-            canelButtonText: "取消下发",
+            confirmButtonText: "确",
+            canelButtonText: "取消",
           })
           .then(() => {
             publishPlan(row.id, 1);
@@ -1009,14 +1009,14 @@ export default {
             {
               yesText: "立即生成",//1
               noText: "下周期",//0
-              cancelText: "取消下发",
+              cancelText: "取消",
             }
           );
         } else if (row.planStatus == 2) {
           this.$modal
             .confirm("因存在已完成任务,是否确定从下周期生成任务", {
               confirmButtonText: "确定",
-              canelButtonText: "取消下发",
+              canelButtonText: "取消",
             })
             .then(() => {
               publishPlan(row.id, 0);