Skip to content

M
mes-ui
Commit 54059f9d authored by 康振飞's avatar 康振飞
Browse files
Options

层级&工步

parent 7b229c05
Show whitespace changes
Inline Side-by-side
Showing with 255 additions and 132 deletions
pages/technology/details/routingStep/add.vue
View file @ 54059f9d
<template> <template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90"> <Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row> <Row>
<Col :span="12"><FormItem :label="l('creationTime')" prop="creationTime"> <DatePicker type="date" v-model="entity.creationTime"></DatePicker> <Col :span="12">
</FormItem></Col> <FormItem :label="l('routingHeaderId')" prop="routingHeaderId">
<Col :span="12"><FormItem :label="l('creatorUserId')" prop="creatorUserId"> <InputNumber v-model="entity.creatorUserId"></InputNumber> <InputNumber style="width:200px" v-model="entity.routingHeaderId"></InputNumber>
</FormItem></Col> </FormItem>
<Col :span="12"><FormItem :label="l('lastModificationTime')" prop="lastModificationTime"> <DatePicker type="date" v-model="entity.lastModificationTime"></DatePicker> </Col>
</FormItem></Col> <Col :span="12">
<Col :span="12"><FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId"> <InputNumber v-model="entity.lastModifierUserId"></InputNumber> <FormItem :label="l('routingDetailId')" prop="routingDetailId">
</FormItem></Col> <InputNumber style="width:200px" v-model="entity.routingDetailId"></InputNumber>
<Col :span="12"><FormItem :label="l('isDeleted')" prop="isDeleted"> <Input v-model="entity.isDeleted"> </Input> </FormItem>
</FormItem></Col> </Col>
<Col :span="12"><FormItem :label="l('deleterUserId')" prop="deleterUserId"> <InputNumber v-model="entity.deleterUserId"></InputNumber> <Col :span="12">
</FormItem></Col> <FormItem :label="l('stepSeq')" prop="stepSeq">
<Col :span="12"><FormItem :label="l('deletionTime')" prop="deletionTime"> <DatePicker type="date" v-model="entity.deletionTime"></DatePicker> <!-- <InputNumber v-model="entity.stepSeq"></InputNumber> -->
</FormItem></Col> <Input style="width:300px" v-model="entity.stepSeq"></Input>
<Col :span="12"><FormItem :label="l('routingHeaderId')" prop="routingHeaderId"> <InputNumber v-model="entity.routingHeaderId"></InputNumber> </FormItem>
</FormItem></Col> </Col>
<Col :span="12"><FormItem :label="l('routingDetailId')" prop="routingDetailId"> <InputNumber v-model="entity.routingDetailId"></InputNumber> <Col :span="12">
</FormItem></Col> <FormItem :label="l('name')" prop="name">
<Col :span="12"><FormItem :label="l('classId')" prop="classId"> <InputNumber v-model="entity.classId"></InputNumber> <Input style="width:350px" v-model="entity.name"></Input>
</FormItem></Col> </FormItem>
<Col :span="12"><FormItem :label="l('stepSeq')" prop="stepSeq"> <InputNumber v-model="entity.stepSeq"></InputNumber> </Col>
</FormItem></Col> <Col :span="24">
<Col :span="12"><FormItem :label="l('name')" prop="name"> <Input v-model="entity.name"> </Input> <FormItem :label="l('stepContent')" prop="stepContent">
</FormItem></Col> <i-quill
<Col :span="24"><FormItem :label="l('description')" prop="description"> <Input v-model="entity.description" type="textarea" :rows="5"></Input> v-model="entity.stepContent"
</FormItem></Col> :height="260"
<Col :span="12"><FormItem :label="l('status')" prop="status"> <Dictionary code="Process.Status" v-model="entity.status"></Dictionary> v-paste="handleImg"
</FormItem></Col> />
<Col :span="24"><FormItem :label="l('remark')" prop="remark"> <Input v-model="entity.remark" type="textarea" :rows="5"></Input> <!-- <Input v-model="entity.stepContent" type="textarea" :rows="5"></Input> -->
</FormItem></Col> <!-- <Input v-model="entity.stepContent" type="textarea" :minRows="3", :maxRows="7" ></Input> -->
<Col :span="24"><FormItem :label="l('stepContent')" prop="stepContent"> <Input v-model="entity.stepContent" type="textarea" :rows="5"></Input> </FormItem>
</FormItem></Col> </Col>
<Col :span="12"><FormItem :label="l('extend')" prop="extend"> <Input v-model="entity.extend"> </Input> <Col :span="12">
</FormItem></Col> <FormItem :label="l('status')" prop="status">
<RadioGroup v-model="entity.status">
<Radio :label="1">是</Radio>
<Radio :label="0">否</Radio>
</RadioGroup>
<!-- <Dictionary style="width:100px" code="Process.Status" v-model="entity.status"></Dictionary> -->
</FormItem>
</Col>
<!--<Col :span="24">
<FormItem :label="l('description')" prop="description">
<Input v-model="entity.description" type="textarea" :rows="5"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('creationTime')" prop="creationTime">
<DatePicker type="date" v-model="entity.creationTime"></DatePicker>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('creatorUserId')" prop="creatorUserId">
<InputNumber v-model="entity.creatorUserId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('lastModificationTime')" prop="lastModificationTime">
<DatePicker type="date" v-model="entity.lastModificationTime"></DatePicker>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId">
<InputNumber v-model="entity.lastModifierUserId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('isDeleted')" prop="isDeleted">
<Input v-model="entity.isDeleted"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('deleterUserId')" prop="deleterUserId">
<InputNumber v-model="entity.deleterUserId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('deletionTime')" prop="deletionTime">
<DatePicker type="date" v-model="entity.deletionTime"></DatePicker>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('classId')" prop="classId">
<InputNumber v-model="entity.classId"></InputNumber>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('remark')" prop="remark">
<Input v-model="entity.remark" type="textarea" :rows="5"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('extend')" prop="extend">
<Input v-model="entity.extend"></Input>
</FormItem>
</Col> -->
</Row>
</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>
</Form> </Form>
</template> </template>
<script> <script>
import Api from './api' import Api from "./api";
export default { import iQuill from '@/components/quill'
name: 'Add', export default {
name: "Add",
components: { iQuill },
data() { data() {
return { return {
disabled: false, disabled: false,
entity: {creationTime: null, entity: {
creatorUserId: null, creationTime: null,
lastModificationTime: null, creatorUserId: null,
lastModifierUserId: null, lastModificationTime: null,
isDeleted: null, lastModifierUserId: null,
deleterUserId: null, isDeleted: null,
deletionTime: null, deleterUserId: null,
routingHeaderId: null, deletionTime: null,
routingDetailId: null, routingHeaderId: null,
classId: null, routingDetailId: null,
stepSeq: null, classId: null,
name: "", stepSeq: null,
description: "", name: "",
status: null, description: "",
remark: "", status: null,
stepContent: "", remark: "",
extend: ""}, stepContent: "",
extend: ""
},
rules: { rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }] name: [{ required: true, message: "必填", trigger: "blur" }]
}
} }
};
}, },
props: { props: {
v: Object, v: Object,
...@@ -82,27 +149,50 @@ extend: ""}, ...@@ -82,27 +149,50 @@ extend: ""},
}, },
methods: { methods: {
handleSubmit() { handleSubmit() {
this.$refs.form.validate((v) => { this.$refs.form.validate(v => {
if (v) { if (v) {
this.disabled = true; this.disabled = true;
Api.create(this.entity).then((r) => { Api.create(this.entity)
.then(r => {
this.disabled = false; this.disabled = false;
if (r.success) { if (r.success) {
this.$Message.success('保存成功') this.$Message.success("保存成功");
this.$emit('on-ok') this.$emit("on-ok");
} else { } else {
this.$Message.error('保存失败') this.$Message.error("保存失败");
} }
}).catch(err => {
this.disabled = false;
this.$Message.error('保存失败')
console.warn(err)
}) })
.catch(err => {
this.disabled = false;
this.$Message.error("保存失败");
console.warn(err);
});
} }
}) });
},
handleImg(e) {
console.warn(e)
// let file = null
// if (
// e.clipboardData &&
// e.clipboardData.items[0] &&
// e.clipboardData.items[0].type &&
// e.clipboardData.items[0].type.indexOf('image') > -1
// ) {
// //这里就是判断是否有粘贴进来的文件且文件为图片格式
// file = e.clipboardData.items[0].getAsFile()
// let reader = new FileReader()
// reader.readAsDataURL(file)
// setTimeout(() => {
// var img = '<img src="' + reader.result + '" alt=""/>'
// this.bugForm.content += img
// }, 1000)
// // new R
// }
}, },
handleClose() { handleClose() {
this.$emit('on-close') this.$emit("on-close");
}, },
load(v) { load(v) {
Api.get({ id: v }).then(r => { Api.get({ id: v }).then(r => {
...@@ -112,12 +202,12 @@ extend: ""}, ...@@ -112,12 +202,12 @@ extend: ""},
}, },
l(key) { l(key) {
key = "routing_step" + "." + key; key = "routing_step" + "." + key;
return this.$t(key) return this.$t(key);
} }
}, },
watch: { watch: {
v() { v() {
this.entity = this.$u.clone(this.v) this.entity = this.$u.clone(this.v);
}, },
eid(v) { eid(v) {
if (v > 0) { if (v > 0) {
...@@ -125,5 +215,5 @@ extend: ""}, ...@@ -125,5 +215,5 @@ extend: ""},
} }
} }
} }
} };
</script> </script>
\ No newline at end of file \ No newline at end of file
pages/technology/details/routingStep/edit.vue
View file @ 54059f9d
...@@ -14,7 +14,12 @@ ...@@ -14,7 +14,12 @@
</Col> </Col>
<Col :span="24"> <Col :span="24">
<FormItem :label="l('stepContent')" prop="stepContent"> <FormItem :label="l('stepContent')" prop="stepContent">
<Input v-model="entity.stepContent" type="textarea" :rows="5"></Input> <i-quill
v-model="entity.stepContent"
:height="260"
v-paste="handleImg"
/>
<!-- <Input v-model="entity.stepContent" type="textarea" :rows="5"></Input> -->
<!-- <Input v-model="entity.stepContent" type="textarea" :minRows="3", :maxRows="7" ></Input> --> <!-- <Input v-model="entity.stepContent" type="textarea" :minRows="3", :maxRows="7" ></Input> -->
</FormItem> </FormItem>
</Col> </Col>
...@@ -27,12 +32,12 @@ ...@@ -27,12 +32,12 @@
<!-- <Dictionary style="width:100px" code="Process.Status" v-model="entity.status"></Dictionary> --> <!-- <Dictionary style="width:100px" code="Process.Status" v-model="entity.status"></Dictionary> -->
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24"> <!--<Col :span="24">
<FormItem :label="l('description')" prop="description"> <FormItem :label="l('description')" prop="description">
<Input v-model="entity.description" type="textarea" :rows="5"></Input> <Input v-model="entity.description" type="textarea" :rows="5"></Input>
</FormItem> </FormItem>
</Col> </Col>
<!--<Col :span="12"> <Col :span="12">
<FormItem :label="l('creationTime')" prop="creationTime"> <FormItem :label="l('creationTime')" prop="creationTime">
<DatePicker type="date" v-model="entity.creationTime"></DatePicker> <DatePicker type="date" v-model="entity.creationTime"></DatePicker>
</FormItem> </FormItem>
...@@ -101,8 +106,10 @@ ...@@ -101,8 +106,10 @@
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
import iQuill from '@/components/quill'
export default { export default {
name: "Edit", name: "Edit",
components: { iQuill },
data() { data() {
return { return {
disabled: false, disabled: false,
...@@ -150,6 +157,27 @@ export default { ...@@ -150,6 +157,27 @@ export default {
} }
}); });
}, },
handleImg(e) {
console.warn(e)
// let file = null
// if (
// e.clipboardData &&
// e.clipboardData.items[0] &&
// e.clipboardData.items[0].type &&
// e.clipboardData.items[0].type.indexOf('image') > -1
// ) {
// //这里就是判断是否有粘贴进来的文件且文件为图片格式
// file = e.clipboardData.items[0].getAsFile()
// let reader = new FileReader()
// reader.readAsDataURL(file)
// setTimeout(() => {
// var img = '<img src="' + reader.result + '" alt=""/>'
// this.bugForm.content += img
// }, 1000)
// // new R
// }
},
handleClose() { handleClose() {
this.$emit("on-close"); this.$emit("on-close");
}, },
......
pages/technology/details/routingStep/index.vue
View file @ 54059f9d
...@@ -81,13 +81,13 @@ export default { ...@@ -81,13 +81,13 @@ export default {
{ {
key: "routingHeaderId", key: "routingHeaderId",
title: this.l("routingHeaderId"), title: this.l("routingHeaderId"),
hide: true, high: true,
align: "left" align: "left"
}, },
{ {
key: "routingDetailId", key: "routingDetailId",
title: this.l("routingDetailId"), title: this.l("routingDetailId"),
hide: true, high: true,
align: "left" align: "left"
}, },
{ key: "classId", title: this.l("classId"), hide: true, align: "left" }, { key: "classId", title: this.l("classId"), hide: true, align: "left" },
...@@ -103,8 +103,13 @@ export default { ...@@ -103,8 +103,13 @@ export default {
key: "description", key: "description",
title: this.l("description"), title: this.l("description"),
align: "left", align: "left",
easy: true, hide: true
high: true },
{
key: "stepContent",
title: this.l("stepContent"),
align: "left",
hide: true
}, },
{ {
key: "status", key: "status",
......
pages/technology/index.vue
View file @ 54059f9d
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
right: 0; right: 0;
// bottom:100%; // bottom:100%;
// right: 100%; // right: 100%;
z-index: 990; z-index: 898;
background-color: white; background-color: white;
// background: red; // background: red;
.top { .top {
......
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