Commit b2cf7a09 authored by zhanglongtao's avatar zhanglongtao

部门编号限制

parent 8055e5a7
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('departcode')"> <FormItem :label="l('departcode')" prop="departcode">
<Input v-model="entity.departcode" placeholder="请输入..."></Input> <Input v-model="entity.departcode" placeholder="请输入..."></Input>
</FormItem> </FormItem>
</Col> </Col>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</Col>--> </Col>-->
<Col :span="12"> <Col :span="12">
<FormItem :label="l('upMent')"> <FormItem :label="l('upMent')">
<b>{{entity.name}}</b> <b>{{ entity.name }}</b>
</FormItem> </FormItem>
</Col> </Col>
...@@ -44,7 +44,9 @@ ...@@ -44,7 +44,9 @@
</Col> </Col>
</Row> </Row>
<FormItem> <FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button> <Button type="primary" @click="handleSubmit" :disabled="disabled"
>保存</Button
>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
<!-- 组织类型 --> <!-- 组织类型 -->
...@@ -63,6 +65,18 @@ export default { ...@@ -63,6 +65,18 @@ export default {
name: "Add", name: "Add",
// components: { OrganizType }, // components: { OrganizType },
data() { 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 { return {
// showTree: false, //组织类型 // showTree: false, //组织类型
disabled: false, disabled: false,
...@@ -73,33 +87,37 @@ export default { ...@@ -73,33 +87,37 @@ export default {
organization_Id: 0, organization_Id: 0,
organization_Type: "", organization_Type: "",
departcode: "", departcode: "",
name:'', name: "",
}, },
property: [], property: [],
location: [], location: [],
rules: { rules: {
title02: [ title02: [
{ required: true, message: "库位名不能为空", trigger: "blur" } { required: true, message: "库位名不能为空", trigger: "blur" },
], ],
organizationType: [ organizationType: [
{ {
required: true, required: true,
message: "组织类型不能为空", message: "组织类型不能为空",
trigger: "blur" trigger: "blur",
} },
] ],
} departcode: [
{ required: true, message: "必填", trigger: "blur" },
{ validator: validateCode, trigger: "blur" },
],
},
}; };
}, },
props: { props: {
val: Object val: Object,
}, },
created() { created() {
// this.entity = {}; // this.entity = {};
}, },
methods: { methods: {
handleSubmit() { handleSubmit() {
this.$refs["form"].validate(value => { this.$refs["form"].validate((value) => {
if (value) { if (value) {
let isProduction = 0; let isProduction = 0;
let property = []; let property = [];
...@@ -120,18 +138,18 @@ export default { ...@@ -120,18 +138,18 @@ export default {
} }
let location = this.location; let location = this.location;
let paramsdata = { let paramsdata = {
parentTitle:this.entity.name, parentTitle: this.entity.name,
name: this.entity.title02, //部门名称 name: this.entity.title02, //部门名称
parent_Id: this.entity.id, //上级部门 [id] parent_Id: this.entity.id, //上级部门 [id]
code: this.entity.departcode, //部门编号 code: this.entity.departcode, //部门编号
// organization_Id: this.entity.organization_Id, //组织类型 [id] // organization_Id: this.entity.organization_Id, //组织类型 [id]
location: location.join(","), //省市县 location: location.join(","), //省市县
isProduction:isProduction, //是否生产班组:1是,0否 isProduction: isProduction, //是否生产班组:1是,0否
property: property.join(",") //属性 property: property.join(","), //属性
}; };
Api.create(paramsdata) Api.create(paramsdata)
.then(r => { .then((r) => {
this.disabled = false; this.disabled = false;
if (r.success) { if (r.success) {
this.$Message.success("保存成功!"); this.$Message.success("保存成功!");
...@@ -140,7 +158,7 @@ export default { ...@@ -140,7 +158,7 @@ export default {
this.$Message.error("保存失败,请联系管理员"); this.$Message.error("保存失败,请联系管理员");
} }
}) })
.catch(err => { .catch((err) => {
this.disabled = false; this.disabled = false;
this.$Message.error("保存失败,请联系管理员"); this.$Message.error("保存失败,请联系管理员");
}); });
...@@ -156,7 +174,7 @@ export default { ...@@ -156,7 +174,7 @@ export default {
l(key) { l(key) {
key = "DipartLocation" + "." + key; key = "DipartLocation" + "." + key;
return this.$t(key); return this.$t(key);
} },
}, },
watch: { watch: {
val(v) { val(v) {
...@@ -164,7 +182,7 @@ export default { ...@@ -164,7 +182,7 @@ export default {
this.entity = {}; this.entity = {};
this.entity.name = v.name; this.entity.name = v.name;
this.entity.id = v.id; this.entity.id = v.id;
} },
} },
}; };
</script> </script>
\ No newline at end of file
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('departcode')"> <FormItem :label="l('departcode')" prop="departcode">
<Input v-model="entity.departcode" placeholder="请输入..."></Input> <Input v-model="entity.departcode" placeholder="请输入..."></Input>
</FormItem> </FormItem>
</Col> </Col>
...@@ -39,7 +39,9 @@ ...@@ -39,7 +39,9 @@
</Col> </Col>
</Row> </Row>
<FormItem> <FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button> <Button type="primary" @click="handleSubmit" :disabled="disabled"
>保存</Button
>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
<!-- 组织类型 --> <!-- 组织类型 -->
...@@ -58,6 +60,18 @@ export default { ...@@ -58,6 +60,18 @@ export default {
name: "Add", name: "Add",
// components: { OrganizType }, // components: { OrganizType },
data() { 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 { return {
// showTree: false, //组织类型 // showTree: false, //组织类型
disabled: false, disabled: false,
...@@ -67,28 +81,31 @@ export default { ...@@ -67,28 +81,31 @@ export default {
// organizationType: "" // organizationType: ""
departcode: "", departcode: "",
title02: "", title02: "",
}, },
property: [], property: [],
location: [], location: [],
rules: { rules: {
title02: [ title02: [
{ required: true, message: "库位名不能为空", trigger: "blur" } { required: true, message: "库位名不能为空", trigger: "blur" },
], ],
organizationType: [ organizationType: [
{ {
// type: 'array', // type: 'array',
required: true, required: true,
message: "组织类型不能为空", message: "组织类型不能为空",
trigger: "blur" trigger: "blur",
} },
] ],
} departcode: [
{ required: true, message: "必填", trigger: "blur" },
{ validator: validateCode, trigger: "blur" },
],
},
}; };
}, },
methods: { methods: {
handleSubmit() { handleSubmit() {
this.$refs["form"].validate(value => { this.$refs["form"].validate((value) => {
if (value) { if (value) {
let isProduction = 0; let isProduction = 0;
let property = []; let property = [];
...@@ -109,17 +126,17 @@ export default { ...@@ -109,17 +126,17 @@ export default {
} }
let location = this.location; let location = this.location;
let paramsdata = { let paramsdata = {
parentTitle:'', parentTitle: "",
name: this.entity.title02, //部门名称 name: this.entity.title02, //部门名称
parent_Id: 0, //上级部门 [id] parent_Id: 0, //上级部门 [id]
code: this.entity.departcode, //部门编号 code: this.entity.departcode, //部门编号
organization_Id: this.entity.organization_Id, //组织类型 [id] organization_Id: this.entity.organization_Id, //组织类型 [id]
location: location.join(","), //省市县 location: location.join(","), //省市县
isProduction: isProduction, //是否生产班组:1是,0否 isProduction: isProduction, //是否生产班组:1是,0否
property: property.join(",") //属性 property: property.join(","), //属性
}; };
Api.create(paramsdata) Api.create(paramsdata)
.then(r => { .then((r) => {
this.disabled = false; this.disabled = false;
if (r.success) { if (r.success) {
this.$Message.success("保存成功!"); this.$Message.success("保存成功!");
...@@ -128,7 +145,7 @@ export default { ...@@ -128,7 +145,7 @@ export default {
this.$Message.error("保存失败,请联系管理员"); this.$Message.error("保存失败,请联系管理员");
} }
}) })
.catch(err => { .catch((err) => {
this.disabled = false; this.disabled = false;
this.$Message.error("保存失败,请联系管理员"); this.$Message.error("保存失败,请联系管理员");
}); });
...@@ -144,7 +161,7 @@ export default { ...@@ -144,7 +161,7 @@ export default {
l(key) { l(key) {
key = "DipartLocation" + "." + key; key = "DipartLocation" + "." + key;
return this.$t(key); return this.$t(key);
} },
} },
}; };
</script> </script>
\ No newline at end of file
...@@ -20,5 +20,8 @@ export default { ...@@ -20,5 +20,8 @@ export default {
departImport(params) { departImport(params) {
return Api.post(`${systemUrl}/departmentimport/import`, params); return Api.post(`${systemUrl}/departmentimport/import`, params);
}, },
// 编号是否存在
isExist(value) {
return Api.post(`${systemUrl}/Department/IsExist`, value);
},
} }
\ No newline at end of file
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('departcode')"> <FormItem :label="l('departcode')">
<Input v-model="entity.code" placeholder="请输入..."></Input> <Input v-model="entity.code" placeholder="请输入..." disabled></Input>
</FormItem> </FormItem>
</Col> </Col>
<!-- <Col :span="12"> <!-- <Col :span="12">
......
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