Commit 5c0ecf15 by zhaopanyu

zpy 教师电子档案

parent 1a784211
...@@ -8,3 +8,11 @@ export function listAward(query) { ...@@ -8,3 +8,11 @@ export function listAward(query) {
params: query, params: query,
}); });
} }
// 个人
export function listAwardgr(phoneNumber) {
return request({
url: `/teacher/basiclnformation/compre/${phoneNumber}`,
method: "get",
});
}
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1702947865570" class="icon" viewBox="0 0 1102 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1709" xmlns:xlink="http://www.w3.org/1999/xlink" width="215.234375" height="200"><path d="M89.009231 219.411692V100.036923c0-45.764923 37.100308-82.825846 82.825846-82.825846h814.473846c45.686154 0 82.786462 37.060923 82.786462 82.825846v823.926154a82.825846 82.825846 0 0 1-82.825847 82.825846H171.835077A82.825846 82.825846 0 0 1 89.009231 923.963077V804.627692h75.303384v119.37477c0 4.174769 3.387077 7.522462 7.522462 7.522461h814.473846a7.522462 7.522462 0 0 0 7.483077-7.483077V100.036923a7.522462 7.522462 0 0 0-7.483077-7.522461H171.795692a7.522462 7.522462 0 0 0-7.483077 7.483076v119.414154H89.009231z" fill="#195c9f" p-id="1710"></path><path d="M586.279385 599.788308c107.953231 0 195.465846-88.418462 195.465846-197.513846 0-109.056-87.512615-197.474462-195.465846-197.474462-107.913846 0-195.426462 88.418462-195.426462 197.474462 0 109.095385 87.512615 197.513846 195.426462 197.513846z m0-60.258462c-74.515692 0-135.168-61.321846-135.168-137.255384s60.652308-137.255385 135.168-137.255385c74.555077 0 135.207385 61.321846 135.207384 137.255385S660.873846 539.569231 586.279385 539.569231z" fill="#195c9f" p-id="1711"></path><path d="M840.782769 819.2c0-154.545231-94.601846-271.478154-254.503384-271.478154-159.862154 0-254.503385 116.932923-254.503385 271.478154h60.258462c0-123.746462 70.813538-211.259077 194.244923-211.259077 123.470769 0 194.284308 87.512615 194.284307 211.259077h60.258462z" fill="#195c9f" p-id="1712"></path><path d="M18.077538 347.411692m37.651693 0l141.863384 0q37.651692 0 37.651693 37.651693l0 0q0 37.651692-37.651693 37.651692l-141.863384 0q-37.651692 0-37.651693-37.651692l0 0q0-37.651692 37.651693-37.651693Z" fill="#195c9f" p-id="1713"></path><path d="M18.077538 566.862769m37.651693 0l141.863384 0q37.651692 0 37.651693 37.651693l0 0q0 37.651692-37.651693 37.651692l-141.863384 0q-37.651692 0-37.651693-37.651692l0 0q0-37.651692 37.651693-37.651693Z" fill="#195c9f" p-id="1714"></path></svg>
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1702947865570" class="icon" viewBox="0 0 1102 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1709" xmlns:xlink="http://www.w3.org/1999/xlink" width="215.234375" height="200"><path d="M89.009231 219.411692V100.036923c0-45.764923 37.100308-82.825846 82.825846-82.825846h814.473846c45.686154 0 82.786462 37.060923 82.786462 82.825846v823.926154a82.825846 82.825846 0 0 1-82.825847 82.825846H171.835077A82.825846 82.825846 0 0 1 89.009231 923.963077V804.627692h75.303384v119.37477c0 4.174769 3.387077 7.522462 7.522462 7.522461h814.473846a7.522462 7.522462 0 0 0 7.483077-7.483077V100.036923a7.522462 7.522462 0 0 0-7.483077-7.522461H171.795692a7.522462 7.522462 0 0 0-7.483077 7.483076v119.414154H89.009231z" fill="#195c9f" p-id="1710"></path><path d="M586.279385 599.788308c107.953231 0 195.465846-88.418462 195.465846-197.513846 0-109.056-87.512615-197.474462-195.465846-197.474462-107.913846 0-195.426462 88.418462-195.426462 197.474462 0 109.095385 87.512615 197.513846 195.426462 197.513846z m0-60.258462c-74.515692 0-135.168-61.321846-135.168-137.255384s60.652308-137.255385 135.168-137.255385c74.555077 0 135.207385 61.321846 135.207384 137.255385S660.873846 539.569231 586.279385 539.569231z" fill="#195c9f" p-id="1711"></path><path d="M840.782769 819.2c0-154.545231-94.601846-271.478154-254.503384-271.478154-159.862154 0-254.503385 116.932923-254.503385 271.478154h60.258462c0-123.746462 70.813538-211.259077 194.244923-211.259077 123.470769 0 194.284308 87.512615 194.284307 211.259077h60.258462z" fill="#195c9f" p-id="1712"></path><path d="M18.077538 347.411692m37.651693 0l141.863384 0q37.651692 0 37.651693 37.651693l0 0q0 37.651692-37.651693 37.651692l-141.863384 0q-37.651692 0-37.651693-37.651692l0 0q0-37.651692 37.651693-37.651693Z" fill="#195c9f" p-id="1713"></path><path d="M18.077538 566.862769m37.651693 0l141.863384 0q37.651692 0 37.651693 37.651693l0 0q0 37.651692-37.651693 37.651692l-141.863384 0q-37.651692 0-37.651693-37.651692l0 0q0-37.651692 37.651693-37.651693Z" fill="#195c9f" p-id="1714"></path></svg>
\ No newline at end of file
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1702947904698" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3973" xmlns:xlink="http://www.w3.org/1999/xlink" width="212.5" height="200"><path d="M679.61065531 460.66664566c84.263383-55.849753 121.771133-159.81706 92.390977-255.997255S653.13007431 42.66666666 551.78776031 42.66666666s-190.767818 65.778598-220.213873 162.002724 8.083661 200.169468 92.347044 256.019221C266.57509931 502.66653766 155.21607431 641.51660166 149.34004331 803.03606366c0 101.441164 201.959735 152.161745 403.414241 152.161745s402.447717-50.742548 402.447717-152.183711c-5.271953-162.376154-117.300956-302.104877-275.591346-343.863139z m-77.212146 297.722566l-51.159911 50.720581-51.126962-50.720581 51.126962-165.846857z m-222.41052-487.908273c-0.087866-81.484625 57.716903-151.733399 138.300902-167.845806s161.310781 26.359765 193.019382 101.572962a170.174252 170.174252 0 0 1-62.604443 207.660035 173.35939 173.35939 0 0 1-217.55593-20.176204 170.240151 170.240151 0 0 1-51.126961-121.210987zM552.80920131 898.37054866c-210.658458 0-345.126211-56.805294-345.126211-93.357502 7.853013-167.01108 143.441056-300.182811 311.92389-306.344406l-76.728884 259.720571a28.259865 28.259865 0 0 0 7.688265 28.402647l82.31935 81.649373a28.798044 28.798044 0 0 0 40.90157 0l81.792155-84.186501a28.259865 28.259865 0 0 0 7.688265-28.402647l-77.739342-257.150494c167.900722 5.810132 303.499748 137.905506 312.407152 304.312508 0 36.519258-134.467753 93.357502-345.12621 93.357502z m0 0" p-id="3974" fill="#0096f9"></path></svg>
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1702947904698" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3973" xmlns:xlink="http://www.w3.org/1999/xlink" width="212.5" height="200"><path d="M679.61065531 460.66664566c84.263383-55.849753 121.771133-159.81706 92.390977-255.997255S653.13007431 42.66666666 551.78776031 42.66666666s-190.767818 65.778598-220.213873 162.002724 8.083661 200.169468 92.347044 256.019221C266.57509931 502.66653766 155.21607431 641.51660166 149.34004331 803.03606366c0 101.441164 201.959735 152.161745 403.414241 152.161745s402.447717-50.742548 402.447717-152.183711c-5.271953-162.376154-117.300956-302.104877-275.591346-343.863139z m-77.212146 297.722566l-51.159911 50.720581-51.126962-50.720581 51.126962-165.846857z m-222.41052-487.908273c-0.087866-81.484625 57.716903-151.733399 138.300902-167.845806s161.310781 26.359765 193.019382 101.572962a170.174252 170.174252 0 0 1-62.604443 207.660035 173.35939 173.35939 0 0 1-217.55593-20.176204 170.240151 170.240151 0 0 1-51.126961-121.210987zM552.80920131 898.37054866c-210.658458 0-345.126211-56.805294-345.126211-93.357502 7.853013-167.01108 143.441056-300.182811 311.92389-306.344406l-76.728884 259.720571a28.259865 28.259865 0 0 0 7.688265 28.402647l82.31935 81.649373a28.798044 28.798044 0 0 0 40.90157 0l81.792155-84.186501a28.259865 28.259865 0 0 0 7.688265-28.402647l-77.739342-257.150494c167.900722 5.810132 303.499748 137.905506 312.407152 304.312508 0 36.519258-134.467753 93.357502-345.12621 93.357502z m0 0" p-id="3974" fill="#0096f9"></path></svg>
\ No newline at end of file
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1702947932221" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5959" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M772.2 956.6H251.9c-48.2 0-87.4-35.4-87.4-79v-655c0-43.6 39.2-79 87.4-79h109.8v49.7H251.9c-19.2 0-35.4 13.4-35.4 29.2v655c0 15.9 16.2 29.2 35.4 29.2h520.2c19.2 0 35.4-13.4 35.4-29.2v-655c0-15.9-16.2-29.2-35.4-29.2H660.3v-49.7h111.8c48.2 0 87.4 35.4 87.4 79v655c0.1 43.6-39.2 79-87.3 79z m0 0" p-id="5960" fill="#0096f9"></path><path d="M316.2 780.4H708v49.7H316.2v-49.7z m0-103.4H708v49.7H316.2V677z m0 3M599.7 143.5c0.6 4.1 0.9 8.3 0.9 12.4 0 48.8-39.7 88.5-88.5 88.5s-88.5-39.7-88.5-88.5c0-4.3 0.3-8.4 0.9-12.4H383v81.4c0 15.7 12.8 28.5 28.5 28.5h201.2c15.7 0 28.5-12.8 28.5-28.5v-81.4h-41.5z m0 0" p-id="5961" fill="#0096f9"></path><path d="M512.1 244.4c48.8 0 88.5-39.7 88.5-88.5 0-4.3-0.3-8.4-0.9-12.4-6.1-43-43.1-76.1-87.6-76.1-44.5 0-81.5 33.1-87.6 76.1-0.6 4.1-0.9 8.3-0.9 12.4-0.1 48.8 39.6 88.5 88.5 88.5z m-36.7-100.9c5.2-15.3 19.7-26.3 36.7-26.3 17 0 31.5 11 36.7 26.3 1.3 3.9 2.1 8.2 2.1 12.4 0 21.4-17.4 38.8-38.8 38.8s-38.8-17.4-38.8-38.8c0-4.4 0.7-8.5 2.1-12.4z m0 0M439.7 460.9h146.7v34.7H439.7z" p-id="5962" fill="#0096f9"></path><path d="M495.03 547.165v-140.4h35.7v140.4z" p-id="5963" fill="#0096f9"></path><path d="M624.5 621.1h-225c-17.2 0-31.1-14-31.1-31.3V398.5h39.2v182.6h208.8V398.5h39.2v191.4c0 17.2-14 31.2-31.1 31.2z" p-id="5964" fill="#0096f9"></path><path d="M337.5 436.8c-7.2-9.5-5.3-23 4.2-30.2l154-116.4c9.5-7.2 23-5.3 30.2 4.2 7.2 9.5 5.3 23-4.2 30.2L367.7 441c-9.5 7.2-23 5.3-30.2-4.2z" p-id="5965" fill="#0096f9"></path><path d="M684.4 434.9c-7 9.6-20.5 11.7-30.1 4.7L503.2 329.4c-9.6-7-11.7-20.5-4.7-30.1 7-9.6 20.5-11.7 30.1-4.7l151.2 110.2c9.5 7 11.6 20.5 4.6 30.1z" p-id="5966" fill="#0096f9"></path></svg>
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1702947932221" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5959" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M772.2 956.6H251.9c-48.2 0-87.4-35.4-87.4-79v-655c0-43.6 39.2-79 87.4-79h109.8v49.7H251.9c-19.2 0-35.4 13.4-35.4 29.2v655c0 15.9 16.2 29.2 35.4 29.2h520.2c19.2 0 35.4-13.4 35.4-29.2v-655c0-15.9-16.2-29.2-35.4-29.2H660.3v-49.7h111.8c48.2 0 87.4 35.4 87.4 79v655c0.1 43.6-39.2 79-87.3 79z m0 0" p-id="5960" fill="#0096f9"></path><path d="M316.2 780.4H708v49.7H316.2v-49.7z m0-103.4H708v49.7H316.2V677z m0 3M599.7 143.5c0.6 4.1 0.9 8.3 0.9 12.4 0 48.8-39.7 88.5-88.5 88.5s-88.5-39.7-88.5-88.5c0-4.3 0.3-8.4 0.9-12.4H383v81.4c0 15.7 12.8 28.5 28.5 28.5h201.2c15.7 0 28.5-12.8 28.5-28.5v-81.4h-41.5z m0 0" p-id="5961" fill="#0096f9"></path><path d="M512.1 244.4c48.8 0 88.5-39.7 88.5-88.5 0-4.3-0.3-8.4-0.9-12.4-6.1-43-43.1-76.1-87.6-76.1-44.5 0-81.5 33.1-87.6 76.1-0.6 4.1-0.9 8.3-0.9 12.4-0.1 48.8 39.6 88.5 88.5 88.5z m-36.7-100.9c5.2-15.3 19.7-26.3 36.7-26.3 17 0 31.5 11 36.7 26.3 1.3 3.9 2.1 8.2 2.1 12.4 0 21.4-17.4 38.8-38.8 38.8s-38.8-17.4-38.8-38.8c0-4.4 0.7-8.5 2.1-12.4z m0 0M439.7 460.9h146.7v34.7H439.7z" p-id="5962" fill="#0096f9"></path><path d="M495.03 547.165v-140.4h35.7v140.4z" p-id="5963" fill="#0096f9"></path><path d="M624.5 621.1h-225c-17.2 0-31.1-14-31.1-31.3V398.5h39.2v182.6h208.8V398.5h39.2v191.4c0 17.2-14 31.2-31.1 31.2z" p-id="5964" fill="#0096f9"></path><path d="M337.5 436.8c-7.2-9.5-5.3-23 4.2-30.2l154-116.4c9.5-7.2 23-5.3 30.2 4.2 7.2 9.5 5.3 23-4.2 30.2L367.7 441c-9.5 7.2-23 5.3-30.2-4.2z" p-id="5965" fill="#0096f9"></path><path d="M684.4 434.9c-7 9.6-20.5 11.7-30.1 4.7L503.2 329.4c-9.6-7-11.7-20.5-4.7-30.1 7-9.6 20.5-11.7 30.1-4.7l151.2 110.2c9.5 7 11.6 20.5 4.6 30.1z" p-id="5966" fill="#0096f9"></path></svg>
\ No newline at end of file
...@@ -2,21 +2,10 @@ ...@@ -2,21 +2,10 @@
<div> <div>
<template v-for="(item, index) in options"> <template v-for="(item, index) in options">
<template v-if="values.includes(item.value)"> <template v-if="values.includes(item.value)">
<span <span v-if="item.raw.listClass == 'default' || item.raw.listClass == ''" :key="item.value" :index="index"
v-if="item.raw.listClass == 'default' || item.raw.listClass == ''" :class="item.raw.cssClass">{{ item.label }}</span>
:key="item.value" <el-tag v-else :disable-transitions="true" :key="item.value" :index="index"
:index="index" :type="item.raw.listClass == 'primary' ? '' : item.raw.listClass" :class="item.raw.cssClass">
:class="item.raw.cssClass"
>{{ item.label }}</span
>
<el-tag
v-else
:disable-transitions="true"
:key="item.value"
:index="index"
:type="item.raw.listClass == 'primary' ? '' : item.raw.listClass"
:class="item.raw.cssClass"
>
{{ item.label }} {{ item.label }}
</el-tag> </el-tag>
</template> </template>
...@@ -29,7 +18,7 @@ export default { ...@@ -29,7 +18,7 @@ export default {
name: "DictTag", name: "DictTag",
props: { props: {
options: { options: {
type: Array, type: [Number, Object, String, Array],
default: null, default: null,
}, },
value: [Number, String, Array], value: [Number, String, Array],
...@@ -46,7 +35,7 @@ export default { ...@@ -46,7 +35,7 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
.el-tag + .el-tag { .el-tag+.el-tag {
margin-left: 10px; margin-left: 10px;
} }
</style> </style>
...@@ -30,9 +30,8 @@ ...@@ -30,9 +30,8 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="出生年月" prop="birthDate"> <el-form-item label="出生年月" prop="birthDate">
<el-date-picker clearable v-model="queryParams.birthDate" type="date" value-format="yyyy-MM-dd" <el-input v-model="queryParams.birthDate" clearable placeholder="请输入"></el-input>
placeholder="请选择" :style="{ width: '100%' }">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -111,7 +110,7 @@ ...@@ -111,7 +110,7 @@
</el-col> </el-col>
<el-col :offset="1" :span="1.5"> <el-col :offset="1" :span="1.5">
<el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport" <el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport"
v-hasPermi="['system:student:export']">导入 v-hasPermi="['system:student:import']">导入
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -164,9 +163,12 @@ ...@@ -164,9 +163,12 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width "> <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width ">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)">修改</el-button> <el-button v-hasPermi="['system:student:edit']" size="mini" type="text"
<el-button size="mini" type="text" @click="handleLook(scope.row)">详情</el-button> @click="handleUpdate(scope.row)">修改</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)">删除</el-button> <el-button v-hasPermi="['system:student:look']" size="mini" type="text"
@click="handleLook(scope.row)">详情</el-button>
<el-button v-hasPermi="['system:student:remove']" size="mini" type="text"
@click="handleDelete(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -199,7 +201,7 @@ ...@@ -199,7 +201,7 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 添加对话框 --> <!-- 添加对话框 -->
<el-dialog title="详细信息" :visible.sync="open" width="980px"> <el-dialog title="详细信息" :visible.sync="open" width="60%">
<el-form ref="form" :model="form" :rules="rules" label-width="138px"> <el-form ref="form" :model="form" :rules="rules" label-width="138px">
<el-row type="flex" justify="space-between"> <el-row type="flex" justify="space-between">
<el-col :span="16"> <el-col :span="16">
...@@ -257,8 +259,8 @@ ...@@ -257,8 +259,8 @@
</el-col> </el-col>
<el-col :span="12" class="custom-margin"> <el-col :span="12" class="custom-margin">
<el-form-item label="入党时间" prop="partyMembershipTime"> <el-form-item label="入党时间" prop="partyMembershipTime">
<el-date-picker clearable v-model="form.partyMembershipTime" type="date" <el-date-picker clearable v-model="form.partyMembershipTime" type="month"
value-format="yyyy-MM-dd" placeholder="请选择" :style="{ width: '100%' }"> value-format="yyyy-MM" placeholder="请选择" :style="{ width: '100%' }">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -433,7 +435,9 @@ ...@@ -433,7 +435,9 @@
<el-row :gutter="2" type="flex" justify="space-between"> <el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="毕业时间1" prop="graduationTime1"> <el-form-item label="毕业时间1" prop="graduationTime1">
<el-input v-model="form.graduationTime1" placeholder="请输入" /> <el-date-picker clearable v-model="form.graduationTime1" type="month" value-format="yyyy-MM"
placeholder="请选择" :style="{ width: '100%' }">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
...@@ -450,7 +454,9 @@ ...@@ -450,7 +454,9 @@
<el-row :gutter="2" type="flex" justify="space-between"> <el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="毕业时间2" prop="graduationTime2"> <el-form-item label="毕业时间2" prop="graduationTime2">
<el-input v-model="form.graduationTime2" placeholder="请输入" /> <el-date-picker clearable v-model="form.graduationTime2" type="month" value-format="yyyy-MM"
placeholder="请选择" :style="{ width: '100%' }">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
...@@ -467,7 +473,9 @@ ...@@ -467,7 +473,9 @@
<el-row :gutter="2" type="flex" justify="space-between"> <el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="毕业时间3" prop="graduationTime3"> <el-form-item label="毕业时间3" prop="graduationTime3">
<el-input v-model="form.graduationTime3" placeholder="请输入" /> <el-date-picker clearable v-model="form.graduationTime3" type="month" value-format="yyyy-MM"
placeholder="请选择" :style="{ width: '100%' }">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
...@@ -1382,7 +1390,7 @@ export default { ...@@ -1382,7 +1390,7 @@ export default {
}, },
}; };
</script> </script>
<style scoped> <style lang="scss" scoped>
.avatar-uploader .el-upload { .avatar-uploader .el-upload {
border: 1px dashed #d9d9d9; border: 1px dashed #d9d9d9;
border-radius: 6px; border-radius: 6px;
...@@ -1420,9 +1428,9 @@ export default { ...@@ -1420,9 +1428,9 @@ export default {
margin-top: -2px; margin-top: -2px;
margin-bottom: -5px; margin-bottom: -5px;
} */ } */
.custom-margin { /* .custom-margin {
margin: -6px 0px; margin: -6px 0px;
} } */
.custom-evenly { .custom-evenly {
margin-top: -40px !important; margin-top: -40px !important;
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="班级类型" prop="classType"> <el-form-item label="班级类型" prop="classType">
<el-select v-model="queryParams.classType" multiple placeholder="请选择" style="width: 100%"> <el-select v-model="queryParams.classType" placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -90,22 +90,22 @@ ...@@ -90,22 +90,22 @@
</el-table-column> </el-table-column>
<el-table-column label="高考评优" align="center" prop="gkAppraising" sortable> <el-table-column label="高考评优" align="center" prop="gkAppraising" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.gk_appraising" :value="scope.row.sub" /> <dict-tag :options="dict.type.gk_appraising" :value="scope.row.gkAppraising" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" sortable /> <el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" sortable />
<el-table-column label="增量情况" align="center" prop="incrementSituation" sortable /> <el-table-column label="增量情况" align="center" prop="incrementSituation" sortable />
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable /> <el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable />
<el-table-column label="其他" align="center" prop="other" sortable /> <el-table-column label="其他情况" align="center" prop="other" sortable />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']"
v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:achievement:remove']"
v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">删除</el-button> v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" <el-button size="mini" type="text" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '1'">审核</el-button> v-hasPermi="['system:achievement:aduit']" v-if="scope.row.auditState === '1'">审核</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -27,23 +27,23 @@ ...@@ -27,23 +27,23 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:assessment:add']">新增</el-button> v-hasPermi="['school:annualAssessment:add']">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:assessment:edit']">修改</el-button> v-hasPermi="['school: annualAssessment:edit']">修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:assessment:remove']">删除</el-button> v-hasPermi="['school:annualAssessment:remove']">删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:assessment:export']">导出</el-button> v-hasPermi="['school:annualAssessment:export ']">导出</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-upload" size="mini" @click="handleImport" <el-button type="warning" plain icon="el-icon-upload" size="mini" @click="handleImport"
v-hasPermi="['system:assessment:import']">导入</el-button> v-hasPermi="['school:annualAssessment:importData']">导入</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
......
...@@ -53,19 +53,19 @@ ...@@ -53,19 +53,19 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:awards:add']">新增</el-button> v-hasPermi="['school:fudaos:addgl']">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:awards:edit']">修改</el-button> v-hasPermi="['school:fudaos:edit']">修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:awards:remove']">删除</el-button> v-hasPermi="['school:fudaos:delete']">删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:awards:export']">导出</el-button> v-hasPermi="['school:fudaos:export']">导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
...@@ -111,13 +111,13 @@ ...@@ -111,13 +111,13 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:honors:edit']" v-hasPermi="['school:fudaos:edit']"
v-if="scope.row.auditstate === '1' || scope.row.auditstate === '2' || scope.row.auditstate === '3'">修改</el-button> v-if="scope.row.auditstate === '1' || scope.row.auditstate === '2' || scope.row.auditstate === '3'">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['school:fudaos:delete ']"
v-if="scope.row.auditstate === '1' || scope.row.auditstate === '2' || scope.row.auditstate === '3'">删除</el-button> v-if="scope.row.auditstate === '1' || scope.row.auditstate === '2' || scope.row.auditstate === '3'">删除</el-button>
<el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)" <el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditstate === '1'">审核</el-button> v-hasPermi="['school:fudaos:submit']" v-if="scope.row.auditstate === '1'">审核</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -85,9 +85,9 @@ ...@@ -85,9 +85,9 @@
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardType" sortable> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardType" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="综合荣誉-成果名称" align="center" prop="resultName" sortable /> <el-table-column label="综合荣誉-成果名称" align="center" prop="resultName" sortable />
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:honors:remove']"
v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">删除</el-button> v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)" <el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '1'">审核</el-button> v-hasPermi="['system:honors:audit']" v-if="scope.row.auditState === '1'">审核</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:honors:remove']"
v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">删除</el-button> v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)" <el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '1'">审核</el-button> v-hasPermi="['system:works:audit']" v-if="scope.row.auditState === '1'">审核</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -367,6 +367,7 @@ export default { ...@@ -367,6 +367,7 @@ export default {
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
look: false, look: false,
isEdit: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
......
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:honors:remove']"
v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">删除</el-button> v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)" <el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '1'">审核</el-button> v-hasPermi="['system:awards:audit']" v-if="scope.row.auditState === '1'">审核</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -53,19 +53,19 @@ ...@@ -53,19 +53,19 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:works:add']">新增</el-button> v-hasPermi="['system:research:add']">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:works:edit']">修改</el-button> v-hasPermi="['system:research:edit']">修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:works:remove']">删除</el-button> v-hasPermi="['system:research: remove']">删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:works:export']">导出</el-button> v-hasPermi="['system:research:export']">导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
...@@ -108,13 +108,13 @@ ...@@ -108,13 +108,13 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:honors:edit']" v-hasPermi="['system:research:edit']"
v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:research:remove']"
v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">删除</el-button> v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)" <el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '1'">审核</el-button> v-hasPermi="['system:research:audit']" v-if="scope.row.auditState === '1'">审核</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -369,6 +369,7 @@ export default { ...@@ -369,6 +369,7 @@ export default {
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
look: false, look: false,
isEdit: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="获奖类别" prop="awardType"> <el-form-item label="获奖类别" prop="awardType">
<el-select v-model="form.awardType" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_categoriesjs" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.award_categoriesjs" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</el-form-item> </el-form-item>
<el-form-item label="获奖等级" prop="awardLevel"> <el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="form.awardLevel" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -53,19 +53,19 @@ ...@@ -53,19 +53,19 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:awards:add']">新增</el-button> v-hasPermi="['school:teacherAwards:add']">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:awards:edit']">修改</el-button> v-hasPermi="['school:teacherAwards:edit']">修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:awards:remove']">删除</el-button> v-hasPermi="['school:teacherAwards:remove']">删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:awards:export']">导出</el-button> v-hasPermi="['school:teacherAwards:export']">导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
...@@ -110,13 +110,13 @@ ...@@ -110,13 +110,13 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:honors:edit']" v-hasPermi="['school:teacherAwards:edit']"
v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['school:teacherAwards:remove']"
v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">删除</el-button> v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)" <el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '1'">审核</el-button> v-hasPermi="['school:teacherAwards:audit']" v-if="scope.row.auditState === '1'">审核</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="学期" prop="semester"> <el-form-item label="学期" prop="semester">
<el-select v-model="queryParams.semster" placeholder="请选择"> <el-select v-model="queryParams.semester" placeholder="请选择">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport" <el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport"
v-hasPermi="['system:student:export']">导入 v-hasPermi="['system:achievements:importData']">导入
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
......
...@@ -60,19 +60,19 @@ ...@@ -60,19 +60,19 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:awards:add']">新增</el-button> v-hasPermi="['school:fudaot:addgl']">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:awards:edit']">修改</el-button> v-hasPermi="['school:fudaot:edit']">修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:awards:remove']">删除</el-button> v-hasPermi="['school:fudaot:delete']">删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:awards:export']">导出</el-button> v-hasPermi="['school:fudaot:export']">导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
...@@ -123,13 +123,13 @@ ...@@ -123,13 +123,13 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:honors:edit']" v-hasPermi="['school:fudaot:edit']"
v-if="scope.row.auditstate === '1' || scope.row.auditstate === '2' || scope.row.auditstate === '3'">修改</el-button> v-if="scope.row.auditstate === '1' || scope.row.auditstate === '2' || scope.row.auditstate === '3'">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['school:fudaot:delete']"
v-if="scope.row.auditstate === '1' || scope.row.auditstate === '2' || scope.row.auditstate === '3'">删除</el-button> v-if="scope.row.auditstate === '1' || scope.row.auditstate === '2' || scope.row.auditstate === '3'">删除</el-button>
<el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)" <el-button size="mini" type="text" icon="el-icon-s-check" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditstate === '1'">审核</el-button> v-hasPermi="['school:fudaot:submit']" v-if="scope.row.auditstate === '1'">审核</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="学期" prop="semester"> <el-form-item label="学期" prop="semester">
<el-select v-model="queryParams.semster" placeholder="请选择"> <el-select v-model="queryParams.semester" placeholder="请选择">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport" <el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport"
v-hasPermi="['system:student:export']">导入 v-hasPermi="['system:assessment:import']">导入
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -180,7 +180,11 @@ ...@@ -180,7 +180,11 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="班级" prop="className"> <el-form-item label="班级" prop="className">
<el-input v-model="form.className" placeholder="请输入" /> <el-select v-model="form.className" multiple placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.class_num" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -198,7 +202,7 @@ ...@@ -198,7 +202,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="德育考核成绩" prop="moralEduCheckAchievement"> <el-form-item label="德育考核成绩" prop="moralEduCheckAchievement">
<el-input v-model="form.moralEduCheckAchievement" placeholder="请输入" /> <el-input v-model="form.moralEduCheckAchievement" type="number" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -206,7 +210,7 @@ ...@@ -206,7 +210,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="智育考核成绩" prop="intellEduCheckAchievement"> <el-form-item label="智育考核成绩" prop="intellEduCheckAchievement">
<el-input v-model="form.intellEduCheckAchievement" placeholder="请输入" /> <el-input v-model="form.intellEduCheckAchievement" type="number" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -278,7 +282,7 @@ import { listAssessment, getAssessment, delAssessment, addAssessment, updateAsse ...@@ -278,7 +282,7 @@ import { listAssessment, getAssessment, delAssessment, addAssessment, updateAsse
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
export default { export default {
name: "Assessment", name: "Assessment",
dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda', 'appointment_situation', 'appointment_positions'], dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda', 'appointment_situation', 'appointment_positions', 'class_num'],
data() { data() {
return { return {
uploadOpen: false, uploadOpen: false,
...@@ -492,6 +496,7 @@ export default { ...@@ -492,6 +496,7 @@ export default {
getAssessment(id).then(response => { getAssessment(id).then(response => {
this.form = response.data; this.form = response.data;
this.form.classType = this.form.classType.split(','); this.form.classType = this.form.classType.split(',');
this.form.className = this.form.className.split(',');
this.open = true; this.open = true;
this.title = "修改班主任考核"; this.title = "修改班主任考核";
}); });
...@@ -501,15 +506,17 @@ export default { ...@@ -501,15 +506,17 @@ export default {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
const classTypeStr = this.form.classType.join(','); const classTypeStr = this.form.classType.join(',');
console.log(classTypeStr); // 输出转换后的字符串 console.log(classTypeStr); // 输出转换后的字符串
const classNameStr = this.form.className.join(',');
console.log(classNameStr); // 输出转换后的字符串
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
updateAssessment({ ...this.form, classType: classTypeStr }).then(response => { updateAssessment({ ...this.form, classType: classTypeStr, className: classNameStr }).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addAssessment({ ...this.form, classType: classTypeStr }).then(response => { addAssessment({ ...this.form, classType: classTypeStr, className: classNameStr }).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<el-input v-model="queryParams.className" placeholder="请输入" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.className" placeholder="请输入" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="班级类型" prop="classType"> <el-form-item label="班级类型" prop="classType">
<el-select v-model="queryParams.classType" multiple placeholder="请选择" style="width: 100%"> <el-select v-model="queryParams.classType" placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
v-hasPermi="['system:aworkload:remove']">删除</el-button> v-hasPermi="['system:aworkload:remove']">删除</el-button>
</el-col> </el-col>
<el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport" <el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport"
v-hasPermi="['system:student:export']">导入 v-hasPermi="['system:student:import']">导入
</el-button> </el-button>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
...@@ -123,7 +123,11 @@ ...@@ -123,7 +123,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="聘任职务" align="center" prop="appointmentPosition" sortable width="120px" /> <el-table-column label="聘任职务" align="center" prop="appointmentPosition" sortable width="120px" />
<el-table-column label="聘任情况" align="center" prop="appointmentSituation" sortable width="120px" /> <el-table-column label="聘任情况" align="center" prop="appointmentSituation" sortable width="120px">
<template slot-scope="scope">
<dict-tag :options="dict.type.appointment_situation" :value="scope.row.appointmentSituation" />
</template>
</el-table-column>
<el-table-column label="班级" align="center" prop="className" sortable /> <el-table-column label="班级" align="center" prop="className" sortable />
<el-table-column label="班级类型" align="center"> <el-table-column label="班级类型" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -146,7 +150,7 @@ ...@@ -146,7 +150,7 @@
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['system:aworkload:edit']">修改</el-button> v-hasPermi="['system:aworkload:edit']">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" <el-button size="mini" type="text" @click="handleLook(scope.row)"
v-hasPermi="['system:aworkload:edit']">详情</el-button> v-hasPermi="['system:aworkload:look']">详情</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:aworkload:remove']">删除</el-button> v-hasPermi="['system:aworkload:remove']">删除</el-button>
</template> </template>
...@@ -264,19 +268,19 @@ ...@@ -264,19 +268,19 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="早读" prop="earlyReading"> <el-form-item label="早读" prop="earlyReading">
<el-input v-model="form.earlyReading" placeholder="请输入早读" /> <el-input v-model="form.earlyReading" type="number" placeholder="请输入早读" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="正课" prop="requiredCourses"> <el-form-item label="正课" prop="requiredCourses">
<el-input v-model="form.requiredCourses" placeholder="请输入正课" /> <el-input v-model="form.requiredCourses" type="number" placeholder="请输入正课" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="晚自习" prop="eveningSelfStudy"> <el-form-item label="晚自习" prop="eveningSelfStudy">
<el-input v-model="form.eveningSelfStudy" placeholder="请输入晚自习" /> <el-input v-model="form.eveningSelfStudy" type="number" placeholder="请输入晚自习" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -789,7 +793,7 @@ export default { ...@@ -789,7 +793,7 @@ export default {
this.download( this.download(
"/aworkload/download", "/aworkload/download",
{}, {},
`教师基础信息_${Date.now()}.xlsx` `工作量信息_${Date.now()}.xlsx`
); );
}, },
// 取消按钮 // 取消按钮
...@@ -908,7 +912,7 @@ export default { ...@@ -908,7 +912,7 @@ export default {
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('/aworkload/download', { this.download('/aworkload/export', {
...this.queryParams ...this.queryParams
}, `工作量信息_${new Date().getTime()}.xlsx`) }, `工作量信息_${new Date().getTime()}.xlsx`)
} }
......
...@@ -53,19 +53,19 @@ ...@@ -53,19 +53,19 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:awards:add']">新增</el-button> v-hasPermi="['system:tutoringstu:add']">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:awards:edit']">修改</el-button> v-hasPermi="['system:tutoringstu:edit']">修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:awards:remove']">删除</el-button> v-hasPermi="['system:tutoringstu:remove']">删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:awards:export']">导出</el-button> v-hasPermi="['system:tutoringstu:export']">导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
...@@ -110,15 +110,17 @@ ...@@ -110,15 +110,17 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['system:tutoringstu:edit']"
v-if="scope.row.auditstate === '0' || scope.row.auditstate === '3'">修改</el-button> v-if="scope.row.auditstate === '0' || scope.row.auditstate === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleLook(scope.row)"
v-hasPermi="['system:tutoringstu:look']"
v-if="scope.row.auditstate === '0' || scope.row.auditstate === '1' || scope.row.auditstate === '3' || scope.row.auditstate === '2'">查看</el-button> v-if="scope.row.auditstate === '0' || scope.row.auditstate === '1' || scope.row.auditstate === '3' || scope.row.auditstate === '2'">查看</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:tutoringstu:remove']"
v-if="scope.row.auditstate === '0' || scope.row.auditstate === '3'">删除</el-button> v-if="scope.row.auditstate === '0' || scope.row.auditstate === '3'">删除</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" <el-button size="mini" type="text" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditstate === '0'">提交</el-button> v-hasPermi="['system:tutoringstu:sub']" v-if="scope.row.auditstate === '0'">提交</el-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -228,9 +230,6 @@ ...@@ -228,9 +230,6 @@
</el-dialog> </el-dialog>
<!-- 选择对应处理人 -->
<SelectUser :id="selectHandles.id" :open.sync="selectHandles.open" :title="selectHandles.title"
:width="selectHandles.width" :execute="selectHandles.method" @select="selectUser"></SelectUser>
</div> </div>
</template> </template>
...@@ -238,24 +237,13 @@ ...@@ -238,24 +237,13 @@
<script> <script>
import { listAward, listAwardgr, getAward, addAward, addAwardgr, updateAward, delAward, audit } from "@/api/smartSchool/electronicArchives/professionalDevelopment/awardTutoringstu"; import { listAward, listAwardgr, getAward, addAward, addAwardgr, updateAward, delAward, audit } from "@/api/smartSchool/electronicArchives/professionalDevelopment/awardTutoringstu";
import { uploadImage as commonUpload } from "@/api/common"; import { uploadImage as commonUpload } from "@/api/common";
import SelectUser from "./components/SelectUser";
export default { export default {
name: "tutorAward", name: "tutorAward",
dicts: ["teaching_subjects", 'award_type_fdxs', 'awards_level', 'award_rank', 'coachingr'], dicts: ["teaching_subjects", 'award_type_fdxs', 'awards_level', 'award_rank', 'coachingr'],
components: {
SelectUser,
},
data() { data() {
return { return {
// 选择对应处理人
selectHandles: {
id: null,
open: false,
title: '',
width: '50%',
method: null,
type: null // 处理类型: 1 级部/处室; 2 分管; 3 主管
},
// 图片上传遮罩层 // 图片上传遮罩层
uploadLoading: false, uploadLoading: false,
baseUrl: [process.env.VUE_APP_BASE_API], baseUrl: [process.env.VUE_APP_BASE_API],
......
...@@ -80,9 +80,9 @@ ...@@ -80,9 +80,9 @@
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardType" sortable> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardType" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="综合荣誉-成果名称" align="center" prop="resultName" sortable /> <el-table-column label="综合荣誉-成果名称" align="center" prop="resultName" sortable />
...@@ -97,13 +97,13 @@ ...@@ -97,13 +97,13 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:honors:look']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:honors:remove']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" <el-button size="mini" type="text" @click="handleExamine(scope.row)" v-hasPermi="['system:honors:sub']"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '0'">提交</el-button> v-if="scope.row.auditState === '0'">提交</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
...@@ -109,15 +109,14 @@ ...@@ -109,15 +109,14 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:works:edit']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:works:look']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)" v-hasPermi="['system:works:remove']"
v-hasPermi="['system:honors:remove']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" <el-button size="mini" type="text" @click="handleExamine(scope.row)" v-hasPermi="['system:works:sub']"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '0'">提交</el-button> v-if="scope.row.auditState === '0'">提交</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
...@@ -99,15 +99,17 @@ ...@@ -99,15 +99,17 @@
<el-table-column label="其他" align="center" prop="other" sortable /> <el-table-column label="其他" align="center" prop="other" sortable />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['system:achievement:edit']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleLook(scope.row)"
v-hasPermi="['system:achievement:look']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:achievement:remove']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" <el-button size="mini" type="text" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '0'">提交</el-button> v-hasPermi="['system:achievement:sub']" v-if="scope.row.auditState === '0'">提交</el-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -235,6 +237,7 @@ export default { ...@@ -235,6 +237,7 @@ export default {
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
isEdit: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
......
...@@ -98,9 +98,9 @@ ...@@ -98,9 +98,9 @@
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="讲课获奖-成果名称" align="center" prop="resultName" sortable/> <el-table-column label="讲课获奖-成果名称" align="center" prop="resultName" sortable />
<el-table-column label="获奖人" align="center" prop="userName" sortable/> <el-table-column label="获奖人" align="center" prop="userName" sortable />
<el-table-column label="主办单位" align="center" prop="org" sortable/> <el-table-column label="主办单位" align="center" prop="org" sortable />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable> <el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
...@@ -108,15 +108,15 @@ ...@@ -108,15 +108,15 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:awards:edit']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:awards:look']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:awards:remove']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" <el-button size="mini" type="text" @click="handleExamine(scope.row)" v-hasPermi="['system:awards:sub']"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '0'">提交</el-button> v-if="scope.row.auditState === '0'">提交</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
...@@ -53,19 +53,19 @@ ...@@ -53,19 +53,19 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:works:add']">新增</el-button> v-hasPermi="['system:research:add']">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:works:edit']">修改</el-button> v-hasPermi="['system:research:edit']">修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:works:remove']">删除</el-button> v-hasPermi="['system:research:remove']">删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:works:export']">导出</el-button> v-hasPermi="['system:research:export']">导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
...@@ -107,15 +107,16 @@ ...@@ -107,15 +107,16 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['system:research:edit']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:research:look']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:research:remove']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" <el-button size="mini" type="text" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '0'">提交</el-button> v-hasPermi="['system:research:sub']" v-if="scope.row.auditState === '0'">提交</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="获奖类别" prop="awardType"> <el-form-item label="获奖类别" prop="awardType">
<el-select v-model="form.awardType" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_categoriesjs" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.award_categoriesjs" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</el-form-item> </el-form-item>
<el-form-item label="获奖等级" prop="awardLevel"> <el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="form.awardLevel" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -109,15 +109,15 @@ ...@@ -109,15 +109,15 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:awards:edit']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:awards:look']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:awards:remove']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" <el-button size="mini" type="text" @click="handleExamine(scope.row)" v-hasPermi="['system:awards:sub']"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '0'">提交</el-button> v-if="scope.row.auditState === '0'">提交</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
...@@ -42,19 +42,19 @@ ...@@ -42,19 +42,19 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:award:add']">新增</el-button> v-hasPermi="['system:teamaward:add']">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:award:edit']">修改</el-button> v-hasPermi="['system:teamaward:edit']">修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:award:remove']">删除</el-button> v-hasPermi="['system:teamaward:remove']">删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:award:export']">导出</el-button> v-hasPermi="['system:teamaward:export']">导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
...@@ -89,15 +89,17 @@ ...@@ -89,15 +89,17 @@
<el-table-column label="备注" align="center" prop="remark" sortable /> <el-table-column label="备注" align="center" prop="remark" sortable />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['system:teamaward:edit']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleLook(scope.row)"
v-hasPermi="['system:teamaward:look']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:teamaward:remove']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" <el-button size="mini" type="text" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditState === '0'">提交</el-button> v-hasPermi="['system:teamaward:sub']" v-if="scope.row.auditState === '0'">提交</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
...@@ -60,19 +60,19 @@ ...@@ -60,19 +60,19 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:awards:add']">新增</el-button> v-hasPermi="['system:tutoraward:add']">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:awards:edit']">修改</el-button> v-hasPermi="['system:tutoraward:edit']">修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:awards:remove']">删除</el-button> v-hasPermi="['system:tutoraward:remove']">删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:awards:export']">导出</el-button> v-hasPermi="['system:tutoraward:export']">导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
...@@ -122,15 +122,15 @@ ...@@ -122,15 +122,15 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:tutoraward:edit']"
v-if="scope.row.auditstate === '0' || scope.row.auditstate === '3'">修改</el-button> v-if="scope.row.auditstate === '0' || scope.row.auditstate === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:tutoraward:look']"
v-if="scope.row.auditstate === '0' || scope.row.auditstate === '1' || scope.row.auditstate === '3' || scope.row.auditstate === '2'">查看</el-button> v-if="scope.row.auditstate === '0' || scope.row.auditstate === '1' || scope.row.auditstate === '3' || scope.row.auditstate === '2'">查看</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:honors:remove']" v-hasPermi="['system:tutoraward:remove']"
v-if="scope.row.auditstate === '0' || scope.row.auditstate === '3'">删除</el-button> v-if="scope.row.auditstate === '0' || scope.row.auditstate === '3'">删除</el-button>
<el-button size="mini" type="text" @click="handleExamine(scope.row)" <el-button size="mini" type="text" @click="handleExamine(scope.row)"
v-hasPermi="['system:honors:remove']" v-if="scope.row.auditstate === '0'">提交</el-button> v-hasPermi="['system:tutoraward:sub']" v-if="scope.row.auditstate === '0'">提交</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment