|
@@ -77,16 +77,16 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="时间" prop="xdbs_sj" width="200">
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
+ <!-- <el-table-column
|
|
|
label="卫生分值"
|
|
|
prop="xdbs_wsxmfz"
|
|
|
align="center"
|
|
|
width=""
|
|
|
- >
|
|
|
+ > -->
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
label="实际分值"
|
|
|
- prop="xdbs_wssjdf"
|
|
|
+ prop="new_sjdf"
|
|
|
align="center"
|
|
|
width=""
|
|
|
>
|
|
@@ -134,17 +134,17 @@
|
|
|
</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td>
|
|
|
+ <!-- <td>
|
|
|
<h3 class="font-size-14">卫生分值</h3>
|
|
|
</td>
|
|
|
<td>
|
|
|
<div class="font-size-14">{{ detailInfo.xdbs_wsxmfz }}</div>
|
|
|
- </td>
|
|
|
+ </td> -->
|
|
|
<td>
|
|
|
<h3 class="font-size-14">实际分值</h3>
|
|
|
</td>
|
|
|
- <td>
|
|
|
- <div class="font-size-14">{{ detailInfo.xdbs_wssjdf }}</div>
|
|
|
+ <td colspan="3">
|
|
|
+ <div class="font-size-14">{{ detailInfo.new_sjdf }}</div>
|
|
|
</td>
|
|
|
</tr>
|
|
|
</table>
|
|
@@ -192,7 +192,7 @@
|
|
|
<h3 class="font-size-14">{{ item.xdbs_jcxm }}</h3>
|
|
|
</td>
|
|
|
<td>
|
|
|
- <h3 class="font-size-14">{{ item.xdbsp_fz }}</h3>
|
|
|
+ <h3 class="font-size-14">-{{ item.xdbsp_fz }}</h3>
|
|
|
</td>
|
|
|
<td>
|
|
|
<h3 class="font-size-14">{{ item.xdbb_glr }}</h3>
|
|
@@ -219,21 +219,31 @@
|
|
|
:rules="rules"
|
|
|
label-width="100px"
|
|
|
>
|
|
|
- <h4 class="mb20 ml20 font-size-12 color-2">
|
|
|
- 每个班级总分为100分(卫生50分+常规50分)
|
|
|
- </h4>
|
|
|
- <el-form-item class="mr75" label="评分项" prop="pfx">
|
|
|
- <el-input v-model="dialogForm.pfx"></el-input>
|
|
|
+ <el-form-item class="mr75" label="评分项" prop="pfx_id">
|
|
|
+ <el-select v-model="dialogForm.pfx_id" clearable filterable @change="handlePfxChange" placeholder="请选择">
|
|
|
+ <el-option-group
|
|
|
+ v-for="group in wspbData"
|
|
|
+ :key="group.label"
|
|
|
+ :label="group.label"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in group.options"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value"
|
|
|
+ />
|
|
|
+ </el-option-group>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
|
|
|
<el-form-item class="mr75" label="类型" prop="lx">
|
|
|
<el-radio-group v-model="dialogForm.lx">
|
|
|
- <el-radio :label="1">加分</el-radio>
|
|
|
- <el-radio :label="2">扣分</el-radio>
|
|
|
+ <el-radio label="1">加分</el-radio>
|
|
|
+ <el-radio label="2">扣分</el-radio>
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="mr75" label="分值" prop="fz">
|
|
|
- <el-input v-model="dialogForm.fz"></el-input>
|
|
|
+ <el-form-item class="mr75" label="分值" prop="fz">
|
|
|
+ <el-input v-model="dialogForm.fz" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item class="mr75" label="关联学生" prop="glxs">
|
|
|
<el-select v-model="dialogForm.glxs" clearable filterable>
|
|
@@ -306,12 +316,12 @@
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="mr75" label="卫生分值" prop="xdbs_wsxmfz">
|
|
|
+ <!-- <el-form-item class="mr75" label="卫生分值" prop="xdbs_wsxmfz">
|
|
|
<el-input v-model="addDialogForm.xdbs_wsxmfz"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item class="mr75" label="实际分值" prop="xdbs_wssjdf">
|
|
|
<el-input v-model="addDialogForm.xdbs_wssjdf"></el-input>
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item> -->
|
|
|
</el-form>
|
|
|
<div slot="footer" class="text-center">
|
|
|
<el-button @click="addDialogFormVisible = false">取 消</el-button>
|
|
@@ -338,6 +348,7 @@ import {
|
|
|
fzxq_edit,
|
|
|
fzxq_list,
|
|
|
xjk_list,
|
|
|
+ wspb_tree,
|
|
|
} from "./api";
|
|
|
import { useUserStore } from "@/stores/user";
|
|
|
const { token } = useUserStore();
|
|
@@ -360,7 +371,8 @@ export default {
|
|
|
classList: [],
|
|
|
detailInfo: {},
|
|
|
dialogForm: {
|
|
|
- pfx: "",
|
|
|
+ pfx_id: "",
|
|
|
+ pfx_name: "",
|
|
|
lx: "",
|
|
|
fz: "",
|
|
|
glxs: "",
|
|
@@ -373,7 +385,7 @@ export default {
|
|
|
time: [],
|
|
|
},
|
|
|
rules: {
|
|
|
- pfx: [{ required: true, message: "请输入评分项", trigger: "blur" }],
|
|
|
+ pfx_id: [{ required: true, message: "请输入评分项", trigger: "blur" }],
|
|
|
lx: [{ required: true, message: "请选择类型", trigger: "blur" }],
|
|
|
fz: [{ required: true, message: "请输入分值", trigger: "blur" }],
|
|
|
},
|
|
@@ -399,17 +411,19 @@ export default {
|
|
|
grade_id: [{ required: true, message: "请输入年级", trigger: "blur" }],
|
|
|
class_id: [{ required: true, message: "请选择班级", trigger: "blur" }],
|
|
|
xdbs_sj: [{ required: true, message: "请选择时间", trigger: "blur" }],
|
|
|
- xdbs_wsxmfz: [
|
|
|
- { required: true, message: "请输入卫生分值", trigger: "blur" },
|
|
|
- ],
|
|
|
- xdbs_wssjdf: [
|
|
|
- { required: true, message: "请输入实际分值", trigger: "blur" },
|
|
|
- ],
|
|
|
+ // xdbs_wsxmfz: [
|
|
|
+ // { required: true, message: "请输入卫生分值", trigger: "blur" },
|
|
|
+ // ],
|
|
|
+ // xdbs_wssjdf: [
|
|
|
+ // { required: true, message: "请输入实际分值", trigger: "blur" },
|
|
|
+ // ],
|
|
|
},
|
|
|
tablejlData: [],
|
|
|
totalTableData: [],
|
|
|
multipleSelection1: [],
|
|
|
isButton: false,
|
|
|
+ wspfxData: [],
|
|
|
+ wspbData: [],
|
|
|
};
|
|
|
},
|
|
|
methods: {
|
|
@@ -435,6 +449,20 @@ export default {
|
|
|
this.total = Number(res.data.total_rows);
|
|
|
});
|
|
|
},
|
|
|
+ getWspbData() {
|
|
|
+ this.loading = true;
|
|
|
+ let data = {
|
|
|
+ page: this.cur_page,
|
|
|
+ limit: "9999",
|
|
|
+ keyword: this.keyword,
|
|
|
+ xdbs_jclx: "1",
|
|
|
+ };
|
|
|
+ wspb_tree(data).then((res) => {
|
|
|
+ this.loading = false;
|
|
|
+ this.wspbData = res.data.tree;
|
|
|
+ });
|
|
|
+ },
|
|
|
+
|
|
|
addData() {
|
|
|
this.isButton = false;
|
|
|
this.addDialogForm = {
|
|
@@ -502,7 +530,6 @@ export default {
|
|
|
},
|
|
|
|
|
|
handleChange(e) {
|
|
|
- console.log(e, 555555555);
|
|
|
this.firstForm.class = "";
|
|
|
this.addDialogForm.class_id = "";
|
|
|
this.gradeList.map((item) => {
|
|
@@ -533,12 +560,30 @@ export default {
|
|
|
this.getListData();
|
|
|
},
|
|
|
|
|
|
+ handlePfxChange(e) {
|
|
|
+ console.log(e, 1111);
|
|
|
+ this.wspbData.map((group) => {
|
|
|
+ group.options.map((item) => {
|
|
|
+ if (e == item.value) {
|
|
|
+ this.dialogForm.pfx_name = item.label;
|
|
|
+ this.dialogForm.lx = item.xdbsp_lx;
|
|
|
+ this.dialogForm.fz = item.fz;
|
|
|
+ }
|
|
|
+ console.log(
|
|
|
+ this.dialogForm.pfx_name,
|
|
|
+ this.dialogForm.lx,
|
|
|
+ this.dialogForm.fz
|
|
|
+ );
|
|
|
+ });
|
|
|
+ });
|
|
|
+ },
|
|
|
rate(item) {
|
|
|
this.isButton = false;
|
|
|
this.title = "评分";
|
|
|
this.rateDialogFormVisible = true;
|
|
|
this.id = item.xdbb_id;
|
|
|
- this.dialogForm.pfx = item.xdbs_jcxm;
|
|
|
+ this.dialogForm.pfx_id = item.xdbs_id;
|
|
|
+ this.dialogForm.pfx_name = item.xdbs_jcxm;
|
|
|
this.dialogForm.lx = item.xdbsp_lx;
|
|
|
this.dialogForm.fz = item.xdbsp_fz;
|
|
|
this.dialogForm.glxs = item.xdbb_glr;
|
|
@@ -552,13 +597,16 @@ export default {
|
|
|
this.isButton = true;
|
|
|
let data = {
|
|
|
xdbs_jclx: "1",
|
|
|
- xdbs_jcxm: this.dialogForm.pfx,
|
|
|
+ xdbs_id: this.dialogForm.pfx_id,
|
|
|
+ xdbs_jcxm: this.dialogForm.pfx_name,
|
|
|
xdbsp_lx: this.dialogForm.lx,
|
|
|
xdbsp_fz: this.dialogForm.fz,
|
|
|
xdbb_glr: this.dialogForm.glxs,
|
|
|
grade_id: this.dialogForm.grade_id,
|
|
|
class_id: this.dialogForm.class_id,
|
|
|
};
|
|
|
+ console.log(data, 111);
|
|
|
+
|
|
|
fzxq_add(data).then((res) => {
|
|
|
if (res.code == 1) {
|
|
|
this.$message({
|
|
@@ -619,15 +667,19 @@ export default {
|
|
|
arr.push(item.xdbs_jcxm);
|
|
|
});
|
|
|
this.totalTableData.push(arr);
|
|
|
-
|
|
|
let arr1 = [];
|
|
|
children.map((item) => {
|
|
|
- arr1.push(item.xdbsp_fz);
|
|
|
+ if (item.xdbsp_lx_option_k == "2") {
|
|
|
+ arr1.push("-" + item.xdbsp_fz);
|
|
|
+ } else {
|
|
|
+ arr1.push("+" + item.xdbsp_fz);
|
|
|
+ }
|
|
|
+ // arr1.push(item.xdbsp_fz);
|
|
|
});
|
|
|
this.totalTableData.push(arr1);
|
|
|
});
|
|
|
|
|
|
- console.log(this.totalTableData);
|
|
|
+ console.log(this.totalTableData, "totalTableData");
|
|
|
});
|
|
|
});
|
|
|
},
|
|
@@ -684,6 +736,7 @@ export default {
|
|
|
this.getListData();
|
|
|
this.gradeListData();
|
|
|
this.studentData();
|
|
|
+ this.getWspbData();
|
|
|
},
|
|
|
};
|
|
|
</script>
|