Commit 1980d95c authored by 骆瑛's avatar 骆瑛

修改对象fff管理页面

parent 736da3b1
......@@ -3,15 +3,18 @@
<Row>
<Col :span="12"
><FormItem :label="l('code')" prop="code">
<Input v-model="entity.code"> </Input> </FormItem></Col>
<Input v-model="entity.code"> </Input> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('name')" prop="name">
<Input v-model="entity.name"> </Input> </FormItem></Col>
<Input v-model="entity.name"> </Input> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('duration')" prop="duration">
<InputNumber v-model="entity.duration" ></InputNumber> </FormItem>
</Col>
<InputNumber v-model="entity.duration"></InputNumber>
</FormItem>
</Col>
<Col :span="12"
><FormItem :label="l('strategy')" prop="strategy">
<Dictionary
......@@ -43,9 +46,7 @@
></Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled"
>保存</Button
>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
......@@ -56,7 +57,6 @@ export default {
name: "Add",
data() {
return {
disabled: false,
entity: {
code: "",
name: "",
......@@ -69,7 +69,9 @@ export default {
rules: {
code: [{ required: true, message: "必填", trigger: "blur" }],
name: [{ required: true, message: "必填", trigger: "blur" }],
duration: [{ required: true, message: "必填", trigger: "blur",type:"number" }],
duration: [
{ required: true, message: "必填", trigger: "blur", type: "number" },
],
},
};
},
......@@ -86,10 +88,8 @@ export default {
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true;
Api.create(this.entity)
.then((r) => {
this.disabled = false;
if (r.success) {
this.$Message.success("保存成功");
this.$emit("on-ok");
......@@ -98,7 +98,6 @@ export default {
}
})
.catch((err) => {
this.disabled = false;
this.$Message.error("保存失败");
console.warn(err);
});
......
......@@ -45,7 +45,7 @@
></Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled"
<Button type="primary" @click="handleSubmit" v-noClick
>保存</Button
>
<Button @click="handleClose" class="ml20">取消</Button>
......@@ -58,7 +58,7 @@ export default {
name: "Edit",
data() {
return {
disabled: false,
entity: {},
rules: {
code: [{ required: true, message: "必填", trigger: "blur" }],
......@@ -84,10 +84,10 @@ export default {
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true;
Api.update(this.entity)
.then((r) => {
this.disabled = false;
if (r.success) {
this.$Message.success("保存成功");
this.$emit("on-ok");
......@@ -96,7 +96,7 @@ export default {
}
})
.catch((err) => {
this.disabled = false;
this.$Message.error("保存失败");
console.warn(err);
});
......
......@@ -3,17 +3,31 @@
<Row>
<Col :span="24">
<FormItem :label="l('shiftWorkSchedCode')" prop="shiftWorkSchedCode">
<Input v-model="entity.shiftWorkSchedCode" placeholder="请填写班次编号" style="width: 90%"></Input>
<Input
v-model="entity.shiftWorkSchedCode"
placeholder="请填写班次编号"
style="width: 90%"
></Input>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('shiftName')" prop="shiftName">
<Input v-model="entity.shiftName" placeholder="请填写班次名称" style="width: 90%"></Input>
<Input
v-model="entity.shiftName"
placeholder="请填写班次名称"
style="width: 90%"
></Input>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('shiftStartEnd')" prop="shiftStartEnd">
<TimePicker format="HH:mm" v-model="entity.shiftStartEnd" type="timerange" placeholder="请选择时间段" style="width: 130px"></TimePicker>
<TimePicker
format="HH:mm"
v-model="entity.shiftStartEnd"
type="timerange"
placeholder="请选择时间段"
style="width: 130px"
></TimePicker>
</FormItem>
</Col>
<!-- <Col :span="24">
......@@ -28,7 +42,7 @@
</Col> -->
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
......@@ -39,39 +53,49 @@ export default {
name: "Add",
data() {
return {
disabled: false,
entity: {},
rules: {
shiftWorkSchedCode: [{ required: true, message: "请填写班次编号", trigger: "blur" }],
shiftName: [{ required: true, message: "请填写班次名称", trigger: "blur" }],
shiftStartEnd: [{
required: true,
type: 'array',
message: "请选择班次时间段",
trigger: 'blur',
fields: {
0: {type: "string", required: true, message: "请选择班次时间段"},
1: {type: "string", required: true, message: "请选择班次时间段"}
}
}
shiftWorkSchedCode: [
{ required: true, message: "请填写班次编号", trigger: "blur" },
],
}
shiftName: [
{ required: true, message: "请填写班次名称", trigger: "blur" },
],
shiftStartEnd: [
{
required: true,
type: "array",
message: "请选择班次时间段",
trigger: "blur",
fields: {
0: {
type: "string",
required: true,
message: "请选择班次时间段",
},
1: {
type: "string",
required: true,
message: "请选择班次时间段",
},
},
},
],
},
};
},
props: {
v: Object
v: Object,
},
methods: {
handleSubmit() {
this.$refs.form.validate(v => {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true;
var data = this.$u.clone(this.entity)
data.shiftStart = this.entity.shiftStartEnd[0]
data.shiftEnd = this.entity.shiftStartEnd[1]
var data = this.$u.clone(this.entity);
data.shiftStart = this.entity.shiftStartEnd[0];
data.shiftEnd = this.entity.shiftStartEnd[1];
Api.create(data)
.then(r => {
this.disabled = false;
.then((r) => {
if (r.success) {
this.$Message.success("保存成功");
this.$emit("on-ok");
......@@ -79,8 +103,7 @@ export default {
this.$Message.error("保存失败");
}
})
.catch(err => {
this.disabled = false;
.catch((err) => {
this.$Message.error("保存失败");
console.warn(err);
});
......@@ -93,12 +116,12 @@ export default {
l(key) {
key = "mes_shift_work_sched" + "." + key;
return this.$t(key);
}
},
},
watch: {
v() {
this.entity = this.$u.clone(this.v);
}
}
},
},
};
</script>
......@@ -11,24 +11,40 @@
<Input v-model="entity.shiftName"></Input>
</FormItem>
</Col>
<Col :span="24">
<Col :span="24">
<FormItem :label="l('shiftStartEnd')" prop="shiftStartEnd">
<TimePicker format="HH:mm" v-model="entity.shiftStartEnd" type="timerange" placeholder="选择时间段" style="width: 130px"></TimePicker>
<TimePicker
format="HH:mm"
v-model="entity.shiftStartEnd"
type="timerange"
placeholder="选择时间段"
style="width: 130px"
></TimePicker>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('shiftStart')" prop="shiftStart">
<TimePicker format="HH:mm" v-model="entity.shiftStart" placeholder="选择时间段" style="width: 130px"></TimePicker>
<TimePicker
format="HH:mm"
v-model="entity.shiftStart"
placeholder="选择时间段"
style="width: 130px"
></TimePicker>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('shiftEnd')" prop="shiftEnd">
<TimePicker format="HH:mm" v-model="entity.shiftEnd" placeholder="选择时间段" style="width: 130px"></TimePicker>
<TimePicker
format="HH:mm"
v-model="entity.shiftEnd"
placeholder="选择时间段"
style="width: 130px"
></TimePicker>
</FormItem>
</Col>
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
......@@ -39,61 +55,65 @@ export default {
name: "Edit",
data() {
return {
disabled: false,
entity: {},
rules: {
shiftWorkSchedCode: [{ required: true, message: "请填写班次编号", trigger: "blur" }],
shiftName: [{ required: true, message: "请填写班次名称", trigger: "blur" }],
shiftStart: [{
required: true,
message: "请选择开始时间",
trigger: "change"
}],
shiftEnd: [{
required: true,
message: "请选择结束时间",
trigger: "change"
}],
}
shiftWorkSchedCode: [
{ required: true, message: "请填写班次编号", trigger: "blur" },
],
shiftName: [
{ required: true, message: "请填写班次名称", trigger: "blur" },
],
shiftStart: [
{
required: true,
message: "请选择开始时间",
trigger: "change",
},
],
shiftEnd: [
{
required: true,
message: "请选择结束时间",
trigger: "change",
},
],
},
};
},
props: {
eid: Number
eid: Number,
},
methods: {
load(v) {
Api.get({ id: v }).then(r => {
Api.get({ id: v }).then((r) => {
this.entity = r.result;
this.$emit("on-load");
});
},
handleSubmit() {
this.$refs.form.validate(v => {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true;
var data = this.entity
let startime = data.shiftStart
let endtime = data.shiftEnd
if(startime> endtime){
alert("结束时间不能小于开始时间!");
this.disabled = false;
return;
}else{
Api.update(data)
.then(r => {
this.disabled = false;
if (r.success) {
this.$Message.success("保存成功");
this.$emit("on-ok");
} else {
var data = this.entity;
let startime = data.shiftStart;
let endtime = data.shiftEnd;
if (startime > endtime) {
alert("结束时间不能小于开始时间!");
return;
} else {
Api.update(data)
.then((r) => {
if (r.success) {
this.$Message.success("保存成功");
this.$emit("on-ok");
} else {
this.$Message.error("保存失败");
}
})
.catch((err) => {
this.$Message.error("保存失败");
}
})
.catch(err => {
this.disabled = false;
this.$Message.error("保存失败");
console.warn(err);
});
console.warn(err);
});
}
}
});
......@@ -104,14 +124,14 @@ export default {
l(key) {
key = "mes_shift_work_sched" + "." + key;
return this.$t(key);
}
},
},
watch: {
eid(v) {
if (v != 0) {
this.load(v);
}
}
}
},
},
};
</script>
\ No newline at end of file
......@@ -3,12 +3,20 @@
<Row>
<Col :span="24">
<FormItem :label="l('holidayId')" prop="holidayId">
<Input v-model="entity.holidayId" placeholder="请填写节假日编号" style="width: 90%"></Input>
<Input
v-model="entity.holidayId"
placeholder="请填写节假日编号"
style="width: 90%"
></Input>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('holidayName')" prop="holidayName">
<Input v-model="entity.holidayName" placeholder="请填写节假日名称" style="width: 90%"></Input>
<Input
v-model="entity.holidayName"
placeholder="请填写节假日名称"
style="width: 90%"
></Input>
</FormItem>
</Col>
<!-- <Col :span="24">
......@@ -24,17 +32,25 @@
</Col> -->
<Col :span="24">
<FormItem :label="l('holidayStart')" prop="holidayStart">
<DatePicker type="date" placeholder="请选择开始日期" v-model="entity.holidayStart"></DatePicker>
<DatePicker
type="date"
placeholder="请选择开始日期"
v-model="entity.holidayStart"
></DatePicker>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('holidayEnd')" prop="holidayEnd">
<DatePicker type="date" placeholder="请选择结束日期" v-model="entity.holidayEnd"></DatePicker>
<DatePicker
type="date"
placeholder="请选择结束日期"
v-model="entity.holidayEnd"
></DatePicker>
</FormItem>
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
......@@ -45,27 +61,30 @@ export default {
name: "Add",
data() {
return {
disabled: false,
entity: {},
rules: {
holidayId: [
{ required: true, message: "请填写节假日编号", trigger: "blur" }
{ required: true, message: "请填写节假日编号", trigger: "blur" },
],
holidayName: [
{ required: true, message: "请填写节假日名称", trigger: "blur" }
{ required: true, message: "请填写节假日名称", trigger: "blur" },
],
holidayStart: [
{
required: true,
type: "date",
message: "请选择开始时间",
trigger: "change",
},
],
holidayEnd: [
{
required: true,
type: "date",
message: "请选择结束时间",
trigger: "change",
},
],
holidayStart: [{
required: true,
type: "date",
message: "请选择开始时间",
trigger: "change"
}],
holidayEnd: [{
required: true,
type: "date",
message: "请选择结束时间",
trigger: "change"
}],
// holidayTimeslot: [
// {
// required: true,
......@@ -77,41 +96,38 @@ export default {
// 1: {type: "date", required: true, message: "请选择班次时间段"}
// }
// }
// ]
}
},
};
},
props: {
v: Object
v: Object,
},
methods: {
handleSubmit() {
this.$refs.form.validate(v => {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true;
let startime = this.entity.holidayStart
let endtime = this.entity.holidayEnd
if(startime.getTime() > endtime.getTime()){
alert("结束时间不能大于开始时间!");
this.disabled = false;
return;
}else{
Api.create(this.entity)
.then(r => {
this.disabled = false;
if (r.success) {
this.$Message.success("保存成功");
this.$emit("on-ok");
} else {
let startime = this.entity.holidayStart;
let endtime = this.entity.holidayEnd;
if (startime.getTime() > endtime.getTime()) {
this.$Message.error("结束时间不能大于开始时间!");
return;
} else {
Api.create(this.entity)
.then((r) => {
if (r.success) {
this.$Message.success("保存成功");
this.$emit("on-ok");
} else {
this.$Message.error("保存失败");
}
})
.catch((err) => {
this.$Message.error("保存失败");
}
})
.catch(err => {
this.disabled = false;
this.$Message.error("保存失败");
console.warn(err);
});
console.warn(err);
});
}
}
});
......@@ -122,12 +138,12 @@ export default {
l(key) {
key = "calendar_holiday" + "." + key;
return this.$t(key);
}
},
},
watch: {
v() {
this.entity = this.$u.clone(this.v);
}
}
},
},
};
</script>
\ No newline at end of file
......@@ -23,33 +23,35 @@
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</template>
<script>
import Api from './api'
import Api from "./api";
export default {
name: 'Add',
name: "Add",
data() {
return {
disabled: false,
entity: {},
rules: {
shiftWorkSchedCode: [{ required: true, message: '请填写编号', trigger: 'blur' }],
shiftName: [{ required: true, message: '请填写班次名称', trigger: 'blur' }],
}
}
shiftWorkSchedCode: [
{ required: true, message: "请填写编号", trigger: "blur" },
],
shiftName: [
{ required: true, message: "请填写班次名称", trigger: "blur" },
],
},
};
},
props: {
v: Object
v: Object,
},
methods: {
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true
// let parmes = {
// pageIndex: 1,
// pageSize: 20,
......@@ -61,52 +63,51 @@ export default {
// }
// ],
// total: 4
// }
// }
// Api.paged(parmes).then((r) => {
// console.log(r.success)
// if(r.success){
// this.$Message.error("该班次名称已存在!")
// this.disabled = true
// return
// }else{
let pames = {
title: this.entity.title,
startendTime: this.entity.startendTime.join('-')
}
Api.create(pames)
.then((r) => {
if (r.success) {
// this.disabled = false
this.$Message.success('保存成功')
this.entity = {}
this.$emit('on-ok')
} else {
this.$Message.error('保存失败')
}
})
.catch((err) => {
this.$Message.error('保存失败')
console.warn(err)
})
}
})
// }
// })
let pames = {
title: this.entity.title,
startendTime: this.entity.startendTime.join("-"),
};
Api.create(pames)
.then((r) => {
if (r.success) {
this.$Message.success("保存成功");
this.entity = {};
this.$emit("on-ok");
} else {
this.$Message.error("保存失败");
}
})
.catch((err) => {
this.$Message.error("保存失败");
console.warn(err);
});
}
});
// }
// })
},
handleClose() {
this.entity = {}
this.disabled = true
this.$emit('on-close')
this.entity = {};
this.$emit("on-close");
},
l(key) {
key = 'calendar_class' + '.' + key
return this.$t(key)
}
key = "calendar_class" + "." + key;
return this.$t(key);
},
},
watch: {
v() {
this.entity = this.$u.clone(this.v)
}
}
}
this.entity = this.$u.clone(this.v);
},
},
};
</script>
\ No newline at end of file
......@@ -23,7 +23,7 @@
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
......@@ -34,7 +34,7 @@ export default {
name: 'Add',
data() {
return {
disabled: false,
entity: {},
rules: {
shiftWorkSchedCode: [{ required: true, message: '请填写编号', trigger: 'blur' }],
......@@ -49,7 +49,7 @@ export default {
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true
// let parmes = {
// pageIndex: 1,
// pageSize: 20,
......@@ -95,7 +95,7 @@ export default {
},
handleClose() {
this.entity = {}
this.disabled = true
this.$emit('on-close')
},
l(key) {
......
......@@ -6,88 +6,90 @@
<Input v-model="entity.title"></Input>
</FormItem>
</Col>
<Col span="24">
<!-- prop="startendTime" -->
<Col span="24">
<!-- prop="startendTime" -->
<FormItem :label="l('startendTime')">
<TimePicker type="timerange" format="HH:mm" v-model="entity.startendTime" placeholder="请选择时间段"></TimePicker>
<TimePicker
type="timerange"
format="HH:mm"
v-model="entity.startendTime"
placeholder="请选择时间段"
></TimePicker>
</FormItem>
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</template>
<script>
import Api from './api'
import Api from "./api";
export default {
name: 'Edit',
name: "Edit",
data() {
return {
disabled: false,
entity: {},
rules: {
title: [{ required: true, message: '请填写班次名称', trigger: 'blur' }],
title: [{ required: true, message: "请填写班次名称", trigger: "blur" }],
// startendTime: [{ required: true, message: '请选择时间段', trigger: 'blur' }],
}
}
},
};
},
props: {
eid: Number
eid: Number,
},
methods: {
load(v) {
Api.get({ id: v }).then((r) => {
r.result.startendTime=r.result.startendTime.split('-')
this.entity = r.result
this.$emit('on-load')
})
r.result.startendTime = r.result.startendTime.split("-");
this.entity = r.result;
this.$emit("on-load");
});
},
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
let startendTime = this.entity.startendTime
let pames={
let startendTime = this.entity.startendTime;
let pames = {
title: this.entity.title,
startendTime: startendTime.join('-'),
startendTime: startendTime.join("-"),
workHours: this.entity.workHours,
creationTime: this.entity.creationTime,
creatorUserId: this.entity.creatorUserId,
id: this.entity.id,
}
};
Api.update(pames)
.then((r) => {
this.disabled = false
if (r.success) {
this.$Message.success('保存成功')
this.$emit('on-ok')
this.$Message.success("保存成功");
this.$emit("on-ok");
} else {
this.$Message.error('保存失败')
this.$Message.error("保存失败");
}
})
.catch((err) => {
this.disabled = false
this.$Message.error('保存失败')
console.warn(err)
})
this.$Message.error("保存失败");
// console.warn(err)
});
}
})
});
},
handleClose() {
this.$emit('on-close')
this.$emit("on-close");
},
l(key) {
key = 'calendar_class' + '.' + key
return this.$t(key)
}
key = "calendar_class" + "." + key;
return this.$t(key);
},
},
watch: {
eid(v) {
if (v != 0) {
this.load(v)
this.load(v);
}
}
}
}
},
},
};
</script>
\ No newline at end of file
......@@ -23,91 +23,98 @@
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" v-noClick
>保存</Button
>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</template>
<script>
import Api from './api'
import Api from "./api";
export default {
name: 'Edit',
name: "Edit",
data() {
return {
disabled: false,
entity: {},
rules: {
holidayId: [{ required: true, message: '请填写节假日编号', trigger: 'blur' }],
holidayName: [{ required: true, message: '请填写节假日名称', trigger: 'blur' }],
holidayStart: [{
required: true,
type: "date",
message: "请选择开始时间",
trigger: "change"
}],
holidayEnd: [{
required: true,
type: "date",
message: "请选择结束时间",
trigger: "change"
}],
}
}
holidayId: [
{ required: true, message: "请填写节假日编号", trigger: "blur" },
],
holidayName: [
{ required: true, message: "请填写节假日名称", trigger: "blur" },
],
holidayStart: [
{
required: true,
type: "date",
message: "请选择开始时间",
trigger: "change",
},
],
holidayEnd: [
{
required: true,
type: "date",
message: "请选择结束时间",
trigger: "change",
},
],
},
};
},
props: {
eid: Number
eid: Number,
},
methods: {
load(v) {
Api.get({ id: v }).then((r) => {
this.entity = r.result
this.$emit('on-load')
})
this.entity = r.result;
this.$emit("on-load");
});
},
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true
let startime = this.entity.holidayStart
let endtime = this.entity.holidayEnd
if(startime.getTime() > endtime.getTime()){
alert("结束时间不能小于开始时间!");
this.disabled = false;
return;
}else{
Api.update(this.entity)
.then((r) => {
this.disabled = false
if (r.success) {
this.$Message.success('保存成功')
this.$emit('on-ok')
} else {
this.$Message.error('保存失败')
}
})
.catch((err) => {
this.disabled = false
this.$Message.error('保存失败')
console.warn(err)
})
let startime = this.entity.holidayStart;
let endtime = this.entity.holidayEnd;
if (startime.getTime() > endtime.getTime()) {
this.$Message.error("结束时间不能小于开始时间!");
return;
} else {
Api.update(this.entity)
.then((r) => {
if (r.success) {
this.$Message.success("保存成功");
this.$emit("on-ok");
} else {
this.$Message.error("保存失败");
}
})
.catch((err) => {
this.$Message.error("保存失败");
console.warn(err);
});
}
}
})
});
},
handleClose() {
this.$emit('on-close')
this.$emit("on-close");
},
l(key) {
key = 'calendar_holiday' + '.' + key
return this.$t(key)
}
key = "calendar_holiday" + "." + key;
return this.$t(key);
},
},
watch: {
eid(v) {
if (v != 0) {
this.load(v)
this.load(v);
}
}
}
}
},
},
};
</script>
\ No newline at end of file
......@@ -18,113 +18,122 @@
v-for="item in orderCatList"
:value="item.id"
:key="item.index"
:label="item.title+'('+ item.startendTime +')'"
:label="item.title + '(' + item.startendTime + ')'"
></Option>
</Select>
</FormItem>
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</template>
<script>
import Api from './api'
import Api from "./api";
export default {
name: 'Add',
name: "Add",
data() {
return {
disabled: false,
entity: {
id:[],
title:"",
holidayId:[],
holidayTitle:"",
selectItems:[],//选中的加班日历
id: [],
title: "",
holidayId: [],
holidayTitle: "",
selectItems: [], //选中的加班日历
},
orderCatList: [],
rules: {
holidayCalId: [{ required: true, message: '请填写日历编号', trigger: 'blur' }],
holidayCalName: [{ required: true, message: '请填写日历名称', trigger: 'blur' }],
holidayCalId: [
{ required: true, message: "请填写日历编号", trigger: "blur" },
],
holidayCalName: [
{ required: true, message: "请填写日历名称", trigger: "blur" },
],
holidayId: [
{ required: true, type: 'array', min: 1, message: '请选择关联假日', trigger: 'change' },
]
}
}
{
required: true,
type: "array",
min: 1,
message: "请选择关联假日",
trigger: "change",
},
],
},
};
},
props: {
v: Object
v: Object,
},
created() {
this.selectAry()
this.selectAry();
},
methods: {
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true
let titles=[];
this.selectItems.map(u=>{
titles.push(u.title+"("+u.startendTime+")")
})
let titles = [];
this.selectItems.map((u) => {
titles.push(u.title + "(" + u.startendTime + ")");
});
let parme = {
holidayCalId:this.entity.holidayCalId,
holidayCalName:this.entity.holidayCalName,
mesHolidayTitles:titles.join(),
mesHolidayIds:this.entity.holidayId.join(),
}
Api.create(parme).then((r) => {
this.disabled = false
holidayCalId: this.entity.holidayCalId,
holidayCalName: this.entity.holidayCalName,
mesHolidayTitles: titles.join(),
mesHolidayIds: this.entity.holidayId.join(),
};
Api.create(parme)
.then((r) => {
if (r.success) {
this.$Message.success('保存成功')
this.entity.holidayId=[];
this.$Message.success("保存成功");
this.entity.holidayId = [];
this.$refs.form.resetFields();
this.$emit('on-ok')
this.$emit("on-ok");
} else {
this.$Message.error('保存失败')
this.$Message.error("保存失败");
}
})
.catch((err) => {
this.disabled = false
this.$Message.error('保存失败')
console.warn(err)
})
this.$Message.error("保存失败");
console.warn(err);
});
}
})
});
},
handleClose() {
this.$emit('on-close')
this.$emit("on-close");
},
selectAry() {
Api.getlist().then((res) => {
console.log("加班日历",res)
this.orderCatList = res.result
})
console.log("加班日历", res);
this.orderCatList = res.result;
});
},
getItems(v){ //获取所有选中项;
var items=this.orderCatList.filter(u=>{
return v.indexOf(u.id)>-1
})
this.selectItems=items;
getItems(v) {
//获取所有选中项;
var items = this.orderCatList.filter((u) => {
return v.indexOf(u.id) > -1;
});
this.selectItems = items;
},
getHours(){ //获取工时
let sum=0;
this.selectItems.map(u=>{
sum+=u.workHours;
getHours() {
//获取工时
let sum = 0;
this.selectItems.map((u) => {
sum += u.workHours;
});
return sum;
},
l(key) {
key = 'calendar_overtime' + '.' + key
return this.$t(key)
}
key = "calendar_overtime" + "." + key;
return this.$t(key);
},
},
watch: {
v() {
this.entity = this.$u.clone(this.v)
}
}
}
this.entity = this.$u.clone(this.v);
},
},
};
</script>
\ No newline at end of file
......@@ -18,116 +18,122 @@
v-for="item in orderCatList"
:value="item.id"
:key="item.index"
:label="item.title+'('+ item.startendTime +')'"
:label="item.title + '(' + item.startendTime + ')'"
></Option>
</Select>
</FormItem>
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</template>
<script>
import Api from './api'
import Api from "./api";
export default {
name: 'Edit',
name: "Edit",
data() {
return {
disabled: false,
entity: {},
selectItems: [], //选中的加班日历
orderCatList: [],
rules: {
holidayCalId: [{ required: true, message: '请填写日历编号', trigger: 'blur' }],
holidayCalName: [{ required: true, message: '请填写日历名称', trigger: 'blur' }],
holidayCalId: [
{ required: true, message: "请填写日历编号", trigger: "blur" },
],
holidayCalName: [
{ required: true, message: "请填写日历名称", trigger: "blur" },
],
classId: [
{ required: true, type: 'array', min: 1, message: '请选择关联节日', trigger: 'change' },
]
}
}
{
required: true,
type: "array",
min: 1,
message: "请选择关联节日",
trigger: "change",
},
],
},
};
},
props: {
eid: Number
eid: Number,
},
created() {
this.selectAry()
this.selectAry();
},
methods: {
selectAry() {
Api.getlist().then((res) => {
this.orderCatList = res.result
})
this.orderCatList = res.result;
});
},
load(v) {
Api.get({ id: v }).then((r) => {
let dataForm = r.result
let dataForm = r.result;
if (dataForm.mesHolidayIds) {
let ids = dataForm.mesHolidayIds.split(',')
var uids = []
let ids = dataForm.mesHolidayIds.split(",");
var uids = [];
ids.map((u) => {
uids.push(parseInt(u))
})
this.getItems(uids)
dataForm.classId = uids
uids.push(parseInt(u));
});
this.getItems(uids);
dataForm.classId = uids;
} else {
dataForm.classId = []
dataForm.classId = [];
}
this.entity = dataForm
this.$emit('on-load')
})
this.entity = dataForm;
this.$emit("on-load");
});
},
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true
let titles = []
let titles = [];
this.selectItems.map((u) => {
titles.push(u.title + '(' + u.startendTime + ')')
})
var data = this.$u.clone(this.entity)
data.mesHolidayTitles = titles.join()
data.mesHolidayIds = this.entity.classId.join()
titles.push(u.title + "(" + u.startendTime + ")");
});
var data = this.$u.clone(this.entity);
data.mesHolidayTitles = titles.join();
data.mesHolidayIds = this.entity.classId.join();
Api.update(data)
.then((r) => {
this.disabled = false
if (r.success) {
this.$Message.success('保存成功')
this.$emit('on-ok')
this.$Message.success("保存成功");
this.$emit("on-ok");
} else {
this.$Message.error('保存失败')
this.$Message.error("保存失败");
}
})
.catch((err) => {
this.disabled = false
this.$Message.error('保存失败')
console.warn(err)
})
this.$Message.error("保存失败");
console.warn(err);
});
}
})
});
},
getItems(v) {
var items = this.orderCatList.filter((u) => {
return v.indexOf(u.id) > -1
})
this.selectItems = items
var items = this.orderCatList.filter((u) => {
return v.indexOf(u.id) > -1;
});
this.selectItems = items;
},
handleClose() {
this.$emit('on-close')
this.$emit("on-close");
},
l(key) {
key = 'calendar_overtime' + '.' + key
return this.$t(key)
}
key = "calendar_overtime" + "." + key;
return this.$t(key);
},
},
watch: {
eid(v) {
if (v != 0) {
this.load(v)
this.load(v);
}
}
}
}
},
},
};
</script>
\ No newline at end of file
......@@ -13,134 +13,144 @@
</Col>
<Col span="24">
<FormItem :label="l('shiftName')" prop="mesShiftWorkSchedIds">
<Select v-model="entity.mesShiftWorkSchedIds" multiple @on-change="getItems">
<Select
v-model="entity.mesShiftWorkSchedIds"
multiple
@on-change="getItems"
>
<Option
v-for="item in orderCatList"
:value="item.id"
:key="item.index"
:label="item.title+'('+ item.startendTime +')'"
:label="item.title + '(' + item.startendTime + ')'"
></Option>
</Select>
</FormItem>
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</template>
<script>
import Api from './api'
import Api from "./api";
export default {
name: 'Add',
name: "Add",
data() {
return {
disabled: false,
orderCatList: [],
multipleFlag: false,
vlableLis : [],
sum: 0,
idList : [],
titleClass:'',
titleClass02:'',
vlableLis: [],
sum: 0,
idList: [],
titleClass: "",
titleClass02: "",
entity: {
id:[],
title:"",
mesShiftWorkSchedIds:[],
calendarClassTitle:"",
workHours:0
id: [],
title: "",
mesShiftWorkSchedIds: [],
calendarClassTitle: "",
workHours: 0,
},
selectItems:[],//选中的加班日历
selectItems: [], //选中的加班日历
rules: {
calId: [{ required: true, message: '请填写日历编号', trigger: 'blur' }],
calName: [{ required: true, message: '请填写日历名称', trigger: 'blur' }],
calId: [{ required: true, message: "请填写日历编号", trigger: "blur" }],
calName: [
{ required: true, message: "请填写日历名称", trigger: "blur" },
],
mesShiftWorkSchedIds: [
{ required: true, type: 'array', min: 1, message: '请选择关联班次', trigger: 'change' },
]
}
}
{
required: true,
type: "array",
min: 1,
message: "请选择关联班次",
trigger: "change",
},
],
},
};
},
props: {
v: Object
v: Object,
},
created() {
this.selectAry()
this.selectAry();
},
methods: {
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true
let titles=[];
this.selectItems.map(u=>{
titles.push(u.title+"("+u.startendTime+")")
})
let titles = [];
this.selectItems.map((u) => {
titles.push(u.title + "(" + u.startendTime + ")");
});
let parme = {
calId:this.entity.calId,
calName:this.entity.calName,
shiftName:titles.join(),
mesShiftWorkSchedIds:this.entity.mesShiftWorkSchedIds.join(),
workingLong:this.getHours()
}
calId: this.entity.calId,
calName: this.entity.calName,
shiftName: titles.join(),
mesShiftWorkSchedIds: this.entity.mesShiftWorkSchedIds.join(),
workingLong: this.getHours(),
};
Api.create(parme)
.then((r) => {
this.disabled = false
if (r.success) {
this.$Message.success('保存成功')
this.entity.mesShiftWorkSchedIds=[];
this.$Message.success("保存成功");
this.entity.mesShiftWorkSchedIds = [];
this.$refs.form.resetFields();
this.$emit('on-ok')
this.$emit("on-ok");
} else {
this.$Message.error('保存失败')
this.$Message.error("保存失败");
}
})
.catch((err) => {
this.disabled = false
this.$Message.error('保存失败')
console.warn(err)
})
this.$Message.error("保存失败");
console.warn(err);
});
}
})
});
},
handleClose() {
// this.orderCatList = []
this.$emit('on-close')
this.$emit("on-close");
},
selectAry() {
let parmse = {
pageIndex: 0,
cont: 0,
conditions: [],
pageSize: 20
}
pageSize: 20,
};
Api.getlist().then((res) => {
// console.log("工作日历",res)
this.orderCatList = res.result
})
this.orderCatList = res.result;
});
},
getItems(v){ //获取所有选中项;
var items=this.orderCatList.filter(u=>{
return v.indexOf(u.id)>-1
})
this.selectItems=items;
getItems(v) {
//获取所有选中项;
var items = this.orderCatList.filter((u) => {
return v.indexOf(u.id) > -1;
});
this.selectItems = items;
},
getHours(){ //获取工时
let sum=0;
this.selectItems.map(u=>{
sum+=u.workHours;
getHours() {
//获取工时
let sum = 0;
this.selectItems.map((u) => {
sum += u.workHours;
});
return sum;
},
l(key) {
key = 'calendar_work' + '.' + key
return this.$t(key)
}
key = "calendar_work" + "." + key;
return this.$t(key);
},
},
watch: {
v() {
this.entity = this.$u.clone(this.v)
}
}
}
this.entity = this.$u.clone(this.v);
},
},
};
</script>
\ No newline at end of file
......@@ -18,130 +18,134 @@
v-for="item in orderCatList"
:value="item.id"
:key="item.index"
:label="item.title+'('+ item.startendTime +')'"
:label="item.title + '(' + item.startendTime + ')'"
></Option>
</Select>
</FormItem>
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</template>
<script>
import Api from './api'
import Api from "./api";
export default {
name: 'Edit',
name: "Edit",
data() {
return {
disabled: false,
entity: {},
orderCatList: [],
selectItems: [], //选中的加班日历
rules: {
calId: [{ required: true, message: '请填写日历编号', trigger: 'blur' }],
calName: [{ required: true, message: '请填写日历名称', trigger: 'blur' }],
calId: [{ required: true, message: "请填写日历编号", trigger: "blur" }],
calName: [
{ required: true, message: "请填写日历名称", trigger: "blur" },
],
classId: [
{ required: true, type: 'array', min: 1, message: '请选择关联班次', trigger: 'change' },
]
}
}
{
required: true,
type: "array",
min: 1,
message: "请选择关联班次",
trigger: "change",
},
],
},
};
},
props: {
eid: Number
eid: Number,
},
created() {
this.selectList()
this.selectList();
},
methods: {
load(v) {
Api.get({ id: v }).then((r) => {
let dataForm = r.result
if(dataForm.mesShiftWorkSchedIds){
let ids = dataForm.mesShiftWorkSchedIds.split(',')
var uids=[];
ids.map(u=>{
uids.push(parseInt(u))
})
console.warn(uids)
let dataForm = r.result;
if (dataForm.mesShiftWorkSchedIds) {
let ids = dataForm.mesShiftWorkSchedIds.split(",");
var uids = [];
ids.map((u) => {
uids.push(parseInt(u));
});
console.warn(uids);
this.getItems(uids);
dataForm.classId=uids;
}else{
dataForm.classId=[];
}
this.entity = dataForm
this.$emit('on-load')
})
dataForm.classId = uids;
} else {
dataForm.classId = [];
}
this.entity = dataForm;
this.$emit("on-load");
});
},
selectList() {
Api.getlist().then((res) => {
console.log(res)
this.orderCatList = res.result
})
console.log(res);
this.orderCatList = res.result;
});
},
getItems(v) {
//获取所有选中项;
var items = this.orderCatList.filter((u) => {
console.log(u.id)
return v.indexOf(u.id) > -1
})
this.selectItems = items
console.log(this.selectItems)
console.log(u.id);
return v.indexOf(u.id) > -1;
});
this.selectItems = items;
console.log(this.selectItems);
},
getHours() {
let sum = 0
let sum = 0;
this.selectItems.map((u) => {
sum += u.workHours
})
return sum
sum += u.workHours;
});
return sum;
},
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true
let titles=[];
this.selectItems.map(u=>{
titles.push(u.title+"("+u.startendTime+")")
})
this.entity.shiftName=titles.join();
var data=this.$u.clone(this.entity);
data.mesShiftWorkSchedIds=this.entity.classId.join();
data.workingLong=this.getHours();
let titles = [];
this.selectItems.map((u) => {
titles.push(u.title + "(" + u.startendTime + ")");
});
this.entity.shiftName = titles.join();
var data = this.$u.clone(this.entity);
data.mesShiftWorkSchedIds = this.entity.classId.join();
data.workingLong = this.getHours();
Api.update(data)
.then((r) => {
this.disabled = false
if (r.success) {
this.$Message.success('保存成功');
this.$emit('on-ok')
this.$Message.success("保存成功");
this.$emit("on-ok");
} else {
this.$Message.error('保存失败')
this.$Message.error("保存失败");
}
})
.catch((err) => {
this.disabled = false
this.$Message.error('保存失败')
console.warn(err)
})
this.$Message.error("保存失败");
console.warn(err);
});
}
})
});
},
handleClose() {
this.$emit('on-close')
this.$emit("on-close");
},
l(key) {
key = 'calendar_work' + '.' + key
return this.$t(key)
}
key = "calendar_work" + "." + key;
return this.$t(key);
},
},
watch: {
eid(v) {
if (v != 0) {
this.load(v)
this.load(v);
}
}
}
}
},
},
};
</script>
\ No newline at end of file
......@@ -37,69 +37,64 @@
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</template>
<script>
import Api from './api'
import Api from "./api";
export default {
name: 'Add',
name: "Add",
data() {
return {
disabled: false,
entity: {
day: '1',
maxSerial: 0
day: "1",
maxSerial: 0,
},
rules: {
businessName: [{ required: true, message: '必填', trigger: 'blur' }],
businessCode: [{ required: true, message: '必填', trigger: 'blur' }]
}
}
businessName: [{ required: true, message: "必填", trigger: "blur" }],
businessCode: [{ required: true, message: "必填", trigger: "blur" }],
},
};
},
props: {
v: Object
v: Object,
},
methods: {
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true
Api.create(this.entity)
.then((r) => {
if (r.success) {
this.$Message.success('保存成功')
this.$emit('on-ok')
this.entity = {}
this.entity.maxSerial=0;
this.disabled = false
this.$Message.success("保存成功");
this.$emit("on-ok");
this.entity = {};
this.entity.maxSerial = 0;
} else {
this.$Message.error('保存失败')
this.disabled = false
this.$Message.error("保存失败");
}
})
.catch((err) => {
this.disabled = false
this.$Message.error('保存失败')
console.warn(err)
})
this.$Message.error("保存失败");
console.warn(err);
});
}
})
});
},
handleClose() {
this.$emit('on-close')
this.$emit("on-close");
},
l(key) {
key = 'business_code_config' + '.' + key
return this.$t(key)
}
key = "business_code_config" + "." + key;
return this.$t(key);
},
},
watch: {
v() {
this.entity = this.$u.clone(this.v)
}
}
}
this.entity = this.$u.clone(this.v);
},
},
};
</script>
\ No newline at end of file
......@@ -26,7 +26,7 @@
<FormItem :label="l('day')" prop="day">
<Dictionary
code="mes_xingchi_system.business_code_config.day"
:value='entity.day'
:value="entity.day"
:key="entity.day"
v-model="entity.day"
type="radio"
......@@ -40,75 +40,70 @@
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</template>
<script>
import Api from './api'
import Api from "./api";
export default {
name: 'Edit',
name: "Edit",
data() {
return {
disabled: false,
entity: {
color: ''
color: "",
},
rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }],
code: [{ required: true, message: '必填', trigger: 'blur' }]
}
}
name: [{ required: true, message: "必填", trigger: "blur" }],
code: [{ required: true, message: "必填", trigger: "blur" }],
},
};
},
props: {
eid: Number
eid: Number,
},
methods: {
load(v) {
Api.get({ id: v }).then((r) => {
this.entity = r.result
this.entity.day=this.entity.day
this.$emit('on-load')
})
this.entity = r.result;
this.entity.day = this.entity.day;
this.$emit("on-load");
});
},
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true
Api.update(this.entity)
.then((r) => {
if (r.success) {
this.$Message.success('保存成功')
this.$emit('on-ok')
this.$Message.success("保存成功");
this.$emit("on-ok");
} else {
this.$Message.error('保存失败')
this.disabled = false
this.$Message.error("保存失败");
}
})
.catch((err) => {
this.disabled = false
this.$Message.error('保存失败')
console.warn(err)
})
this.$Message.error("保存失败");
console.warn(err);
});
}
})
});
},
handleClose() {
this.$emit('on-close')
this.$emit("on-close");
},
l(key) {
key = 'business_code_config' + '.' + key
return this.$t(key)
}
key = "business_code_config" + "." + key;
return this.$t(key);
},
},
watch: {
eid(v) {
if (v != 0) {
this.load(v)
this.load(v);
}
this.disabled=false;
}
}
}
},
},
};
</script>
\ No newline at end of file
......@@ -22,7 +22,7 @@
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
......@@ -34,7 +34,7 @@ export default {
name: 'Edit',
data() {
return {
disabled: false,
entity: {},
tishi: '',
rules: {
......@@ -59,7 +59,7 @@ export default {
this.entity.day = this.entity.day + ''
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true
Api.setrule(this.entity)
.then((r) => {
if (r.success) {
......@@ -67,11 +67,11 @@ export default {
this.$emit('on-ok')
} else {
this.$Message.error('保存失败')
this.disabled = false
}
})
.catch((err) => {
this.disabled = false
this.$Message.error('保存失败')
console.warn(err)
})
......@@ -91,7 +91,7 @@ export default {
if (v != 0) {
this.load(v)
}
this.disabled = false
},
'entity.day': {
handler(newValue, oldValue) {
......
......@@ -43,9 +43,7 @@
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled"
>保存</Button
>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
<!-- 组织类型 -->
......@@ -69,7 +67,7 @@ export default {
return callback(new Error("编号不能为空"));
}
Api.isExist(value).then((r) => {
if (r.result) {
if (r.result) {
return callback(new Error("编号已经存在"));
} else {
callback();
......@@ -78,7 +76,7 @@ export default {
};
return {
// showTree: false, //组织类型
disabled: false,
citys: citys(),
entity: {
id: 0,
......@@ -149,7 +147,6 @@ export default {
Api.create(paramsdata)
.then((r) => {
this.disabled = false;
if (r.success) {
this.$Message.success("保存成功!");
this.$emit("on-ok");
......@@ -158,7 +155,6 @@ export default {
}
})
.catch((err) => {
this.disabled = false;
this.$Message.error("保存失败,请联系管理员");
});
}
......
......@@ -39,9 +39,7 @@
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled"
>保存</Button
>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
<!-- 组织类型 -->
......@@ -74,7 +72,7 @@ export default {
};
return {
// showTree: false, //组织类型
disabled: false,
citys: citys(),
entity: {
organization_Id: 0,
......@@ -85,9 +83,7 @@ export default {
property: [],
location: [],
rules: {
title02: [
{ required: true, message: "名称不能为空", trigger: "blur" },
],
title02: [{ required: true, message: "名称不能为空", trigger: "blur" }],
organizationType: [
{
// type: 'array',
......@@ -137,7 +133,6 @@ export default {
};
Api.create(paramsdata)
.then((r) => {
this.disabled = false;
if (r.success) {
this.$Message.success("保存成功!");
this.$emit("on-ok");
......@@ -146,7 +141,6 @@ export default {
}
})
.catch((err) => {
this.disabled = false;
this.$Message.error("保存失败,请联系管理员");
});
}
......
......@@ -34,7 +34,7 @@
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
<!-- 组织类型 -->
......@@ -57,7 +57,6 @@ export default {
city_level: [],
propertyList: [],
showTree: false, //组织类型
disabled: false,
citys: citys(),
entity: {
organization_Id: 0, //组织类型
......@@ -69,7 +68,7 @@ export default {
isProduction: 1,
code: "",
property: "",
id: -1
id: -1,
},
rules: {
name: [{ required: true, message: "不能为空", trigger: "blur" }],
......@@ -78,19 +77,19 @@ export default {
{
required: true,
message: "属性不能为空",
trigger: "change"
}
]
}
trigger: "change",
},
],
},
};
},
props: {
row: Object
row: Object,
},
created() {},
methods: {
handleSubmit() {
this.$refs["form"].validate(value => {
this.$refs["form"].validate((value) => {
if (value) {
if (this.entity.id > 0) {
let isProduction = 0;
......@@ -132,11 +131,10 @@ export default {
organization_Id: this.entity.organization_Id, //组织类型 [id]
location: location, //省市县
isProduction: isProduction, //是否生产班组:1是,0否
property: property //属性
property: property, //属性
};
Api.update(paramsdata)
.then(r => {
this.disabled = false;
.then((r) => {
if (r.success) {
this.$Message.success("编辑成功");
this.$emit("on-ok");
......@@ -144,8 +142,7 @@ export default {
this.$Message.error("编辑失败,请联系管理员");
}
})
.catch(err => {
this.disabled = false;
.catch((err) => {
this.$Message.error("编辑失败,请联系管理员");
});
}
......@@ -158,7 +155,7 @@ export default {
l(key) {
key = "DipartLocation" + "." + key;
return this.$t(key);
}
},
},
watch: {
"row.id"(v) {
......@@ -173,7 +170,7 @@ export default {
property: this.row.property,
id: this.row.id,
organization_Id: this.row.organization_Id,
organizationType: this.row.organizationType
organizationType: this.row.organizationType,
};
if (!model.property) {
model.property = "";
......@@ -187,7 +184,7 @@ export default {
this.city_level = model.location.split(",");
}
this.entity = model;
}
}
},
},
};
</script>
\ No newline at end of file
<template>
<Form ref="form" :model="entity" :rules="rules" :label-width="100">
<Row class="rowTitle100">
<FormItem label="类别" prop="typeId">
<RadioGroup v-model="entity.typeId">
<Radio :label="0" disabled>系统</Radio>
<Radio :label="1" disabled>分类</Radio>
<Radio :label="2" disabled>字典</Radio>
<Radio :label="3" disabled>字典项</Radio>
</RadioGroup>
</FormItem>
</Row>
<Row class="rowTitle100">
<FormItem label="名称" prop="name">
<Input v-model="entity.name">
<ColorPicker
v-model="entity.color"
slot="prepend"
transfer
size="small"
transfer
recommend
/>
</Input>
</FormItem>
</Row>
<Row class="rowTitle100">
<FormItem label="编码" prop="code">
<Input v-model="entity.code" />
</FormItem>
</Row>
<Row class="rowTitle100">
<FormItem label="图标" prop="icon">
<InputIcon v-model="entity.icon"></InputIcon>
</FormItem>
</Row>
<FormItem label="状态" prop="number">
<RadioGroup v-model="entity.status">
<Radio :label="0">启用</Radio>
<Radio :label="1">禁用(名称和值可以启用或禁用,但不能删除)</Radio>
</RadioGroup>
</FormItem>
<FormItem label="锁定" prop="number">
<RadioGroup v-model="entity.isStatic">
<Radio :label="0">不锁定</Radio>
<Radio :label="1">锁定(锁定后不可改变名称和值,不能删除)</Radio>
</RadioGroup>
</FormItem>
<Row class="rowTitle100">
<FormItem label="描述" prop="description">
<Input v-model="entity.description" type="textarea" :rows="3"></Input>
</FormItem>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</template>
<script>
import api from "../api.js";
export default {
name: "Edit",
data() {
return {
entity: {
upId: 0,
typeId: this.v.typeId,
status: 0,
isStatic: 0,
priority: 0,
color: "",
},
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }],
code: [{ required: true, message: "必填", trigger: "blur" }],
},
};
},
props: ["v"],
mounted() {
if (this.v.id) {
this.entity.typeId = this.v.typeId + 1;
this.entity.upId = this.v.id;
}
},
methods: {
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
api.save(this.entity).then((r) => {
console.warn(r);
if (r.success) {
this.$Message.success("添加成功");
this.$emit("on-ok");
}
});
}
});
},
handleClose() {
this.$emit("on-close");
},
},
watch: {},
};
</script>
......@@ -45,7 +45,7 @@
</FormItem>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit">保存</Button>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
......@@ -55,7 +55,9 @@ export default {
name: 'Edit',
data() {
return {
entity: this.v,
entity: {
color:""
},
rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }],
code: [{ required: true, message: '必填', trigger: 'blur' }]
......@@ -65,6 +67,13 @@ export default {
props: {
v: Object
},
mounted(){
this.entity = this.v
if(!this.entity.color){
this.entity.color="";
}
},
methods: {
handleSubmit() {
this.$refs.form.validate((v) => {
......@@ -86,6 +95,9 @@ export default {
watch: {
v(v) {
this.entity = this.v
if(!this.entity.color){
this.entity.color="";
}
console.info(this.entity)
}
}
......
This diff is collapsed.
......@@ -14,7 +14,12 @@
</Col>
<Col :span="12">
<FormItem :label="l('type')" prop="type">
<Dictionary code="mes_xingchi_system.menu.type" :disabled="true" v-model="entity.type" type="radio"></Dictionary>
<Dictionary
code="mes_xingchi_system.menu.type"
:disabled="true"
v-model="entity.type"
type="radio"
></Dictionary>
<!-- -->
</FormItem>
</Col>
......@@ -32,28 +37,41 @@
</Col>
<Col :span="12">
<FormItem :label="l('target')" prop="target">
<Dictionary code="mes_xingchi_system.menu.target" v-model="entity.target" type="radio"></Dictionary>
<Dictionary
code="mes_xingchi_system.menu.target"
v-model="entity.target"
type="radio"
></Dictionary>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('status')" prop="status">
<Dictionary code="mes_xingchi_system.menu.status" v-model="entity.status" type="radio"></Dictionary>
<Dictionary
code="mes_xingchi_system.menu.status"
v-model="entity.status"
type="radio"
></Dictionary>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('source')" prop="source">
<Dictionary code="mes_xingchi_system.menu.source" type="radio" disabled v-model="entity.source"></Dictionary>
<Dictionary
code="mes_xingchi_system.menu.source"
type="radio"
disabled
v-model="entity.source"
></Dictionary>
</FormItem>
</Col>
<Col :span="6">
<Col :span="6">
<FormItem :label="l('code')" prop="code">
<Input v-model="entity.code"></Input>
</FormItem>
</Col>
<Col :span="6">
<FormItem :label="l('app')" prop="app">
<Input v-model="entity.app" :disabled="entity.upId!=0"></Input>
<Input v-model="entity.app" :disabled="entity.upId != 0"></Input>
</FormItem>
</Col>
<Col :span="12">
......@@ -68,82 +86,78 @@
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</template>
<script>
import Api from './api'
import Api from "./api";
export default {
name: 'Add',
name: "Add",
data() {
return {
disabled: false,
entity: {
id: 0,
name: '',
name: "",
upId: 0,
type: 1,
code: '',
icon: '',
code: "",
icon: "",
target: 0,
url: '',
url: "",
status: 1,
description: '',
description: "",
source: 0,
app: '',
priority: 0
app: "",
priority: 0,
},
rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }]
}
}
name: [{ required: true, message: "必填", trigger: "blur" }],
},
};
},
props: {
v: Object
v: Object,
},
methods: {
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true
Api.create(this.entity)
.then((r) => {
if (r.success) {
this.$Message.success('保存成功')
this.$emit('on-ok')
this.disabled = false
this.$refs.form.resetFields()
this.$Message.success("保存成功");
this.$emit("on-ok");
this.$refs.form.resetFields();
} else {
this.$Message.error('保存失败')
this.disabled = false
this.$Message.error("保存失败");
}
})
.catch((err) => {
this.disabled = false
this.$Message.error('保存失败')
console.warn(err)
})
this.$Message.error("保存失败");
console.warn(err);
});
}
})
});
},
handleClose() {
this.$emit('on-close')
this.$emit("on-close");
},
l(key) {
key = 'menu' + '.' + key
return this.$t(key)
}
key = "menu" + "." + key;
return this.$t(key);
},
},
watch: {
v(val) {
// console.log(JSON.stringify(this.$u.clone(this.v)));
console.log(this.v)
this.entity.upId = this.v.id
this.entity.type = this.v.type + 1
this.entity.app = this.v.app
}
}
}
console.log(this.v);
this.entity.upId = this.v.id;
this.entity.type = this.v.type + 1;
this.entity.app = this.v.app;
},
},
};
</script>
\ No newline at end of file
......@@ -2,7 +2,7 @@
<div>
<DataGrid :columns="columns" :action="index" border :height="400" :conditions="conditions" @on-selection-change="selectionChange" :set="false" :high="false"></DataGrid>
<div>
<Button v-if="items.length>0" type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button v-if="items.length>0" type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</div>
</div>
......@@ -14,7 +14,7 @@ export default {
data() {
return {
index:Api.method,
disabled:false,
list: [],
controller:null,
keys:"",
......
......@@ -30,12 +30,20 @@
</Col>
<Col :span="12">
<FormItem :label="l('target')" prop="target">
<Dictionary code="mes_xingchi_system.menu.target" v-model="entity.target" type="radio"></Dictionary>
<Dictionary
code="mes_xingchi_system.menu.target"
v-model="entity.target"
type="radio"
></Dictionary>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('status')" prop="status">
<Dictionary code="mes_xingchi_system.menu.status" v-model="entity.status" type="radio"></Dictionary>
<Dictionary
code="mes_xingchi_system.menu.status"
v-model="entity.status"
type="radio"
></Dictionary>
</FormItem>
</Col>
......@@ -56,7 +64,7 @@
</Col>
<Col :span="6">
<FormItem :label="l('app')" prop="app">
<Input v-model="entity.app" :disabled="entity.upId!=0"></Input>
<Input v-model="entity.app" :disabled="entity.upId != 0"></Input>
</FormItem>
</Col>
<Col :span="12">
......@@ -71,75 +79,71 @@
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</template>
<script>
import Api from './api'
import Api from "./api";
export default {
name: 'Edit',
name: "Edit",
data() {
return {
disabled: false,
entity: {
color: ''
color: "",
},
rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }]
}
}
name: [{ required: true, message: "必填", trigger: "blur" }],
},
};
},
props: {
eid: Number,
v: Object
},
v: Object,
},
methods: {
load(v) {
Api.get({ id: v }).then((r) => {
this.entity = r.result
this.$emit('on-load')
})
this.entity = r.result;
this.$emit("on-load");
});
},
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true
Api.update(this.entity)
.then((r) => {
if (r.success) {
this.$Message.success('保存成功')
this.$emit('on-ok')
this.disabled = false
this.$refs.form.resetFields()
this.$Message.success("保存成功");
this.$emit("on-ok");
this.$refs.form.resetFields();
} else {
this.$Message.error('保存失败')
this.disabled = false
this.$Message.error("保存失败");
}
})
.catch((err) => {
this.disabled = false
this.$Message.error('保存失败')
console.warn(err)
})
this.$Message.error("保存失败");
console.warn(err);
});
}
})
});
},
handleClose() {
this.$emit('on-close')
this.$emit("on-close");
},
l(key) {
key = 'menu' + '.' + key
return this.$t(key)
}
key = "menu" + "." + key;
return this.$t(key);
},
},
watch: {
eid(v) {
if (v != 0) {
this.load(v)
this.load(v);
}
}
}
}
},
},
};
</script>
\ No newline at end of file
......@@ -32,7 +32,11 @@
<Col :span="12">
<FormItem :label="l('status')" prop="status">
<Dictionary code="message.config.status" v-model="entity.status" type="radio"></Dictionary>
<Dictionary
code="message.config.status"
v-model="entity.status"
type="radio"
></Dictionary>
</FormItem>
</Col>
<!-- <Col :span="12">
......@@ -53,7 +57,13 @@
<Col :span="6">
<FormItem :label="l('color')" prop="color">
<Input v-model="entity.color">
<ColorPicker v-model="entity.color" slot="prepend" transfer size="small" recommend />
<ColorPicker
v-model="entity.color"
slot="prepend"
transfer
size="small"
recommend
/>
</Input>
</FormItem>
</Col>
......@@ -69,7 +79,7 @@
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
......@@ -92,7 +102,6 @@ export default {
});
};
return {
disabled: false,
entity: {
// creationTime: "",
// creatorUserId: null,
......@@ -143,10 +152,8 @@ export default {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true;
Api.create(this.entity)
.then((r) => {
this.disabled = false;
if (r.success) {
this.$Message.success("保存成功");
this.$emit("on-ok");
......@@ -155,7 +162,6 @@ export default {
}
})
.catch((err) => {
this.disabled = false;
this.$Message.error("保存失败");
console.warn(err);
});
......
......@@ -32,7 +32,11 @@
<Col :span="12">
<FormItem :label="l('status')" prop="status">
<Dictionary code="message.config.status" v-model="entity.status" type="radio"></Dictionary>
<Dictionary
code="message.config.status"
v-model="entity.status"
type="radio"
></Dictionary>
</FormItem>
</Col>
<!-- <Col :span="12">
......@@ -53,7 +57,13 @@
<Col :span="6">
<FormItem :label="l('color')" prop="color">
<Input v-model="entity.color">
<ColorPicker v-model="entity.color" slot="prepend" transfer size="small" recommend />
<ColorPicker
v-model="entity.color"
slot="prepend"
transfer
size="small"
recommend
/>
</Input>
</FormItem>
</Col>
......@@ -69,7 +79,7 @@
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
......@@ -80,9 +90,8 @@ export default {
name: "Edit",
data() {
return {
disabled: false,
entity: {
color:""
color: "",
},
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }],
......@@ -106,7 +115,7 @@ export default {
r.result.userIds = this.$u.toIntArray(r.result.userIds);
r.result.roleIds = this.$u.toIntArray(r.result.roleIds);
r.result.departmentIds = this.$u.toIntArray(r.result.departmentIds);
if(r.result.color == null){
if (r.result.color == null) {
r.result.color = "";
}
this.entity = r.result;
......@@ -125,10 +134,8 @@ export default {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true;
Api.update(this.entity)
.then((r) => {
this.disabled = false;
if (r.success) {
this.$Message.success("保存成功");
this.$emit("on-ok");
......@@ -137,7 +144,6 @@ export default {
}
})
.catch((err) => {
this.disabled = false;
this.$Message.error("保存失败");
console.warn(err);
});
......
<template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<Col :span="12"><FormItem :label="l('title')" prop="title"> <Input v-model="entity.title"> </Input>
</FormItem></Col>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<Col :span="12"
><FormItem :label="l('title')" prop="title">
<Input v-model="entity.title"> </Input> </FormItem
></Col>
<Col :span="12"><FormItem :label="l('httpMethod')" prop="httpMethod"> <Input v-model="entity.httpMethod"> </Input>
</FormItem></Col>
<Col :span="24"><FormItem :label="l('url')" prop="url"> <Input v-model="entity.url"> </Input>
</FormItem></Col>
<Col :span="24"><FormItem :label="l('methodDescription')" > <Input v-model="entity.methodDescription" prop="methodDescription" type="textarea" :rows="5"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('service')" prop="service"> <Input v-model="entity.service"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('serviceDescription')" prop="serviceDescription"> <Input v-model="entity.serviceDescription"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('controller')" prop="controller"> <Input v-model="entity.controller"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('controllerDescription')" prop="controllerDescription"> <Input v-model="entity.controllerDescription" ></Input>
</FormItem></Col>
<Col :span="12"
><FormItem :label="l('httpMethod')" prop="httpMethod">
<Input v-model="entity.httpMethod"> </Input> </FormItem
></Col>
<Col :span="24"
><FormItem :label="l('url')" prop="url">
<Input v-model="entity.url"> </Input> </FormItem
></Col>
<Col :span="24"
><FormItem :label="l('methodDescription')">
<Input
v-model="entity.methodDescription"
prop="methodDescription"
type="textarea"
:rows="5"
>
</Input> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('service')" prop="service">
<Input v-model="entity.service"> </Input> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('serviceDescription')" prop="serviceDescription">
<Input v-model="entity.serviceDescription"> </Input> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('controller')" prop="controller">
<Input v-model="entity.controller"> </Input> </FormItem
></Col>
<Col :span="12"
><FormItem
:label="l('controllerDescription')"
prop="controllerDescription"
>
<Input v-model="entity.controllerDescription"></Input> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('level')" prop="level">
<Dictionary
v-model="entity.level"
code="system.method.level"
type="radio"
></Dictionary> </FormItem
></Col>
<Col :span="12"><FormItem :label="l('level')" prop="level"> <Dictionary v-model="entity.level" code="system.method.level" type="radio"></Dictionary>
</FormItem></Col>
<!-- <Col :span="12"><FormItem :label="l('creationTime')" prop="creationTime"> <DatePicker type="date" v-model="entity.creationTime"></DatePicker>
<!-- <Col :span="12"><FormItem :label="l('creationTime')" prop="creationTime"> <DatePicker type="date" v-model="entity.creationTime"></DatePicker>
</FormItem></Col> -->
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</template>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</template>
<script>
import Api from './api'
export default {
name: 'Add',
data() {
return {
disabled: false,
entity: {
},
rules: {
title: [{ required: true, message: '必填', trigger: 'blur' }],
url: [{ required: true, message: '必填', trigger: 'blur' }]
}
}
},
props: {
v: Object
},
methods: {
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true;
Api.create(this.entity).then((r) => {
this.disabled = false;
if (r.success) {
this.$Message.success('保存成功')
this.$emit('on-ok')
} else {
this.$Message.error('保存失败')
}
}).catch(err => {
this.disabled = false;
this.$Message.error('保存失败')
console.warn(err)
})
}
})
},
handleClose() {
this.$emit('on-close')
},
l(key) {
key = "method" + "." + key;
return this.$t(key)
}
},
watch: {
v() {
this.entity = this.$u.clone(this.v)
}
import Api from "./api";
export default {
name: "Add",
data() {
return {
entity: {},
rules: {
title: [{ required: true, message: "必填", trigger: "blur" }],
url: [{ required: true, message: "必填", trigger: "blur" }],
},
};
},
props: {
v: Object,
},
methods: {
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
Api.create(this.entity)
.then((r) => {
if (r.success) {
this.$Message.success("保存成功");
this.$emit("on-ok");
} else {
this.$Message.error("保存失败");
}
})
.catch((err) => {
this.$Message.error("保存失败");
console.warn(err);
});
}
}
</script>
\ No newline at end of file
});
},
handleClose() {
this.$emit("on-close");
},
l(key) {
key = "method" + "." + key;
return this.$t(key);
},
},
watch: {
v() {
this.entity = this.$u.clone(this.v);
},
},
};
</script>
\ No newline at end of file
<template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<Col :span="12"><FormItem :label="l('title')" prop="title"> <Input v-model="entity.title"> </Input>
</FormItem></Col>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<Col :span="12"
><FormItem :label="l('title')" prop="title">
<Input v-model="entity.title"> </Input> </FormItem
></Col>
<Col :span="12"><FormItem :label="l('httpMethod')" prop="httpMethod"> <Input v-model="entity.httpMethod"> </Input>
</FormItem></Col>
<Col :span="24"><FormItem :label="l('url')" prop="url"> <Input v-model="entity.url"> </Input>
</FormItem></Col>
<Col :span="24"><FormItem :label="l('methodDescription')" > <Input v-model="entity.methodDescription" prop="methodDescription" type="textarea" :rows="5"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('service')" prop="service"> <Input v-model="entity.service"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('serviceDescription')" prop="serviceDescription"> <Input v-model="entity.serviceDescription"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('controller')" prop="controller"> <Input v-model="entity.controller"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('controllerDescription')" prop="controllerDescription"> <Input v-model="entity.controllerDescription" ></Input>
</FormItem></Col>
<Col :span="12"
><FormItem :label="l('httpMethod')" prop="httpMethod">
<Input v-model="entity.httpMethod"> </Input> </FormItem
></Col>
<Col :span="24"
><FormItem :label="l('url')" prop="url">
<Input v-model="entity.url"> </Input> </FormItem
></Col>
<Col :span="24"
><FormItem :label="l('methodDescription')">
<Input
v-model="entity.methodDescription"
prop="methodDescription"
type="textarea"
:rows="5"
>
</Input> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('service')" prop="service">
<Input v-model="entity.service"> </Input> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('serviceDescription')" prop="serviceDescription">
<Input v-model="entity.serviceDescription"> </Input> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('controller')" prop="controller">
<Input v-model="entity.controller"> </Input> </FormItem
></Col>
<Col :span="12"
><FormItem
:label="l('controllerDescription')"
prop="controllerDescription"
>
<Input v-model="entity.controllerDescription"></Input> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('level')" prop="level">
<Dictionary
v-model="entity.level"
code="system.method.level"
type="radio"
></Dictionary> </FormItem
></Col>
<Col :span="12"><FormItem :label="l('level')" prop="level"> <Dictionary v-model="entity.level" code="system.method.level" type="radio"></Dictionary>
</FormItem></Col>
<!-- <Col :span="12"><FormItem :label="l('creationTime')" prop="creationTime"> <DatePicker type="date" v-model="entity.creationTime"></DatePicker>
<!-- <Col :span="12"><FormItem :label="l('creationTime')" prop="creationTime"> <DatePicker type="date" v-model="entity.creationTime"></DatePicker>
</FormItem></Col> -->
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</template>
<script>
import Api from './api'
export default {
name: 'Edit',
data() {
return {
disabled: false,
entity: {
},
rules: {
title: [{ required: true, message: '必填', trigger: 'blur' }],
url: [{ required: true, message: '必填', trigger: 'blur' }]
}
}
},
props: {
eid: Number
},
methods: {
load(v) {
Api.get({ id: v }).then(r => {
this.entity = r.result;
this.$emit('on-load')
})
},
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true;
Api.update(this.entity).then((r) => {
this.disabled = false;
if (r.success) {
this.$Message.success('保存成功')
this.$emit('on-ok')
} else {
this.$Message.error('保存失败')
}
}).catch(err => {
this.disabled = false;
this.$Message.error('保存失败')
console.warn(err)
})
}
})
},
handleClose() {
this.$emit('on-close')
},
l(key) {
key = "method" + "." + key;
return this.$t(key)
}
},
watch: {
eid(v) {
if (v != 0) {
this.load(v);
}
}
import Api from "./api";
export default {
name: "Edit",
data() {
return {
entity: {},
rules: {
title: [{ required: true, message: "必填", trigger: "blur" }],
url: [{ required: true, message: "必填", trigger: "blur" }],
},
};
},
props: {
eid: Number,
},
methods: {
load(v) {
Api.get({ id: v }).then((r) => {
this.entity = r.result;
this.$emit("on-load");
});
},
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
Api.update(this.entity)
.then((r) => {
if (r.success) {
this.$Message.success("保存成功");
this.$emit("on-ok");
} else {
this.$Message.error("保存失败");
}
})
.catch((err) => {
this.$Message.error("保存失败");
console.warn(err);
});
}
}
});
},
handleClose() {
this.$emit("on-close");
},
l(key) {
key = "method" + "." + key;
return this.$t(key);
},
},
watch: {
eid(v) {
if (v != 0) {
this.load(v);
}
},
},
};
</script>
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
......@@ -80,17 +80,16 @@
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</div>
</template>
<script>
import Api from "./api";
import util from '@/libs/util';
import util from "@/libs/util";
const valideTel = (rule, value, callback) => {
var re = /^1[3-9]{1}[0-9]{9}/;
if (value === "" || value === null) {
......@@ -109,7 +108,7 @@ export default {
if (!value) {
return callback(new Error("员工编号不能为空"));
}
Api.list(value).then(r => {
Api.list(value).then((r) => {
if (r.result.length > 0) {
return callback(new Error("员工编号已经存在"));
} else {
......@@ -118,66 +117,64 @@ export default {
});
};
return {
disabled: false,
showDeptTree: false,
entity: {
gender: 1,
status: 1,
property: false,
userType:0
userType: 0,
},
rules: {
userName: [{
required: true,
message: "必填",
trigger: "blur"
}],
trigger: "blur",
}, ],
cardNo: [{
required: true,
message: "必填",
trigger: "blur"
trigger: "blur",
},
{
validator: validateCarNo,
trigger: "blur"
}
trigger: "blur",
},
],
departmentTitle: [{
required: true,
message: "必选",
trigger: "change"
}],
trigger: "change",
}, ],
// email: [
// { required: true, message: '必填', trigger: 'blur', type: 'email' }
// ],
phone: [{
validator: valideTel,
required: true,
trigger: "blur"
}]
trigger: "blur",
}, ],
// degreeId: [
// { required: true, message: '必填', trigger: 'blur', type: 'number' }
// ],
// phone: [{ required: true, message: '必填', trigger: 'blur' }]
}
},
};
},
props: {
v: Object
v: Object,
},
methods: {
handleSubmit() {
this.$refs.form.validate(v => {
this.$refs.form.validate((v) => {
if (v) {
if (this.entity.property) {
this.entity.property = 2;
} else {
this.entity.property = "";
}
this.disabled = true;
Api.create(this.entity)
.then(r => {
this.disabled = false;
.then((r) => {
if (r.success) {
this.$Message.success("保存成功");
//账户同步操作start
......@@ -186,18 +183,18 @@ export default {
loginName: this.entity.phone, //用户电话
status: this.entity.status, //状态
// tenantCode: this.$store.state.userInfo.tenantCode, //商户号
tenantCode: util.cookies.get('tenantCode'), //商户号
name: this.entity.userName
tenantCode: util.cookies.get("tenantCode"), //商户号
name: this.entity.userName,
};
Api.authAccount(parms).then(res => {
Api.authAccount(parms).then((res) => {
if (res.success) {
this.$Message.success("账户同步成功");
//修改用户表的accountId start
let parms1 = {
userId: parms.userId,
accountId: res.result
accountId: res.result,
};
Api.updateAccount(parms1).then(res1 => {
Api.updateAccount(parms1).then((res1) => {
if (res1.success) {
this.$Message.success("操作成功");
this.$emit("on-ok");
......@@ -214,10 +211,10 @@ export default {
this.$Message.error(r.error.message);
}
})
.catch(err => {
.catch((err) => {
// alert(JSON.stringify(err))
console.warn(err);
this.disabled = false;
this.$Message.error(err.error.message);
});
}
......@@ -238,13 +235,13 @@ export default {
},
getBirthday(value) {
this.entity.birthday = value;
}
},
},
watch: {
v() {
this.entity = this.$u.clone(this.v);
}
}
},
},
};
</script>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment