Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
79c64fde by 任超
Options

Merge branch 'master' into dev

2 parents f5d6a89e 1c167f15
Inline Side-by-side
Showing 8 changed files with 17 additions and 32 deletions
1 import { Message } from "element-ui"; 1 import { Message } from "element-ui";
2 export function removeTreeListItem (treeList, dictId, idName = 'bsmDict') { 2 export function removeTreeListItem (treeList, dictId, idName = 'bsmDict') {
3 debugger 3
4 if (!treeList || !treeList.length) { 4 if (!treeList || !treeList.length) {
5 return 5 return
6 } 6 }
...@@ -122,9 +122,9 @@ export function timeFormat (date, end) { ...@@ -122,9 +122,9 @@ export function timeFormat (date, end) {
122 var d = date.getDate(); //日 122 var d = date.getDate(); //日
123 d < 10 && (d = '0' + d) 123 d < 10 && (d = '0' + d)
124 if (end) { 124 if (end) {
125 return y + "/" + m + "/" + d + ' 23:59:59'; 125 return y + "-" + m + "-" + d + ' 23:59:59';
126 } else { 126 } else {
127 return y + "/" + m + "/" + d + ' 00:00:00'; 127 return y + "-" + m + "-" + d + ' 00:00:00';
128 } 128 }
129 } 129 }
130 export function getFirstDayOfSeason (d) { 130 export function getFirstDayOfSeason (d) {
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 placeholder="开始日期" 17 placeholder="开始日期"
18 :picker-options="pickerOptionsStart" 18 :picker-options="pickerOptionsStart"
19 v-model="form.startTime" 19 v-model="form.startTime"
20 value-format="yyyy/MM/dd HH:mm:ss" 20 value-format="yyyy-MM-dd HH:mm:ss"
21 ></el-date-picker> 21 ></el-date-picker>
22 </el-form-item> 22 </el-form-item>
23 </el-col> 23 </el-col>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 placeholder="结束日期" 30 placeholder="结束日期"
31 :picker-options="pickerOptionsEnd" 31 :picker-options="pickerOptionsEnd"
32 v-model="form.endTime" 32 v-model="form.endTime"
33 value-format="yyyy/MM/dd HH:mm:ss" 33 value-format="yyyy-MM-dd HH:mm:ss"
34 @change="endTimeChange" 34 @change="endTimeChange"
35 ></el-date-picker> 35 ></el-date-picker>
36 </el-form-item> 36 </el-form-item>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
35 placeholder="开始日期" 35 placeholder="开始日期"
36 :picker-options="pickerOptionsStart" 36 :picker-options="pickerOptionsStart"
37 v-model="form.startTime" 37 v-model="form.startTime"
38 value-format="yyyy/MM/dd HH:mm:ss" 38 value-format="yyyy-MM-dd HH:mm:ss"
39 ></el-date-picker> 39 ></el-date-picker>
40 </el-form-item> 40 </el-form-item>
41 </el-col> 41 </el-col>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
48 placeholder="结束日期" 48 placeholder="结束日期"
49 :picker-options="pickerOptionsEnd" 49 :picker-options="pickerOptionsEnd"
50 v-model="form.endTime" 50 v-model="form.endTime"
51 value-format="yyyy/MM/dd HH:mm:ss" 51 value-format="yyyy-MM-dd HH:mm:ss"
52 @change="endTimeChange" 52 @change="endTimeChange"
53 ></el-date-picker> 53 ></el-date-picker>
54 </el-form-item> 54 </el-form-item>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
35 placeholder="开始日期" 35 placeholder="开始日期"
36 :picker-options="pickerOptionsStart" 36 :picker-options="pickerOptionsStart"
37 v-model="form.startTime" 37 v-model="form.startTime"
38 value-format="yyyy/MM/dd HH:mm:ss" 38 value-format="yyyy-MM-dd HH:mm:ss"
39 ></el-date-picker> 39 ></el-date-picker>
40 </el-form-item> 40 </el-form-item>
41 </el-col> 41 </el-col>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
48 placeholder="结束日期" 48 placeholder="结束日期"
49 :picker-options="pickerOptionsEnd" 49 :picker-options="pickerOptionsEnd"
50 v-model="form.endTime" 50 v-model="form.endTime"
51 value-format="yyyy/MM/dd HH:mm:ss" 51 value-format="yyyy-MM-dd HH:mm:ss"
52 @change="endTimeChange" 52 @change="endTimeChange"
53 ></el-date-picker> 53 ></el-date-picker>
54 </el-form-item> 54 </el-form-item>
......
...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
19 <el-col :span="6"> 19 <el-col :span="6">
20 <el-form-item label="接收日期" prop="receiveStartTime"> 20 <el-form-item label="接收日期" prop="receiveStartTime">
21 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart" 21 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
22 clearable v-model="form.receiveStartTime" value-format="yyyy/MM/dd HH:mm:ss"></el-date-picker> 22 clearable v-model="form.receiveStartTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
23 </el-form-item> 23 </el-form-item>
24 </el-col> 24 </el-col>
25 <el-col :span="6"> 25 <el-col :span="6">
26 <el-form-item label="至" prop="receiveEndTime" label-width="35px"> 26 <el-form-item label="至" prop="receiveEndTime" label-width="35px">
27 <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd" 27 <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
28 clearable v-model="form.receiveEndTime" value-format="yyyy/MM/dd HH:mm:ss" 28 clearable v-model="form.receiveEndTime" value-format="yyyy-MM-dd HH:mm:ss"
29 @change="endTimeChange"></el-date-picker> 29 @change="endTimeChange"></el-date-picker>
30 </el-form-item> 30 </el-form-item>
31 </el-col> 31 </el-col>
......
...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
19 <el-col :span="6"> 19 <el-col :span="6">
20 <el-form-item label="开始日期" prop="startTime"> 20 <el-form-item label="开始日期" prop="startTime">
21 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart" 21 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
22 clearable v-model="form.startTime" value-format="yyyy/MM/dd HH:mm:ss"></el-date-picker> 22 clearable v-model="form.startTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
23 </el-form-item> 23 </el-form-item>
24 </el-col> 24 </el-col>
25 <el-col :span="6"> 25 <el-col :span="6">
26 <el-form-item label="结束日期" prop="endTime"> 26 <el-form-item label="结束日期" prop="endTime">
27 <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd" 27 <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
28 clearable v-model="form.endTime" value-format="yyyy/MM/dd HH:mm:ss" 28 clearable v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss"
29 @change="endTimeChange"></el-date-picker> 29 @change="endTimeChange"></el-date-picker>
30 </el-form-item> 30 </el-form-item>
31 </el-col> 31 </el-col>
......
...@@ -20,14 +20,14 @@ ...@@ -20,14 +20,14 @@
20 <el-form-item label="汇交时间" prop="exchangeStartTime"> 20 <el-form-item label="汇交时间" prop="exchangeStartTime">
21 <el-date-picker type="date" class="width100" placeholder="开始日期" clearable 21 <el-date-picker type="date" class="width100" placeholder="开始日期" clearable
22 :picker-options="pickerOptionsStart" v-model="form.exchangeStartTime" 22 :picker-options="pickerOptionsStart" v-model="form.exchangeStartTime"
23 value-format="yyyy/MM/dd HH:mm:ss"></el-date-picker> 23 value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
24 </el-form-item> 24 </el-form-item>
25 </el-col> 25 </el-col>
26 <el-col :span="6"> 26 <el-col :span="6">
27 <el-form-item label="至" prop="exchangeStartTime" label-width="35px"> 27 <el-form-item label="至" prop="exchangeStartTime" label-width="35px">
28 <el-date-picker type="date" class="width100" placeholder="结束日期" clearable 28 <el-date-picker type="date" class="width100" placeholder="结束日期" clearable
29 :picker-options="pickerOptionsEnd" v-model="form.exchangeEndTime" 29 :picker-options="pickerOptionsEnd" v-model="form.exchangeEndTime"
30 value-format="yyyy/MM/dd HH:mm:ss" @change="endTimeChange"></el-date-picker> 30 value-format="yyyy-MM-dd HH:mm:ss" @change="endTimeChange"></el-date-picker>
31 </el-form-item> 31 </el-form-item>
32 </el-col> 32 </el-col>
33 <el-col :span="6"> 33 <el-col :span="6">
......
...@@ -284,24 +284,8 @@ export default { ...@@ -284,24 +284,8 @@ export default {
284 }); 284 });
285 }, 285 },
286 handleMinus (index, row) { 286 handleMinus (index, row) {
287 this.$confirm("此操作将永久删除, 是否继续?", "提示", {
288 confirmButtonText: "确定",
289 cancelButtonText: "取消",
290 type: "warning",
291 })
292 .then(() => {
293 removeTreeListItem(this.tableData, row.dictid, 'dictid'); 287 removeTreeListItem(this.tableData, row.dictid, 'dictid');
294 this.$message({ 288 this.tableData = judgeSort(this.tableData)
295 type: "success",
296 message: "删除成功!",
297 });
298 })
299 .catch(() => {
300 this.$message({
301 type: "info",
302 message: "已取消删除",
303 });
304 });
305 }, 289 },
306 handleSubmit () { 290 handleSubmit () {
307 editDictNode({ 291 editDictNode({
...@@ -354,6 +338,7 @@ export default { ...@@ -354,6 +338,7 @@ export default {
354 typeid: this.ruleForm.typeid, 338 typeid: this.ruleForm.typeid,
355 }); 339 });
356 this.addIndexes(); 340 this.addIndexes();
341 this.tableData = judgeSort(this.tableData)
357 this.key++; 342 this.key++;
358 }, 343 },
359 // 上移下移 344 // 上移下移
......