Skip to content

M
mes-ui
Commit cdc709ba authored by renjintao's avatar renjintao
Browse files
Options

add

parent 496c0920
Show whitespace changes
Inline Side-by-side
Showing with 298 additions and 182 deletions
i18n/locale/zh-CN.js
View file @ cdc709ba
...@@ -1201,11 +1201,11 @@ export default { ...@@ -1201,11 +1201,11 @@ export default {
isDeleted:'是否删除', isDeleted:'是否删除',
deleterUserId:'删除人', deleterUserId:'删除人',
deletionTime:'删除时间', deletionTime:'删除时间',
classId:'', classId:'classId',
routingHeaderId:'工艺规程id', routingHeaderId:'工艺规程id',
name:'工序名称', name:'工序名称',
taskSeq:'工序号', taskSeq:'工序号',
description:'备注', description:'描述',
taskContent:'工序内容', taskContent:'工序内容',
resourceId:'资源ID', resourceId:'资源ID',
resourceType:'资源类型', resourceType:'资源类型',
...@@ -1217,7 +1217,7 @@ export default { ...@@ -1217,7 +1217,7 @@ export default {
efficiencyValue:'效率系数', efficiencyValue:'效率系数',
singleOut:'单件产出', singleOut:'单件产出',
isOutside:'是否外协', isOutside:'是否外协',
departmentId:'工序的承制车间', departmentId:'承制车间',
isImportant:'是否关键工序', isImportant:'是否关键工序',
milestoneId:'里程碑', milestoneId:'里程碑',
phaseId:'阶段id', phaseId:'阶段id',
......
pages/technology/details/add.vue
View file @ cdc709ba
<template> <template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90"> <Form ref="form" :model="entity" :rules="rules" :label-width="110">
<Row> <Row>
<Col :span="12"><FormItem :label="l('classId')" prop="classId"> <InputNumber v-model="entity.classId"></InputNumber> <!--
</FormItem></Col> <Col :span="12">
<Col :span="12"><FormItem :label="l('routingHeaderId')" prop="routingHeaderId"> <InputNumber v-model="entity.routingHeaderId"></InputNumber> <FormItem :label="l('routingHeaderId')" prop="routingHeaderId">
</FormItem></Col> <InputNumber v-model="entity.routingHeaderId"></InputNumber>
<Col :span="12"><FormItem :label="l('name')" prop="name"> <Input v-model="entity.name"> </Input> </FormItem>
</FormItem></Col> </Col>
<Col :span="12"><FormItem :label="l('taskSeq')" prop="taskSeq"> <InputNumber v-model="entity.taskSeq"></InputNumber> <Col :span="12">
</FormItem></Col> <FormItem :label="l('classId')" prop="classId">
<Col :span="24"><FormItem :label="l('description')" prop="description"> <Input v-model="entity.description" type="textarea" :rows="5"></Input> <InputNumber v-model="entity.classId"></InputNumber>
</FormItem></Col> </FormItem>
<Col :span="12"><FormItem :label="l('taskContent')" prop="taskContent"> <Input v-model="entity.taskContent"> </Input> </Col>
</FormItem></Col> <Col :span="12">
<Col :span="12"><FormItem :label="l('resourceId')" prop="resourceId"> <InputNumber v-model="entity.resourceId"></InputNumber> <FormItem :label="l('note')" prop="note">
</FormItem></Col> <Input v-model="entity.note"></Input>
<Col :span="12"><FormItem :label="l('resourceType')" prop="resourceType"> <Dictionary code="Process.routing_detail.resource_type" v-model="entity.resourceType"></Dictionary> </FormItem>
</FormItem></Col> </Col>
<Col :span="12"><FormItem :label="l('runtime')" prop="runtime"> <InputNumber v-model="entity.runtime"></InputNumber> <Col :span="12">
</FormItem></Col> <FormItem :label="l('singleOut')" prop="singleOut">
<Col :span="12"><FormItem :label="l('setupTime')" prop="setupTime"> <InputNumber v-model="entity.setupTime"></InputNumber> <InputNumber v-model="entity.singleOut"></InputNumber>
</FormItem></Col> </FormItem>
<Col :span="12"><FormItem :label="l('transportTime')" prop="transportTime"> <InputNumber v-model="entity.transportTime"></InputNumber> </Col>
</FormItem></Col> <Col :span="12">
<Col :span="12"><FormItem :label="l('checkTime')" prop="checkTime"> <InputNumber v-model="entity.checkTime"></InputNumber> <FormItem :label="l('milestoneId')" prop="milestoneId">
</FormItem></Col> <InputNumber v-model="entity.milestoneId"></InputNumber>
<Col :span="12"><FormItem :label="l('checkFlag')" prop="checkFlag"> <Dictionary code="Process.routing_detail.check_flag" v-model="entity.checkFlag"></Dictionary> </FormItem>
</FormItem></Col> </Col>
<Col :span="12"><FormItem :label="l('efficiencyValue')" prop="efficiencyValue"> <InputNumber v-model="entity.efficiencyValue"></InputNumber>
</FormItem></Col> <Col :span="12">
<Col :span="12"><FormItem :label="l('singleOut')" prop="singleOut"> <InputNumber v-model="entity.singleOut"></InputNumber> <FormItem :label="l('status')" prop="status">
</FormItem></Col> <Dictionary code="Process.Status" v-model="entity.status"></Dictionary>
<Col :span="12"><FormItem :label="l('isOutside')" prop="isOutside"> <Dictionary code="Process.state" v-model="entity.isOutside"></Dictionary> </FormItem>
</FormItem></Col> </Col>
<Col :span="12"><FormItem :label="l('departmentId')" prop="departmentId"> <InputNumber v-model="entity.departmentId"></InputNumber> <Col :span="24">
</FormItem></Col> <FormItem :label="l('remark')" prop="remark">
<Col :span="12"><FormItem :label="l('isImportant')" prop="isImportant"> <Dictionary code="Process.state" v-model="entity.isImportant"></Dictionary> <Input v-model="entity.remark" type="textarea" :rows="5"></Input>
</FormItem></Col> </FormItem>
<Col :span="12"><FormItem :label="l('milestoneId')" prop="milestoneId"> <InputNumber v-model="entity.milestoneId"></InputNumber> </Col>
</FormItem></Col> <Col :span="12">
<Col :span="12"><FormItem :label="l('phaseId')" prop="phaseId"> <InputNumber v-model="entity.phaseId"></InputNumber> <FormItem :label="l('extend')" prop="extend">
</FormItem></Col> <Input v-model="entity.extend"></Input>
<Col :span="12"><FormItem :label="l('status')" prop="status"> <Dictionary code="Process.Status" v-model="entity.status"></Dictionary> </FormItem>
</FormItem></Col> </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">
<Col :span="12"><FormItem :label="l('extend')" prop="extend"> <Input v-model="entity.extend"> </Input> <FormItem :label="l('performanceHours')" prop="performanceHours">
</FormItem></Col> <InputNumber v-model="entity.performanceHours"></InputNumber>
<Col :span="12"><FormItem :label="l('outsideTime')" prop="outsideTime"> <InputNumber v-model="entity.outsideTime"></InputNumber> </FormItem>
</FormItem></Col> </Col>
<Col :span="12"><FormItem :label="l('performanceHours')" prop="performanceHours"> <InputNumber v-model="entity.performanceHours"></InputNumber> <Col :span="12">
</FormItem></Col> <FormItem :label="l('resourceCode')" prop="resourceCode">
<Col :span="12"><FormItem :label="l('resourceCode')" prop="resourceCode"> <Input v-model="entity.resourceCode"> </Input> <Input v-model="entity.resourceCode"></Input>
</FormItem></Col> </FormItem>
<Col :span="12"><FormItem :label="l('isImportantResources')" prop="isImportantResources"> <Dictionary code="Process.state" v-model="entity.isImportantResources"></Dictionary> </Col>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('schedulingWorkingHours')" prop="schedulingWorkingHours"> <InputNumber v-model="entity.schedulingWorkingHours"></InputNumber> <Col :span="12">
</FormItem></Col> <FormItem :label="l('schedulingWorkingHours')" prop="schedulingWorkingHours">
<Col :span="12"><FormItem :label="l('realWorkingHours')" prop="realWorkingHours"> <InputNumber v-model="entity.realWorkingHours"></InputNumber> <InputNumber v-model="entity.schedulingWorkingHours"></InputNumber>
</FormItem></Col> </FormItem>
<Col :span="12"><FormItem :label="l('realRuntime')" prop="realRuntime"> <InputNumber v-model="entity.realRuntime"></InputNumber> </Col>
</FormItem></Col> <Col :span="12">
<Col :span="12"><FormItem :label="l('performanceWorkingHours')" prop="performanceWorkingHours"> <InputNumber v-model="entity.performanceWorkingHours"></InputNumber> <FormItem :label="l('realWorkingHours')" prop="realWorkingHours">
</FormItem></Col> <InputNumber v-model="entity.realWorkingHours"></InputNumber>
<Col :span="12"><FormItem :label="l('isParticipateIntime')" prop="isParticipateIntime"> <Dictionary code="Process.state" v-model="entity.isParticipateIntime"></Dictionary> </FormItem>
</FormItem></Col> </Col>
<Col :span="12"><FormItem :label="l('equipType')" prop="equipType"> <Input v-model="entity.equipType"> </Input> <Col :span="12">
</FormItem></Col> <FormItem :label="l('realRuntime')" prop="realRuntime">
<Col :span="12"><FormItem :label="l('equipTypeId')" prop="equipTypeId"> <InputNumber v-model="entity.equipTypeId"></InputNumber> <InputNumber v-model="entity.realRuntime"></InputNumber>
</FormItem></Col> </FormItem>
<Col :span="12"><FormItem :label="l('note')" prop="note"> <Input v-model="entity.note"> </Input> </Col>
</FormItem></Col> <Col :span="12">
<FormItem :label="l('performanceWorkingHours')" prop="performanceWorkingHours">
<InputNumber v-model="entity.performanceWorkingHours"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('isParticipateIntime')" prop="isParticipateIntime">
<Dictionary code="Process.state" v-model="entity.isParticipateIntime"></Dictionary>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('equipType')" prop="equipType">
<Input v-model="entity.equipType"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('equipTypeId')" prop="equipTypeId">
<InputNumber v-model="entity.equipTypeId"></InputNumber>
</FormItem>
</Col>
-->
<Col :span="8">
<FormItem :label="l('taskSeq')" prop="taskSeq">
<InputNumber v-model="entity.taskSeq"></InputNumber>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('name')" prop="name">
<Input v-model="entity.name"></Input>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('taskContent')" prop="taskContent">
<Input v-model="entity.taskContent"></Input>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('phaseId')" prop="phaseId">
<InputNumber v-model="entity.phaseId"></InputNumber>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('resourceType')" prop="resourceType">
<Dictionary code="Process.routing_detail.resource_type" v-model="entity.resourceType"></Dictionary>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('resourceId')" prop="resourceId">
<InputNumber v-model="entity.resourceId"></InputNumber>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('runtime')" prop="runtime">
<InputNumber v-model="entity.runtime"></InputNumber>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('setupTime')" prop="setupTime">
<InputNumber v-model="entity.setupTime"></InputNumber>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('transportTime')" prop="transportTime">
<InputNumber v-model="entity.transportTime"></InputNumber>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('checkTime')" prop="checkTime">
<InputNumber v-model="entity.checkTime"></InputNumber>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('isImportant')" prop="isImportant">
<Dictionary code="Process.state" v-model="entity.isImportant"></Dictionary>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('isImportantResources')" prop="isImportantResources">
<Dictionary code="Process.state" v-model="entity.isImportantResources"></Dictionary>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('isOutside')" prop="isOutside">
<Dictionary code="Process.state" v-model="entity.isOutside"></Dictionary>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('outsideTime')" prop="outsideTime">
<InputNumber v-model="entity.outsideTime"></InputNumber>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('departmentId')" prop="departmentId">
<InputNumber v-model="entity.departmentId"></InputNumber>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('efficiencyValue')" prop="efficiencyValue">
<InputNumber v-model="entity.efficiencyValue"></InputNumber>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('checkFlag')" prop="checkFlag">
<Dictionary code="Process.routing_detail.check_flag" v-model="entity.checkFlag"></Dictionary>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('description')" prop="description">
<Input v-model="entity.description" type="textarea" :rows="5"></Input>
</FormItem>
</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>
</Form> </Form>
</template> </template>
<script> <script>
import Api from './api' import Api from "./api";
export default { export default {
name: 'Add', name: "Add",
data() { data() {
return { return {
disabled: false, disabled: false,
entity: {classId: null, entity: {
routingHeaderId: null, classId: null,
name: "", routingHeaderId: null,
taskSeq: null, name: "",
description: "", taskSeq: null,
taskContent: "", description: "",
resourceId: null, taskContent: "",
resourceType: null, resourceId: null,
runtime: null, resourceType: null,
setupTime: null, runtime: null,
transportTime: null, setupTime: null,
checkTime: null, transportTime: null,
checkFlag: null, checkTime: null,
efficiencyValue: null, checkFlag: null,
singleOut: null, efficiencyValue: null,
isOutside: null, singleOut: null,
departmentId: null, isOutside: null,
isImportant: null, departmentId: null,
milestoneId: null, isImportant: null,
phaseId: null, milestoneId: null,
status: null, phaseId: null,
remark: "", status: null,
extend: "", remark: "",
outsideTime: null, extend: "",
performanceHours: null, outsideTime: null,
resourceCode: "", performanceHours: null,
isImportantResources: null, resourceCode: "",
schedulingWorkingHours: null, isImportantResources: null,
realWorkingHours: null, schedulingWorkingHours: null,
realRuntime: null, realWorkingHours: null,
performanceWorkingHours: null, realRuntime: null,
isParticipateIntime: null, performanceWorkingHours: null,
equipType: "", isParticipateIntime: null,
equipTypeId: null, equipType: "",
note: ""}, equipTypeId: null,
note: ""
},
rules: { rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }] name: [{ required: true, message: "必填", trigger: "blur" }]
}
} }
};
}, },
props: { props: {
v: Object, v: Object,
...@@ -136,27 +248,29 @@ note: ""}, ...@@ -136,27 +248,29 @@ note: ""},
}, },
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);
});
} }
}) });
}, },
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 => {
...@@ -166,12 +280,12 @@ note: ""}, ...@@ -166,12 +280,12 @@ note: ""},
}, },
l(key) { l(key) {
key = "routing_detail" + "." + key; key = "routing_detail" + "." + 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) {
...@@ -179,5 +293,5 @@ note: ""}, ...@@ -179,5 +293,5 @@ note: ""},
} }
} }
} }
} };
</script> </script>
\ No newline at end of file \ No newline at end of file
pages/technology/details/index.vue
View file @ cdc709ba
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</template> </template>
</DataGrid> </DataGrid>
<Modal v-model="modal" :title="title" width="1200" footer-hide> <Modal v-model="modal" :title="title" width="1200" footer-hide>
<component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" /> <component :is="detail" :eid="curId" :headid="hid" @on-close="cancel" @on-ok="ok" />
</Modal> </Modal>
</div> </div>
</template> </template>
...@@ -40,6 +40,7 @@ export default { ...@@ -40,6 +40,7 @@ export default {
title: "新增", title: "新增",
detail: null, detail: null,
curId: 0, curId: 0,
hid:0,
columns: [ columns: [
{ {
type: "expand", type: "expand",
...@@ -291,6 +292,7 @@ export default { ...@@ -291,6 +292,7 @@ export default {
} else { } else {
this.easySearch.routingHeaderId.value = this.$route.query.id; this.easySearch.routingHeaderId.value = this.$route.query.id;
} }
this.hid= this.$route.query.id
}, },
mounted() { mounted() {
this.load(); this.load();
......
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