Skip to content

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

mesPlan

parent ee3ec524
Hide whitespace changes
Inline Side-by-side
Showing with 574 additions and 278 deletions
components/page/dataGrid.vue
View file @ ecd17fa7
...@@ -237,6 +237,7 @@ export default { ...@@ -237,6 +237,7 @@ export default {
type: Number, type: Number,
default: 24 default: 24
}, },
//table控件children子数据控制功能
rowKey:{ rowKey:{
type:[String,Number] type:[String,Number]
} }
......
i18n/locale/zh-CN.js
View file @ ecd17fa7
...@@ -903,7 +903,7 @@ export default { ...@@ -903,7 +903,7 @@ export default {
deleterUserId: '删除人', deleterUserId: '删除人',
mesCode: '订单编号', mesCode: '订单编号',
taskType: '任务类型', taskType: '任务类型',
productId: '产品主键', productId: '产品Id',
quantity: '数量', quantity: '数量',
remark: '备注', remark: '备注',
taskRequire: '任务节点要求', taskRequire: '任务节点要求',
...@@ -923,6 +923,15 @@ export default { ...@@ -923,6 +923,15 @@ export default {
upId: '父订单id', upId: '父订单id',
demandStartDate: '投料时间', demandStartDate: '投料时间',
demandFinishDate: '节点时间', demandFinishDate: '节点时间',
//tempTitle------
stage:'阶段',
materialId:'材料',
routing_Method:'工艺方法',
outer_Envelope_Size:'外包络尺寸',
guestName:'甲方客户',
taskCode:'甲方任务号',
putintDocmentCode:'甲方投产输入文件（编号）',
technologyDocmentCode:'甲方技术输入文件（编号）',
}, },
mes_part_task_plan_simulate: { mes_part_task_plan_simulate: {
id: '', id: '',
......
pages/mesPlan/add.vue
View file @ ecd17fa7
<template> <template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90"> <div style="width:100%;">
<Row> <Form :model="orderSearchForm" :label-width="95" :rules="ruleValidate" ref="formValidate">
<Col :span="12"> <Row>
<FormItem :label="l('mesCode')" prop="mesCode"> <Col span="8">
<Input v-model="entity.mesCode"></Input> <FormItem label="产品名称" style="width:100%" prop="productId">
</FormItem> <Select
</Col> v-model="orderSearchForm.productId"
<Col :span="12"> :placeholder="placeholdeinfo"
<FormItem :label="l('taskType')" prop="taskType"> style="width:240px;"
<Dictionary code="mes.mes_plan.task_type" v-model="entity.taskType"></Dictionary> >
</FormItem> <Option
</Col> v-for="(item,index) in list"
<Col :span="12"> :key="index"
<FormItem :label="l('productId')" prop="productId"> :value="item.value"
<InputNumber v-model="entity.productId"></InputNumber> style="display:none"
</FormItem> :label="item.label"
</Col> ></Option>
<Col :span="12"> <Tree key="mytree" :data="data1" ref="mytree" :render="renderContent"></Tree>
<FormItem :label="l('quantity')" prop="quantity"> </Select>
<InputNumber v-model="entity.quantity"></InputNumber> </FormItem>
</FormItem> </Col>
</Col> <Col span="8">
<Col :span="24"> <FormItem label="产品图号" style="width:100%">
<FormItem :label="l('remark')" prop="remark"> <Input v-model="orderSearchForm.drawnNumber" style="width:240px" disabled />
<Input v-model="entity.remark" type="textarea" :rows="5"></Input> <Input v-model="orderSearchForm.productName" style="width:240px" v-show="false" />
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24"> <Col span="8">
<FormItem :label="l('taskRequire')" prop="taskRequire"> <FormItem label="任务类型" style="width:100%" prop="taskType">
<Input v-model="entity.taskRequire" type="textarea" :rows="5"></Input> <dictionary
</FormItem> code="plan.order.taskType"
</Col> v-model="orderSearchForm.taskType"
<Col :span="12"> style="width:240px"
<FormItem :label="l('status')" prop="status"> ></dictionary>
<Dictionary code="mes.mes_plan.status" v-model="entity.status"></Dictionary> </FormItem>
</FormItem> </Col>
</Col> </Row>
<Col :span="12"> <Row>
<FormItem :label="l('divideMark')" prop="divideMark"> <Col span="8">
<Dictionary code="mes.mes_plan.divide_mark" v-model="entity.divideMark"></Dictionary> <FormItem label="阶段" style="width:100%" prop="stage">
</FormItem> <dictionary code="plan.order.stage" v-model="orderSearchForm.stage" style="width:240px"></dictionary>
</Col> </FormItem>
<Col :span="24"> </Col>
<FormItem :label="l('productCode')" prop="productCode"> <Col span="8">
<Input v-model="entity.productCode" type="textarea" :rows="5"></Input> <FormItem label="材料" style="width:100%" prop="materialId">
</FormItem> <dictionary
</Col> code="plan.order.material"
<Col :span="12"> v-model="orderSearchForm.materialId"
<FormItem :label="l('productName')" prop="productName"> style="width:240px"
<Input v-model="entity.productName"></Input> ></dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('drawnNumber')" prop="drawnNumber"> <FormItem label="数量" style="width:100%" prop="quantity">
<Input v-model="entity.drawnNumber"></Input> <InputNumber :min="0" v-model="orderSearchForm.quantity" style="width:240px"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> </Row>
<FormItem :label="l('rootId')" prop="rootId"> <Row>
<InputNumber v-model="entity.rootId"></InputNumber> <Col span="8">
</FormItem> <FormItem label="工艺方法" style="width:100%" prop="routing_Method">
</Col> <dictionary
<Col :span="12"> code="plan.order.routingMethod"
<FormItem :label="l('batchNumber')" prop="batchNumber"> v-model="orderSearchForm.routing_Method"
<Input v-model="entity.batchNumber"></Input> style="width:240px"
</FormItem> ></dictionary>
</Col> </FormItem>
<Col :span="12"> </Col>
<FormItem :label="l('projectNumber')" prop="projectNumber"> <Col span="8">
<Input v-model="entity.projectNumber"></Input> <FormItem label="外包络尺寸(mm)" style="width:100%">
</FormItem> <Input v-model="orderSearchForm.outer_Envelope_Size" style="width:240px"></Input>
</Col> </FormItem>
<Col :span="12"> </Col>
<FormItem :label="l('urgencyLevel')" prop="urgencyLevel"> <Col span="8">
<Dictionary code="mes.mes_plan.urgency_level" v-model="entity.urgencyLevel"></Dictionary> <FormItem label="开始时间" style="width:100%">
</FormItem> <DatePicker
</Col> type="date"
<Col :span="12"> placeholder="请选择日期"
<FormItem :label="l('productingPreparationPeople')" prop="productingPreparationPeople"> style="width:240px"
<InputNumber v-model="entity.productingPreparationPeople"></InputNumber> @on-change="getStartDate"
</FormItem> v-model="orderSearchForm.demandStartDate"
</Col> ></DatePicker>
<Col :span="12"> </FormItem>
<FormItem </Col>
:label="l('productingPreparationFinishDate')" </Row>
prop="productingPreparationFinishDate" <Row>
> <Col span="8">
<DatePicker type="date" v-model="entity.productingPreparationFinishDate"></DatePicker> <FormItem label="完成时间" style="width:100%">
</FormItem> <DatePicker
</Col> type="date"
<Col :span="12"> placeholder="请选择日期"
<FormItem :label="l('quotationPeople')" prop="quotationPeople"> style="width:240px"
<InputNumber v-model="entity.quotationPeople"></InputNumber> @on-change="getFinishedDate"
</FormItem> v-model="orderSearchForm.demandFinishDate"
</Col> ></DatePicker>
<Col :span="12"> </FormItem>
<FormItem :label="l('quotationFinishDate')" prop="quotationFinishDate"> </Col>
<DatePicker type="date" v-model="entity.quotationFinishDate"></DatePicker> <Col span="8">
</FormItem> <FormItem label="甲方客户" style="width:100%">
</Col> <dictionary
<Col :span="12"> code="plan.order.guestName"
<FormItem :label="l('upId')" prop="upId"> v-model="orderSearchForm.guestName"
<InputNumber v-model="entity.upId"></InputNumber> style="width:240px"
</FormItem> ></dictionary>
</Col> </FormItem>
<Col :span="12"> </Col>
<FormItem :label="l('demandStartDate')" prop="demandStartDate"> <Col span="8">
<DatePicker type="date" v-model="entity.demandStartDate"></DatePicker> <FormItem label="项目号" style="width:100%">
</FormItem> <Input v-model="orderSearchForm.projectNumber" style="width:240px" />
</Col> </FormItem>
<Col :span="12"> </Col>
<FormItem :label="l('demandFinishDate')" prop="demandFinishDate"> </Row>
<DatePicker type="date" v-model="entity.demandFinishDate"></DatePicker> <Row>
</FormItem> <Col span="8">
</Col> <FormItem label="批次号" style="width:100%">
</Row> <Input v-model="orderSearchForm.batchNumber" style="width:240px" />
<FormItem> </FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button> </Col>
<Button @click="handleClose" class="ml20">取消</Button> <Col span="8">
</FormItem> <FormItem label="紧急程度" style="width:100%">
</Form> <dictionary
style="width:240px"
code="plan.order.urgencyLevel"
v-model="orderSearchForm.urgencyLevel"
></dictionary>
</FormItem>
</Col>
<Col span="8">
<FormItem label="甲方任务号" style="width:100%">
<Input v-model="orderSearchForm.taskCode" placeholder style="width:240px" />
</FormItem>
</Col>
</Row>
<Row>
<Col span="8">
<FormItem label="任务节点要求" style="width:100%">
<Input v-model="orderSearchForm.taskRequire" placeholder style="width:240px" />
</FormItem>
</Col>
<Col span="8">
<FormItem label="甲方投产输入文件(编号)" style="width:100%">
<Input v-model="orderSearchForm.putintDocmentCode" placeholder style="width:240px" />
</FormItem>
</Col>
<Col span="8">
<FormItem label="甲方技术输入文件(编号)" style="width:100%">
<Input v-model="orderSearchForm.technologyDocmentCode" placeholder style="width:240px" />
</FormItem>
</Col>
</Row>
<Row>
<Col span="24">
<FormItem label="备注" style="width:100%">
<Input v-model="orderSearchForm.remark" placeholder type="textarea" :rows="3" />
</FormItem>
</Col>
<Col span="24">
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Col>
</Row>
</Form>
</div>
</template> </template>
<script> <script>
var myDate = new Date();
var dayTomorrow = new Date();
dayTomorrow.setTime(dayTomorrow.getTime() + 24 * 60 * 60 * 1000);
var nowDate =
myDate.getFullYear() + "-" + (myDate.getMonth() + 1) + "-" + myDate.getDate();
var tomorrowDate =
dayTomorrow.getFullYear() +
"-" +
(dayTomorrow.getMonth() + 1) +
"-" +
dayTomorrow.getDate();
import Api from "./api"; import Api from "./api";
export default { export default {
name: "Add", name: "Add",
data() { data() {
return { return {
disabled: false, divHeight: "260px",
entity: {}, list: [],
rules: { data1: [],
name: [{ required: true, message: "必填", trigger: "blur" }] selectdata: [],
placeholdeinfo: "请选择",
orderSearchForm: {
id: null,
productId: null, //产品id
productName: "", //产品名称
drawnNumber: null, //图号
taskType: null, //任务类型
stage: null, //阶段
materialId: null, //材料
quantity: 1, //数量
guestName: "", //甲方客户
printSupply: "", //3D打印承制单位
functionaryOffice: "", //厂内责任机关
mainDepartmentId: "", //厂内责任主体部门ID
taskRequire: "", //任务接点要求
putintDocmentCode: "", //甲方投产输入文件编号
technologyDocmentCode: "", //甲方技术输入文件编号
outerDrawnNumber: "", //外部图号/模型号
modelVersion: "", //模型版本
taskCode: "", //甲方任务号
designer: "", //甲方设计人员
officeFunctionary: "", //厂内机关负责人
mainRoutingPeople: "", //厂内主工艺人员
routing_Method: null, //工艺方法
outer_Envelope_Size: "", //包装尺寸
demandStartDate: this.getFormatDate(nowDate), //开始时间
demandFinishDate: this.getFormatDate(tomorrowDate), //完成时间
remark: "", //备注
projectNumber: "", //项目号
batchNumber: "", //批次号
urgencyLevel: null //紧急程度
},
ruleValidate: {
productId: [
{
required: true,
message: "请选择产品名称",
type: "number",
trigger: "change"
}
],
taskType: [
{
required: true,
message: "请选择任务类型",
trigger: "change",
type: "number"
}
],
stage: [
{
required: true,
message: "请选择阶段",
type: "number",
trigger: "change"
}
],
materialId: [
{
required: true,
message: "请选择材料",
type: "number",
trigger: "change"
}
],
quantity: [
{
required: true,
message: "请输入数量",
type: "number",
trigger: "change"
}
],
routing_Method: [
{
required: true,
message: "请选择工艺方法",
type: "number",
trigger: "change"
}
]
} }
}; };
}, },
props: { mounted(){
v: Object this.loadTree()
}, },
methods: { methods: {
handleSubmit() { handleSubmit() {
this.$refs.form.validate(v => { this.$refs.formValidate.validate(v => {
if (v) { if (v) {
this.disabled = true; this.disabled = true;
Api.create(this.entity) Api.create(this.entity)
...@@ -161,17 +297,123 @@ export default { ...@@ -161,17 +297,123 @@ export default {
}); });
}, },
handleClose() { handleClose() {
this.resetFields()
this.$emit("on-close"); this.$emit("on-close");
}, },
l(key) { l(key) {
key = "mes_plan" + "." + key; key = "mes_plan" + "." + key;
return this.$t(key); return this.$t(key);
},
handleSelect(data) {
if (data.length > 0) {
this.selectdata = [];
this.selectdata = data;
this.list = [];
this.list.push({ label: data[0].title, value: data[0].id });
if (data[0].isProduct == "1") {
this.orderSearchForm.productName = data[0].title;
this.orderSearchForm.productId = data[0].productId;
this.orderSearchForm.drawnNumber = data[0].drawingNo;
} else {
this.$Message.error("此节点不是产品,请选择产品节点!");
}
}
},
resetFields() {
this.orderSearchForm = {
productId: null, //产品id
productName: "", //产品名称
drawnNumber: null, //图号
taskType: null, //任务类型
stage: null, //阶段
materialId: null, //材料
quantity: 1, //数量
guestName: "", //甲方客户
printSupply: "", //3D打印承制单位
functionaryOffice: "", //厂内责任机关
mainDepartmentId: "", //厂内责任主体部门ID
taskRequire: "", //任务接点要求
putintDocmentCode: "", //甲方投产输入文件编号
technologyDocmentCode: "", //甲方技术输入文件编号
outerDrawnNumber: "", //外部图号/模型号
modelVersion: "", //模型版本
taskCode: "", //甲方任务号
designer: "", //甲方设计人员
officeFunctionary: "", //厂内机关负责人
mainRoutingPeople: "", //厂内主工艺人员
routing_Method: null, //工艺方法
outer_Envelope_Size: "", //包装尺寸
demandStartDate: this.getFormatDate(nowDate), //开始时间
demandFinishDate: this.getFormatDate(tomorrowDate), //完成时间
remark: "" //备注
};
},
loadTree() {
//打开新增订单窗口加载产品
this.resetFields();
var sumData = [];
this.$http.order.getallselecttree().then(res => {
if (res.result) {
for (var i = 0; i < res.result.length; i++) {
sumData = sumData.concat(res.result[i]);
}
this.data1 = sumData;
} else {
this.$Message.error("加载产品树失败!");
}
});
},
renderContent(h, { root, node, data }) {
//渲染树的样式
return h(
"span",
{
style: {
color: data.isProduct != "1" ? "#249E91" : "#333", //根据选中状态设置样式
cursor: "pointer"
},
on: {
click: () => {
let arrTree = [];
arrTree.push(data);
this.handleSelect(arrTree); //手动选择树节点
}
}
},
data.title
);
},
//时间相关start
getStartDate(value) {
if (value == "") {
this.orderSearchForm.demandStartDate = this.getFormatDate(nowDate);
} else {
this.orderSearchForm.demandStartDate = this.getFormatDate(value);
}
},
getFinishedDate(value) {
if (value == "") {
this.orderSearchForm.demandFinishDate = this.getFormatDate(
tomorrowDate
);
} else {
this.orderSearchForm.demandFinishDate = this.getFormatDate(value);
}
},
getFormatDate(dates) {
const d = new Date(dates);
const resDate =
d.getFullYear() +
"-" +
this.p(d.getMonth() + 1) +
"-" +
this.p(d.getDate());
return resDate;
},
p(s) {
return s < 10 ? "0" + s : s;
} }
}, //时间相关end
watch: {
v() {
this.entity = this.$u.clone(this.v);
}
} }
}; };
</script> </script>
pages/mesPlan/detail.vue
View file @ ecd17fa7
...@@ -2,59 +2,45 @@ ...@@ -2,59 +2,45 @@
<div class="detail"> <div class="detail">
<Row> <Row>
<Filed :span="12" :name="l('mesCode')">{{entity.mesCode}}</Filed> <Filed :span="12" :name="l('mesCode')">{{entity.mesCode}}</Filed>
<Filed :span="12" :name="l('taskType')">{{entity.taskType}}</Filed> <Filed :span="12" :name="l('taskType')"><state code="plan.order.taskType" :value="entity.taskType" type="text"></state></Filed>
<Filed :span="12" :name="l('productId')">{{entity.productId}}</Filed>
<Filed :span="12" :name="l('quantity')">{{entity.quantity}}</Filed> <Filed :span="12" :name="l('quantity')">{{entity.quantity}}</Filed>
<Filed :span="24" :name="l('remark')">{{entity.remark}}</Filed> <Filed :span="12" :name="l('status')"><state code="plan.order.status" :value="entity.status" type="text"></state></Filed>
<Filed :span="24" :name="l('taskRequire')">{{entity.taskRequire}}</Filed>
<Filed :span="12" :name="l('status')">{{entity.status}}</Filed>
<Filed :span="12" :name="l('divideMark')">{{entity.divideMark}}</Filed>
<Filed :span="24" :name="l('productCode')">{{entity.productCode}}</Filed>
<Filed :span="12" :name="l('productName')">{{entity.productName}}</Filed> <Filed :span="12" :name="l('productName')">{{entity.productName}}</Filed>
<Filed :span="12" :name="l('drawnNumber')">{{entity.drawnNumber}}</Filed> <Filed :span="12" :name="l('drawnNumber')">{{entity.drawnNumber}}</Filed>
<Filed :span="12" :name="l('rootId')">{{entity.rootId}}</Filed>
<Filed :span="12" :name="l('batchNumber')">{{entity.batchNumber}}</Filed> <Filed :span="12" :name="l('batchNumber')">{{entity.batchNumber}}</Filed>
<Filed :span="12" :name="l('projectNumber')">{{entity.projectNumber}}</Filed> <Filed :span="12" :name="l('projectNumber')">{{entity.projectNumber}}</Filed>
<Filed :span="12" :name="l('urgencyLevel')">{{entity.urgencyLevel}}</Filed> <Filed :span="12" :name="l('urgencyLevel')"><state code="plan.order.urgencyLevel" :value="entity.urgencyLevel" type="text"></state></Filed>
<Filed
:span="12"
:name="l('productingPreparationPeople')"
>{{entity.productingPreparationPeople}}</Filed>
<Filed
:span="12"
:name="l('productingPreparationFinishDate')"
>{{entity.productingPreparationFinishDate}}</Filed>
<Filed :span="12" :name="l('quotationPeople')">{{entity.quotationPeople}}</Filed>
<Filed :span="12" :name="l('quotationFinishDate')">{{entity.quotationFinishDate}}</Filed>
<Filed :span="12" :name="l('upId')">{{entity.upId}}</Filed>
<Filed :span="12" :name="l('demandStartDate')">{{entity.demandStartDate}}</Filed> <Filed :span="12" :name="l('demandStartDate')">{{entity.demandStartDate}}</Filed>
<Filed :span="12" :name="l('demandFinishDate')">{{entity.demandFinishDate}}</Filed> <Filed :span="12" :name="l('demandFinishDate')">{{entity.demandFinishDate}}</Filed>
<Filed :span="12" :name="l('taskRequire')">{{entity.taskRequire}}</Filed>
<Filed :span="24" :name="l('remark')">{{entity.remark}}</Filed>
</Row> </Row>
</div> </div>
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
export default { export default {
name: "Add", name: "detail",
data() { data() {
return { return {
entity: {}, entity: {},
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }],
code: [{ required: true, message: "必填", trigger: "blur" }]
}
}; };
}, },
props: { props: {
eid: Number row: {
type: Object,
default: () => {
return null;
}
}
}, },
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;
this.$emit("on-load"); // this.$emit("on-load");
}); // });
}, // },
handleClose() { handleClose() {
this.$emit("on-close"); this.$emit("on-close");
}, },
...@@ -64,9 +50,9 @@ export default { ...@@ -64,9 +50,9 @@ export default {
} }
}, },
watch: { watch: {
eid(v) { row(v) {
if (v != 0) { if (v != null) {
this.load(v); this.entity = this.$u.clone(this.row);
} }
} }
} }
......
pages/mesPlan/edit.vue
View file @ ecd17fa7
<template> <template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90"> <Form :model="orderSearchForm" :label-width="95" :rules="ruleValidate" ref="formValidate">
<Row> <Row>
<Col :span="12"> <!-- <Col span="24">
<FormItem :label="l('mesCode')" prop="mesCode"> <FormItem label="订单编号" style="width:100%">
<Input v-model="entity.mesCode"></Input> {{this.orderSearchForm.mesCode}}
</FormItem>
</Col> -->
<Col span="8">
<FormItem :label="l('productName')" style="width:100%" prop="productId">
<Select
v-model="orderSearchForm.productId"
:placeholder="placeholdeinfo"
style="width:240px;"
>
<Option
v-for="(item,index) in list"
:key="index"
:value="item.value"
style="display:none"
:label="item.label"
></Option>
<Tree key="mytree" :data="data1" ref="mytree" :render="renderContent"></Tree>
</Select>
</FormItem>
</Col>
<Col span="8">
<FormItem :label="l('drawnNumber')" style="width:100%">
<Input v-model="orderSearchForm.drawnNumber" style="width:240px" disabled />
<Input v-model="orderSearchForm.productName" style="width:240px" v-show="false" />
</FormItem>
</Col>
<Col span="8">
<FormItem :label="l('taskType')" style="width:100%" prop="taskType">
<dictionary
code="plan.order.taskType"
v-model="orderSearchForm.taskType"
style="width:240px"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> </Row>
<FormItem :label="l('taskType')" prop="taskType"> <Row>
<Dictionary code="mes.mes_plan.task_type" v-model="entity.taskType"></Dictionary> <Col span="8">
</FormItem> <FormItem :label="l('stage')" style="width:100%" prop="stage">
</Col> <dictionary code="plan.order.stage" v-model="orderSearchForm.stage" style="width:240px"></dictionary>
<Col :span="12">
<FormItem :label="l('productId')" prop="productId">
<InputNumber v-model="entity.productId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('quantity')" prop="quantity">
<InputNumber v-model="entity.quantity"></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="24">
<FormItem :label="l('taskRequire')" prop="taskRequire">
<Input v-model="entity.taskRequire" type="textarea" :rows="5"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('status')" prop="status"> <FormItem :label="l('materialId')" style="width:100%" prop="materialId">
<Dictionary code="mes.mes_plan.status" v-model="entity.status"></Dictionary> <dictionary
code="plan.order.material"
v-model="orderSearchForm.materialId"
style="width:240px"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('divideMark')" prop="divideMark"> <FormItem :label="l('quantity')" style="width:100%" prop="quantity">
<Dictionary code="mes.mes_plan.divide_mark" v-model="entity.divideMark"></Dictionary> <InputNumber :min="0" v-model="orderSearchForm.quantity" style="width:240px"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24"> </Row>
<FormItem :label="l('productCode')" prop="productCode"> <Row>
<Input v-model="entity.productCode" type="textarea" :rows="5"></Input> <Col span="8">
<FormItem :label="l('routing_Method')" style="width:100%" prop="routing_Method">
<dictionary
code="plan.order.routingMethod"
v-model="orderSearchForm.routing_Method"
style="width:240px"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('productName')" prop="productName"> <FormItem :label="l('outer_Envelope_Size')" style="width:100%">
<Input v-model="entity.productName"></Input> <Input v-model="orderSearchForm.outer_Envelope_Size" style="width:240px"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('drawnNumber')" prop="drawnNumber"> <FormItem :label="l('demandStartDate')" style="width:100%">
<Input v-model="entity.drawnNumber"></Input> <DatePicker
type="date"
placeholder="请选择日期"
style="width:240px"
@on-change="getStartDate"
v-model="orderSearchForm.demandStartDate"
></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> </Row>
<FormItem :label="l('rootId')" prop="rootId"> <Row>
<InputNumber v-model="entity.rootId"></InputNumber> <Col span="8">
<FormItem :label="l('demandFinishDate')" style="width:100%">
<DatePicker
type="date"
placeholder="请选择日期"
style="width:240px"
@on-change="getFinishedDate"
v-model="orderSearchForm.demandFinishDate"
></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('batchNumber')" prop="batchNumber"> <FormItem :label="l('guestName')" style="width:100%">
<Input v-model="entity.batchNumber"></Input> <dictionary
code="plan.order.guestName"
v-model="orderSearchForm.guestName"
style="width:240px"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('projectNumber')" prop="projectNumber"> <FormItem :label="l('projectNumber')" style="width:100%">
<Input v-model="entity.projectNumber"></Input> <Input v-model="orderSearchForm.projectNumber" style="width:240px" />
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> </Row>
<FormItem :label="l('urgencyLevel')" prop="urgencyLevel"> <Row>
<Dictionary code="mes.mes_plan.urgency_level" v-model="entity.urgencyLevel"></Dictionary> <Col span="8">
<FormItem :label="l('batchNumber')" label="批次号" style="width:100%">
<Input v-model="orderSearchForm.batchNumber" style="width:240px" />
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('productingPreparationPeople')" prop="productingPreparationPeople"> <FormItem :label="l('urgencyLevel')" style="width:100%">
<InputNumber v-model="entity.productingPreparationPeople"></InputNumber> <dictionary
style="width:240px"
code="plan.order.urgencyLevel"
v-model="orderSearchForm.urgencyLevel"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem <FormItem :label="l('taskCode')" style="width:100%">
:label="l('productingPreparationFinishDate')" <Input v-model="orderSearchForm.taskCode" placeholder style="width:240px" />
prop="productingPreparationFinishDate"
>
<DatePicker type="date" v-model="entity.productingPreparationFinishDate"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> </Row>
<FormItem :label="l('quotationPeople')" prop="quotationPeople"> <Row>
<InputNumber v-model="entity.quotationPeople"></InputNumber> <Col span="8">
<FormItem :label="l('taskRequire')" style="width:100%">
<Input v-model="orderSearchForm.taskRequire" placeholder style="width:240px" />
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('quotationFinishDate')" prop="quotationFinishDate"> <FormItem :label="l('putintDocmentCode')" style="width:100%">
<DatePicker type="date" v-model="entity.quotationFinishDate"></DatePicker> <Input v-model="orderSearchForm.putintDocmentCode" placeholder style="width:240px" />
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('upId')" prop="upId"> <FormItem :label="l('technologyDocmentCode')" style="width:100%">
<InputNumber v-model="entity.upId"></InputNumber> <Input v-model="orderSearchForm.technologyDocmentCode" placeholder style="width:240px" />
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> </Row>
<FormItem :label="l('demandStartDate')" prop="demandStartDate"> <Row>
<DatePicker type="date" v-model="entity.demandStartDate"></DatePicker> <Col span="24">
<FormItem :label="l('remark')" style="width:100%">
<Input v-model="orderSearchForm.remark" placeholder type="textarea" :rows="3" />
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="24">
<FormItem :label="l('demandFinishDate')" prop="demandFinishDate"> <FormItem>
<DatePicker type="date" v-model="entity.demandFinishDate"></DatePicker> <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form> </Form>
</template> </template>
<script> <script>
...@@ -128,14 +175,19 @@ export default { ...@@ -128,14 +175,19 @@ export default {
data() { data() {
return { return {
disabled: false, disabled: false,
entity: {}, orderSearchForm: {},
rules: { rules: {
name: [{ required: true, message: "必填", trigger: "blur" }] name: [{ required: true, message: "必填", trigger: "blur" }]
} }
}; };
}, },
props: { props: {
eid: Number row: {
type: Object,
default: () => {
return null;
}
}
}, },
methods: { methods: {
load(v) { load(v) {
...@@ -148,7 +200,7 @@ export default { ...@@ -148,7 +200,7 @@ export default {
this.$refs.form.validate(v => { this.$refs.form.validate(v => {
if (v) { if (v) {
this.disabled = true; this.disabled = true;
Api.update(this.entity) Api.update(this.orderSearchForm)
.then(r => { .then(r => {
this.disabled = false; this.disabled = false;
if (r.success) { if (r.success) {
...@@ -172,12 +224,14 @@ export default { ...@@ -172,12 +224,14 @@ export default {
l(key) { l(key) {
key = "mes_plan" + "." + key; key = "mes_plan" + "." + key;
return this.$t(key); return this.$t(key);
} },
}, },
watch: { watch: {
eid(v) { row(v) {
if (v != 0) { if (v != null) {
this.load(v); this.orderSearchForm = this.$u.clone(this.row);
} }
} }
} }
......
pages/mesPlan/index.vue
View file @ ecd17fa7
...@@ -28,9 +28,8 @@ ...@@ -28,9 +28,8 @@
<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"
style="width:240px;"
/> />
</FormItem> </FormItem>
<FormItem> <FormItem>
...@@ -49,14 +48,14 @@ ...@@ -49,14 +48,14 @@
<Button type="primary" class="mr10 ml10">批量删除</Button> <Button type="primary" class="mr10 ml10">批量删除</Button>
</template> </template>
</DataGrid> </DataGrid>
<Modal v-model="addModal" title="新增" footer-hide width="1000"> <Modal v-model="addModal" title="新增" footer-hide width="1200">
<Add @on-close="cancel" @on-ok="addOk" /> <Add @on-close="cancel" @on-ok="addOk" />
</Modal> </Modal>
<Modal v-model="editModal" title="编辑" footer-hide width="1000"> <Modal v-model="editModal" title="编辑" footer-hide width="1200">
<Edit :eid="curId" @on-close="cancel" @on-ok="addOk" /> <Edit :row="rowData" @on-close="cancel" @on-ok="addOk" />
</Modal> </Modal>
<Modal v-model="detailModal" title="详情" width="1000"> <Modal v-model="detailModal" title="详情" width="1200">
<Detail :eid="curId" /> <Detail :row="rowData" />
</Modal> </Modal>
<Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel"> <Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel">
<p>确定删除？</p> <p>确定删除？</p>
...@@ -137,13 +136,15 @@ export default { ...@@ -137,13 +136,15 @@ export default {
title: this.l("taskType"), title: this.l("taskType"),
align: "center", align: "center",
high: true, high: true,
code: "plan.order.taskType" code: "plan.order.taskType",
width:100,
}, },
{ {
key: "quantity", key: "quantity",
title: this.l("quantity"), title: this.l("quantity"),
align: "right", align: "right",
high: true high: true,
width:80,
}, },
{ {
key: "taskRequire", key: "taskRequire",
...@@ -158,7 +159,8 @@ export default { ...@@ -158,7 +159,8 @@ export default {
title: this.l("status"), title: this.l("status"),
align: "center", align: "center",
high: true, high: true,
code: "plan.order.status" code: "plan.order.status",
width:100,
}, },
{ {
key: "productCode", key: "productCode",
...@@ -199,9 +201,10 @@ export default { ...@@ -199,9 +201,10 @@ export default {
{ {
key: "urgencyLevel", key: "urgencyLevel",
title: this.l("urgencyLevel"), title: this.l("urgencyLevel"),
align: "left", align: "center",
high: true, high: true,
code: "plan.order.urgencyLevel" code: "plan.order.urgencyLevel",
width:100,
}, },
{ {
key: "productingPreparationPeople", key: "productingPreparationPeople",
...@@ -256,7 +259,7 @@ export default { ...@@ -256,7 +259,7 @@ export default {
"op", "op",
{ {
attrs: { oprate: "detail" }, attrs: { oprate: "detail" },
on: { click: () => this.detail(params.row.id) } on: { click: () => this.detail(params.row) }
}, },
"查看" "查看"
), ),
...@@ -264,7 +267,7 @@ export default { ...@@ -264,7 +267,7 @@ export default {
"op", "op",
{ {
attrs: { oprate: "edit" }, attrs: { oprate: "edit" },
on: { click: () => this.edit(params.row.id) } on: { click: () => this.edit(params.row) }
}, },
"编辑" "编辑"
), ),
...@@ -662,7 +665,8 @@ export default { ...@@ -662,7 +665,8 @@ export default {
ownerGustList: [], //甲方客户下拉 ownerGustList: [], //甲方客户下拉
mainDeptList: [], //厂内主体部门下拉 mainDeptList: [], //厂内主体部门下拉
taskTypeList: [], //任务类型 taskTypeList: [], //任务类型
statusList: [] //状态类型 statusList: [], //状态类型
rowData:{},//编辑、查看的当前行数据
}; };
}, },
created() { created() {
...@@ -718,13 +722,13 @@ export default { ...@@ -718,13 +722,13 @@ export default {
search() { search() {
this.$refs.grid.reload(this.easySearch); this.$refs.grid.reload(this.easySearch);
}, },
detail(id) { detail(row) {
this.detailModal = true; this.detailModal = true;
this.curId = id; this.rowData = row;
}, },
edit(id) { edit(row) {
this.editModal = true; this.editModal = true;
this.curId = id; this.rowData = row;
}, },
remove(id) { remove(id) {
......
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