From f18ff6df94830a0147f372f031fa94ab5402ead8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 18 三月 2024 15:57:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/point/index.vue | 295 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 168 insertions(+), 127 deletions(-)
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index 05ca375..ad4b242 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -65,11 +65,19 @@
<el-button
type="warning"
plain
- icon="el-icon-download"
+ icon="el-icon-top"
size="mini"
- @click="handleExport"
- v-hasPermi="['x:point:export']"
- >瀵煎嚭</el-button>
+ @click="handleImportPoint"
+ >瀵煎叆鐐逛綅</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="danger"
+ plain
+ icon="el-icon-receiving"
+ size="mini"
+ @click="handleEditBatch"
+ >鎵归噺淇敼</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -87,7 +95,15 @@
<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="unitName" />
+ <el-table-column label="鐩戠閮ㄩ棬" align="center" prop="deptName" />
+ <el-table-column label="杩愮淮绫诲埆" align="center" prop="category">
+ <template slot-scope="scope">
+ <div v-if="scope.row.category === 1">瑙嗛鐩戞帶</div>
+ <div v-else-if="scope.row.category === 2">杞﹁締璇嗗埆</div>
+ <div v-else-if="scope.row.category === 3">浜鸿劯璇嗗埆</div>
+ </template>
+ </el-table-column>
<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">
@@ -117,83 +133,27 @@
/>
<!-- 娣诲姞杩愮淮鐐逛綅瀵硅瘽妗� -->
- <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-dialog :title="title" :visible.sync="open" 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="region">
+ <el-cascader v-model="form.region" :options="regionList" placeholder="鐐逛綅鎵�鍦ㄥ湴" :props="props" collapse-tags></el-cascader>
+ </el-form-item>
+ <el-form-item label="璁惧绫诲瀷" prop="category">
+ <el-select v-model="form.category" placeholder="璁惧绫诲瀷">
+ <el-option label="浜鸿劯璇嗗埆" value="2"/>
+ <el-option label="瑙嗛鐩戞帶" value="1"/>
+ <el-option label="杞﹁締鐩戞帶" value="3"/>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鐩戠閮ㄩ棬" prop="category">
+ <el-select v-model="form.deptName" placeholder="鐩戠閮ㄩ棬">
+ <el-option label="鐪佸巺" value="鐪佸巺"/>
+ <el-option label="鑷础鑽ｅ幙鍏畨灞�" value="鑷础鑽ｅ幙鍏畨灞�"/>
+ <el-option label="鑷础瀵岄『鍏畨灞�" value="鑷础瀵岄『鍏畨灞�"/>
+ </el-select>
</el-form-item>
<el-form-item label="杩愮淮鍗曚綅" prop="unitId">
<el-select v-model="form.unitId" placeholder="杩愮淮鍗曚綅">
@@ -221,20 +181,70 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="updateCancel">鍙� 娑�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
+
+ <!-- 鎵归噺淇敼杩愮淮鍗曚綅 -->
+ <el-dialog title="鎵归噺淇敼杩愮淮鍗曚綅" :visible.sync="batchOpen" width="600px" append-to-body>
+ <el-form ref="form" :model="batchEditForm" :rules="batchRules" label-width="120px">
+ <el-form-item label="鐐逛綅閫夋嫨" prop="ids">
+ <el-cascader @change="cos" v-model="batchEditForm.ids" :options="regionList" placeholder="璇烽�夋嫨鍖哄煙" :props="props" collapse-tags></el-cascader>
+ </el-form-item>
+ <el-form-item label="杩愮淮鍗曚綅" prop="unitId">
+ <el-select v-model="batchEditForm.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="batchEditForm.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="submitBatchEdit">纭� 瀹�</el-button>
+ <el-button @click="cancelBatchEdit">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+
</div>
</template>
<script>
-import { listPoint, getPoint, delPoint, addPoint, addPointBatch, updatePoint } from "@/api/platform/point";
+import { listPoint, getPoint, delPoint, addPoint, batchEdit, updatePoint } from "@/api/platform/point";
import { unitSelect } from "@/api/platform/unit";
+import { getCascader } from '../../../api/platform/region'
export default {
name: "Point",
data() {
return {
+ // 鎵归噺淇敼琛ㄥ崟
+ batchEditForm: {
+ ids: [],
+ unitId: null,
+ timezone: null,
+ startTime: null,
+ endTime: null
+ },
+ // 鎵归噺淇敼寮圭獥
+ batchOpen: false,
+ props: { multiple: true },
+ regionList: [],
// 姝ｅ湪淇敼绗嚑涓�
editingIndex: null,
// 閬僵灞�
@@ -284,20 +294,62 @@
pointName: [
{ required: true, message: "鐐逛綅鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
],
- timezone: [
- { required: true, message: "鐐逛綅鏃跺尯涓嶈兘涓虹┖", trigger: "blur" }
+ region: [
+ { required: true, message: "鐐逛綅鎵�鍦ㄥ湴涓嶈兘涓虹┖", trigger: "change" }
],
- unitId: [
- { required: true, message: "杩愮淮鍗曚綅涓嶈兘涓虹┖", trigger: "change" }
+ deptName: [
+ { required: true, message: "鐩戠閮ㄩ棬涓嶈兘涓虹┖", trigger: "change" }
],
+ category: [
+ { required: true, message: "璁惧绫诲瀷", trigger: "change" }
+ ],
+ },
+ // 鎵归噺琛ㄥ崟鏍￠獙
+ batchRules: {
+ ids: [
+ { required: true, message: "璇烽�夋嫨鐐逛綅", trigger: "change" }
+ ]
}
};
},
created() {
this.getList();
this.getUnitSelect();
+ this.getCascader();
},
methods: {
+ // 鐐逛綅瀵煎叆
+ handleImportPoint() {
+
+ },
+ cos(value) {
+ console.log(value)
+ },
+ // 鎻愪氦鎵归噺淇敼
+ submitBatchEdit() {
+ this.batchEditForm.ids = this.batchEditForm.ids.map(array => array[array.length - 1]);
+ if (this.batchEditForm.timezone) {
+ this.batchEditForm.startTime = this.batchEditForm.timezone[0];
+ this.batchEditForm.endTime = this.batchEditForm.timezone[1];
+ }
+ },
+ // 鍙栨秷鎵归噺淇敼
+ cancelBatchEdit() {
+ this.batchOpen = false;
+ },
+ // 鎵归噺淇敼
+ handleEditBatch() {
+ this.batchOpen = true;
+ },
+ removeRegion(item) {
+ this.tempFormList = this.tempFormList.filter(data => data !== item)
+ },
+ // 鑾峰彇鍖哄幙绾ц仈
+ getCascader() {
+ getCascader().then(res => {
+ this.regionList = res.data;
+ })
+ },
// 鐐逛綅椤逛慨鏀瑰畬鎴�
editFinishItem(index) {
this.editingIndex = null;
@@ -322,9 +374,9 @@
},
// 缁х画娣诲姞鐐逛綅
nextAdd() {
- this.formList.push(this.tempForm);
- this.tempFormList.push(this.tempForm);
- this.tempForm = {};
+ let item = {}
+ // this.formList.push(item);
+ this.tempFormList.push(item);
},
getUnitSelect() {
// 杩愮淮鍗曚綅涓嬫媺鍒楄〃
@@ -362,7 +414,8 @@
remark: null,
createTime: null,
updateTime: null,
- deleted: null
+ deleted: null,
+ pointDetail: ""
};
this.resetForm("form");
},
@@ -379,7 +432,7 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
+ this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 鏂板鎸夐挳鎿嶄綔 */
@@ -395,39 +448,31 @@
getPoint(id).then(response => {
this.form = response.data;
this.form.timezone = [this.form.startTime, this.form.endTime]
- this.editOpen = true;
+ if (this.form.pointDetail) {
+ this.tempFormList = JSON.parse(this.form.pointDetail)
+ }
+ this.open = 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();
- });
- }
+ if (this.tempFormList) {
+ this.form.pointDetail = JSON.stringify(this.tempFormList)
+ }
+ if (this.form.id != null) {
+ updatePoint(this.form).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ } else {
+ addPoint(this.form).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ this.reset()
+ this.getList();
+ });
}
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
@@ -438,7 +483,8 @@
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ }).catch(() => {
+ });
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
@@ -451,16 +497,11 @@
</script>
<style scoped>
-.point-row {
+.col-item {
+ margin: 5px 0;
display: flex;
flex-direction: row;
+ align-content: center;
justify-content: center;
- align-items: center;
-}
-.row-item {
- margin-right: 5px;
-}
-.row-item:nth-last-child {
- margin-right: 0;
}
</style>
--
Gitblit v1.8.0