Skip to content

M
mes-ui
Commit c26d050f authored by 周远喜's avatar 周远喜
Browse files
Options

Merge branch 'portal' of http://git.mes123.com/zhouyx/mes-ui into portal

parents 4eaf4684 b2cf7a09
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 33 deletions
pages/basicData/department/Addrow.vue
View file @ c26d050f
......@@ -20,7 +20,7 @@
</Col>-->
<Col :span="12">
<FormItem :label="l('upMent')">
<b>{{entity.name}}</b>
<b>{{ entity.name }}</b>
</FormItem>
</Col>
<Col :span="24">
......@@ -43,7 +43,9 @@
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" :disabled="disabled"
>保存</Button
>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
<!-- 组织类型 -->
......@@ -62,6 +64,18 @@ export default {
name: "Add",
// components: { OrganizType },
data() {
const validateCode = (rule, value, callback) => {
if (!value) {
return callback(new Error("编号不能为空"));
}
Api.isExist(value).then((r) => {
if (r.result) {
return callback(new Error("编号已经存在"));
} else {
callback();
}
});
};
return {
// showTree: false, //组织类型
disabled: false,
......@@ -72,13 +86,13 @@ export default {
organization_Id: 0,
organization_Type: "",
departcode: "",
name:'',
name: "",
},
property: [],
location: [],
rules: {
title02: [
{ required: true, message: "库位名不能为空", trigger: "blur" }
{ required: true, message: "库位名不能为空", trigger: "blur" },
],
departcode: [
{ required: true, message: "编码不能为空", trigger: "blur" },
......@@ -87,21 +101,25 @@ export default {
{
required: true,
message: "组织类型不能为空",
trigger: "blur"
}
]
}
trigger: "blur",
},
],
departcode: [
{ required: true, message: "必填", trigger: "blur" },
{ validator: validateCode, trigger: "blur" },
],
},
};
},
props: {
val: Object
val: Object,
},
created() {
// this.entity = {};
},
methods: {
handleSubmit() {
this.$refs["form"].validate(value => {
this.$refs["form"].validate((value) => {
if (value) {
let isProduction = 0;
let property = [];
......@@ -122,18 +140,18 @@ export default {
}
let location = this.location;
let paramsdata = {
parentTitle:this.entity.name,
parentTitle: this.entity.name,
name: this.entity.title02, //部门名称
parent_Id: this.entity.id, //上级部门 [id]
code: this.entity.departcode, //部门编号
// organization_Id: this.entity.organization_Id, //组织类型 [id]
location: location.join(","), //省市县
isProduction:isProduction, //是否生产班组：1是，0否
property: property.join(",") //属性
isProduction: isProduction, //是否生产班组：1是，0否
property: property.join(","), //属性
};
Api.create(paramsdata)
.then(r => {
.then((r) => {
this.disabled = false;
if (r.success) {
this.$Message.success("保存成功！");
......@@ -142,7 +160,7 @@ export default {
this.$Message.error("保存失败，请联系管理员");
}
})
.catch(err => {
.catch((err) => {
this.disabled = false;
this.$Message.error("保存失败，请联系管理员");
});
......@@ -158,7 +176,7 @@ export default {
l(key) {
key = "DipartLocation" + "." + key;
return this.$t(key);
}
},
},
watch: {
val(v) {
......@@ -166,7 +184,7 @@ export default {
this.entity = {};
this.entity.name = v.name;
this.entity.id = v.id;
}
}
},
},
};
</script>
\ No newline at end of file
pages/basicData/department/add.vue
View file @ c26d050f
......@@ -39,7 +39,9 @@
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" :disabled="disabled"
>保存</Button
>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
<!-- 组织类型 -->
......@@ -58,6 +60,18 @@ export default {
name: "Add",
// components: { OrganizType },
data() {
const validateCode = (rule, value, callback) => {
if (!value) {
return callback(new Error("编号不能为空"));
}
Api.isExist(value).then((r) => {
if (r.result) {
return callback(new Error("编号已经存在"));
} else {
callback();
}
});
};
return {
// showTree: false, //组织类型
disabled: false,
......@@ -67,7 +81,6 @@ export default {
// organizationType: ""
departcode: "",
title02: "",
},
property: [],
location: [],
......@@ -83,15 +96,19 @@ export default {
// type: 'array',
required: true,
message: "组织类型不能为空",
trigger: "blur"
}
]
}
trigger: "blur",
},
],
departcode: [
{ required: true, message: "必填", trigger: "blur" },
{ validator: validateCode, trigger: "blur" },
],
},
};
},
methods: {
handleSubmit() {
this.$refs["form"].validate(value => {
this.$refs["form"].validate((value) => {
if (value) {
let isProduction = 0;
let property = [];
......@@ -112,17 +129,17 @@ export default {
}
let location = this.location;
let paramsdata = {
parentTitle:'',
parentTitle: "",
name: this.entity.title02, //部门名称
parent_Id: 0, //上级部门 [id]
code: this.entity.departcode, //部门编号
organization_Id: this.entity.organization_Id, //组织类型 [id]
location: location.join(","), //省市县
isProduction: isProduction, //是否生产班组：1是，0否
property: property.join(",") //属性
property: property.join(","), //属性
};
Api.create(paramsdata)
.then(r => {
.then((r) => {
this.disabled = false;
if (r.success) {
this.$Message.success("保存成功！");
......@@ -131,7 +148,7 @@ export default {
this.$Message.error("保存失败，请联系管理员");
}
})
.catch(err => {
.catch((err) => {
this.disabled = false;
this.$Message.error("保存失败，请联系管理员");
});
......@@ -147,7 +164,7 @@ export default {
l(key) {
key = "DipartLocation" + "." + key;
return this.$t(key);
}
}
},
},
};
</script>
\ No newline at end of file
pages/basicData/department/api.js
View file @ c26d050f
......@@ -20,5 +20,8 @@ export default {
departImport(params) {
return Api.post(`${systemUrl}/departmentimport/import`, params);
},
// 编号是否存在
isExist(value) {
return Api.post(`${systemUrl}/Department/IsExist`, value);
},
}
\ No newline at end of file
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