Merge remote-tracking branch 'origin/master'

cd490d8a · 赵啸非 · 21ada6d6 · 77f50345 · cd490d8a · cd490d8a
Commit cd490d8a authored Jul 17, 2023 by 赵啸非
18 changed files
--- a/attendance-performance-manager-ui/admin/src/assets/mixins/table.js
+++ b/attendance-performance-manager-ui/admin/src/assets/mixins/table.js
@@ -489,6 +489,7 @@ export default {
    },
    // 当某一行被点击时会触发该事件
    handleRowClick(row, column, event) {},
+    handleCellClick(row, column, event) {},
    // 合并表格行列
    handleSpanMethod() {},
    // 自定义表格排序
@@ -619,6 +620,7 @@ export default {
        methods: {
          handleSelectionChange: this.handleSelectionChange,
          handleRowClick: this.handleRowClick,
+          handleCellClick: this.handleCellClick,
          tableRowClassName: this.tableRowClassName,
          handleSpanMethod: this.handleSpanMethod,
          handleSortChange: this.handleSortChange,

--- a/attendance-performance-manager-ui/admin/src/components/DataTable.vue
+++ b/attendance-performance-manager-ui/admin/src/components/DataTable.vue
@@ -8,6 +8,7 @@
    @selection-change="handleSelectionChange"
    @sort-change="handleSortChange"
    @row-click="handleRowClick"
+    @cell-click="handleCellClick"
    :row-class-name="tableRowClassName"
    :empty-text="emptytxt ? emptytxt : emptyText"
    border
@@ -81,6 +82,11 @@ export default {
      required: false,
      default: () => {},
    },
+    handleCellClick: {
+      type: Function,
+      required: false,
+      default: () => {},
+    },
    handleSortChange: {
      type: Function,
      required: false,

--- a/attendance-performance-manager-ui/admin/src/components/Table.vue
+++ b/attendance-performance-manager-ui/admin/src/components/Table.vue
@@ -182,6 +182,7 @@
          :handleSelectableMethod="config.methods.handleSelectableMethod"
          :handleSelectionChange="config.methods.handleSelectionChange"
          :handleRowClick="config.methods.handleRowClick"
+          :handleCellClick="config.methods.handleCellClick"
        />

        <DataTableFlow

--- 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
@@ -71,6 +71,7 @@
              >图片凭证：

              <el-image
+                v-if="form.filePaths"
                style="width: 100px; height: 100px"
                :src="
                  `${
@@ -82,6 +83,7 @@
                :preview-src-list="form.filePaths"
              >
              </el-image>
+              <span v-else>--</span>
            </el-col>
          </el-row>
        </div>
@@ -106,12 +108,16 @@
                  @input="radioChange"
                  v-else
                >
-                  <el-radio :label="1">加分/扣分</el-radio>
-                  <el-radio :label="2">不加分/不扣分</el-radio>
+                  <el-radio
+                    v-for="(val, i) in dict.checkResult"
+                    :key="i"
+                    :label="val"
+                    >{{ val }}</el-radio
+                  >
                </el-radio-group>
              </el-form-item>
            </el-row>
-            <div v-if="form.checkResult == 1">
+            <div v-if="form.checkResult == '加分或扣分'">
              <el-row>
                <el-form-item
                  :label="form.view == '查看' ? '绩效规则：' : '修改规则：'"
@@ -441,7 +447,6 @@ export default {

      await this.$get("/check/attend/record/info", { id: row.id }).then(
        (res) => {
-          console.log(res.data);
          if (res.code == 1) {
            this.form = res.data;
            this.dict = res.dict;

--- 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
@@ -86,6 +86,7 @@
            <el-col :span="12"
              >图片凭证：
              <el-image
+                v-if="form.filePaths"
                style="width: 100px; height: 100px"
                :src="
                  `${
@@ -96,8 +97,9 @@
                "
                :preview-src-list="form.filePaths"
              >
-              </el-image
-            ></el-col>
+              </el-image>
+              <span v-else>--</span>
+            </el-col>
          </el-row>
        </div>
      </div>
@@ -121,12 +123,16 @@
                  @input="radioChange"
                  v-else
                >
-                  <el-radio :label="1">加分/扣分</el-radio>
-                  <el-radio :label="2">不加分/不扣分</el-radio>
+                  <el-radio
+                    v-for="(val, i) in dict.checkResult"
+                    :key="i"
+                    :label="val"
+                    >{{ val }}</el-radio
+                  >
                </el-radio-group>
              </el-form-item>
            </el-row>
-            <div v-if="form.checkResult == 1">
+            <div v-if="form.checkResult == '加分或扣分'">
              <el-row>
                <el-form-item
                  :label="form.view == '查看' ? '绩效规则：' : '修改规则：'"

--- 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
@@ -63,6 +63,7 @@
            <el-col :span="24">
              图片凭证：
              <el-image
+                v-if="form.filePaths"
                style="width: 100px; height: 100px"
                :src="
                  `${
@@ -73,8 +74,9 @@
                "
                :preview-src-list="form.filePaths"
              >
-              </el-image
-            ></el-col>
+              </el-image>
+              <span v-else>--</span>
+            </el-col>
          </el-row>
        </div>
      </div>
@@ -98,12 +100,16 @@
                  @input="radioChange"
                  v-else
                >
-                  <el-radio :label="1">加分/扣分</el-radio>
-                  <el-radio :label="2">不加分/不扣分</el-radio>
+                  <el-radio
+                    v-for="(val, i) in dict.checkResult"
+                    :key="i"
+                    :label="val"
+                    >{{ val }}</el-radio
+                  >
                </el-radio-group>
              </el-form-item>
            </el-row>
-            <div v-if="form.checkResult == 1">
+            <div v-if="form.checkResult == '加分或扣分'">
              <el-row>
                <el-form-item
                  :label="form.view == '查看' ? '绩效规则：' : '修改规则：'"

--- 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
@@ -65,6 +65,7 @@
            <el-col :span="24">
              图片凭证：
              <el-image
+                v-if="form.filePaths"
                style="width: 100px; height: 100px"
                :src="
                  `${
@@ -75,8 +76,9 @@
                "
                :preview-src-list="form.filePaths"
              >
-              </el-image
-            ></el-col>
+              </el-image>
+              <span v-else>--</span>
+            </el-col>
          </el-row>
        </div>
      </div>
@@ -100,12 +102,16 @@
                  @input="radioChange"
                  v-else
                >
-                  <el-radio :label="1">加分/扣分</el-radio>
-                  <el-radio :label="2">不加分/不扣分</el-radio>
+                  <el-radio
+                    v-for="(val, i) in dict.checkResult"
+                    :key="i"
+                    :label="val"
+                    >{{ val }}</el-radio
+                  >
                </el-radio-group>
              </el-form-item>
            </el-row>
-            <div v-if="form.checkResult == 1">
+            <div v-if="form.checkResult == '加分或扣分'">
              <el-row>
                <el-form-item
                  :label="form.view == '查看' ? '绩效规则：' : '修改规则：'"

--- 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
@@ -61,6 +61,7 @@
            <el-col :span="24"
              >图片凭证：
              <el-image
+                v-if="form.filePaths"
                style="width: 100px; height: 100px"
                :src="
                  `${
@@ -71,8 +72,9 @@
                "
                :preview-src-list="form.filePaths"
              >
-              </el-image
-            ></el-col>
+              </el-image>
+              <span v-else>--</span>
+            </el-col>
          </el-row>
        </div>
      </div>
@@ -96,12 +98,16 @@
                  @input="radioChange"
                  v-else
                >
-                  <el-radio :label="1">加分/扣分</el-radio>
-                  <el-radio :label="2">不加分/不扣分</el-radio>
+                  <el-radio
+                    v-for="(val, i) in dict.checkResult"
+                    :key="i"
+                    :label="val"
+                    >{{ val }}</el-radio
+                  >
                </el-radio-group>
              </el-form-item>
            </el-row>
-            <div v-if="form.checkResult == 1">
+            <div v-if="form.checkResult == '加分或扣分'">
              <el-row>
                <el-form-item
                  :label="form.view == '查看' ? '绩效规则：' : '修改规则：'"

--- 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
@@ -66,6 +66,7 @@
            <el-col :span="12"
              >图片凭证：
              <el-image
+                v-if="form.filePaths"
                style="width: 100px; height: 100px"
                :src="
                  `${
@@ -76,8 +77,9 @@
                "
                :preview-src-list="form.filePaths"
              >
-              </el-image
-            ></el-col>
+              </el-image>
+              <span v-else>--</span>
+            </el-col>
          </el-row>
        </div>
      </div>
@@ -101,12 +103,16 @@
                  @input="radioChange"
                  v-else
                >
-                  <el-radio :label="1">加分/扣分</el-radio>
-                  <el-radio :label="2">不加分/不扣分</el-radio>
+                  <el-radio
+                    v-for="(val, i) in dict.checkResult"
+                    :key="i"
+                    :label="val"
+                    >{{ val }}</el-radio
+                  >
                </el-radio-group>
              </el-form-item>
            </el-row>
-            <div v-if="form.checkResult == 1">
+            <div v-if="form.checkResult == '加分或扣分'">
              <el-row>
                <el-form-item
                  :label="form.view == '查看' ? '绩效规则：' : '修改规则：'"

--- a/attendance-performance-manager-ui/admin/src/views/homeCharts/record/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/homeCharts/record/list.vue
@@ -504,6 +504,7 @@ export default {
    this.getStaff();
    this.getYearRecordAll();
    this.getMonthRecordAll();
+    this.getDayRecordAll();
  },
  mounted() {
    this.staffStatList();
@@ -963,7 +964,7 @@ export default {
        },
        angleAxis: {
          show: false, // 隐藏刻度
-          max: 180,
+          max: Math.max(...values) * 1.5, // 控制柱子高度
          startAngle: 90,
        },
        radiusAxis: {
@@ -1048,6 +1049,11 @@ export default {
    // 1分值自动刷新数据
    autoUpdata() {
      this.timer = setInterval(() => {
+        this.getDeptList();
+        this.getStaff();
+        this.getYearRecordAll();
+        this.getMonthRecordAll();
+        this.getDayRecordAll();
        this.staffStatList();
        this.getException();
        this.depStatList();

--- a/attendance-performance-manager-ui/admin/src/views/perform/attend/record/drawershow.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/attend/record/drawershow.vue
@@ -123,6 +123,7 @@
          <el-form-item label="图片凭证：">
            <div v-if="form.view == '查看'">
              <el-image
+                v-if="form.filePaths"
                style="width: 100px; height: 100px"
                :src="
                  `${
@@ -134,6 +135,7 @@
                :preview-src-list="form.filePaths"
              >
              </el-image>
+              <span v-else>--</span>
            </div>
            <ImageUpload
              v-else

--- a/attendance-performance-manager-ui/admin/src/views/perform/complain/record/drawershow.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/complain/record/drawershow.vue
@@ -175,6 +175,7 @@
          <el-form-item label="图片凭证：">
            <div v-if="form.view == '查看'">
              <el-image
+                v-if="form.filePaths"
                style="width: 100px; height: 100px"
                :src="
                  `${
@@ -186,6 +187,7 @@
                :preview-src-list="form.filePaths"
              >
              </el-image>
+              <span v-else>--</span>
            </div>
            <ImageUpload
              v-else

--- a/attendance-performance-manager-ui/admin/src/views/perform/effect/record/drawershow.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/effect/record/drawershow.vue
@@ -149,6 +149,7 @@
          <el-form-item label="图片凭证：">
            <div v-if="form.view == '查看'">
              <el-image
+                v-if="form.filePaths"
                style="width: 100px; height: 100px"
                :src="
                  `${
@@ -160,6 +161,7 @@
                :preview-src-list="form.filePaths"
              >
              </el-image>
+              <span v-else>--</span>
            </div>
            <ImageUpload
              v-else
@@ -487,7 +489,6 @@ export default {
      this.form.filePaths = val;

      this.$forceUpdate(this.form);
-
    },
    staffChange(val) {
      console.log(val);

--- a/attendance-performance-manager-ui/admin/src/views/perform/gowork/record/drawershow.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/gowork/record/drawershow.vue
@@ -127,6 +127,7 @@
          <el-form-item label="图片凭证：">
            <div v-if="form.view == '查看'">
              <el-image
+                v-if="form.filePaths"
                style="width: 100px; height: 100px"
                :src="
                  `${
@@ -138,6 +139,7 @@
                :preview-src-list="form.filePaths"
              >
              </el-image>
+              <span v-else>--</span>
            </div>
            <ImageUpload
              v-else

--- a/attendance-performance-manager-ui/admin/src/views/perform/other/record/drawershow.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/other/record/drawershow.vue
@@ -87,6 +87,7 @@
          <el-form-item label="图片凭证：">
            <div v-if="form.view == '查看'">
              <el-image
+                v-if="form.filePaths"
                style="width: 100px; height: 100px"
                :src="
                  `${
@@ -98,6 +99,7 @@
                :preview-src-list="form.filePaths"
              >
              </el-image>
+              <span v-else>--</span>
            </div>
            <ImageUpload
              v-else

--- a/attendance-performance-manager-ui/admin/src/views/perform/review/record/drawershow.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/review/record/drawershow.vue
@@ -140,6 +140,7 @@
          <el-form-item label="图片凭证：">
            <div v-if="form.view == '查看'">
              <el-image
+                v-if="form.filePaths"
                style="width: 100px; height: 100px"
                :src="
                  `${
@@ -151,6 +152,7 @@
                :preview-src-list="form.filePaths"
              >
              </el-image>
+              <span v-else>--</span>
            </div>
            <ImageUpload
              v-else

--- a/attendance-performance-manager-ui/admin/src/views/perform/staff/conf/deptdrawershow.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/staff/conf/deptdrawershow.vue
@@ -381,6 +381,7 @@ export default {
    };
  },
  methods: {
+    
    handleRowClick(val) {
      val.check = !val.check;
      val.check

--- a/attendance-performance-manager-ui/admin/src/views/perform/staff/conf/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/staff/conf/list.vue
@@ -103,6 +103,11 @@ export default {
    sessionStorage.setItem("type", this.type);
  },
  methods: {
+    handleCellClick(row, column, event, cell) {
+      if (column.label == "负责窗口数量") {
+        this.$refs.windowdrawerform.edit(row);
+      }
+    },
    /** 重写新增方法 */
    toAdd(row) {
      this.$refs.windowdrawerform.add(row);