Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.5

src/views/core/drill/plan/index.vue

@@ -907,15 +907,21 @@ export default {
           })
           .then(() => {
             publishPlan(row.id, 1);
+            setTimeout(() => {
+              this.getList()
+            }, 100)
           });
       } else {
         if (row.planStatus == 0) {
-          msg = "请选择从当前轮次或周期开始生成任务?";
+          msg = "请选择从当前轮次或下周期开始生成任务?";
           this.$refs["DialogThreeState"].show(
             msg,
             (state) => {
               if (state == 0 || state == 1) {
                 publishPlan(row.id, state);
+                setTimeout(() => {
+                  this.getList()
+                }, 100)
               }
             },
             {
@@ -932,10 +938,13 @@ export default {
             })
             .then(() => {
               publishPlan(row.id, 0);
+              setTimeout(() => {
+                this.getList()
+              }, 100)
             });
         }
       }
-      this.getList();
+
     },
     //撤回计划
     handleRevocation(row) {

src/views/core/edu/plan/index.vue

@@ -678,6 +678,7 @@ export default {
     },
     /** 查询教育培训计划列表 */
     getList() {
+      console.log("12312312312312")
       this.loading = true;
       listPlan(this.queryParams).then((response) => {
         this.planList = response.rows;
@@ -983,15 +984,21 @@ export default {
           })
           .then(() => {
             publishPlan(row.id, 1);
+            setTimeout(() => {
+              this.getList()
+            }, 100)
           });
       } else {
         if (row.planStatus == 0) {
-          msg = "请选择从当前轮次或周期开始生成任务?";
+          msg = "请选择从当前轮次或下周期开始生成任务?";
           this.$refs["DialogThreeState"].show(
             msg,
             (state) => {
               if (state == 0 || state == 1) {
                 publishPlan(row.id, state);
+                setTimeout(() => {
+                  this.getList()
+                }, 100)
               }
             },
             {
@@ -1008,6 +1015,9 @@ export default {
             })
             .then(() => {
               publishPlan(row.id, 0);
+              setTimeout(() => {
+                this.getList()
+              }, 100)
             });
         }
       }

src/views/system/dept/index.vue

@@ -406,6 +406,18 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="机构缩略词" prop="breviary" label-width="240">
+              <el-input
+                :maxlength="50"
+                style="width: 270px;" 
+                v-model="form.breviary"
+                placeholder="请输入机构缩略词"
+                :disabled="form.source == 1"
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -492,9 +504,12 @@ export default {
         isLock:null,
       },
       // 表单参数
-      form: {},
+      form: {breviary:null},
       // 表单校验
       rules: {
+        breviary:[
+        { required: true, message: "机构缩略词不能为空", trigger: "blur" },
+        ],
         parentId: [
           { required: true, message: "上级机构不能为空", trigger: "blur" },
         ],