Merge remote-tracking branch 'origin/master'

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
-                      ? "加分/扣分"
-                      : 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 == '核查扣分' || '核查加分'">
               <el-row>
                 <el-form-item
                   :label="form.view == '查看' ? '绩效规则：' : '修改规则：'"

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
-                      ? "加分/扣分"
-                      : 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 == '核查扣分' || '核查加分'">
               <el-row>
                 <el-form-item
                   :label="form.view == '查看' ? '绩效规则：' : '修改规则：'"

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
-                      ? "加分/扣分"
-                      : 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 == '核查扣分' || '核查加分'">
               <el-row>
                 <el-form-item
                   :label="form.view == '查看' ? '绩效规则：' : '修改规则：'"

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
-                      ? "加分/扣分"
-                      : 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 == '核查扣分' || '核查加分'">
               <el-row>
                 <el-form-item
                   :label="form.view == '查看' ? '绩效规则：' : '修改规则：'"

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
-                      ? "加分/扣分"
-                      : 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 == '核查扣分' || '核查加分'">
               <el-row>
                 <el-form-item
                   :label="form.view == '查看' ? '绩效规则：' : '修改规则：'"

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
-                      ? "加分/扣分"
-                      : 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 == '核查扣分' || '核查加分'">
               <el-row>
                 <el-form-item
                   :label="form.view == '查看' ? '绩效规则：' : '修改规则：'"

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();