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 18 additions and 33 deletions
import { Message } from "element-ui";
export function removeTreeListItem (treeList, dictId, idName = 'bsmDict') {
debugger
if (!treeList || !treeList.length) {
return
}
......@@ -122,9 +122,9 @@ export function timeFormat (date, end) {
var d = date.getDate(); //日
d < 10 && (d = '0' + d)
if (end) {
return y + "/" + m + "/" + d + ' 23:59:59';
return y + "-" + m + "-" + d + ' 23:59:59';
} else {
return y + "/" + m + "/" + d + ' 00:00:00';
return y + "-" + m + "-" + d + ' 00:00:00';
}
}
export function getFirstDayOfSeason (d) {
......
......@@ -17,7 +17,7 @@
placeholder="开始日期"
:picker-options="pickerOptionsStart"
v-model="form.startTime"
value-format="yyyy/MM/dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
></el-date-picker>
</el-form-item>
</el-col>
......@@ -30,7 +30,7 @@
placeholder="结束日期"
:picker-options="pickerOptionsEnd"
v-model="form.endTime"
value-format="yyyy/MM/dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
@change="endTimeChange"
></el-date-picker>
</el-form-item>
......
......@@ -35,7 +35,7 @@
placeholder="开始日期"
:picker-options="pickerOptionsStart"
v-model="form.startTime"
value-format="yyyy/MM/dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
></el-date-picker>
</el-form-item>
</el-col>
......@@ -48,7 +48,7 @@
placeholder="结束日期"
:picker-options="pickerOptionsEnd"
v-model="form.endTime"
value-format="yyyy/MM/dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
@change="endTimeChange"
></el-date-picker>
</el-form-item>
......
......@@ -35,7 +35,7 @@
placeholder="开始日期"
:picker-options="pickerOptionsStart"
v-model="form.startTime"
value-format="yyyy/MM/dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
></el-date-picker>
</el-form-item>
</el-col>
......@@ -48,7 +48,7 @@
placeholder="结束日期"
:picker-options="pickerOptionsEnd"
v-model="form.endTime"
value-format="yyyy/MM/dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
@change="endTimeChange"
></el-date-picker>
</el-form-item>
......
......@@ -19,13 +19,13 @@
<el-col :span="6">
<el-form-item label="接收日期" prop="receiveStartTime">
<el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
clearable v-model="form.receiveStartTime" value-format="yyyy/MM/dd HH:mm:ss"></el-date-picker>
clearable v-model="form.receiveStartTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="至" prop="receiveEndTime" label-width="35px">
<el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
clearable v-model="form.receiveEndTime" value-format="yyyy/MM/dd HH:mm:ss"
clearable v-model="form.receiveEndTime" value-format="yyyy-MM-dd HH:mm:ss"
@change="endTimeChange"></el-date-picker>
</el-form-item>
</el-col>
......
......@@ -19,13 +19,13 @@
<el-col :span="6">
<el-form-item label="开始日期" prop="startTime">
<el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
clearable v-model="form.startTime" value-format="yyyy/MM/dd HH:mm:ss"></el-date-picker>
clearable v-model="form.startTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="结束日期" prop="endTime">
<el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
clearable v-model="form.endTime" value-format="yyyy/MM/dd HH:mm:ss"
clearable v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss"
@change="endTimeChange"></el-date-picker>
</el-form-item>
</el-col>
......
......@@ -20,14 +20,14 @@
<el-form-item label="汇交时间" prop="exchangeStartTime">
<el-date-picker type="date" class="width100" placeholder="开始日期" clearable
:picker-options="pickerOptionsStart" v-model="form.exchangeStartTime"
value-format="yyyy/MM/dd HH:mm:ss"></el-date-picker>
value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="至" prop="exchangeStartTime" label-width="35px">
<el-date-picker type="date" class="width100" placeholder="结束日期" clearable
:picker-options="pickerOptionsEnd" v-model="form.exchangeEndTime"
value-format="yyyy/MM/dd HH:mm:ss" @change="endTimeChange"></el-date-picker>
value-format="yyyy-MM-dd HH:mm:ss" @change="endTimeChange"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
......
......@@ -284,24 +284,8 @@ export default {
});
},
handleMinus (index, row) {
this.$confirm("此操作将永久删除, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
removeTreeListItem(this.tableData, row.dictid, 'dictid');
this.$message({
type: "success",
message: "删除成功!",
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消删除",
});
});
removeTreeListItem(this.tableData, row.dictid, 'dictid');
this.tableData = judgeSort(this.tableData)
},
handleSubmit () {
editDictNode({
......@@ -354,6 +338,7 @@ export default {
typeid: this.ruleForm.typeid,
});
this.addIndexes();
this.tableData = judgeSort(this.tableData)
this.key++;
},
// 上移下移
......