From 6c0ea451a0fcb663c76da277d9f7924489647e56 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 20 三月 2024 20:59:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/calculate/order/index.vue | 262 ++++++++++++++++++++++++++++++++++++++++++++++++++++
src/views/system/work-order/distribute/index.vue | 5
src/views/system/point/index.vue | 18 +-
3 files changed, 272 insertions(+), 13 deletions(-)
diff --git a/src/views/system/calculate/order/index.vue b/src/views/system/calculate/order/index.vue
new file mode 100644
index 0000000..161c00c
--- /dev/null
+++ b/src/views/system/calculate/order/index.vue
@@ -0,0 +1,262 @@
+<template>
+ <div class="app-container">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form-item label="杩濈害鍚�" prop="examineId">
+ <el-input v-model="queryParams.examineId" placeholder="璇疯緭鍏ヨ繚绾﹀悕" clearable @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">鏂板</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
+ @click="handleUpdate">淇敼</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+ @click="handleDelete">鍒犻櫎</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
+ </el-col>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ </el-row>
+
+ <el-table v-loading="loading" :data="scoreList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column label="杩濈害鍚�" align="center" prop="examineName" />
+ <el-table-column label="杩濈害瀵硅薄" align="center" prop="unitName" />
+ <el-table-column label="鍒嗗��" align="center" prop="score" />
+ <el-table-column label="杩濈害瑙勫垯" align="center" prop="scoreCategory">
+ <template slot-scope="scope">
+ <div v-if="scope.row.scoreCategory === 1">瑙嗛鍦ㄧ嚎鐜�</div>
+ <div v-else-if="scope.row.scoreCategory === 2">瀛樺偍鏁呴殰</div>
+ <div v-else-if="scope.row.scoreCategory === 3">淇濋殰宸ヤ綔</div>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍒涘缓浜�" align="center" prop="createBy" />
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" />
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <template slot-scope="scope">
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">淇敼</el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+ @pagination="getList" />
+
+ <!-- 娣诲姞鎴栦慨鏀硅繚绾﹁鍒嗗璇濇 -->
+ <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form-item label="鍒嗗��" prop="score">
+ <el-input v-model="form.score" placeholder="璇疯緭鍏ュ垎鍊�" />
+ </el-form-item>
+ <el-form-item label="鍗曚綅鍚�" prop="unitId">
+ <el-select v-model="form.unitId" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="杩濈害鍚�" prop="examineId">
+ <el-select v-model="form.examineId" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in examineList" :key="item.id" :label="item.value" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="绉垎绫诲瀷" prop="scoreCategory">
+ <el-select v-model="form.scoreCategory" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in scoreCategoryList" :key="item.id" :label="item.value" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import { listScore, getScore, delScore, addScore, updateScore } from "@/api/platform/score";
+import { unitSelect } from "@/api/platform/unit";
+import { publishSelect } from "@/api/platform/publish";
+
+export default {
+ name: "Score",
+ dicts: ['platform_operate_category'],
+ data() {
+ return {
+ operateCategoryList: [
+ { id: 2, value: '浜哄伐鎵撳垎' },
+ { id: 1, value: '绯荤粺鎵撳垎' },
+ ],
+ scoreCategoryList: [
+ { id: 2, value: '瀛樺偍鏁呴殰' },
+ { id: 1, value: '瑙嗛鍦ㄧ嚎鐜�' },
+ { id: 3, value: '淇濋殰宸ヤ綔' },
+ ],
+
+ unitList: [],
+ examineList: [],
+ // 閬僵灞�
+ loading: true,
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 鎬绘潯鏁�
+ total: 0,
+ // 杩濈害璁″垎琛ㄦ牸鏁版嵁
+ scoreList: [],
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ score: null,
+ unitId: null,
+ examineId: null,
+ operateCategory: null,
+ scoreCategory: null,
+ },
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ }
+ };
+ },
+ created() {
+ this.getList();
+ this.selectUnit();
+ this.selectExamine();
+ },
+ methods: {
+ // 杩愮淮鍏徃涓嬫媺鏁版嵁
+ selectUnit() {
+ unitSelect().then(res => {
+ this.unitList = res.data;
+ })
+ },
+ // 杩濈害涓嬫媺鏁版嵁
+ selectExamine() {
+ publishSelect().then(res => {
+ this.examineList = res.data;
+ })
+ },
+ /** 鏌ヨ杩濈害璁″垎鍒楄〃 */
+ getList() {
+ this.loading = true;
+ listScore(this.queryParams).then(response => {
+ this.scoreList = response.rows;
+ this.total = response.total;
+ this.loading = false;
+ });
+ },
+ // 鍙栨秷鎸夐挳
+ cancel() {
+ this.open = false;
+ this.reset();
+ },
+ // 琛ㄥ崟閲嶇疆
+ reset() {
+ this.form = {
+ id: null,
+ score: null,
+ unitId: null,
+ examineId: null,
+ operateCategory: null,
+ scoreCategory: null,
+ createTime: null,
+ createBy: null
+ };
+ this.resetForm("form");
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.queryParams.pageNum = 1;
+ this.getList();
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.resetForm("queryForm");
+ this.handleQuery();
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ this.ids = selection.map(item => item.id)
+ this.single = selection.length !== 1
+ this.multiple = !selection.length
+ },
+ /** 鏂板鎸夐挳鎿嶄綔 */
+ handleAdd() {
+ this.reset();
+ this.open = true;
+ this.title = "娣诲姞杩濈害璁″垎";
+ },
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate(row) {
+ this.reset();
+ const id = row.id || this.ids
+ getScore(id).then(response => {
+ this.form = response.data;
+ this.open = true;
+ this.title = "淇敼杩濈害璁″垎";
+ });
+ },
+ /** 鎻愪氦鎸夐挳 */
+ submitForm() {
+ this.$refs["form"].validate(valid => {
+ if (valid) {
+ if (this.form.id != null) {
+ updateScore(this.form).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ } else {
+ addScore(this.form).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ }
+ }
+ });
+ },
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ handleDelete(row) {
+ const ids = row.id || this.ids;
+ this.$modal.confirm('鏄惁纭鍒犻櫎杩濈害璁″垎缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function () {
+ return delScore(ids);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => { });
+ },
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ handleExport() {
+ this.download('platform/score/export', {
+ ...this.queryParams
+ }, `score_${new Date().getTime()}.xlsx`)
+ }
+ }
+};
+</script>
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index ad4b242..854dc37 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -32,15 +32,15 @@
</el-form>
<el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- >鏂板</el-button>
- </el-col>
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="primary"-->
+<!-- plain-->
+<!-- icon="el-icon-plus"-->
+<!-- size="mini"-->
+<!-- @click="handleAdd"-->
+<!-- >鏂板</el-button>-->
+<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="success"
diff --git a/src/views/system/work-order/distribute/index.vue b/src/views/system/work-order/distribute/index.vue
index d868567..6ae9267 100644
--- a/src/views/system/work-order/distribute/index.vue
+++ b/src/views/system/work-order/distribute/index.vue
@@ -18,9 +18,6 @@
<el-menu-item index="6">璐′簳杩愮淮鍗曚綅(45)</el-menu-item>
<el-menu-item index="7">娌挎哗杩愮淮鍗曚綅(70)</el-menu-item>
</el-menu>
- <el-tooltip class="item" effect="dark" content="宸ュ崟鐢熸垚璁剧疆" placement="left">
-
- </el-tooltip>
<el-popover
placement="right"
width="400"
@@ -95,6 +92,7 @@
</el-form>
<el-button slot="reference" type="primary" size="small">蹇嵎涓嬪彂</el-button>
</el-popover>
+ <el-button size="small" type="primary" @click="page" class="op">鍒锋柊</el-button>
</el-col>
</el-row>
@@ -221,7 +219,6 @@
this.fastDistributeForm.fastNumLimit = null
this.fastTimeRange = []
},
- allDis() {},
// 鍏ㄩ儴涓嬪彂
allDistribute() {
this.fastDistribute();
--
Gitblit v1.8.0