diff --git a/attendance-performance-manager-ui/admin/src/views/check/attend/record/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/check/attend/record/drawershow.vue index a41d06a8a729058e3340ab6b35c7c2b0f0b692b4..0cff27a50f13e3344f2f654c79819012f940ab26 100644 --- a/attendance-performance-manager-ui/admin/src/views/check/attend/record/drawershow.vue +++ b/attendance-performance-manager-ui/admin/src/views/check/attend/record/drawershow.vue @@ -45,7 +45,9 @@ >寮傚父鏃堕棿锛歿{ form.errorTime ? form.errorTime : "--" }}</el-col > <el-col :span="12" - >寮傚父缁撴灉锛歿{ form.errorTime ? form.errorTime : "--" }}</el-col + >寮傚父缁撴灉锛歿{ + form.errorResult ? form.errorResult : "--" + }}</el-col > </el-row> <el-row> @@ -97,15 +99,26 @@ <div class="content"> <el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-row> - <el-form-item label="鏍告煡缁撴灉锛�"> + <el-form-item label="鏍告煡缁撴灉锛�" v-if="form.subAddType == 1"> + <p v-if="form.view == '鏌ョ湅'"> + {{ form.checkResult }} + </p> + <el-radio-group + v-model="form.checkResult" + @input="radioChange" + v-else + > + <el-radio + v-for="(val, i) in dict.checkResultAdd" + :key="i" + :label="val" + >{{ val }}</el-radio + > + </el-radio-group> + </el-form-item> + <el-form-item label="鏍告煡缁撴灉锛�" v-else> <p v-if="form.view == '鏌ョ湅'"> - {{ - form.checkResult == 1 - ? "鍔犲垎/鎵e垎" - : form.checkResult == 2 - ? "涓嶅姞鍒�/涓嶆墸鍒�" - : "--" - }} + {{ form.checkResult }} </p> <el-radio-group v-model="form.checkResult" @@ -113,7 +126,7 @@ v-else > <el-radio - v-for="(val, i) in dict.checkResult" + v-for="(val, i) in dict.checkResultSub" :key="i" :label="val" >{{ val }}</el-radio @@ -121,7 +134,7 @@ </el-radio-group> </el-form-item> </el-row> - <div v-if="form.checkResult == '鍔犲垎鎴栨墸鍒�'"> + <div v-if="form.checkResult == '鏍告煡鎵e垎' || '鏍告煡鍔犲垎'"> <el-row> <el-form-item :label="form.view == '鏌ョ湅' ? '缁╂晥瑙勫垯锛�' : '淇敼瑙勫垯锛�'" diff --git a/attendance-performance-manager-ui/admin/src/views/check/complain/record/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/check/complain/record/drawershow.vue index 0d4d75f5f386ff989ab024309bf13ab32abfe31a..b6f045c5287fac6bef9b706b24eb25b6384fd7c3 100644 --- a/attendance-performance-manager-ui/admin/src/views/check/complain/record/drawershow.vue +++ b/attendance-performance-manager-ui/admin/src/views/check/complain/record/drawershow.vue @@ -112,15 +112,9 @@ <div class="content"> <el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-row> - <el-form-item label="鏍告煡缁撴灉锛�"> + <el-form-item label="鏍告煡缁撴灉锛�" v-if="form.subAddType == 1"> <p v-if="form.view == '鏌ョ湅'"> - {{ - form.checkResult == 1 - ? "鍔犲垎/鎵e垎" - : form.checkResult == 2 - ? "涓嶅姞鍒�/涓嶆墸鍒�" - : "--" - }} + {{ form.checkResult }} </p> <el-radio-group v-model="form.checkResult" @@ -128,7 +122,24 @@ v-else > <el-radio - v-for="(val, i) in dict.checkResult" + v-for="(val, i) in dict.checkResultAdd" + :key="i" + :label="val" + >{{ val }}</el-radio + > + </el-radio-group> + </el-form-item> + <el-form-item label="鏍告煡缁撴灉锛�" v-else> + <p v-if="form.view == '鏌ョ湅'"> + {{ form.checkResult }} + </p> + <el-radio-group + v-model="form.checkResult" + @input="radioChange" + v-else + > + <el-radio + v-for="(val, i) in dict.checkResultSub" :key="i" :label="val" >{{ val }}</el-radio @@ -136,7 +147,7 @@ </el-radio-group> </el-form-item> </el-row> - <div v-if="form.checkResult == '鍔犲垎鎴栨墸鍒�'"> + <div v-if="form.checkResult == '鏍告煡鎵e垎' || '鏍告煡鍔犲垎'"> <el-row> <el-form-item :label="form.view == '鏌ョ湅' ? '缁╂晥瑙勫垯锛�' : '淇敼瑙勫垯锛�'" diff --git a/attendance-performance-manager-ui/admin/src/views/check/effect/record/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/check/effect/record/drawershow.vue index 02c7140891c8260bef08c6ae9f93fb7d29b10f2a..12eac71e38f8b3a8fa000936318a1f999894eae3 100644 --- a/attendance-performance-manager-ui/admin/src/views/check/effect/record/drawershow.vue +++ b/attendance-performance-manager-ui/admin/src/views/check/effect/record/drawershow.vue @@ -89,15 +89,9 @@ <div class="content"> <el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-row> - <el-form-item label="鏍告煡缁撴灉锛�"> + <el-form-item label="鏍告煡缁撴灉锛�" v-if="form.subAddType == 1"> <p v-if="form.view == '鏌ョ湅'"> - {{ - form.checkResult == 1 - ? "鍔犲垎/鎵e垎" - : form.checkResult == 2 - ? "涓嶅姞鍒�/涓嶆墸鍒�" - : "--" - }} + {{ form.checkResult }} </p> <el-radio-group v-model="form.checkResult" @@ -105,7 +99,24 @@ v-else > <el-radio - v-for="(val, i) in dict.checkResult" + v-for="(val, i) in dict.checkResultAdd" + :key="i" + :label="val" + >{{ val }}</el-radio + > + </el-radio-group> + </el-form-item> + <el-form-item label="鏍告煡缁撴灉锛�" v-else> + <p v-if="form.view == '鏌ョ湅'"> + {{ form.checkResult }} + </p> + <el-radio-group + v-model="form.checkResult" + @input="radioChange" + v-else + > + <el-radio + v-for="(val, i) in dict.checkResultSub" :key="i" :label="val" >{{ val }}</el-radio @@ -113,7 +124,7 @@ </el-radio-group> </el-form-item> </el-row> - <div v-if="form.checkResult == '鍔犲垎鎴栨墸鍒�'"> + <div v-if="form.checkResult == '鏍告煡鎵e垎' || '鏍告煡鍔犲垎'"> <el-row> <el-form-item :label="form.view == '鏌ョ湅' ? '缁╂晥瑙勫垯锛�' : '淇敼瑙勫垯锛�'" diff --git a/attendance-performance-manager-ui/admin/src/views/check/gowork/record/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/check/gowork/record/drawershow.vue index 718a40769299f9f9f7e27b7f572457c838aeacb5..493d197c9dbaeedb2ef719cc1481923a2774aae5 100644 --- a/attendance-performance-manager-ui/admin/src/views/check/gowork/record/drawershow.vue +++ b/attendance-performance-manager-ui/admin/src/views/check/gowork/record/drawershow.vue @@ -91,15 +91,9 @@ <div class="content"> <el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-row> - <el-form-item label="鏍告煡缁撴灉锛�"> + <el-form-item label="鏍告煡缁撴灉锛�" v-if="form.subAddType == 1"> <p v-if="form.view == '鏌ョ湅'"> - {{ - form.checkResult == 1 - ? "鍔犲垎/鎵e垎" - : form.checkResult == 2 - ? "涓嶅姞鍒�/涓嶆墸鍒�" - : "--" - }} + {{ form.checkResult }} </p> <el-radio-group v-model="form.checkResult" @@ -107,7 +101,24 @@ v-else > <el-radio - v-for="(val, i) in dict.checkResult" + v-for="(val, i) in dict.checkResultAdd" + :key="i" + :label="val" + >{{ val }}</el-radio + > + </el-radio-group> + </el-form-item> + <el-form-item label="鏍告煡缁撴灉锛�" v-else> + <p v-if="form.view == '鏌ョ湅'"> + {{ form.checkResult }} + </p> + <el-radio-group + v-model="form.checkResult" + @input="radioChange" + v-else + > + <el-radio + v-for="(val, i) in dict.checkResultSub" :key="i" :label="val" >{{ val }}</el-radio @@ -115,7 +126,7 @@ </el-radio-group> </el-form-item> </el-row> - <div v-if="form.checkResult == '鍔犲垎鎴栨墸鍒�'"> + <div v-if="form.checkResult == '鏍告煡鎵e垎' || '鏍告煡鍔犲垎'"> <el-row> <el-form-item :label="form.view == '鏌ョ湅' ? '缁╂晥瑙勫垯锛�' : '淇敼瑙勫垯锛�'" diff --git a/attendance-performance-manager-ui/admin/src/views/check/other/record/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/check/other/record/drawershow.vue index 12e7bec3b2bce9c94d20ac128ffdddf87645aef7..8acb6e321e5091376de0b785552b6007b773a615 100644 --- a/attendance-performance-manager-ui/admin/src/views/check/other/record/drawershow.vue +++ b/attendance-performance-manager-ui/admin/src/views/check/other/record/drawershow.vue @@ -87,15 +87,9 @@ <div class="content"> <el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-row> - <el-form-item label="鏍告煡缁撴灉锛�"> + <el-form-item label="鏍告煡缁撴灉锛�" v-if="form.subAddType == 1"> <p v-if="form.view == '鏌ョ湅'"> - {{ - form.checkResult == 1 - ? "鍔犲垎/鎵e垎" - : form.checkResult == 2 - ? "涓嶅姞鍒�/涓嶆墸鍒�" - : "--" - }} + {{ form.checkResult }} </p> <el-radio-group v-model="form.checkResult" @@ -103,7 +97,24 @@ v-else > <el-radio - v-for="(val, i) in dict.checkResult" + v-for="(val, i) in dict.checkResultAdd" + :key="i" + :label="val" + >{{ val }}</el-radio + > + </el-radio-group> + </el-form-item> + <el-form-item label="鏍告煡缁撴灉锛�" v-else> + <p v-if="form.view == '鏌ョ湅'"> + {{ form.checkResult }} + </p> + <el-radio-group + v-model="form.checkResult" + @input="radioChange" + v-else + > + <el-radio + v-for="(val, i) in dict.checkResultSub" :key="i" :label="val" >{{ val }}</el-radio @@ -111,7 +122,7 @@ </el-radio-group> </el-form-item> </el-row> - <div v-if="form.checkResult == '鍔犲垎鎴栨墸鍒�'"> + <div v-if="form.checkResult == '鏍告煡鎵e垎' || '鏍告煡鍔犲垎'"> <el-row> <el-form-item :label="form.view == '鏌ョ湅' ? '缁╂晥瑙勫垯锛�' : '淇敼瑙勫垯锛�'" diff --git a/attendance-performance-manager-ui/admin/src/views/check/review/record/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/check/review/record/drawershow.vue index 859ca1f37ba49bc6d5d6c7bb04d8f3295e660c7b..f97189f55112599595b7438b148f2df00f640d42 100644 --- a/attendance-performance-manager-ui/admin/src/views/check/review/record/drawershow.vue +++ b/attendance-performance-manager-ui/admin/src/views/check/review/record/drawershow.vue @@ -92,15 +92,9 @@ <div class="content"> <el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-row> - <el-form-item label="鏍告煡缁撴灉锛�"> + <el-form-item label="鏍告煡缁撴灉锛�" v-if="form.subAddType == 1"> <p v-if="form.view == '鏌ョ湅'"> - {{ - form.checkResult == 1 - ? "鍔犲垎/鎵e垎" - : form.checkResult == 2 - ? "涓嶅姞鍒�/涓嶆墸鍒�" - : "--" - }} + {{ form.checkResult }} </p> <el-radio-group v-model="form.checkResult" @@ -108,7 +102,24 @@ v-else > <el-radio - v-for="(val, i) in dict.checkResult" + v-for="(val, i) in dict.checkResultAdd" + :key="i" + :label="val" + >{{ val }}</el-radio + > + </el-radio-group> + </el-form-item> + <el-form-item label="鏍告煡缁撴灉锛�" v-else> + <p v-if="form.view == '鏌ョ湅'"> + {{ form.checkResult }} + </p> + <el-radio-group + v-model="form.checkResult" + @input="radioChange" + v-else + > + <el-radio + v-for="(val, i) in dict.checkResultSub" :key="i" :label="val" >{{ val }}</el-radio @@ -116,7 +127,7 @@ </el-radio-group> </el-form-item> </el-row> - <div v-if="form.checkResult == '鍔犲垎鎴栨墸鍒�'"> + <div v-if="form.checkResult == '鏍告煡鎵e垎' || '鏍告煡鍔犲垎'"> <el-row> <el-form-item :label="form.view == '鏌ョ湅' ? '缁╂晥瑙勫垯锛�' : '淇敼瑙勫垯锛�'" diff --git a/attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/list.vue b/attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/list.vue index d06fcbb618e046a18bce8b9da516a6d4830465e7..6de18e6d228892e9b4cca67f0560bc7588b881ee 100644 --- a/attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/list.vue +++ b/attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/list.vue @@ -109,9 +109,9 @@ export default { ? this.$post("/perform/attend/appeal/list", { processStatus: this.activeName, }).then((res) => { - console.log(res); if (res.code == 1) { this.tableData = res.data; + this.dict = res.dict; } }) : this.getChartsData();