From cdd2f0dbe5f6d2a43f6b96a35956b2532a6642cb Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 06 三月 2024 14:29:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/default-auditing/index.vue | 313 ++++++++
src/views/system/point/index.vue | 471 +++++++++++++
.gitignore | 1
src/views/system/unit/people/index.vue | 58 +
src/api/platform/default-auditing.js | 44 +
src/api/platform/people.js | 10
src/views/system/default-rule/index.vue | 395 +++++++++++
src/api/platform/default-rule.js | 53 +
src/views/system/work-order/index.vue | 514 ++++++++++++++
src/main.js | 2
src/api/platform/point.js | 53 +
src/api/platform/unit.js | 22
src/api/platform/work-order.js | 62 +
src/views/system/unit/index.vue | 44
14 files changed, 1,998 insertions(+), 44 deletions(-)
diff --git a/.gitignore b/.gitignore
index 78a752d..507b2dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
yarn-debug.log*
yarn-error.log*
**/*.log
+pnpm-lock.yaml
tests/**/coverage/
tests/e2e/reports
diff --git a/src/api/platform/default-auditing.js b/src/api/platform/default-auditing.js
new file mode 100644
index 0000000..8d3ac9b
--- /dev/null
+++ b/src/api/platform/default-auditing.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 鏌ヨ杩濊瀹℃牳鍒楄〃
+export function listAuditing(query) {
+ return request({
+ url: '/default-auditing/page',
+ method: 'get',
+ params: query
+ })
+}
+
+// 鏌ヨ杩濊瀹℃牳璇︾粏
+export function getAuditing(id) {
+ return request({
+ url: '/default-auditing/' + id,
+ method: 'get'
+ })
+}
+
+// 鏂板杩濊瀹℃牳
+export function addAuditing(data) {
+ return request({
+ url: '/default-auditing',
+ method: 'post',
+ data: data
+ })
+}
+
+// 淇敼杩濊瀹℃牳
+export function updateAuditing(data) {
+ return request({
+ url: '/default-auditing',
+ method: 'put',
+ data: data
+ })
+}
+
+// 鍒犻櫎杩濊瀹℃牳
+export function delAuditing(id) {
+ return request({
+ url: '/default-auditing/' + id,
+ method: 'delete'
+ })
+}
diff --git a/src/api/platform/default-rule.js b/src/api/platform/default-rule.js
new file mode 100644
index 0000000..e43c2de
--- /dev/null
+++ b/src/api/platform/default-rule.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 鏌ヨ杩濈害瑙勫垯鍒楄〃
+export function listRule(data) {
+ return request({
+ url: '/default-rule/page',
+ method: 'post',
+ data: data
+ })
+}
+
+// 鏌ヨ杩濈害瑙勫垯璇︾粏
+export function getRule(id) {
+ return request({
+ url: '/default-rule/' + id,
+ method: 'get'
+ })
+}
+
+// 鏂板杩濈害瑙勫垯
+export function addRule(data) {
+ return request({
+ url: '/default-rule',
+ method: 'post',
+ data: data
+ })
+}
+
+// 淇敼杩濈害瑙勫垯
+export function updateRule(data) {
+ return request({
+ url: '/default-rule',
+ method: 'put',
+ data: data
+ })
+}
+
+// 鍒犻櫎杩濈害瑙勫垯
+export function delRule(id) {
+ return request({
+ url: '/default-rule/' + id,
+ method: 'delete'
+ })
+}
+
+// 鍚敤/鍋滅敤杩濈害瑙勫垯
+export function setRule(data) {
+ return request({
+ url: '/default-rule/set',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/src/api/platform/people.js b/src/api/platform/people.js
index 92d797d..efc0d1f 100644
--- a/src/api/platform/people.js
+++ b/src/api/platform/people.js
@@ -3,7 +3,7 @@
// 鏌ヨ杩愮淮浜哄憳鍒楄〃
export function listPeople(query) {
return request({
- url: '/system/yw-people/page',
+ url: '/yw-people/page',
method: 'get',
params: query
})
@@ -12,7 +12,7 @@
// 鏌ヨ杩愮淮浜哄憳璇︾粏
export function getPeople(id) {
return request({
- url: '/system/yw-people/' + id,
+ url: '/yw-people/' + id,
method: 'get'
})
}
@@ -20,7 +20,7 @@
// 鏂板杩愮淮浜哄憳
export function addPeople(data) {
return request({
- url: '/system/yw-people',
+ url: '/yw-people',
method: 'post',
data: data
})
@@ -29,7 +29,7 @@
// 淇敼杩愮淮浜哄憳
export function updatePeople(data) {
return request({
- url: '/system/yw-people',
+ url: '/yw-people',
method: 'put',
data: data
})
@@ -38,7 +38,7 @@
// 鍒犻櫎杩愮淮浜哄憳
export function delPeople(id) {
return request({
- url: '/system/yw-people/' + id,
+ url: '/yw-people/' + id,
method: 'delete'
})
}
diff --git a/src/api/platform/point.js b/src/api/platform/point.js
new file mode 100644
index 0000000..b203118
--- /dev/null
+++ b/src/api/platform/point.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 鏌ヨ杩愮淮鐐逛綅鍒楄〃
+export function listPoint(query) {
+ return request({
+ url: '/yw-point/page',
+ method: 'get',
+ params: query
+ })
+}
+
+// 鏌ヨ杩愮淮鐐逛綅璇︾粏
+export function getPoint(id) {
+ return request({
+ url: '/yw-point/' + id,
+ method: 'get'
+ })
+}
+
+// 鏂板杩愮淮鐐逛綅
+export function addPoint(data) {
+ return request({
+ url: '/yw-point',
+ method: 'post',
+ data: data
+ })
+}
+
+// 鏂板杩愮淮鐐逛綅-鎵归噺
+export function addPointBatch(data) {
+ return request({
+ url: '/yw-point/batch',
+ method: 'post',
+ data: data
+ })
+}
+
+// 淇敼杩愮淮鐐逛綅
+export function updatePoint(data) {
+ return request({
+ url: '/yw-point',
+ method: 'put',
+ data: data
+ })
+}
+
+// 鍒犻櫎杩愮淮鐐逛綅
+export function delPoint(id) {
+ return request({
+ url: '/yw-point/' + id,
+ method: 'delete'
+ })
+}
diff --git a/src/api/platform/unit.js b/src/api/platform/unit.js
index 017bd8e..d3893ce 100644
--- a/src/api/platform/unit.js
+++ b/src/api/platform/unit.js
@@ -3,16 +3,16 @@
// 鏌ヨ杩愮淮鍗曚綅鍒楄〃
export function listUnit(query) {
return request({
- url: '/system/yw-unit/page',
- method: 'get',
- params: query
+ url: '/yw-unit/page',
+ method: 'post',
+ data: query
})
}
// 鏌ヨ杩愮淮鍗曚綅璇︾粏
export function getUnit(id) {
return request({
- url: '/system/yw-unit/' + id,
+ url: '/yw-unit/' + id,
method: 'get'
})
}
@@ -20,7 +20,7 @@
// 鏂板杩愮淮鍗曚綅
export function addUnit(data) {
return request({
- url: '/system/yw-unit',
+ url: '/yw-unit',
method: 'post',
data: data
})
@@ -29,7 +29,7 @@
// 淇敼杩愮淮鍗曚綅
export function updateUnit(data) {
return request({
- url: '/system/yw-unit',
+ url: '/yw-unit',
method: 'put',
data: data
})
@@ -38,7 +38,15 @@
// 鍒犻櫎杩愮淮鍗曚綅
export function delUnit(id) {
return request({
- url: '/system/yw-unit/' + id,
+ url: '/yw-unit/' + id,
method: 'delete'
})
}
+
+// 鑾峰彇杩愮淮鍗曚綅涓嬫媺鍒楄〃
+export function unitSelect() {
+ return request({
+ url: '/yw-unit/list',
+ method: 'get'
+ })
+}
diff --git a/src/api/platform/work-order.js b/src/api/platform/work-order.js
new file mode 100644
index 0000000..4b02485
--- /dev/null
+++ b/src/api/platform/work-order.js
@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 鏌ヨ杩愮淮宸ュ崟鍒楄〃
+export function listWorkOrder(query) {
+ return request({
+ url: '/work-order/page',
+ method: 'post',
+ data: query
+ })
+}
+
+// 鏌ヨ杩愮淮宸ュ崟璇︾粏
+export function getWorkOrder(id) {
+ return request({
+ url: '/work-order/' + id,
+ method: 'get'
+ })
+}
+
+// 鏂板杩愮淮宸ュ崟
+export function addWorkOrder(data) {
+ return request({
+ url: '/work-order',
+ method: 'post',
+ data: data
+ })
+}
+
+// 淇敼杩愮淮宸ュ崟
+export function updateWorkOrder(data) {
+ return request({
+ url: '/work-order',
+ method: 'put',
+ data: data
+ })
+}
+
+// 鍒犻櫎杩愮淮宸ュ崟
+export function delWorkOrder(id) {
+ return request({
+ url: '/work-order/' + id,
+ method: 'delete'
+ })
+}
+
+// 瀹℃牳宸ュ崟
+export function auditing(data) {
+ return request({
+ url: '/work-order/auditing',
+ method: 'put',
+ data: data
+ })
+}
+
+// 宸ュ崟杩愮淮鎯呭喌
+export function ywCondition(data) {
+ return request({
+ url: '/work-order/yw-condition',
+ method: 'put',
+ data: data
+ })
+}
diff --git a/src/main.js b/src/main.js
index 13c6cf2..402f115 100644
--- a/src/main.js
+++ b/src/main.js
@@ -76,7 +76,7 @@
size: Cookies.get('size') || 'medium' // set element-ui default size
})
-Vue.config.productionTip = false
+Vue.config.productionTip = true
new Vue({
el: '#app',
diff --git a/src/views/system/default-auditing/index.vue b/src/views/system/default-auditing/index.vue
new file mode 100644
index 0000000..aaf359a
--- /dev/null
+++ b/src/views/system/default-auditing/index.vue
@@ -0,0 +1,313 @@
+<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="defaultId">
+ <el-input
+ v-model="queryParams.defaultId"
+ placeholder="璇疯緭鍏ヨ繚瑙�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="瀹℃牳鏃堕棿">
+ <el-date-picker
+ v-model="daterangeAuditingTime"
+ style="width: 240px"
+ value-format="yyyy-MM-dd"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ ></el-date-picker>
+ </el-form-item>
+ <el-form-item label="瀹℃牳浜�" prop="auditingUser">
+ <el-input
+ v-model="queryParams.auditingUser"
+ placeholder="璇疯緭鍏ュ鏍镐汉"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍒涘缓鏃堕棿">
+ <el-date-picker
+ v-model="daterangeCreateTime"
+ style="width: 240px"
+ value-format="yyyy-MM-dd"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ ></el-date-picker>
+ </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"
+ v-hasPermi="['system:auditing:add']"
+ >鏂板</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="success"
+ plain
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleUpdate"
+ v-hasPermi="['system:auditing:edit']"
+ >淇敼</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="danger"
+ plain
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="multiple"
+ @click="handleDelete"
+ v-hasPermi="['system:auditing:remove']"
+ >鍒犻櫎</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-download"
+ size="mini"
+ @click="handleExport"
+ v-hasPermi="['system:auditing:export']"
+ >瀵煎嚭</el-button>
+ </el-col>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ </el-row>
+
+ <el-table v-loading="loading" :data="auditingList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column label="杩濊" align="center" prop="defaultId" />
+ <el-table-column label="瀹℃牳鐘舵��" align="center" prop="auditingStatus" />
+ <el-table-column label="瀹℃牳璇存槑" align="center" prop="remark" />
+ <el-table-column label="瀹℃牳鏃堕棿" align="center" prop="auditingTime" width="180">
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.auditingTime, '{y}-{m}-{d}') }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="瀹℃牳浜�" align="center" prop="auditingUser" />
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+ </template>
+ </el-table-column>
+ <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)"
+ v-hasPermi="['system:auditing:edit']"
+ >淇敼</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['system:auditing:remove']"
+ >鍒犻櫎</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>
+ <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 { listAuditing, getAuditing, delAuditing, addAuditing, updateAuditing } from "@/api/platform/default-auditing";
+
+export default {
+ name: "Auditing",
+ data() {
+ return {
+ // 閬僵灞�
+ loading: true,
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 鎬绘潯鏁�
+ total: 0,
+ // 杩濊瀹℃牳琛ㄦ牸鏁版嵁
+ auditingList: [],
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 閫昏緫鍒犻櫎鏃堕棿鑼冨洿
+ daterangeAuditingTime: [],
+ // 閫昏緫鍒犻櫎鏃堕棿鑼冨洿
+ daterangeCreateTime: [],
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ defaultId: null,
+ auditingStatus: null,
+ auditingTime: null,
+ auditingUser: null,
+ createTime: null,
+ },
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ defaultId: [
+ { required: true, message: "杩濊涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ }
+ };
+ },
+ created() {
+ this.getList();
+ },
+ methods: {
+ /** 鏌ヨ杩濊瀹℃牳鍒楄〃 */
+ getList() {
+ this.loading = true;
+ this.queryParams.params = {};
+ if (null != this.daterangeAuditingTime && '' != this.daterangeAuditingTime) {
+ this.queryParams.params["beginAuditingTime"] = this.daterangeAuditingTime[0];
+ this.queryParams.params["endAuditingTime"] = this.daterangeAuditingTime[1];
+ }
+ if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+ this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+ this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+ }
+ listAuditing(this.queryParams).then(response => {
+ this.auditingList = response.rows;
+ this.total = response.total;
+ this.loading = false;
+ });
+ },
+ // 鍙栨秷鎸夐挳
+ cancel() {
+ this.open = false;
+ this.reset();
+ },
+ // 琛ㄥ崟閲嶇疆
+ reset() {
+ this.form = {
+ id: null,
+ defaultId: null,
+ auditingStatus: null,
+ remark: null,
+ auditingTime: null,
+ auditingUser: null,
+ createTime: null,
+ updateTime: null,
+ deleted: null
+ };
+ this.resetForm("form");
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.queryParams.pageNum = 1;
+ this.getList();
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.daterangeAuditingTime = [];
+ this.daterangeCreateTime = [];
+ 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
+ getAuditing(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) {
+ updateAuditing(this.form).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ } else {
+ addAuditing(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 delAuditing(ids);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
+ },
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ handleExport() {
+ this.download('/default-auditing/export', {
+ ...this.queryParams
+ }, `auditing_${new Date().getTime()}.xlsx`)
+ }
+ }
+};
+</script>
diff --git a/src/views/system/default-rule/index.vue b/src/views/system/default-rule/index.vue
new file mode 100644
index 0000000..1b26798
--- /dev/null
+++ b/src/views/system/default-rule/index.vue
@@ -0,0 +1,395 @@
+<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="ruleName">
+ <el-input
+ v-model="queryParams.ruleName"
+ placeholder="璇疯緭鍏ヨ鍒欏悕绉�"
+ clearable
+ @clear="handleQuery"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍒涘缓鏃堕棿">
+ <el-date-picker
+ v-model="daterangeCreateTime"
+ style="width: 240px"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ ></el-date-picker>
+ </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"
+ v-hasPermi="['system:rule:add']"
+ >鏂板</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="success"
+ plain
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleUpdate"
+ v-hasPermi="['system:rule:edit']"
+ >淇敼</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="danger"
+ plain
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="multiple"
+ @click="handleDelete"
+ v-hasPermi="['system:rule:remove']"
+ >鍒犻櫎</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-download"
+ size="mini"
+ @click="handleExport"
+ v-hasPermi="['system:rule:export']"
+ >瀵煎嚭</el-button>
+ </el-col>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ </el-row>
+
+ <el-table v-loading="loading" :data="ruleList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column label="瑙勫垯鍚嶇О" align="center" prop="ruleName" />
+ <el-table-column label="瑙勫垯鎻忚堪" align="center" prop="ruleDesc" />
+ <el-table-column label="瑙勫垯鐘舵��" align="center" prop="ruleStatus" />
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <template slot-scope="scope">
+ <el-button
+ v-if="scope.row.ruleStatus === '鏈惎鐢�'"
+ size="mini"
+ type="text"
+ icon="el-icon-zoom-in"
+ @click="handleUse(scope.row.id, true)"
+ v-hasPermi="['system:rule:use']"
+ >鍚敤</el-button>
+ <el-button
+ v-else
+ size="mini"
+ type="text"
+ icon="el-icon-zoom-in"
+ @click="handleUse(scope.row.id, false)"
+ v-hasPermi="['system:rule:use']"
+ >鍋滅敤</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-zoom-in"
+ @click="handleDetail(scope.row)"
+ v-hasPermi="['system:rule:detail']"
+ >璇︽儏</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['system:rule:edit']"
+ >淇敼</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['system:rule:remove']"
+ >鍒犻櫎</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="瑙勫垯璇︽儏" :visible.sync="detailOpen" width="500px" append-to-body>
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form-item label="瑙勫垯鍚嶇О" prop="ruleName">
+ <el-input disabled v-model="form.ruleName" placeholder="璇疯緭鍏ヨ鍒欏悕绉�" />
+ </el-form-item>
+ <el-form-item label="瑙勫垯鎻忚堪" prop="ruleDesc">
+ <el-input disabled v-model="form.ruleDesc" placeholder="璇疯緭鍏ヨ鍒欐弿杩�" />
+ </el-form-item>
+ <el-form-item label="瑙勫垯璁剧疆">
+ <div style="margin-top: 30px">
+ <div class="line">
+ <div class="line-left">宸ュ崟鏈強鏃跺鐞嗘暟锛�</div>
+ <div class="line-right"><el-input disabled v-model="jsonRule.overTime" type="number"/></div>
+ </div>
+ <div class="line">
+ <div class="line-left">杩愮淮澶辫触鏁伴噺瓒呰繃锛�</div>
+ <div class="line-right"><el-input disabled v-model="jsonRule.failNum" type="number"/></div>
+ </div>
+ </div>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="closeDetail">鍏抽棴</el-button>
+ </div>
+ </el-dialog>
+
+ <!-- 娣诲姞鎴栦慨鏀硅繚绾﹁鍒欏璇濇 -->
+ <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="ruleName">
+ <el-input v-model="form.ruleName" placeholder="璇疯緭鍏ヨ鍒欏悕绉�" />
+ </el-form-item>
+ <el-form-item label="瑙勫垯鎻忚堪" prop="ruleDesc">
+ <el-input v-model="form.ruleDesc" placeholder="璇疯緭鍏ヨ鍒欐弿杩�" />
+ </el-form-item>
+ <el-form-item label="瑙勫垯璁剧疆">
+ <div style="margin-top: 30px">
+ <div class="line">
+ <div class="line-left">宸ュ崟鏈強鏃跺鐞嗘暟锛�</div>
+ <div class="line-right"><el-input v-model="jsonRule.overTime" type="number"/></div>
+ </div>
+ <div class="line">
+ <div class="line-left">杩愮淮澶辫触鏁伴噺瓒呰繃锛�</div>
+ <div class="line-right"><el-input v-model="jsonRule.failNum" type="number"/></div>
+ </div>
+ </div>
+ </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 { listRule, getRule, delRule, addRule, updateRule, setRule } from "@/api/platform/default-rule";
+
+export default {
+ name: "Rule",
+ data() {
+ return {
+ detailOpen: false,
+ // 閬僵灞�
+ loading: true,
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 鎬绘潯鏁�
+ total: 0,
+ // 杩濈害瑙勫垯琛ㄦ牸鏁版嵁
+ ruleList: [],
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 瑙勫垯鐘舵�侊細鍚敤銆佹湭鍚敤鏃堕棿鑼冨洿
+ daterangeCreateTime: [],
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ ruleName: null,
+ ruleStatus: null,
+ createTime: null,
+ },
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ jsonRule: {},
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ ruleName: [
+ { required: true, message: "瑙勫垯鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ }
+ };
+ },
+ created() {
+ this.getList();
+ },
+ methods: {
+ /** 鏌ヨ杩濈害瑙勫垯鍒楄〃 */
+ getList() {
+ this.loading = true;
+ if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+ this.queryParams["start"] = this.daterangeCreateTime[0];
+ this.queryParams["end"] = this.daterangeCreateTime[1];
+ }
+ listRule(this.queryParams).then(response => {
+ this.ruleList = response.data;
+ this.total = response.total;
+ this.loading = false;
+ });
+ },
+ // 鍙栨秷鎸夐挳
+ cancel() {
+ this.open = false;
+ this.reset();
+ },
+ // 琛ㄥ崟閲嶇疆
+ reset() {
+ this.form = {
+ id: null,
+ ruleName: null,
+ ruleDetail: null,
+ ruleDesc: null,
+ ruleStatus: null,
+ createTime: null,
+ updateTime: null,
+ deleted: null
+ };
+ this.resetForm("form");
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.queryParams.pageNum = 1;
+ this.getList();
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.daterangeCreateTime = [];
+ 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
+ getRule(id).then(response => {
+ this.form = response.data;
+ this.jsonRule = JSON.parse(this.form.ruleDetail)
+ this.open = true;
+ this.title = "淇敼杩濈害瑙勫垯";
+ });
+ },
+ /** 鎻愪氦鎸夐挳 */
+ submitForm() {
+ this.$refs["form"].validate(valid => {
+ if (valid) {
+ this.jsonRule.overtime = this.jsonRule.overtime ? this.jsonRule.overtime : 0;
+ this.jsonRule.failNum = this.jsonRule.failNum ? this.jsonRule.failNum : 0;
+ this.form.ruleDetail = JSON.stringify(this.jsonRule);
+ if (this.form.id != null) {
+ updateRule(this.form).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ } else {
+ addRule(this.form).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ }
+ }
+ });
+ },
+ // 鍚敤銆佸仠鐢�
+ handleUse(id, flag) {
+ let data = {
+ id: id,
+ flag: flag
+ }
+ setRule(data).then(res => {
+ if (res.code === 200) {
+ this.$modal.msgSuccess("璁剧疆鎴愬姛");
+ } else {
+ this.$modal.msgError(res.msg);
+ }
+ this.getList();
+ })
+ },
+ // 璇︽儏鎸夐挳
+ handleDetail(row) {
+ this.detailOpen = true;
+ this.form = row;
+ this.jsonRule = JSON.parse(this.form.ruleDetail);
+ },
+ // 鍏抽棴璇︽儏
+ closeDetail() {
+ this.jsonRule = {};
+ this.form = {};
+ this.detailOpen = false;
+ },
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ handleDelete(row) {
+ const ids = row.id || this.ids;
+ this.$modal.confirm('鏄惁纭鍒犻櫎杩濈害瑙勫垯缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+ return delRule(ids);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
+ },
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ handleExport() {
+ this.download('system/rule/export', {
+ ...this.queryParams
+ }, `rule_${new Date().getTime()}.xlsx`)
+ }
+ }
+};
+</script>
+
+<style scoped>
+.line {
+ display: flex;
+ flex-direction: row;
+ justify-content: flex-start;
+ align-items: center;
+}
+.line-left {
+ width: 200px;
+ text-align: center;
+}
+.line-right {
+ width: 100px;
+}
+</style>
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
new file mode 100644
index 0000000..ff84d5d
--- /dev/null
+++ b/src/views/system/point/index.vue
@@ -0,0 +1,471 @@
+<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="pointName">
+ <el-input
+ v-model="queryParams.pointName"
+ placeholder="璇疯緭鍏ョ偣浣嶅悕绉�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鐐逛綅寮�濮嬫椂闂�" prop="startTime">
+ <el-date-picker clearable
+ v-model="queryParams.startTime"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="璇烽�夋嫨鐐逛綅寮�濮嬫椂闂�">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="鐐逛綅缁撴潫鏃堕棿" prop="endTime">
+ <el-date-picker clearable
+ v-model="queryParams.endTime"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="璇烽�夋嫨鐐逛綅缁撴潫鏃堕棿">
+ </el-date-picker>
+ </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"
+ v-hasPermi="['x:point:add']"
+ >鏂板</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="success"
+ plain
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleUpdate"
+ v-hasPermi="['x:point:edit']"
+ >淇敼</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="danger"
+ plain
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="multiple"
+ @click="handleDelete"
+ v-hasPermi="['x:point:remove']"
+ >鍒犻櫎</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-download"
+ size="mini"
+ @click="handleExport"
+ v-hasPermi="['x:point:export']"
+ >瀵煎嚭</el-button>
+ </el-col>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ </el-row>
+
+ <el-table v-loading="loading" :data="pointList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column label="鐐逛綅鍚嶇О" align="center" prop="pointName" />
+ <el-table-column label="鐐逛綅寮�濮嬫椂闂�" align="center" prop="startTime" width="180">
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鐐逛綅缁撴潫鏃堕棿" align="center" prop="endTime" width="180">
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitId" />
+ <el-table-column label="杩愮淮鐘舵��" align="center" prop="status" />
+ <el-table-column label="澶囨敞" align="center" prop="remark" />
+ <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)"
+ v-hasPermi="['x:point:edit']"
+ >淇敼</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['x:point:remove']"
+ >鍒犻櫎</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="900px" append-to-body>
+ <el-form ref="form" :model="tempForm" :rules="rules" label-width="120px">
+ <el-form-item label="鐐逛綅鍚嶇О" prop="pointName">
+ <el-input v-model="tempForm.pointName" placeholder="璇疯緭鍏ョ偣浣嶅悕绉�" />
+ </el-form-item>
+ <el-form-item label="杩愮淮鍗曚綅" prop="unitId">
+ <el-select v-model="tempForm.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="timezone">
+ <el-date-picker
+ @change="dateChange"
+ v-model="tempForm.timezone"
+ type="daterange"
+ align="right"
+ unlink-panels
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ >
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item>
+ <div style="display: flex;flex-direction: row-reverse">
+ <el-button @click="nextAdd" type="primary" plain>缁х画娣诲姞</el-button>
+ </div>
+ </el-form-item>
+ <div class="point-row" v-for="(point,index) in tempFormList">
+ <div class="row-item">
+ <el-input :disabled="editingIndex!==index" v-model="point.pointName" placeholder="鐐逛綅鍚嶇О"></el-input>
+ </div>
+ <div class="row-item">
+ <el-select :disabled="editingIndex!==index" v-model="point.unitId" placeholder="杩愮淮鍗曚綅">
+ <el-option
+ v-for="item in unitList"
+ :key="item.id"
+ :label="item.value"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </div>
+ <div class="row-item">
+ <el-date-picker
+ :disabled="editingIndex!==index"
+ v-model="point.timezone"
+ type="daterange"
+ align="right"
+ unlink-panels
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ >
+ </el-date-picker>
+ </div>
+ <div class="row-item">
+ <el-button v-show="editingIndex!==index" @click="editPointItem(index)" type="danger" size="small" plain>淇敼</el-button>
+ <el-button v-show="editingIndex===index" @click="editFinishItem(index)" type="success" size="small" plain>瀹屾垚</el-button>
+ </div>
+ </div>
+ </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>
+
+ <!-- 淇敼杩愮淮鐐逛綅瀵硅瘽妗� -->
+ <el-dialog :title="title" :visible.sync="editOpen" width="500px" append-to-body>
+ <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+ <el-form-item label="鐐逛綅鍚嶇О" prop="pointName">
+ <el-input v-model="form.pointName" 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="timezone">
+ <el-date-picker
+ @change="dateChange"
+ v-model="form.timezone"
+ type="daterange"
+ align="right"
+ unlink-panels
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+ <el-button @click="updateCancel">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import { listPoint, getPoint, delPoint, addPoint, addPointBatch, updatePoint } from "@/api/platform/point";
+import { unitSelect } from "@/api/platform/unit";
+
+export default {
+ name: "Point",
+ data() {
+ return {
+ // 姝ｅ湪淇敼绗嚑涓�
+ editingIndex: null,
+ // 閬僵灞�
+ loading: true,
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 鎬绘潯鏁�
+ total: 0,
+ // 杩愮淮鐐逛綅琛ㄦ牸鏁版嵁
+ pointList: [],
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 淇敼寮圭獥
+ editOpen: false,
+ // 杩愮淮鍗曚綅
+ unitList: [],
+ // 杩愮淮鏃跺尯
+ timezone:[],
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ pointName: null,
+ startTime: null,
+ endTime: null,
+ unitId: null,
+ status: null,
+ },
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ // 鎵归噺琛ㄥ崟鍐呭
+ formList:[],
+ // 涓存椂琛ㄥ崟鏁版嵁
+ tempForm: {},
+ // 涓存椂琛ㄥ崟鏁版嵁鍒楄〃
+ tempFormList: [],
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ pointName: [
+ { required: true, message: "鐐逛綅鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ timezone: [
+ { required: true, message: "鐐逛綅鏃跺尯涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ unitId: [
+ { required: true, message: "杩愮淮鍗曚綅涓嶈兘涓虹┖", trigger: "change" }
+ ],
+ }
+ };
+ },
+ created() {
+ this.getList();
+ this.getUnitSelect();
+ },
+ methods: {
+ // 鐐逛綅椤逛慨鏀瑰畬鎴�
+ editFinishItem(index) {
+ this.editingIndex = null;
+ let form = this.tempFormList[index];
+ form.startTime = form.timezone[0];
+ form.endTime = form.timezone[1];
+ this.formList[index] = form;
+ },
+ // 鐐逛綅椤逛慨鏀�
+ editPointItem(index) {
+ if (this.editingIndex !== index && this.editingIndex !== null) {
+ this.$modal.msgWarning("璇峰厛瀹屾垚涓婁竴涓慨鏀�");
+ } else {
+ this.editingIndex = index;
+ this.tempFormList[index] = this.formList[index];
+ }
+ },
+ // 鏃堕棿閫夋嫨鍙戠敓鍙樺寲
+ dateChange() {
+ this.tempForm.startTime = this.tempForm.timezone[0];
+ this.tempForm.endTime = this.tempForm.timezone[1];
+ },
+ // 缁х画娣诲姞鐐逛綅
+ nextAdd() {
+ this.formList.push(this.tempForm);
+ this.tempFormList.push(this.tempForm);
+ this.tempForm = {};
+ },
+ getUnitSelect() {
+ // 杩愮淮鍗曚綅涓嬫媺鍒楄〃
+ unitSelect().then((res) => {
+ this.unitList = res.data;
+ })
+ },
+ /** 鏌ヨ杩愮淮鐐逛綅鍒楄〃 */
+ getList() {
+ this.loading = true;
+ listPoint(this.queryParams).then(response => {
+ this.pointList = response.data;
+ this.total = response.total;
+ this.loading = false;
+ });
+ },
+ // 鍙栨秷鎸夐挳
+ cancel() {
+ this.open = false;
+ this.reset();
+ },
+ updateCancel() {
+ this.editOpen = false;
+ this.reset();
+ },
+ // 琛ㄥ崟閲嶇疆
+ reset() {
+ this.form = {
+ id: null,
+ pointName: null,
+ startTime: null,
+ endTime: null,
+ unitId: null,
+ status: null,
+ remark: null,
+ createTime: null,
+ updateTime: null,
+ deleted: 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
+ getPoint(id).then(response => {
+ this.form = response.data;
+ this.form.timezone = [this.form.startTime, this.form.endTime]
+ this.editOpen = true;
+ this.title = "淇敼杩愮淮鐐逛綅";
+ });
+ },
+ /** 鎻愪氦鎸夐挳 */
+ submitForm() {
+ if (this.formList.length > 0) {
+ // 鎵归噺澧炲姞
+ if (this.formList.every(item => !item.hasOwnProperty("id"))) {
+ addPointBatch(this.formList).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ // 閲嶇疆
+ this.tempForm = {};
+ this.tempFormList = [];
+ this.formList = [];
+ this.getList();
+ });
+ }
+ }else {
+ if (this.form.id != null) {
+ updatePoint(this.form).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.editOpen = false;
+ this.getList();
+ });
+ } else {
+ addPoint(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 delPoint(ids);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
+ },
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ handleExport() {
+ this.download('x/point/export', {
+ ...this.queryParams
+ }, `point_${new Date().getTime()}.xlsx`)
+ }
+ }
+};
+</script>
+
+<style scoped>
+.point-row {
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ align-items: center;
+}
+.row-item {
+ margin-right: 5px;
+}
+.row-item:nth-last-child {
+ margin-right: 0;
+}
+</style>
diff --git a/src/views/system/unit/index.vue b/src/views/system/unit/index.vue
index 83775f8..b09b0a5 100644
--- a/src/views/system/unit/index.vue
+++ b/src/views/system/unit/index.vue
@@ -6,6 +6,7 @@
v-model="queryParams.unitCode"
placeholder="璇疯緭鍏ュ崟浣嶇紪鐮�"
clearable
+ @clear="handleQuery"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -14,6 +15,7 @@
v-model="queryParams.unitName"
placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"
clearable
+ @clear="handleQuery"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -21,7 +23,7 @@
<el-date-picker
v-model="daterangeCreateTime"
style="width: 240px"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
@@ -82,14 +84,14 @@
<el-table v-loading="loading" :data="unitList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="涓婚敭" align="center" prop="id" />
<el-table-column label="鍗曚綅缂栫爜" align="center" prop="unitCode" />
<el-table-column label="鍗曚綅鍚嶇О" align="center" prop="unitName" />
<el-table-column label="鍗曚綅鑱旂郴浜�" align="center" prop="unitContact" />
<el-table-column label="鍗曚綅鑱旂郴浜虹數璇�" align="center" prop="unitContactPhone" />
<el-table-column label="鍗曚綅绠＄悊鍛樿处鍙�" align="center" prop="unitAdminAccount" />
<el-table-column label="澶囨敞" align="center" prop="remark" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="娣诲姞鏃堕棿" align="center" prop="createTime" />
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
@@ -119,24 +121,24 @@
<!-- 娣诲姞鎴栦慨鏀硅繍缁村崟浣嶅璇濇 -->
<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 ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="鍗曚綅缂栫爜" prop="unitCode">
<el-input v-model="form.unitCode" placeholder="璇疯緭鍏ュ崟浣嶇紪鐮�" />
</el-form-item>
<el-form-item label="鍗曚綅鍚嶇О" prop="unitName">
<el-input v-model="form.unitName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�" />
</el-form-item>
+ <el-form-item label="鍗曚綅璐﹀彿" prop="unitAdminAccount">
+ <el-input v-model="form.unitAdminAccount" placeholder="璇疯緭鍏ュ崟浣嶇鐞嗗憳璐﹀彿" />
+ </el-form-item>
<el-form-item label="鍗曚綅鑱旂郴浜�" prop="unitContact">
<el-input v-model="form.unitContact" placeholder="璇疯緭鍏ュ崟浣嶈仈绯讳汉" />
</el-form-item>
- <el-form-item label="鍗曚綅鑱旂郴浜虹數璇�" prop="unitContactPhone">
+ <el-form-item label="鑱旂郴浜虹數璇�" prop="unitContactPhone">
<el-input v-model="form.unitContactPhone" placeholder="璇疯緭鍏ュ崟浣嶈仈绯讳汉鐢佃瘽" />
</el-form-item>
- <el-form-item label="鍗曚綅绠＄悊鍛樿处鍙�" prop="unitAdminAccount">
- <el-input v-model="form.unitAdminAccount" placeholder="璇疯緭鍏ュ崟浣嶇鐞嗗憳璐﹀彿" />
- </el-form-item>
<el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" />
+ <el-input v-model="form.remark" maxlength="100" show-word-limit rows="3" type="textarea" placeholder="澶囨敞淇℃伅" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -180,7 +182,8 @@
pageSize: 10,
unitCode: null,
unitName: null,
- createTime: null,
+ start: null,
+ end: null,
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -204,6 +207,19 @@
}
};
},
+ // computed: {
+ // unitAdminAccount:{
+ // get: function() {
+ // let value = this.form.unitCode ? this.form.unitCode + '_admin' : ""
+ // this.form.unitAdminAccount = value
+ // return value
+ // },
+ // set:function (newValue) {
+ // this.unitAdminAccount = newValue;
+ // this.form.unitAdminAccount = newValue
+ // }
+ // }
+ // },
created() {
this.getList();
},
@@ -211,13 +227,13 @@
/** 鏌ヨ杩愮淮鍗曚綅鍒楄〃 */
getList() {
this.loading = true;
- this.queryParams.params = {};
+ // this.queryParams = {};
if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
- this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
- this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+ this.queryParams.start = this.daterangeCreateTime[0];
+ this.queryParams.end = this.daterangeCreateTime[1];
}
listUnit(this.queryParams).then(response => {
- this.unitList = response.rows;
+ this.unitList = response.data;
this.total = response.total;
this.loading = false;
});
diff --git a/src/views/system/people/index.vue b/src/views/system/unit/people/index.vue
similarity index 84%
rename from src/views/system/people/index.vue
rename to src/views/system/unit/people/index.vue
index cdcf56f..59db6de 100644
--- a/src/views/system/people/index.vue
+++ b/src/views/system/unit/people/index.vue
@@ -1,11 +1,12 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="杩愮淮浜哄憳缂栧彿" prop="ywPersonCode">
<el-input
v-model="queryParams.ywPersonCode"
placeholder="璇疯緭鍏ヨ繍缁翠汉鍛樼紪鍙�"
clearable
+ @clear="handleQuery"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -14,16 +15,19 @@
v-model="queryParams.ywPersonName"
placeholder="璇疯緭鍏ヨ繍缁翠汉鍛樺鍚�"
clearable
+ @clear="handleQuery"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="鎵�灞炶繍缁村崟浣�" prop="belongUnit">
- <el-input
- v-model="queryParams.belongUnit"
- placeholder="璇疯緭鍏ユ墍灞炶繍缁村崟浣�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-select v-model="queryParams.belongUnit" @change="handleQuery" clearable 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>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -79,13 +83,12 @@
<el-table v-loading="loading" :data="peopleList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="涓婚敭" align="center" prop="id" />
<el-table-column label="杩愮淮浜哄憳缂栧彿" align="center" prop="ywPersonCode" />
<el-table-column label="杩愮淮浜哄憳濮撳悕" align="center" prop="ywPersonName" />
<el-table-column label="杩愮淮浜哄憳璐﹀彿" align="center" prop="ywPersonAccount" />
<el-table-column label="鎵�灞炶繍缁村崟浣�" align="center" prop="belongUnit" />
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
@@ -115,18 +118,25 @@
<!-- 娣诲姞鎴栦慨鏀硅繍缁翠汉鍛樺璇濇 -->
<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="ywPersonCode">
+ <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+ <el-form-item label="浜哄憳缂栧彿" prop="ywPersonCode">
<el-input v-model="form.ywPersonCode" placeholder="璇疯緭鍏ヨ繍缁翠汉鍛樼紪鍙�" />
</el-form-item>
- <el-form-item label="杩愮淮浜哄憳濮撳悕" prop="ywPersonName">
+ <el-form-item label="浜哄憳濮撳悕" prop="ywPersonName">
<el-input v-model="form.ywPersonName" placeholder="璇疯緭鍏ヨ繍缁翠汉鍛樺鍚�" />
</el-form-item>
- <el-form-item label="杩愮淮浜哄憳璐﹀彿" prop="ywPersonAccount">
+ <el-form-item label="浜哄憳璐﹀彿" prop="ywPersonAccount">
<el-input v-model="form.ywPersonAccount" placeholder="璇疯緭鍏ヨ繍缁翠汉鍛樿处鍙�" />
</el-form-item>
- <el-form-item label="鎵�灞炶繍缁村崟浣�" prop="belongUnit">
- <el-input v-model="form.belongUnit" placeholder="璇疯緭鍏ユ墍灞炶繍缁村崟浣�" />
+ <el-form-item label="鎵�灞炲崟浣�" prop="belongUnit">
+ <el-select v-model="form.belongUnit" 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="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
@@ -142,6 +152,7 @@
<script>
import { listPeople, getPeople, delPeople, addPeople, updatePeople } from "@/api/platform/people";
+import { unitSelect } from "@/api/platform/unit";
export default {
name: "People",
@@ -173,6 +184,8 @@
ywPersonName: null,
belongUnit: null,
},
+ // 杩愮淮鍗曚綅
+ unitList: [],
// 琛ㄥ崟鍙傛暟
form: {},
// 琛ㄥ崟鏍￠獙
@@ -189,18 +202,29 @@
belongUnit: [
{ required: true, message: "鎵�灞炶繍缁村崟浣嶄笉鑳戒负绌�", trigger: "blur" }
],
+ phone: [
+ { required: true, message: "鑱旂郴鐢佃瘽涓嶈兘涓虹┖", trigger: "blur" }
+ ],
}
};
},
created() {
this.getList();
+ this.getUnitSelect()
},
methods: {
- /** 鏌ヨ杩愮淮浜哄憳鍒楄〃 */
+ getUnitSelect() {
+ // 杩愮淮鍗曚綅涓嬫媺鍒楄〃
+ unitSelect().then((res) => {
+ this.unitList = res.data;
+ })
+ },
+
+ /** 鏌ヨ杩愮淮浜哄憳鍒嗛〉 */
getList() {
this.loading = true;
listPeople(this.queryParams).then(response => {
- this.peopleList = response.rows;
+ this.peopleList = response.data;
this.total = response.total;
this.loading = false;
});
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
new file mode 100644
index 0000000..993fa72
--- /dev/null
+++ b/src/views/system/work-order/index.vue
@@ -0,0 +1,514 @@
+<template>
+ <div class="app-container">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+ <el-form-item label="宸ュ崟鍙�" prop="workOrderNo">
+ <el-input
+ v-model="queryParams.workOrderNo"
+ placeholder="璇疯緭鍏ュ伐鍗曞彿"
+ clearable
+ @clear="handleQuery"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="杩愮淮澶勭悊鏃堕棿">
+ <el-date-picker
+ clearable
+ @clear="handleQuery"
+ v-model="daterangeYwHandleTime"
+ style="width: 240px"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ ></el-date-picker>
+ </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"-->
+<!-- v-hasPermi="['x:work-order:add']"-->
+<!-- >鏂板</el-button>-->
+<!-- </el-col>-->
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="success"-->
+<!-- plain-->
+<!-- icon="el-icon-edit"-->
+<!-- size="mini"-->
+<!-- :disabled="single"-->
+<!-- @click="handleUpdate"-->
+<!-- v-hasPermi="['x:work-order:edit']"-->
+<!-- >淇敼</el-button>-->
+<!-- </el-col>-->
+ <el-col :span="1.5">
+ <el-button
+ type="danger"
+ plain
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="multiple"
+ @click="handleDelete"
+ v-hasPermi="['x:work-order:remove']"
+ >鍒犻櫎</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-download"
+ size="mini"
+ @click="handleExport"
+ v-hasPermi="['x:work-order:export']"
+ >瀵煎嚭</el-button>
+ </el-col>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ </el-row>
+
+ <el-table v-loading="loading" :data="workOrderList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column label="宸ュ崟鍙�" align="center" prop="workOrderNo" width="170"/>
+ <el-table-column label="宸ュ崟鏉ユ簮" align="center" prop="source" width="170"/>
+ <el-table-column label="鏁呴殰绫诲瀷" align="center" prop="errorType" width="170"/>
+ <el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName" width="150"/>
+ <el-table-column label="杩愮淮浜哄憳" align="center" prop="ywPeopleName" />
+ <el-table-column label="杩愮淮澶勭悊鏃堕棿" align="center" prop="ywHandleTime" width="180"/>
+ <el-table-column label="杩愮淮缁撴灉" align="center" prop="ywResult" />
+ <el-table-column label="杩愮淮鎯呭喌" align="center" prop="ywCondition" width="150"/>
+ <el-table-column label="杩愮淮妫�娴嬬粨鏋�" align="center" prop="ywCheckResult" width="230"/>
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180"/>
+
+ <el-table-column label="鎿嶄綔" fixed="right" width="150" 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)"-->
+<!-- v-hasPermi="['x:work-order:edit']"-->
+<!-- >淇敼</el-button>-->
+ <el-button
+ size="mini"
+ type="text"
+ @click="handleAuditing(scope.row)"
+ v-hasPermi="['x:work-order:remove']"
+ >瀹℃牳</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ @click="handleYwCondition(scope.row)"
+ v-hasPermi="['x:work-order:remove']"
+ >杩愮淮鎯呭喌</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ @click="handleYwResult(scope.row)"
+ v-hasPermi="['x:work-order:remove']"
+ >杩愮淮缁撴灉</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ @click="handleCheckResult(scope.row)"
+ v-hasPermi="['x:work-order:remove']"
+ >妫�娴嬬粨鏋�</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="宸ュ崟瀹℃牳" :visible.sync="auditingOpen" width="500px" append-to-body>
+ <el-form ref="auditingForm" :model="auditingForm" :rules="auditingRules" label-width="80px">
+ <el-form-item label="宸ュ崟鍙�" prop="workOrderNo">
+ <el-input v-model="auditingForm.workOrderNo" disabled />
+ </el-form-item>
+ <el-form-item label="杩愮淮鍗曚綅" prop="unitName">
+ <el-input v-model="auditingForm.unitName" disabled />
+ </el-form-item>
+ <el-form-item label="杩愮淮浜哄憳" prop="ywPeopleName">
+ <el-input v-model="auditingForm.ywPeopleName" disabled />
+ </el-form-item>
+ <el-form-item label="瀹℃牳缁撴灉" prop="auditingResult">
+ <el-radio v-model="auditingForm.auditingResult" label="pass">閫氳繃</el-radio>
+ <el-radio v-model="auditingForm.auditingResult" label="return">椹冲洖</el-radio>
+ </el-form-item>
+ <el-form-item label="瀹℃牳澶囨敞" prop="auditingRemark">
+ <el-input v-model="auditingForm.auditingRemark" type="textarea" maxlength="30" show-word-limit/>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitAuditing">纭� 瀹�</el-button>
+ <el-button @click="cancelAuditing">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+
+ <el-dialog title="杩愮淮鎯呭喌璁板綍" :visible.sync="ywConditionOpen" width="500px" append-to-body>
+ <el-form ref="ywConditionForm" :model="ywConditionForm" :rules="ywConditionRules" label-width="80px">
+ <el-form-item label="宸ュ崟鍙�" prop="workOrderNo">
+ <el-input v-model="ywConditionForm.workOrderNo" disabled />
+ </el-form-item>
+ <el-form-item label="杩愮淮鍗曚綅" prop="unitName">
+ <el-input v-model="ywConditionForm.unitName" disabled />
+ </el-form-item>
+ <el-form-item label="杩愮淮浜哄憳" prop="ywPeopleName">
+ <el-input v-model="ywConditionForm.ywPeopleName" disabled />
+ </el-form-item>
+ <el-form-item label="杩愮淮鎯呭喌" prop="ywCondition">
+ <el-input v-model="ywConditionForm.ywCondition" type="textarea" maxlength="150" show-word-limit/>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitYwCondition">纭� 瀹�</el-button>
+ <el-button @click="cancelYwCondition">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+
+
+ <el-dialog title="杩愮淮缁撴灉璁板綍" :visible.sync="ywResultOpen" width="500px" append-to-body>
+ <el-form ref="ywResultForm" :model="ywResultForm" :rules="ywResultRules" label-width="80px">
+ <el-form-item label="宸ュ崟鍙�" prop="workOrderNo">
+ <el-input v-model="ywResultForm.workOrderNo" disabled />
+ </el-form-item>
+ <el-form-item label="杩愮淮鍗曚綅" prop="unitName">
+ <el-input v-model="ywResultForm.unitName" disabled />
+ </el-form-item>
+ <el-form-item label="杩愮淮浜哄憳" prop="ywPeopleName">
+ <el-input v-model="ywResultForm.ywPeopleName" disabled />
+ </el-form-item>
+ <el-form-item label="杩愮淮缁撴灉" prop="ywResult">
+ <el-input v-model="ywResultForm.ywResult" type="textarea" maxlength="150" show-word-limit/>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitYwResult">纭� 瀹�</el-button>
+ <el-button @click="cancelYwResult">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+
+ <el-dialog title="杩愮淮妫�娴嬬粨鏋�" :visible.sync="checkResultOpen" width="500px" append-to-body>
+ <el-form ref="ywResultForm" :model="checkResultForm" :rules="checkResultRules" label-width="120px">
+ <el-form-item label="宸ュ崟鍙�" prop="workOrderNo">
+ <el-input v-model="checkResultForm.workOrderNo" disabled />
+ </el-form-item>
+ <el-form-item label="杩愮淮鍗曚綅" prop="unitName">
+ <el-input v-model="checkResultForm.unitName" disabled />
+ </el-form-item>
+ <el-form-item label="杩愮淮浜哄憳" prop="ywPeopleName">
+ <el-input v-model="checkResultForm.ywPeopleName" disabled />
+ </el-form-item>
+ <el-form-item label="杩愮淮妫�娴嬬粨鏋�" prop="ywCheckResult">
+ <el-input v-model="checkResultForm.ywCheckResult" type="textarea" maxlength="150" show-word-limit/>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitYwResult">纭� 瀹�</el-button>
+ <el-button @click="cancelYwResult">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+
+ <!-- 娣诲姞鎴栦慨鏀硅繍缁村伐鍗曞璇濇 -->
+ <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="workOrderNo">
+ <el-input v-model="form.workOrderNo" placeholder="璇疯緭鍏ュ伐鍗曞彿" />
+ </el-form-item>
+ <el-form-item label="杩愮淮澶勭悊鏃堕棿" prop="ywHandleTime">
+ <el-date-picker clearable
+ v-model="form.ywHandleTime"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="璇烽�夋嫨杩愮淮澶勭悊鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="杩愮淮鎯呭喌" prop="ywCondition">
+ <el-input v-model="form.ywCondition" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ </el-form-item>
+ <el-form-item label="杩愮淮妫�娴嬬粨鏋�" prop="ywCheckResult">
+ <el-input v-model="form.ywCheckResult" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ </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 { listWorkOrder, getWorkOrder, delWorkOrder, addWorkOrder, updateWorkOrder,auditing, ywCondition } from "@/api/platform/work-order";
+
+export default {
+ name: "Work-order",
+ data() {
+ return {
+ // 閬僵灞�
+ loading: true,
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 鎬绘潯鏁�
+ total: 0,
+ // 杩愮淮宸ュ崟琛ㄦ牸鏁版嵁
+ workOrderList: [],
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 杩愮淮妫�娴嬬粨鏋滄椂闂磋寖鍥�
+ daterangeYwHandleTime: [],
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ workOrderNo: null,
+ unitId: null,
+ ywPeopleId: null,
+ ywHandleTime: null,
+ ywResult: null,
+ ywCondition: null,
+ },
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ // 瀹℃牳琛ㄥ崟
+ auditingForm: {},
+ auditingOpen: false,
+ // 杩愮淮鎯呭喌琛ㄥ崟
+ ywConditionForm: {},
+ ywConditionOpen: false,
+ // 杩愮淮缁撴灉琛ㄥ崟
+ ywResultForm: {
+
+ },
+ ywResultOpen: false,
+ // 杩愮淮妫�娴嬬粨鏋�
+ checkResultForm: {
+
+ },
+ checkResultOpen: false,
+ // 瀹℃牳琛ㄥ崟鏍￠獙
+ auditingRules: {
+ auditingResult: [
+ { required: true, message: "瀹℃牳缁撴灉涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ },
+ // 杩愮淮鎯呭喌鏍￠獙
+ ywConditionRules: {
+ ywCondition: [
+ { required: true, message: "杩愮淮鎯呭喌涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ },
+ // 杩愮淮缁撴灉鏍￠獙
+ ywResultRules: {
+ ywResult: [
+ { required: true, message: "杩愮淮缁撴灉涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ },
+ // 杩愮淮妫�娴嬬粨鏋滄牎楠�
+ checkResultRules: {
+ ywCheckResult: [
+ { required: true, message: "杩愮淮妫�娴嬬粨鏋滀笉鑳戒负绌�", trigger: "blur" }
+ ],
+ },
+ };
+ },
+ created() {
+ this.getList();
+ },
+ methods: {
+ // 瀹℃牳鎸夐挳
+ handleAuditing(row) {
+ this.auditingForm = row;
+ this.auditingOpen = true;
+ },
+ // 杩愮淮鎯呭喌鎸夐挳
+ handleYwCondition(row) {
+ this.ywConditionForm = row;
+ this.ywConditionOpen = true;
+ },
+ // 杩愮淮缁撴灉鎸夐挳
+ handleYwResult(row) {
+ this.ywResultForm = row;
+ this.ywResultOpen = true;
+ },
+ // 杩愮淮妫�娴嬬粨鏋滄寜閽�
+ handleCheckResult(row) {
+ this.checkResultForm = row;
+ this.checkResultOpen = true;
+ },
+ // 鎻愪氦瀹℃牳
+ submitAuditing() {
+ this.$refs["auditingForm"].validate(valid => {
+ if (valid) {
+ auditing(this.auditingForm).then(res => {
+ this.auditingOpen = false;
+ this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ })
+ }
+ })
+ },
+ // 鍙栨秷瀹℃牳
+ cancelAuditing() {
+ this.auditingForm = {};
+ this.auditingOpen = false;
+ },
+ // 鎻愪氦杩愮淮鎯呭喌
+ submitYwCondition() {
+ this.$refs["ywConditionForm"].validate(valid => {
+ if (valid) {
+ ywCondition(this.ywConditionForm).then(res => {
+ this.ywConditionOpen = false;
+ this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ })
+ }
+ })
+ },
+ cancelYwCondition() {
+ this.ywConditionForm = {};
+ this.ywConditionOpen = false;
+ },
+ // 鎻愪氦杩愮淮缁撴灉
+ submitYwResult() {
+ // todo
+ },
+ cancelYwResult() {
+ this.ywResultForm = {};
+ this.ywResultOpen = false;
+ },
+ // 鎻愪氦妫�娴嬬粨鏋�
+ submitCheckResult() {
+ // todo
+ },
+ cancelCheckResult() {
+ this.checkResultForm = {};
+ this.checkResultOpen = false;
+ },
+ /** 鏌ヨ杩愮淮宸ュ崟鍒楄〃 */
+ getList() {
+ this.loading = true;
+ this.queryParams.params = {};
+ if (null != this.daterangeYwHandleTime && '' != this.daterangeYwHandleTime) {
+ this.queryParams["start"] = this.daterangeYwHandleTime[0];
+ this.queryParams["end"] = this.daterangeYwHandleTime[1];
+ }
+ listWorkOrder(this.queryParams).then(response => {
+ this.workOrderList = response.data;
+ this.total = response.total;
+ this.loading = false;
+ });
+ },
+ // 鍙栨秷鎸夐挳
+ cancel() {
+ this.open = false;
+ this.reset();
+ },
+ // 琛ㄥ崟閲嶇疆
+ reset() {
+ this.form = {
+ id: null,
+ workOrderNo: null,
+ unitId: null,
+ ywPeopleId: null,
+ ywHandleTime: null,
+ ywResult: null,
+ ywCondition: null,
+ ywCheckResult: null,
+ createTime: null,
+ updateTime: null,
+ deleted: null
+ };
+ this.resetForm("form");
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.queryParams.pageNum = 1;
+ this.getList();
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.daterangeYwHandleTime = [];
+ 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
+ getWorkOrder(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) {
+ updateWorkOrder(this.form).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ } else {
+ addWorkOrder(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 delWorkOrder(ids);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
+ },
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ handleExport() {
+ this.download('/work-order/export', {
+ ...this.queryParams
+ }, `work-order_${new Date().getTime()}.xlsx`)
+ }
+ }
+};
+</script>
--
Gitblit v1.8.0