推

src/assets/mixins/table.js

@@ -46,6 +46,7 @@ export default {
           delete this.query.errorTimeEnd;
         }
       }
+
       this.getData();
     },
   },
@@ -693,8 +694,9 @@ export default {
             ? "/check/window/perform/list"
             : this.$route.path.indexOf("/window/workman/perform/list") == 0
             ? "/check/window/workman/perform/list"
-            : this.$route.path.indexOf("/check/window/workman/perform/detail/list") ==
-              0
+            : this.$route.path.indexOf(
+                "/check/window/workman/perform/detail/list"
+              ) == 0
             ? "/window/workman/perform/detail/list"
             : this.$route.path,
         edit: this.$route.path.replace("/list", "/edit"),

src/components/SearchForm.vue

@@ -428,6 +428,7 @@ export default {
           }
         }
       });
+
       this.form = Object.assign({}, this.form, newFormData);
       // this.form = Object.assign({}, this.form, data);
       // console.log("after form",this.form)
@@ -449,6 +450,7 @@ export default {
       delete this.$route.query.yearmonth;
       delete this.$route.query.createTimeMonth;
       delete this.$route.query.orderColList;
+
       this.form = Object.assign({}, this.form, newData);
       this.onSubmit();
     },
@@ -534,6 +536,10 @@ export default {
           this.form.attendanceDateEnd = timestampToTime(new Date(), 3);
         }
       }
+      if (this.$route.name == "perform/effect/record/list") {
+        this.form.subMethod ? "" : (this.form.subMethod = "1");
+        console.log(this.form.subMethod);
+      }
       let params = JSON.parse(JSON.stringify(this.form)); //不更改原始数据
       let data = this.decode(params);
 

src/views/perform/effect/record/drawershow.vue

@@ -98,6 +98,8 @@
                   ? "玩手机"
                   : form.irregularType == 4
                   ? "睡觉"
+                  : form.irregularType == 4
+                  ? "其他"
                   : "--"
               }}
             </p>
@@ -188,7 +190,16 @@
                 "
               >
               </el-image> -->
-              <filepReview v-if="form.filePaths" :src="form.filePaths" />
+              <filepReview
+                v-if="form.filePaths || form.snapPath"
+                :src="
+                  form.filePaths
+                    ? form.filePaths
+                    : form.snapPath
+                    ? form.snapPath
+                    : []
+                "
+              />
               <span v-else>--</span>
             </div>
             <ImageUpload
@@ -240,7 +251,9 @@
       </el-row>
       <el-row>
         <el-col :span="22">
-          <el-form-item :label="form.subAddType == 1 ? '加分分值：' : '扣分分值：'">
+          <el-form-item
+            :label="form.subAddType == 1 ? '加分分值：' : '扣分分值：'"
+          >
             <p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
           </el-form-item>
         </el-col>
@@ -489,6 +502,10 @@ export default {
           label: "睡觉",
           value: 4,
         },
+        {
+          label: "其他",
+          value: 5,
+        },
       ],
       form: {},
       baseUrl: process.env.VUE_APP_API_BASE_URL + "/",

src/views/perform/effect/record/list.vue

@@ -178,6 +178,12 @@ export default {
       config: {
         isshowTabPane: true,
         search: [
+          {
+            name: "subMethod",
+            type: "select",
+            label: "效能分类",
+            fuzzy: false,
+          },
           {
             name: "processStatus",
             type: "select",
@@ -316,9 +322,28 @@ export default {
             width: 200,
             fixed: "right",
             formatter: (row) => {
-              return row.processStatus == 1 ? (
+              return row.subMethod == 1 && row.processStatus == 1 ? (
                 <table-buttons
                   noAdd
+                  noEdit
+                  row={row}
+                  onEdit={this.toEdit}
+                  onView={this.toView}
+                  onDel={this.toDel}
+                />
+              ) : row.subMethod == 2 && row.processStatus == 1 ? (
+                <table-buttons
+                  noAdd
+                  row={row}
+                  onEdit={this.toEdit}
+                  onView={this.toView}
+                  onDel={this.toDel}
+                />
+              ) : row.subMethod == 1 && row.processStatus == 2 ? (
+                <table-buttons
+                  noAdd
+                  noEdit
+                  noDel
                   row={row}
                   onEdit={this.toEdit}
                   onView={this.toView}