From 80ad124580aab6907f51708e00afdbfc2bd61353 Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Tue, 3 Nov 2020 11:15:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=B8=E6=88=8F=E6=95=B0?=
 =?UTF-8?q?=E5=AD=A6=E8=AF=A6=E7=BB=86=20=E9=80=89=E6=8B=A9=E6=95=B0?=
 =?UTF-8?q?=E5=AD=A6=E6=96=B9=E6=A1=88bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/benyi/mathtermplan/index.vue    |   1 +
 .../benyi/mathtermplanapproval/index.vue      | 433 ++++++++++++++++++
 .../benyi/themetermplanapproval/index.vue     |   2 +-
 .../controller/ByMathTermplanController.java  |   1 +
 4 files changed, 436 insertions(+), 1 deletion(-)
 create mode 100644 ruoyi-ui/src/views/benyi/mathtermplanapproval/index.vue

diff --git a/ruoyi-ui/src/views/benyi/mathtermplan/index.vue b/ruoyi-ui/src/views/benyi/mathtermplan/index.vue
index 02bd8159f..65c19c342 100644
--- a/ruoyi-ui/src/views/benyi/mathtermplan/index.vue
+++ b/ruoyi-ui/src/views/benyi/mathtermplan/index.vue
@@ -418,6 +418,7 @@ export default {
         this.title = "修改游戏数学学期计划";
         const time = [];
         time.push(response.data.startmonth);
+        console.log(response.data.startmonth);
         time.push(response.data.endmonth);
         this.form.startmonth = time;
       });
