Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/attendance/leave/record/list.vue

@@ -92,7 +92,6 @@ export default {
             name: "leaveType",
             type: "select",
             label: "请假类型",
-            fuzzy: false,
           },
           {
             name: "startTime",
@@ -141,7 +140,19 @@ export default {
 
           /*          {label: "处理状态", prop: "processStatus", formatter: this.formatter},*/
 
-          { label: "状态", prop: "auditResult", formatter: this.formatter },
+          {
+            label: "状态",
+            prop: "auditResult",
+            formatter: (row) => {
+              return row.processStatus
+                ? row.processStatus == 1
+                  ? "审核中"
+                  : row.auditResult == 1
+                  ? "通过"
+                  : "不通过"
+                : "--";
+            },
+          },
           { label: "审批负责人", prop: "approver" },
 
           {

attendance-performance-manager-ui/admin/src/views/attendance/vacation/balance/list.vue

@@ -70,7 +70,6 @@ export default {
             name: "deptId",
             type: "select",
             label: "全部部门",
-            fuzzy: true,
           },
           {
             name: "staffName",

attendance-performance-manager-ui/admin/src/views/check/attend/record/drawershow.vue

@@ -121,7 +121,11 @@
         <div class="content">
           <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
-              <el-form-item label="核查结果：" v-if="form.subAddType == 1">
+              <el-form-item
+                label="核查结果："
+                prop="checkResult"
+                v-if="form.subAddType == 1"
+              >
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -138,7 +142,7 @@
                   >
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="核查结果：" v-else>
+              <el-form-item label="核查结果：" prop="checkResult" v-else>
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -431,6 +435,9 @@ export default {
           { max: 64, message: "最多只能录入64个字符", trigger: "blur" },
         ],
         createTime: [{ required: true, message: "请选择创建时间" }],
+        checkResult: [
+          { required: true, message: "请选择核查结果", trigger: "change" },
+        ],
       },
       form: {},
       kaoqinCateArr: [],
@@ -511,7 +518,6 @@ export default {
               ? (this.form[key] = timestampToTime(this.form[key], 6))
               : "";
           }
-          this.form.checkResult = 1;
           this.form.view = "核查";
 
           this.$post("/perform/rules/list", {

attendance-performance-manager-ui/admin/src/views/check/complain/record/drawershow.vue

@@ -132,7 +132,11 @@
         <div class="content">
           <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
-              <el-form-item label="核查结果：" v-if="form.subAddType == 1">
+              <el-form-item
+                label="核查结果："
+                prop="checkResult"
+                v-if="form.subAddType == 1"
+              >
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -149,7 +153,7 @@
                   >
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="核查结果：" v-else>
+              <el-form-item label="核查结果：" prop="checkResult" v-else>
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -461,7 +465,9 @@ export default {
           { required: true, message: "请输入员工姓名", trigger: "blur" },
           { max: 64, message: "最多只能录入64个字符", trigger: "blur" },
         ],
-        createTime: [{ required: true, message: "请选择创建时间" }],
+        checkResult: [
+          { required: true, message: "请选择核查结果", trigger: "change" },
+        ],
       },
       form: {},
       kaoqinCateArr: [],
@@ -539,7 +545,6 @@ export default {
               ? (this.form[key] = timestampToTime(this.form[key], 6))
               : "";
           }
-          this.form.checkResult = 1;
           this.$post("/perform/rules/list", {
             page: 1,
             size: -1,

attendance-performance-manager-ui/admin/src/views/check/effect/record/drawershow.vue

@@ -107,7 +107,11 @@
         <div class="content">
           <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
-              <el-form-item label="核查结果：" v-if="form.subAddType == 1">
+              <el-form-item
+                label="核查结果："
+                prop="checkResult"
+                v-if="form.subAddType == 1"
+              >
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -124,7 +128,7 @@
                   >
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="核查结果：" v-else>
+              <el-form-item label="核查结果：" prop="checkResult" v-else>
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -431,6 +435,9 @@ export default {
           { max: 64, message: "最多只能录入64个字符", trigger: "blur" },
         ],
         createTime: [{ required: true, message: "请选择创建时间" }],
+        checkResult: [
+          { required: true, message: "请选择核查结果", trigger: "change" },
+        ],
       },
       form: {},
       kaoqinCateArr: [],
@@ -510,7 +517,6 @@ export default {
               ? (this.form[key] = timestampToTime(this.form[key], 6))
               : "";
           }
-          this.form.checkResult = 1;
           this.$post("/perform/rules/list", {
             page: 1,
             size: -1,

attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue

@@ -338,7 +338,7 @@ export default {
                   noEdit
                   reCheck
                   noView
-                  text={"效能核查"}
+                  text={"监察绩效核查"}
                   row={row}
                   onEdit={this.toEdit}
                   onView={this.toView}

attendance-performance-manager-ui/admin/src/views/check/gowork/record/drawershow.vue

@@ -109,7 +109,11 @@
         <div class="content">
           <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
-              <el-form-item label="核查结果：" v-if="form.subAddType == 1">
+              <el-form-item
+                label="核查结果："
+                prop="checkResult"
+                v-if="form.subAddType == 1"
+              >
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -126,7 +130,7 @@
                   >
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="核查结果：" v-else>
+              <el-form-item label="核查结果：" prop="checkResult" v-else>
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -426,6 +430,9 @@ export default {
           { max: 64, message: "最多只能录入64个字符", trigger: "blur" },
         ],
         createTime: [{ required: true, message: "请选择创建时间" }],
+        checkResult: [
+          { required: true, message: "请选择核查结果", trigger: "change" },
+        ],
       },
       form: {},
       kaoqinCateArr: [],
@@ -503,7 +510,6 @@ export default {
               ? (this.form[key] = timestampToTime(this.form[key], 6))
               : "";
           }
-          this.form.checkResult = 1;
           this.$post("/perform/rules/list", {
             page: 1,
             size: -1,

attendance-performance-manager-ui/admin/src/views/check/other/record/drawershow.vue

@@ -105,7 +105,11 @@
         <div class="content">
           <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
-              <el-form-item label="核查结果：" v-if="form.subAddType == 1">
+              <el-form-item
+                label="核查结果："
+                prop="checkResult"
+                v-if="form.subAddType == 1"
+              >
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -122,7 +126,7 @@
                   >
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="核查结果：" v-else>
+              <el-form-item label="核查结果：" prop="checkResult" v-else>
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -423,6 +427,9 @@ export default {
           { max: 64, message: "最多只能录入64个字符", trigger: "blur" },
         ],
         createTime: [{ required: true, message: "请选择创建时间" }],
+        checkResult: [
+          { required: true, message: "请选择核查结果", trigger: "change" },
+        ],
       },
       form: {},
       kaoqinCateArr: [],
@@ -502,7 +509,6 @@ export default {
               ? (this.form[key] = timestampToTime(this.form[key], 6))
               : "";
           }
-          this.form.checkResult = 1;
           this.$post("/perform/rules/list", {
             page: 1,
             size: -1,

attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue

@@ -304,7 +304,7 @@ export default {
                   noEdit
                   reCheck
                   noView
-                  text={"其他核查"}
+                  text={"绩效核查"}
                   row={row}
                   onEdit={this.toEdit}
                   onView={this.toView}

attendance-performance-manager-ui/admin/src/views/check/review/record/drawershow.vue

@@ -24,7 +24,9 @@
             >
             <el-col :span="12"
               >评价结果：{{
-                form.reviewResult ? form.reviewResult : "--"
+                form.reviewResult
+                  ? util_formatter("reviewResult", form.reviewResult)
+                  : "--"
               }}</el-col
             >
           </el-row>
@@ -110,7 +112,11 @@
         <div class="content">
           <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
-              <el-form-item label="核查结果：" v-if="form.subAddType == 1">
+              <el-form-item
+                label="核查结果："
+                v-if="form.subAddType == 1"
+                prop="checkResult"
+              >
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -127,7 +133,7 @@
                   >
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="核查结果：" v-else>
+              <el-form-item label="核查结果：" prop="checkResult" v-else>
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -149,6 +155,7 @@
               <el-row>
                 <el-form-item
                   :label="form.view == '查看' ? '绩效规则：' : '修改规则：'"
+                  prop="categoryId"
                 >
                   <p v-if="form.view == '查看'">{{ form.ruleName }}</p>
                   <div v-else>
@@ -187,6 +194,7 @@
               <el-row>
                 <el-form-item
                   :label="form.subAddType == 1 ? '加分分值：' : '扣分分值：'"
+                  prop="score"
                 >
                   <p v-if="form.view == '查看'">
                     {{ form.subAddType == 1 ? "+" : "-"
@@ -199,7 +207,7 @@
               </el-row>
             </div>
             <el-row>
-              <el-form-item label="说明：">
+              <el-form-item label="说明：" prop="checkDesc">
                 <p v-if="form.view == '查看'">{{ form.checkDesc }}</p>
                 <el-input
                   v-else
@@ -209,12 +217,12 @@
               </el-form-item>
             </el-row>
             <el-row v-if="form.view == '查看'">
-              <el-form-item label="核查人员：">
+              <el-form-item label="核查人员：" prop="checkPerson">
                 <p>{{ form.checkPerson ? form.checkPerson : "--" }}</p>
               </el-form-item>
             </el-row>
             <el-row v-if="form.view == '查看'">
-              <el-form-item label="核查时间：">
+              <el-form-item label="核查时间：" prop="checkTime">
                 <p>{{ form.checkTime ? form.checkTime : "--" }}</p>
               </el-form-item>
             </el-row>
@@ -424,13 +432,10 @@ export default {
       toDate: ["reviewTime", "deductTime", "checkTime"],
       // 表单校验
       rules: {
-        staffName: [
-          { required: true, message: "请输入员工姓名", trigger: "blur" },
-          { max: 64, message: "最多只能录入64个字符", trigger: "blur" },
+        checkResult: [
+          { required: true, message: "请选择核查结果", trigger: "change" },
         ],
-        createTime: [{ required: true, message: "请选择创建时间" }],
       },
-      form: {},
       kaoqinCateArr: [],
       kaoqinArr: [],
       urls: { saveUrl: "/check/review/record/examine" }, //重写核查地址
@@ -504,7 +509,6 @@ export default {
               ? (this.form[key] = timestampToTime(this.form[key], 6))
               : "";
           }
-          this.form.checkResult = 1;
           this.$post("/perform/rules/list", {
             page: 1,
             size: -1,
@@ -562,7 +566,6 @@ export default {
               : "";
           }
           this.form.view = "查看";
-          console.log(this.form);
           this.open = true;
         }
       );

attendance-performance-manager-ui/admin/src/views/feedback/addQuestion/list.vue

@@ -73,7 +73,8 @@
                             </el-date-picker>
                         </el-form-item>
                         <el-form-item label="邀请人员：" label-width="125px">
-                            <el-button size="small" type="success" @click="treeDialog = 1">选择人员</el-button>
+                            <el-button size="small" type="success" @click="treeDialog = 1">{{
+                                checkedUser.length > 0 ? `已选择 ${checkedUser.length} 人` : '选择人员 + ' }}</el-button>
                         </el-form-item>
                         <div style="text-align: center;">
                             <el-button size="small" @click="issueDialog = false">取消</el-button>
@@ -185,7 +186,7 @@ export default {
             editStyle: false,
             loadingstate: false,
             ImgUrl: process.env.VUE_APP_API_BASE_URL,
-            showImgUrl:'',
+            showImgUrl: '',
             coverImg: [],
 
             weblink: 0,
@@ -199,11 +200,11 @@ export default {
             }
         }
     },
-    created(){
-        if(process.env.NODE_ENV == "development"){
-            this.showImgUrl= process.env.VUE_APP_API_BASE_URL
-        }else{
-            this.showImgUrl=''
+    created() {
+        if (process.env.NODE_ENV == "development") {
+            this.showImgUrl = process.env.VUE_APP_API_BASE_URL
+        } else {
+            this.showImgUrl = ''
         }
     },
     mounted() {

attendance-performance-manager-ui/admin/src/views/perform/gowork/record/drawershow.vue

@@ -68,8 +68,8 @@
         <el-col :span="22">
           <el-form-item label="办件编码：">
             <p v-if="form.view == '查看'">{{ form.goworkCode }}</p>
-
             <el-input
+              v-else
               v-model="form.goworkCode"
               placeholder="请输入办件编码"
             ></el-input>
@@ -479,7 +479,7 @@ export default {
       this.query = { id: row.id };
       // this.urls.currUrl = "perform/gowork/record/edit";
       // this.getData();
-      this.$get("/perform/review/record/info", { id: row.id }).then((res) => {
+      this.$get("/perform/gowork/record/info", { id: row.id }).then((res) => {
         console.log(res.data);
         if (res.code == 1) {
           this.form = res.data;
@@ -537,7 +537,7 @@ export default {
       this.query = { id: row.id };
       // this.urls.currUrl = "perform/gowork/record/view";
       // this.getData();
-      this.$get("/perform/review/record/info", { id: row.id }).then((res) => {
+      this.$get("/perform/gowork/record/info", { id: row.id }).then((res) => {
         if (res.code == 1) {
           this.form = res.data;
         } else {