Skip to content

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

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

parents ef666dba 669c07ff
Show whitespace changes
Inline Side-by-side
Showing with 964 additions and 623 deletions
pages/aps/ai/editDuration.vue
View file @ 8b9f31e8
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</Form> </Form>
<Row> <Row>
<Col span="24" style="text-align:right;height:60px;line-height:60px"> <Col span="24" style="text-align:right;height:60px;line-height:60px">
<Button type="primary" @click="handleSubmit">确定</Button> <Button type="primary" @click="handleSubmit" v-noClick>确定</Button>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</Col> </Col>
</Row> </Row>
......
pages/aps/ai/options.vue
View file @ 8b9f31e8
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
</Col> </Col>
</Row> </Row>
<FormItem class="click-btn"> <FormItem class="click-btn">
<Button type="primary" @click="handleSubmit">确定</Button> <Button type="primary" @click="handleSubmit" v-noClick>确定</Button>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
</Form> </Form>
......
pages/aps/aps/editDuration.vue
View file @ 8b9f31e8
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</Form> </Form>
<Row> <Row>
<Col span="24" style="text-align:right;height:60px;line-height:60px"> <Col span="24" style="text-align:right;height:60px;line-height:60px">
<Button type="primary" @click="handleSubmit">确定</Button> <Button type="primary" @click="handleSubmit" v-noClick>确定</Button>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</Col> </Col>
</Row> </Row>
......
pages/aps/aps/options.vue
View file @ 8b9f31e8
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
</Col> </Col>
</Row> </Row>
<FormItem class="click-btn"> <FormItem class="click-btn">
<Button type="primary" @click="handleSubmit">确定</Button> <Button type="primary" @click="handleSubmit" v-noClick>确定</Button>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
</Form> </Form>
......
pages/aps/complete/index.vue
View file @ 8b9f31e8
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
</FormItem> </FormItem>
<FormItem> <FormItem>
<Button style="margin-left: 8px" @click="closeOk">取消</Button> <Button style="margin-left: 8px" @click="closeOk">取消</Button>
<Button type="primary" @click="lowerHair">下发</Button> <Button type="primary" @click="lowerHair" v-noClick>下发</Button>
</FormItem> </FormItem>
</Form> </Form>
</div> </div>
......
pages/aps/dispatch/index.vue
View file @ 8b9f31e8
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
</Row> </Row>
<FormItem> <FormItem>
<Button style="margin-right: 8px" @click="cancle">取消</Button> <Button style="margin-right: 8px" @click="cancle">取消</Button>
<Button type="primary" @click="sendSheBei">派工</Button> <Button type="primary" @click="sendSheBei" v-noClick>派工</Button>
</FormItem> </FormItem>
</Form> </Form>
</Drawer> </Drawer>
......
pages/aps/plan/addAccessory.vue
View file @ 8b9f31e8
...@@ -42,7 +42,6 @@ export default { ...@@ -42,7 +42,6 @@ export default {
name: "addAccessory", name: "addAccessory",
data() { data() {
return { return {
disabled: false,
deletelModal: false, deletelModal: false,
curId: 0, curId: 0,
editIndex: -1, editIndex: -1,
......
pages/aps/plan/detailAccessory.vue
View file @ 8b9f31e8
...@@ -43,7 +43,7 @@ export default { ...@@ -43,7 +43,7 @@ export default {
name: "detailAccessory", name: "detailAccessory",
data() { data() {
return { return {
disabled: false,
deletelModal: false, deletelModal: false,
statuList: this.$store.getters.dictionaryByKey("accessory.status") || [], statuList: this.$store.getters.dictionaryByKey("accessory.status") || [],
statuList1: this.$store.getters.dictionaryByKey("outstore.status") || [], statuList1: this.$store.getters.dictionaryByKey("outstore.status") || [],
......
pages/aps/plan/dispatch.vue
View file @ 8b9f31e8
...@@ -2,99 +2,104 @@ ...@@ -2,99 +2,104 @@
<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"> <Col span="12">
<FormItem :label="l('DistributeMainRouting')" prop="DistributeMainRouting"> <FormItem
<UserSelect ref="userSelected" v-model="entity.DistributeMainRouting" /> :label="l('DistributeMainRouting')"
prop="DistributeMainRouting"
>
<UserSelect
ref="userSelected"
v-model="entity.DistributeMainRouting"
/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="完成时间" style="width:100%" prop="MainRoutingFinishDate"> <FormItem
label="完成时间"
style="width: 100%"
prop="MainRoutingFinishDate"
>
<DatePicker <DatePicker
v-model="entity.MainRoutingFinishDate" v-model="entity.MainRoutingFinishDate"
type="datetime" type="datetime"
placeholder="请选择日期" placeholder="请选择日期"
style="width:240px" style="width: 240px"
@on-change="getTimeMainRFD" @on-change="getTimeMainRFD"
></DatePicker> ></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
<Row > <Row> &nbsp; </Row>
&nbsp; <Row> &nbsp; </Row>
</Row>
<Row >
&nbsp;
</Row>
<FormItem> <FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button> <Button type="primary" @click="handleSubmit" v-noClick>保存</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 { export default {
name: 'Dispatch', name: "Dispatch",
props: { props: {
ids: Array ids: Array,
}, },
data() { data() {
return { return {
disabled: false,
entity: { entity: {
DistributeMainRouting: null, DistributeMainRouting: null,
MainRoutingFinishDate: '' MainRoutingFinishDate: "",
}, },
rules: { rules: {
DistributeMainRouting: [ DistributeMainRouting: [
{ {
required: true, required: true,
message: '请选择人员', message: "请选择人员",
trigger: 'change', trigger: "change",
type: 'number' type: "number",
} },
], ],
MainRoutingFinishDate: [ MainRoutingFinishDate: [
{ {
required: true, required: true,
message: '请选择时间', message: "请选择时间",
trigger: 'change' trigger: "change",
} },
] ],
} },
} };
}, },
methods: { methods: {
handleSubmit() { handleSubmit() {
this.$refs.form.validate((v) => { this.$refs.form.validate((v) => {
if (v) { if (v) {
this.entity.ids = this.ids this.entity.ids = this.ids;
Api.routingdistribute(this.entity) Api.routingdistribute(this.entity)
.then((r) => { .then((r) => {
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("工艺派发失败");
} }
this.$emit('on-ok') this.$emit("on-ok");
}) })
.catch((err) => { .catch((err) => {
this.$Message.error('工艺派发失败') this.$Message.error("工艺派发失败");
}) });
} }
}) });
}, },
handleClose() { handleClose() {
this.$emit('on-close') this.$emit("on-close");
}, },
l(key) { l(key) {
key = 'mes_order' + '.' + key key = "mes_order" + "." + key;
return this.$t(key) return this.$t(key);
}, },
getTimeMainRFD(value) { getTimeMainRFD(value) {
this.entity.MainRoutingFinishDate = value this.entity.MainRoutingFinishDate = value;
} },
}, },
watch: {} watch: {},
} };
</script> </script>
pages/mesPlan/split.vue
View file @ 8b9f31e8
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<Col span="12"> <Col span="12">
<FormItem label="分解数量" style="width:100%" prop="splitQuantity"> <FormItem label="分解数量" style="width:100%" prop="splitQuantity">
<InputNumber :min="0" v-model="orderForm.splitQuantity" style="width:180px"></InputNumber> <InputNumber :min="0" v-model="orderForm.splitQuantity" style="width:180px"></InputNumber>
<Button type="primary" @click="addSplitOrder">确定</Button> <Button type="primary" @click="addSplitOrder" v-noClick>确定</Button>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
......
pages/mordent/Sluggish/powder/index.vue
View file @ 8b9f31e8
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<Col span="16">&nbsp;</Col> <Col span="16">&nbsp;</Col>
<Col span="8"> <Col span="8">
<Button @click="cancel" class="ml20">取消</Button> <Button @click="cancel" class="ml20">取消</Button>
<Button type="primary" @click="setNumOk">设置</Button> <Button type="primary" @click="setNumOk" v-noClick>设置</Button>
</Col> </Col>
</Row> </Row>
</Form> </Form>
......
pages/project/plan/add.vue
View file @ 8b9f31e8
...@@ -101,9 +101,7 @@ ...@@ -101,9 +101,7 @@
></Col> ></Col>
</Row> </Row>
<FormItem> <FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled" <Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
>保存</Button
>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
</Form> </Form>
...@@ -114,7 +112,6 @@ export default { ...@@ -114,7 +112,6 @@ export default {
name: "Add", name: "Add",
data() { data() {
return { return {
disabled: false,
entity: { entity: {
// creationTime: null, // creationTime: null,
// creatorUserId: null, // creatorUserId: null,
...@@ -152,10 +149,8 @@ export default { ...@@ -152,10 +149,8 @@ export default {
handleSubmit() { handleSubmit() {
this.$refs.form.validate((v) => { this.$refs.form.validate((v) => {
if (v) { if (v) {
this.disabled = true;
Api.create(this.entity) Api.create(this.entity)
.then((r) => { .then((r) => {
this.disabled = false;
if (r.success) { if (r.success) {
this.$Message.success("保存成功"); this.$Message.success("保存成功");
this.$emit("on-ok"); this.$emit("on-ok");
...@@ -164,7 +159,6 @@ export default { ...@@ -164,7 +159,6 @@ export default {
} }
}) })
.catch((err) => { .catch((err) => {
this.disabled = false;
this.$Message.error("保存失败"); this.$Message.error("保存失败");
console.warn(err); console.warn(err);
}); });
......
pages/project/plan/edit.vue
View file @ 8b9f31e8
<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('creationTime')" prop="creationTime">
<Col :span="12"><FormItem :label="l('creatorUserId')" prop="creatorUserId"> <InputNumber v-model="entity.creatorUserId"></InputNumber> <DatePicker
</FormItem></Col> type="date"
<Col :span="12"><FormItem :label="l('lastModificationTime')" prop="lastModificationTime"> <DatePicker type="date" v-model="entity.lastModificationTime"></DatePicker> v-model="entity.creationTime"
</FormItem></Col> ></DatePicker> </FormItem
<Col :span="12"><FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId"> <InputNumber v-model="entity.lastModifierUserId"></InputNumber> ></Col>
</FormItem></Col> <Col :span="12"
<Col :span="12"><FormItem :label="l('isDeleted')" prop="isDeleted"> <InputNumber v-model="entity.isDeleted"></InputNumber> ><FormItem :label="l('creatorUserId')" prop="creatorUserId">
</FormItem></Col> <InputNumber v-model="entity.creatorUserId"></InputNumber> </FormItem
<Col :span="12"><FormItem :label="l('deletionTime')" prop="deletionTime"> <DatePicker type="date" v-model="entity.deletionTime"></DatePicker> ></Col>
</FormItem></Col> <Col :span="12"
<Col :span="12"><FormItem :label="l('deleterUserId')" prop="deleterUserId"> <InputNumber v-model="entity.deleterUserId"></InputNumber> ><FormItem
</FormItem></Col> :label="l('lastModificationTime')"
<Col :span="12"><FormItem :label="l('projectId')" prop="projectId"> <InputNumber v-model="entity.projectId"></InputNumber> prop="lastModificationTime"
</FormItem></Col> >
<Col :span="12"><FormItem :label="l('upId')" prop="upId"> <InputNumber v-model="entity.upId"></InputNumber> <DatePicker
</FormItem></Col> type="date"
<Col :span="12"><FormItem :label="l('title')" prop="title"> <Input v-model="entity.title"> </Input> v-model="entity.lastModificationTime"
</FormItem></Col> ></DatePicker> </FormItem
<Col :span="12"><FormItem :label="l('status')" prop="status"> <Dictionary code="mes.project_plan.Status" v-model="entity.status"></Dictionary> ></Col>
</FormItem></Col> <Col :span="12"
<Col :span="24"><FormItem :label="l('note')" prop="note"> <Input v-model="entity.note" type="textarea" :rows="5"></Input> ><FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId">
</FormItem></Col> <InputNumber
<Col :span="12"><FormItem :label="l('startDate')" prop="startDate"> <DatePicker type="date" v-model="entity.startDate"></DatePicker> v-model="entity.lastModifierUserId"
</FormItem></Col> ></InputNumber> </FormItem
<Col :span="12"><FormItem :label="l('endDate')" prop="endDate"> <DatePicker type="date" v-model="entity.endDate"></DatePicker> ></Col>
</FormItem></Col> <Col :span="12"
<Col :span="12"><FormItem :label="l('type')" prop="type"> <Dictionary code="mes.project_plan.Type" v-model="entity.type"></Dictionary> ><FormItem :label="l('isDeleted')" prop="isDeleted">
</FormItem></Col> <InputNumber v-model="entity.isDeleted"></InputNumber> </FormItem
<Col :span="12"><FormItem :label="l('attachment')" prop="attachment"> <Input v-model="entity.attachment"> </Input> ></Col>
</FormItem></Col> <Col :span="12"
<Col :span="12"><FormItem :label="l('executor')" prop="executor"> <Input v-model="entity.executor"> </Input> ><FormItem :label="l('deletionTime')" prop="deletionTime">
</FormItem></Col> <DatePicker
type="date"
v-model="entity.deletionTime"
></DatePicker> </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('projectId')" prop="projectId">
<InputNumber v-model="entity.projectId"></InputNumber> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('upId')" prop="upId">
<InputNumber v-model="entity.upId"></InputNumber> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('title')" prop="title">
<Input v-model="entity.title"> </Input> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('status')" prop="status">
<Dictionary
code="mes.project_plan.Status"
v-model="entity.status"
></Dictionary> </FormItem
></Col>
<Col :span="24"
><FormItem :label="l('note')" prop="note">
<Input
v-model="entity.note"
type="textarea"
:rows="5"
></Input> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('startDate')" prop="startDate">
<DatePicker
type="date"
v-model="entity.startDate"
></DatePicker> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('endDate')" prop="endDate">
<DatePicker
type="date"
v-model="entity.endDate"
></DatePicker> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('type')" prop="type">
<Dictionary
code="mes.project_plan.Type"
v-model="entity.type"
></Dictionary> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('attachment')" prop="attachment">
<Input v-model="entity.attachment"> </Input> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('executor')" prop="executor">
<Input v-model="entity.executor"> </Input> </FormItem
></Col>
</Row> </Row>
<FormItem> <FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button> <Button type="primary" @click="handleSubmit" v-noClick>保存</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 { export default {
name: 'Edit', name: "Edit",
data() { data() {
return { return {
disabled: false, entity: {},
entity: {
},
rules: { rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }] name: [{ required: true, message: "必填", trigger: "blur" }],
} },
} };
}, },
props: { props: {
eid: Number eid: Number,
}, },
mounted() { mounted() {
if (this.eid > 0) { if (this.eid > 0) {
...@@ -66,44 +128,43 @@ ...@@ -66,44 +128,43 @@
}, },
methods: { methods: {
load(v) { load(v) {
Api.get({ id: v }).then(r => { Api.get({ id: v }).then((r) => {
this.entity = r.result; this.entity = r.result;
}) });
}, },
handleSubmit() { handleSubmit() {
this.$refs.form.validate((v) => { this.$refs.form.validate((v) => {
if (v) { if (v) {
this.disabled = true; Api.update(this.entity)
Api.update(this.entity).then((r) => { .then((r) => {
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.$Message.error("保存失败");
console.warn(err);
});
} }
}) });
}, },
handleClose() { handleClose() {
this.$emit('on-close') this.$emit("on-close");
}, },
l(key) { l(key) {
key = "project_plan" + "." + key; key = "project_plan" + "." + key;
return this.$t(key) return this.$t(key);
} },
}, },
watch: { watch: {
eid(v) { eid(v) {
if (v != 0) { if (v != 0) {
this.load(v); this.load(v);
} }
} },
} },
} };
</script> </script>
\ No newline at end of file
pages/project/project/add.vue
View file @ 8b9f31e8
<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="8"> <Col span="8" class="projct-img">
<FormItem :label="l('picture')" prop="picture"> <FormItem :label="l('picture')" prop="picture">
<inputFile <inputFile
class="tphoto" class="tphoto"
...@@ -137,7 +137,7 @@ export default { ...@@ -137,7 +137,7 @@ export default {
name: "Add", name: "Add",
data() { data() {
return { return {
disabled: false,
imgName: "", imgName: "",
avatorPath: "", avatorPath: "",
entity: { entity: {
...@@ -155,12 +155,12 @@ export default { ...@@ -155,12 +155,12 @@ export default {
picture: "", picture: "",
attachment: "", attachment: "",
phase: null, phase: null,
startDate: null, startDate: "",
endDate: null, endDate: "",
businessUnits: "", businessUnits: "",
}, },
rules: { rules: {
name: [{ required: true, message: "必填", trigger: "blur" }], title: [{ required: true, message: "必填", trigger: "blur" }],
}, },
parmsName: "app=material&eid=1&name=ProjectMain", parmsName: "app=material&eid=1&name=ProjectMain",
parms: { parms: {
...@@ -196,7 +196,7 @@ export default { ...@@ -196,7 +196,7 @@ export default {
} }
Api.create(this.entity) Api.create(this.entity)
.then((r) => { .then((r) => {
this.disabled = false;
if (r.success) { if (r.success) {
this.$Message.success("保存成功"); this.$Message.success("保存成功");
this.$emit("on-ok"); this.$emit("on-ok");
...@@ -205,7 +205,7 @@ export default { ...@@ -205,7 +205,7 @@ export default {
} }
}) })
.catch((err) => { .catch((err) => {
this.disabled = false;
this.$Message.error("保存失败"); this.$Message.error("保存失败");
console.warn(err); console.warn(err);
}); });
...@@ -221,6 +221,8 @@ export default { ...@@ -221,6 +221,8 @@ export default {
this.entity.id = 0; this.entity.id = 0;
}); });
}, },
//时间相关end
l(key) { l(key) {
key = "project_main" + "." + key; key = "project_main" + "." + key;
return this.$t(key); return this.$t(key);
...@@ -244,3 +246,18 @@ export default { ...@@ -244,3 +246,18 @@ export default {
}, },
}; };
</script> </script>
<style lang="less">
.projct-img {
.img-touxiang {
width: 300px;
height: 300px;
margin: 0px 10px 15px 20px;
overflow: hidden;
border-radius: 5px;
.img1 {
width: 100%;
height: 100%;
}
}
}
</style>
\ No newline at end of file
pages/project/project/detail.vue
View file @ 8b9f31e8
<template> <template>
<div class="detail"> <div class="detail">
<Row> <Row>
<Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed> <Filed :span="12" :name="l('creationTime')">{{
<Filed :span="12" :name="l('creatorUserId')">{{entity.creatorUserId}}</Filed> entity.creationTime
<Filed :span="12" :name="l('lastModificationTime')">{{entity.lastModificationTime}}</Filed> }}</Filed>
<Filed :span="12" :name="l('lastModifierUserId')">{{entity.lastModifierUserId}}</Filed> <Filed :span="12" :name="l('creatorUserId')">
<Filed :span="12" :name="l('isDeleted')">{{entity.isDeleted}}</Filed> <User :value="entity.creatorUserId" />
<Filed :span="12" :name="l('deletionTime')">{{entity.deletionTime}}</Filed> </Filed>
<Filed :span="12" :name="l('deleterUserId')">{{entity.deleterUserId}}</Filed> <!-- <Filed :span="12" :name="l('lastModificationTime')">{{
<Filed :span="12" :name="l('title')">{{entity.title}}</Filed> entity.lastModificationTime
<Filed :span="24" :name="l('note')">{{entity.note}}</Filed> }}</Filed>
<Filed :span="12" :name="l('state')">{{entity.state}}</Filed> <Filed :span="12" :name="l('lastModifierUserId')">{{
<Filed :span="12" :name="l('type')">{{entity.type}}</Filed> entity.lastModifierUserId
<Filed :span="12" :name="l('picture')">{{entity.picture}}</Filed> }}</Filed>
<Filed :span="12" :name="l('attachment')">{{entity.attachment}}</Filed> <Filed :span="12" :name="l('isDeleted')">{{ entity.isDeleted }}</Filed>
<Filed :span="12" :name="l('phase')">{{entity.phase}}</Filed> <Filed :span="12" :name="l('deletionTime')">{{
<Filed :span="12" :name="l('startDate')">{{entity.startDate}}</Filed> entity.deletionTime
<Filed :span="12" :name="l('endDate')">{{entity.endDate}}</Filed> }}</Filed>
<Filed :span="12" :name="l('businessUnits')">{{entity.businessUnits}}</Filed> <Filed :span="12" :name="l('deleterUserId')">{{
entity.deleterUserId
}}</Filed> -->
<Filed :span="12" :name="l('title')">{{ entity.title }}</Filed>
<Filed :span="12" :name="l('state')">
<state code="project.main.state" :value="entity.state"
/></Filed>
<!-- <Filed :span="12" :name="l('phase')">{{ entity.phase }}</Filed> -->
<Filed :span="12" :name="l('startDate')">{{ entity.startDate }}</Filed>
<Filed :span="12" :name="l('endDate')">{{ entity.endDate }}</Filed>
<!-- <Filed :span="12" :name="l('businessUnits')">{{
entity.businessUnits
}}</Filed> -->
<Filed :span="12" :name="l('type')">
<state code="project.main.type" :value="entity.type" />
</Filed>
<Filed :span="12" :name="l('picture')"
><a @click="imgClick(entity.picture)">查看图片</a></Filed
>
<Filed :span="12" :name="l('attachment')">
<files ref="refFile" :parms="parms" fileFormat :showList="false" />
</Filed>
<Filed :span="24" :name="l('note')">{{ entity.note }}</Filed>
</Row> </Row>
</div> </div>
</template> </template>
<script> <script>
import Api from './api' import Api from "./api";
export default { export default {
name: 'Add', name: "Add",
data() { data() {
return { return {
entity: {}, entity: {},
rules: { rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }], name: [{ required: true, message: "必填", trigger: "blur" }],
code: [{ required: true, message: '必填', trigger: 'blur' }] code: [{ required: true, message: "必填", trigger: "blur" }],
}
}
}, },
props: { parms: {
eid: Number app: "material",
eid: null,
name: "",
field: "",
}, },
};
},
props: ["eid"],
mounted() { mounted() {
if (this.eid > 0) {
this.load(this.eid); this.load(this.eid);
}
}, },
methods: { methods: {
imgClick(img) {
window.open(fileUrlDown + img, "_blank");
},
load(v) { load(v) {
Api.get({ id: v }).then(r => { Api.get({ id: v }).then((r) => {
this.entity = r.result; this.entity = r.result;
this.$emit('on-load') this.entity.type = r.result.type + "";
}) this.entity.state = r.result.state + "";
this.parms.eid = r.result.attachment;
this.$emit("on-load");
});
}, },
handleClose() { handleClose() {
this.$emit('on-close') this.$emit("on-close");
}, },
l(key) { l(key) {
key = "project_main" + "." + key; key = "project_main" + "." + key;
return this.$t(key) return this.$t(key);
} },
}, },
watch: { watch: {
eid(v) { eid(v) {
if (v > 0) { if (v) {
this.load(v); this.load(v);
} }
} },
} },
} };
</script> </script>
\ No newline at end of file
pages/project/project/edit.vue
View file @ 8b9f31e8
<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="8" class="projct-img">
</FormItem></Col> <FormItem :label="l('picture')" prop="picture">
<Col :span="12"><FormItem :label="l('creatorUserId')" prop="creatorUserId"> <InputNumber v-model="entity.creatorUserId"></InputNumber> <inputFile
</FormItem></Col> class="tphoto"
<Col :span="12"><FormItem :label="l('lastModificationTime')" prop="lastModificationTime"> <DatePicker type="date" v-model="entity.lastModificationTime"></DatePicker> ref="refmovieFile1"
</FormItem></Col> v-model="imgName"
<Col :span="12"><FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId"> <InputNumber v-model="entity.lastModifierUserId"></InputNumber> :parms="parmsName"
</FormItem></Col> />
<Col :span="12"><FormItem :label="l('isDeleted')" prop="isDeleted"> <InputNumber v-model="entity.isDeleted"></InputNumber> </FormItem>
</FormItem></Col> <div class="img-touxiang">
<Col :span="12"><FormItem :label="l('deletionTime')" prop="deletionTime"> <DatePicker type="date" v-model="entity.deletionTime"></DatePicker> <img :src="avatorPath" v-if="imgName" @click="imgUrl" class="img1" />
</FormItem></Col> <img
<Col :span="12"><FormItem :label="l('deleterUserId')" prop="deleterUserId"> <InputNumber v-model="entity.deleterUserId"></InputNumber> src="@/assets/images/files_header.png"
</FormItem></Col> v-else
<Col :span="12"><FormItem :label="l('title')" prop="title"> <Input v-model="entity.title"> </Input> width="100%"
</FormItem></Col> height="100%"
<Col :span="24"><FormItem :label="l('note')" prop="note"> <Input v-model="entity.note" type="textarea" :rows="5"></Input> />
</FormItem></Col> </div>
<Col :span="12"><FormItem :label="l('state')" prop="state"> <Dictionary code="mes.project_main.State" v-model="entity.state"></Dictionary> </Col>
</FormItem></Col> <Col span="16">
<Col :span="12"><FormItem :label="l('type')" prop="type"> <Dictionary code="mes.project_main.Type" v-model="entity.type"></Dictionary> <Col :span="12"
</FormItem></Col> ><FormItem :label="l('title')" prop="title">
<Col :span="12"><FormItem :label="l('picture')" prop="picture"> <Input v-model="entity.picture"> </Input> <Input v-model="entity.title"> </Input> </FormItem
</FormItem></Col> ></Col>
<Col :span="12"><FormItem :label="l('attachment')" prop="attachment"> <Input v-model="entity.attachment"> </Input> <Col :span="12"
</FormItem></Col> ><FormItem :label="l('state')" prop="state">
<Col :span="12"><FormItem :label="l('phase')" prop="phase"> <Dictionary code="mes.project_main.Phase" v-model="entity.phase"></Dictionary> <Dictionary
</FormItem></Col> code="project.main.state"
<Col :span="12"><FormItem :label="l('startDate')" prop="startDate"> <DatePicker type="date" v-model="entity.startDate"></DatePicker> v-model="entity.state"
</FormItem></Col> ></Dictionary> </FormItem
<Col :span="12"><FormItem :label="l('endDate')" prop="endDate"> <DatePicker type="date" v-model="entity.endDate"></DatePicker> ></Col>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('businessUnits')" prop="businessUnits"> <Input v-model="entity.businessUnits"> </Input> <Col :span="12"
</FormItem></Col> ><FormItem :label="l('startDate')" prop="startDate">
<DatePicker
type="date"
v-model="entity.startDate"
></DatePicker> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('endDate')" prop="endDate">
<DatePicker
type="date"
v-model="entity.endDate"
></DatePicker> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('type')" prop="type">
<Dictionary
code="project.main.type"
v-model="entity.type"
></Dictionary> </FormItem
></Col>
<Col :span="24">
<FormItem :label="l('attachment')" prop="attachment">
<!-- <Input v-model="entity.template" type="textarea" :rows="5"></Input> -->
<files ref="refFile" :parms="parms" files />
</FormItem>
</Col>
<!-- <Col :span="12"
><FormItem :label="l('phase')" prop="phase">
<Dictionary
code="mes.project_main.Phase"
v-model="entity.phase"
></Dictionary> </FormItem
></Col> -->
<!-- <Col :span="12"
><FormItem :label="l('businessUnits')" prop="businessUnits">
<Input v-model="entity.businessUnits"> </Input> </FormItem
></Col> -->
<Col :span="24"
><FormItem :label="l('note')" prop="note">
<Input
v-model="entity.note"
type="textarea"
:rows="5"
></Input> </FormItem
></Col>
</Col>
</Row> </Row>
<FormItem> <FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button> <Button type="primary" @click="handleSubmit" v-noClick>保存</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 { export default {
name: 'Edit', name: "Edit",
data() { data() {
return { return {
disabled: false, imgName: "",
entity: { avatorPath: "",
}, entity: {},
rules: { rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }] title: [{ required: true, message: "必填", trigger: "blur" }],
} },
} parmsName: "app=material&eid=1&name=ProjectMain",
parms: {
app: "material",
eid: null,
name: "",
field: "",
}, },
props: { };
eid: Number
}, },
props: ["eid"],
mounted() { mounted() {
if (this.eid > 0) {
this.load(this.eid); this.load(this.eid);
} this.parms.eid = this.$u.guid();
this.$refs.refmovieFile1.inputShow = false;
}, },
methods: { methods: {
imgUrl() {
window.open(this.avatorPath, "_blank");
},
load(v) { load(v) {
Api.get({ id: v }).then(r => { Api.get({ id: v }).then((r) => {
this.entity = r.result; this.entity = r.result;
}) this.avatorPath = fileUrlDown + r.result.picture;
this.imgName = r.result.picture;
if (r.result.attachment && r.result.attachment != "") {
this.parms.eid = r.result.attachment;
} else {
this.parms.eid = this.$u.guid();
}
this.entity.attachment = this.parms.eid;
// this.entity.creatorUserId = r.result.creatorUserId;
});
}, },
handleSubmit() { handleSubmit() {
this.$refs.form.validate((v) => { this.$refs.form.validate((v) => {
if (v) { if (v) {
this.disabled = true; if (this.$refs.refFile.nameList.length > 0) {
Api.update(this.entity).then((r) => { this.entity.attachment = this.parms.eid;
this.disabled = false; } else {
this.entity.attachment = "";
}
Api.update(this.entity)
.then((r) => {
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.$Message.error("保存失败");
console.warn(err);
});
} }
}) });
}, },
handleClose() { handleClose() {
this.$emit('on-close') this.$emit("on-close");
}, },
l(key) { l(key) {
key = "project_main" + "." + key; key = "project_main" + "." + key;
return this.$t(key) return this.$t(key);
} },
}, },
watch: { watch: {
eid(v) { eid(v) {
if (v != 0) { if (v) {
this.load(v); this.load(v);
} }
} },
} },
} };
</script> </script>
<style lang="less">
</style>
\ No newline at end of file
pages/project/project/index.vue
View file @ 8b9f31e8
<template> <template>
<div> <div class="project">
<DataGrid <DataGrid
:columns="columns" :columns="columns"
ref="grid" ref="grid"
...@@ -7,12 +7,14 @@ ...@@ -7,12 +7,14 @@
:conditions="easySearch" :conditions="easySearch"
:type="typeInfo" :type="typeInfo"
:span="6" :span="6"
:format="formatFun"
><template slot="easySearch" ><template slot="easySearch"
><Form ref="formInline" :model="easySearch" inline ><Form ref="formInline" :model="easySearch" inline
><FormItem prop="keys" ><FormItem prop="keys"
><Input ><Input
placeholder="请输入关键字标题" placeholder="请输入关键字标题"
v-model="easySearch.keys.value" v-model="easySearch.keys.value"
clearable
/> />
</FormItem> </FormItem>
<FormItem <FormItem
...@@ -33,17 +35,36 @@ ...@@ -33,17 +35,36 @@
></Button> ></Button>
</template> </template>
<template slot="card" slot-scope="{ row }"> <template slot="card" slot-scope="{ row }">
<div class="body-card"> <Card
class="body-card"
:style="row._checked ? 'border:1px solid #2680eb;' : ''"
>
<Row class="title-i"> <Row class="title-i">
<Col :span="12"> <Col :span="10" class="title-l">
<Ellipsis :text="row.name" :length="18" tooltip /> <Checkbox v-model="row._checked"></Checkbox>
<Ellipsis :text="row.title" :length="18" tooltip />
</Col>
<Col :span="10" class="btn-click">
<!-- <Ellipsis :text="row.code" :length="18" tooltip/> -->
</Col>
<Col :span="4">
<div class="statuBg" :style="tdStyle(row.state)"></div>
<div class="boxTitle">
<div class="text">
<state
code="project.main.state"
ref="state"
:value="row.state"
type="text"
:color="false"
></state>
</div>
</div>
</Col> </Col>
<Col :span="12" class="btn-click">
<Ellipsis :text="row.code" :length="18" tooltip
/></Col>
</Row> </Row>
<Row class="row-down" :gutter="10"> <Row class="row-down" :gutter="10">
<Col span="7"> <Col span="10">
<div class="img-i"> <div class="img-i">
<!-- <img :src="downUrl + row.img" v-if="row.img" /> --> <!-- <img :src="downUrl + row.img" v-if="row.img" /> -->
<Pictrue :src="row.img" v-if="row.img" /> <Pictrue :src="row.img" v-if="row.img" />
...@@ -55,24 +76,27 @@ ...@@ -55,24 +76,27 @@
/> />
</div> </div>
</Col> </Col>
<Col span="17"> <Col span="14">
<div class="c"> <div class="c">
<div>版本：{{ row.version }}</div> <div>创建人： <User :value="row.creatorUserId" /></div>
<div> <div>
状态： 创建时间：{{ row.creationTime }}
<state code="word.document.status" :value="row.status" /> <!-- <state code="word.document.status" :value="row.status" /> -->
</div> </div>
<!-- <div> <div>开始时间：{{ row.startDate }}</div>
创建人： <div>结束时间：{{ row.endDate }}</div>
<User :value="row.creatorUserId" />
</div>-->
<div class="shuo-ming"> <div class="shuo-ming">
<span>文档说明：</span> <span>备注：</span>
<Ellipsis :text="row.description" :length="12" tooltip /> <Ellipsis :text="row.note" :length="12" tooltip />
</div> </div>
</div> </div>
</Col>
</Row>
<Row class="bottom-b">
<Col span="6"
><state code="project.main.type" :value="row.type"
/></Col>
<Col span="18">
<div class="a-icon"> <div class="a-icon">
<a @click="edit(row.id)"> <Icon type="md-create" />编辑 </a <a @click="edit(row.id)"> <Icon type="md-create" />编辑 </a
>&nbsp; >&nbsp;
...@@ -86,10 +110,10 @@ ...@@ -86,10 +110,10 @@
</div> </div>
</Col> </Col>
</Row> </Row>
</div> </Card>
</template> </template>
</DataGrid> </DataGrid>
<Modal v-model="modal" :title="title" width="1200" footer-hide> <Modal v-model="modal" :title="title" width="1200" footer-hide :mask-closable="false">
<component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" /> <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
</Modal> </Modal>
</div> </div>
...@@ -113,6 +137,7 @@ export default { ...@@ -113,6 +137,7 @@ export default {
easySearch: { easySearch: {
keys: { op: "title", value: null }, keys: { op: "title", value: null },
}, },
// single: false,
modal: false, modal: false,
title: "新增", title: "新增",
detail: null, detail: null,
...@@ -177,55 +202,100 @@ export default { ...@@ -177,55 +202,100 @@ export default {
{ {
key: "state", key: "state",
title: this.l("state"), title: this.l("state"),
align: "left", align: "center",
high: true, high: true,
code: "mes.project_main.State", code: "project.main.state",
}, },
{ {
key: "type", key: "type",
title: this.l("type"), title: this.l("type"),
align: "left", align: "center",
high: true, high: true,
code: "mes.project_main.Type", code: "project.main.type",
}, },
{ key: "picture", title: this.l("picture"), align: "left", high: true },
{ {
key: "attachment", key: "picture",
title: this.l("attachment"), title: this.l("picture"),
align: "left", align: "center",
high: true, high: true,
render: (h, params) => {
return h(
"a",
{
on: { click: () => this.viewImg(params.row) },
},
"查看图片"
);
},
}, },
{ {
key: "phase", key: "attachment",
title: this.l("phase"), title: this.l("attachment"),
align: "left", align: "center",
high: true, high: true,
code: "mes.project_main.Phase", render: (h, params) => {
return h(
"a",
{
on: { click: () => this.view(params.row.id) },
}, },
"查看附件"
);
},
},
// {
// key: "phase",
// title: this.l("phase"),
// align: "left",
// high: true,
// code: "mes.project_main.Phase",
// },
{ {
key: "startDate", key: "startDate",
title: this.l("startDate"), title: this.l("startDate"),
align: "left", align: "center",
high: true, high: true,
render: (h, params) => {
return h(
"span",
params.row.startDate
? this.sliceStr(params.row.startDate + " ", 0, 10)
: ""
);
},
}, },
{ key: "endDate", title: this.l("endDate"), align: "left", high: true },
{ {
key: "businessUnits", key: "endDate",
title: this.l("businessUnits"), title: this.l("endDate"),
align: "left", align: "center",
high: true, high: true,
}, render: (h, params) => {
return h(
"span",
params.row.endDate
? this.sliceStr(params.row.endDate + " ", 0, 10)
: ""
);
},
},
// {
// key: "businessUnits",
// title: this.l("businessUnits"),
// align: "left",
// high: true,
// },
{ {
key: "creationTime", key: "creationTime",
title: this.l("creationTime"), title: this.l("creationTime"),
align: "left", align: "center",
hide: false, hide: false,
}, },
{ {
key: "creatorUserId", key: "creatorUserId",
title: this.l("creatorUserId"), title: this.l("creatorUserId"),
align: "left", align: "center",
high: true, high: true,
type: "user",
}, },
{ {
title: "操作", title: "操作",
...@@ -275,6 +345,26 @@ export default { ...@@ -275,6 +345,26 @@ export default {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
methods: { methods: {
//格式化原始数据
formatFun(data) {
data.map((e) => {
return (e._checked = false);
});
return data;
},
tdStyle(val) {
//动态根据状态值加载状态值对应的颜色 #19c919
let temDic = this.$store.getters.dictionaryByKey("project.main.state");
let temColor = "#19c919";
temDic.forEach((data) => {
if (Number(data.code) == val) {
temColor = data.color;
}
});
var style = {};
style["border-top"] = " solid 38px " + temColor;
return style;
},
changeShwo() { changeShwo() {
//显示模式切换 //显示模式切换
if (this.typeInfo == "card") { if (this.typeInfo == "card") {
...@@ -287,6 +377,10 @@ export default { ...@@ -287,6 +377,10 @@ export default {
this.titleInfo = "卡片模式"; this.titleInfo = "卡片模式";
} }
}, },
viewImg(row) {
console.log(row);
window.open(fileUrlDown + row.picture, "_blank");
},
ok() { ok() {
this.$refs.grid.load(); this.$refs.grid.load();
this.modal = false; this.modal = false;
...@@ -302,6 +396,7 @@ export default { ...@@ -302,6 +396,7 @@ export default {
this.modal = true; this.modal = true;
}, },
copy(id) { copy(id) {
console.log(id);
this.curId = id; this.curId = id;
this.title = "克隆"; this.title = "克隆";
this.detail = () => import("./add"); this.detail = () => import("./add");
...@@ -331,6 +426,10 @@ export default { ...@@ -331,6 +426,10 @@ export default {
this.curId = 0; this.curId = 0;
this.modal = false; this.modal = false;
}, },
//截取字符串
sliceStr(str, lenS, lenE) {
return str.slice(lenS, lenE);
},
l(key) { l(key) {
let vkey = "project_main" + "." + key; let vkey = "project_main" + "." + key;
return this.$t(vkey) || key; return this.$t(vkey) || key;
...@@ -339,4 +438,89 @@ export default { ...@@ -339,4 +438,89 @@ export default {
}; };
</script> </script>
<style lang="less"> <style lang="less">
.project {
.ivu-card-body {
padding: 0 !important;
}
.body-card {
// border: 1px solid rgba(38, 128, 235, 1);
margin: 5px 0;
border-radius: 4px;
// height: 280px;
.title-i {
// border-bottom: 1px solid #2680eb;
// padding: 0 10px;
height: 35px;
line-height: 35px;
background: rgba(38, 128, 235, 0.2);
color: #2680eb;
padding-left: 10px;
.title-l {
display: -webkit-inline-box;
}
.btn-click {
text-align: right;
}
.statuBg {
height: 0px;
width: 0;
border-left: solid 50px transparent;
float: right;
margin-right: -1px;
}
.boxTitle {
color: white;
float: right;
margin-top: -40px;
/* Rotate div */
transform: rotate(37deg);
-ms-transform: rotate(37deg);
/* Internet Explorer */
-moz-transform: rotate(37deg);
/* Firefox */
-webkit-transform: rotate(37deg);
/* Safari 和 Chrome */
-o-transform: rotate(37deg);
/* Opera */
.text {
font-size: 8px;
font-weight: normal;
padding-right: 5px;
}
}
}
.row-down {
padding: 14px;
.img-i {
height: 170px;
width: 170px;
}
.c {
padding-left: 14px;
height: 170px;
div {
height: 33px;
line-height: 33px;
}
}
.shuo-ming {
display: -webkit-inline-box;
// display: inline-block;
}
}
.bottom-b {
// line-height: 40px;
padding: 0 0 6px 14px;
.a-icon {
text-align: right;
}
}
}
}
</style> </style>
\ No newline at end of file
pages/technology/details/routingsupporting/add.vue
View file @ 8b9f31e8
<template> <template>
<Form ref="form" :model="entity" :rules="rules" :label-width="120"> <Form ref="form" :model="entity" :rules="rules" :label-width="120">
<Row> <Row>
<!-- <!--
<Col :span="12"> <Col :span="12">
...@@ -37,12 +37,7 @@ ...@@ -37,12 +37,7 @@
<Col :span="12"> <Col :span="12">
<FormItem :label="l('routingDetailName')" prop="routingDetailId"> <FormItem :label="l('routingDetailName')" prop="routingDetailId">
<Select v-model="entity.routingDetailId"> <Select v-model="entity.routingDetailId">
<Option <Option v-for="(item, index) in routingDetailList" :value="item.value" :key="index">{{ item.label }}</Option>
v-for="(item, index) in routingDetailList"
:value="item.value"
:key="index"
>{{ item.label }}</Option
>
</Select> </Select>
</FormItem> </FormItem>
</Col> </Col>
...@@ -59,24 +54,9 @@ ...@@ -59,24 +54,9 @@
<Materiel :bomId="productBomId" v-model="entity.materialId" @on-change="change"></Materiel> <Materiel :bomId="productBomId" v-model="entity.materialId" @on-change="change"></Materiel>
</FormItem>--> </FormItem>-->
<FormItem :label="l('nameMaterial')" prop="materialId"> <FormItem :label="l('nameMaterial')" prop="materialId">
<Select <Select v-model="entity.materialId" placeholder="请选择" style="width: 300px">
v-model="entity.materialId" <Option v-for="(item, index) in listData" :key="index" :value="item.value" :label="item.label" style="display: none"></Option>
placeholder="请选择" <Tree key="mytree" :data="dataTree" ref="mytree" :render="renderContent"></Tree>
style="width: 300px"
>
<Option
v-for="(item, index) in listData"
:key="index"
:value="item.value"
:label="item.label"
style="display: none"
></Option>
<Tree
key="mytree"
:data="dataTree"
ref="mytree"
:render="renderContent"
></Tree>
</Select> </Select>
<!-- <Materiel <!-- <Materiel
v-model="entity.materialId" v-model="entity.materialId"
...@@ -93,10 +73,7 @@ ...@@ -93,10 +73,7 @@
</Col>--> </Col>-->
<Col :span="12"> <Col :span="12">
<FormItem :label="l('quantity')" prop="quantity"> <FormItem :label="l('quantity')" prop="quantity">
<InputNumber <InputNumber v-model="entity.quantity" style="width: 100%"></InputNumber>
v-model="entity.quantity"
style="width: 100%"
></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Divider orientation="left">物料属性</Divider> <Divider orientation="left">物料属性</Divider>
...@@ -153,9 +130,11 @@ ...@@ -153,9 +130,11 @@
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button> <Button type="primary" @click="handleSubmit" v-noClick>保存</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";
import ApiDetail from "../api"; import ApiDetail from "../api";
export default { export default {
...@@ -180,36 +159,30 @@ export default { ...@@ -180,36 +159,30 @@ export default {
texture: "", texture: "",
procurementStandards: "", procurementStandards: "",
qualityGrade: "", qualityGrade: "",
state: null, state: 0,
extend: "", extend: "",
remark: "", remark: "",
drawNum: "", drawNum: "",
json: {}, json: {},
}, },
rules: { rules: {
routingDetailId: [ routingDetailId: [{
{
required: true, required: true,
message: "请选择工序", message: "请选择工序",
type: "number", type: "number",
trigger: "change", trigger: "change",
}, }, ],
], materialId: [{
materialId: [
{
required: true, required: true,
message: "请选择工序", message: "请选择工序",
trigger: "change", trigger: "change",
}, }, ],
], quantity: [{
quantity: [
{
required: true, required: true,
type: "number", type: "number",
message: "请选择工序", message: "请选择工序",
trigger: "blur", trigger: "blur",
}, }, ],
],
}, },
routingDetailList: [], routingDetailList: [],
}; };
...@@ -228,11 +201,14 @@ export default { ...@@ -228,11 +201,14 @@ export default {
this.getData(); this.getData();
}, },
methods: { methods: {
renderContent(h, { root, node, data }) { renderContent(h, {
root,
node,
data
}) {
//渲染树的样式 //渲染树的样式
return h( return h(
"span", "span", {
{
style: { style: {
cursor: "pointer", cursor: "pointer",
}, },
...@@ -262,14 +238,18 @@ export default { ...@@ -262,14 +238,18 @@ export default {
this.entity.materialNumber = data.mmcode; this.entity.materialNumber = data.mmcode;
this.entity.json.nameMaterial = data.name; this.entity.json.nameMaterial = data.name;
this.entity.json.materialNumber = data.mmcode; this.entity.json.materialNumber = data.mmcode;
Api.getMaterial({ id: data.materialId }).then((r) => { Api.getMaterial({
id: data.materialId
}).then((r) => {
if (r.result) { if (r.result) {
this.forItem = r.result; this.forItem = r.result;
} }
}); });
}, },
getData() { getData() {
Api.alltree({ id: this.productBomId }).then((r) => { Api.alltree({
id: this.productBomId
}).then((r) => {
if (r.success) { if (r.success) {
this.dataTree = r.result; this.dataTree = r.result;
// this.$Message.success("获取物料成功"); // this.$Message.success("获取物料成功");
...@@ -344,8 +324,7 @@ export default { ...@@ -344,8 +324,7 @@ export default {
} }
}, },
productBomId(v) { productBomId(v) {
if (v > 0) { if (v > 0) {}
}
}, },
}, },
}; };
......
pages/word/classification/add.vue
View file @ 8b9f31e8
...@@ -461,7 +461,7 @@ export default { ...@@ -461,7 +461,7 @@ export default {
} }
}) })
.catch((err) => { .catch((err) => {
this.disabled = false;
this.$Message.error("保存失败"); this.$Message.error("保存失败");
console.warn(err); console.warn(err);
}); });
......
pages/word/document/word.vue
View file @ 8b9f31e8
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<Input <Input
placeholder="请输入文档名称/编号" placeholder="请输入文档名称/编号"
v-model="easySearch.keys.value" v-model="easySearch.keys.value"
clearable
/> />
</FormItem> </FormItem>
<FormItem> <FormItem>
...@@ -429,6 +430,7 @@ export default { ...@@ -429,6 +430,7 @@ export default {
} }
.shuo-ming { .shuo-ming {
display: -webkit-inline-box; display: -webkit-inline-box;
// display: inline-block;
} }
.a-icon { .a-icon {
text-align: right; text-align: right;
......
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