diff --git a/ruoyi-ui/src/views/benyi/mathtermplanapproval/index.vue b/ruoyi-ui/src/views/benyi/mathtermplanapproval/index.vue
new file mode 100644
index 000000000..ad72033eb
--- /dev/null
+++ b/ruoyi-ui/src/views/benyi/mathtermplanapproval/index.vue
@@ -0,0 +1,433 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="班级编码" prop="classid">
+        <el-select v-model="queryParams.classid" placeholder="请选择班级">
+          <el-option
+            v-for="dict in classOptions"
+            :key="dict.bjbh"
+            :label="dict.bjmc"
+            :value="dict.bjbh"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="学年学期" prop="xnxq">
+        <el-select
+          v-model="queryParams.xnxq"
+          placeholder="请选择学年学期"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in xnxqOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择状态"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['benyi:mathtermplan:edit']"
+        >审批</el-button>
+      </el-col>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="mathtermplanList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" :selectable="isShow" />
+      <el-table-column label="班级名称" align="center" prop="classid" :formatter="classFormat"/>
+      <el-table-column
+        label="计划名称"
+        align="center"
+        prop="name"
+        :show-overflow-tooltip="true"
+      >
+        <template slot-scope="scope">
+          <router-link
+            :to="'/benyi_course/mathtermplan/data/' + scope.row.id"
+            class="link-type"
+          >
+            <span>{{ scope.row.name }}</span>
+          </router-link>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="开始月份"
+        align="center"
+        prop="startmonth"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startmonth, "{y}-{m}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="结束月份"
+        align="center"
+        prop="endmonth"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endmonth, "{y}-{m}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="学年学期"
+        align="center"
+        prop="xnxq"
+        :formatter="xnxqFormat"
+      />
+      <el-table-column
+        label="状态"
+        align="center"
+        prop="status"
+        :formatter="statusFormat"
+      />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['benyi:mathtermplan:edit']"
+            v-show="isShow(scope.row)"
+          >审批</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleView(scope.row)"
+            v-hasPermi="['benyi:mathtermplan:query']"
+          >预览</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改游戏数学学期计划对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="月份" prop="startmonth">
+          <el-date-picker
+            v-model="form.startmonth"
+            type="monthrange"
+            range-separator="至"
+            start-placeholder="开始月份"
+            end-placeholder="结束月份"
+            value-format="yyyy-MM"
+            :disabled="true"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="学年学期" prop="xnxq">
+          <el-select v-model="form.xnxq" placeholder="请选择学年学期" :disabled="true">
+            <el-option
+              v-for="dict in xnxqOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="审批意见" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio label="0">退回</el-radio>
+            <el-radio label="2">通过</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="审批建议" prop="shyj">
+          <el-input v-model="form.shyj" type="textarea" placeholder="请输入审核建议" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listMathtermplan,
+  getMathtermplan,
+  delMathtermplan,
+  addMathtermplan,
+  updateMathtermplan,
+  checkTermplan,
+} from "@/api/benyi/mathtermplan";
+
+import { listClass } from "@/api/system/class";
+
+export default {
+  name: "Mathtermplan",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 总条数
+      total: 0,
+      // 游戏数学学期计划表格数据
+      mathtermplanList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 学年学期字典
+      xnxqOptions: [],
+      // 班级字典
+      classOptions: [],
+      // 状态字典
+      statusOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        schoolid: undefined,
+        classid: undefined,
+        name: undefined,
+        startmonth: undefined,
+        endmonth: undefined,
+        xnxq: undefined,
+        status: "1",
+        spr: undefined,
+        sptime: undefined,
+        spyj: undefined,
+        createuserid: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        status: [
+          { required: true, message: "状态不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getClassList();
+    this.getList();
+    this.getDicts("sys_xnxq").then((response) => {
+      this.xnxqOptions = response.data;
+    });
+    this.getDicts("sys_dm_planweekstatus").then((response) => {
+      this.statusOptions = response.data;
+    });
+  },
+  methods: {
+    isShow(row) {
+      //console.log(row.status);
+      if (row.status == "1") {
+        return true;
+      } else {
+        return false;
+      }
+    },
+    // 查询班级列表
+    getClassList() {
+      listClass(null).then((response) => {
+        this.classOptions = response.rows;
+      });
+    },
+    /** 查询游戏数学学期计划列表 */
+    getList() {
+      this.loading = true;
+      listMathtermplan(this.queryParams).then((response) => {
+        this.mathtermplanList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 字典翻译
+    classFormat(row, column) {
+      var actions = [];
+      var datas = this.classOptions;
+      Object.keys(datas).map((key) => {
+        if (datas[key].bjbh == "" + row.classid) {
+          actions.push(datas[key].bjmc);
+          return false;
+        }
+      });
+      return actions.join("");
+    },
+    // 学年学期字典翻译
+    xnxqFormat(row, column) {
+      return this.selectDictLabel(this.xnxqOptions, row.xnxq);
+    },
+    // 状态字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.status);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        schoolid: undefined,
+        classid: undefined,
+        name: undefined,
+        startmonth: undefined,
+        endmonth: undefined,
+        xnxq: undefined,
+        status: "2",
+        spr: undefined,
+        sptime: undefined,
+        spyj: undefined,
+        remark: undefined,
+        createuserid: undefined,
+        createTime: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getMathtermplan(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改游戏数学学期计划";
+        const time = [];
+        time.push(response.data.startmonth);
+        time.push(response.data.endmonth);
+        this.form.startmonth = time;
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          const time = this.form.startmonth;
+          this.form.startmonth = time[0];
+          this.form.endmonth = time[1];
+          if (this.form.id != undefined) {
+            updateMathtermplan(this.form).then((response) => {
+              if (response.code === 200) {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          } 
+        }
+      });
+    },
+    /** 提交按钮操作 */
+    handleCheck(row) {
+      const id = row.id;
+      this.$confirm(
+        "是否确认提交游戏数学学期计划?提交后数据无法维护",
+        "警告",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(function () {
+          return checkTermplan(id);
+        })
+        .then(() => {
+          this.getList();
+          this.msgSuccess("提交成功");
+        })
+        .catch(function () {});
+    },
+    /** 预览按钮操作 */
+    handleView(row) {
+      const id = row.id;
+      this.$router.push({
+        path: "/benyi_course/mathtermplanprint/table/"+id,
+      });
+    },
+    
+  },
+};
+</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/benyi/themetermplanapproval/index.vue b/ruoyi-ui/src/views/benyi/themetermplanapproval/index.vue
index 2b90343e5..cacad9371 100644
--- a/ruoyi-ui/src/views/benyi/themetermplanapproval/index.vue
+++ b/ruoyi-ui/src/views/benyi/themetermplanapproval/index.vue
@@ -218,7 +218,7 @@ export default {
   },
   methods: {
     isShow(row) {
-      console.log(row.status);
+      // console.log(row.status);
       if (row.status == "1") {
         return true;
       } else {
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java
index e387787f3..257be9ecd 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java
@@ -60,6 +60,7 @@ public class ByMathTermplanController extends BaseController
         byMathTermplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
         String classId = schoolCommon.getClassId();
         List<ByMathTermplan> list = null;
+        // 判断当前是否为幼儿园账号
         if (schoolCommon.isSchool() && !schoolCommon.isStringEmpty(classId)) {
             byMathTermplan.setClassid(classId);
         }