Skip to content

M
mes-ui
Commit 7b811b92 authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

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

parents 640dc1ee 8244b431
Hide whitespace changes
Inline Side-by-side
Showing with 1576 additions and 311 deletions
assets/css/base.less
View file @ 7b811b92
...@@ -964,7 +964,13 @@ html [type=button] { ...@@ -964,7 +964,13 @@ html [type=button] {
font-weight: bold; font-weight: bold;
font-size: 24px; font-size: 24px;
color: #249e91; color: #249e91;
};
.ivu-icon-ios-cog{
font-weight: bold;
font-size: 24px;
color: #249e91;
} }
} }
} }
......
components/page/dataGrid.vue
View file @ 7b811b92
...@@ -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]
} }
...@@ -250,9 +251,9 @@ export default { ...@@ -250,9 +251,9 @@ export default {
this.columnsCur = this.$u.clone(this.columns); this.columnsCur = this.$u.clone(this.columns);
}, },
mounted() { mounted() {
if (this.data && this.data.length > 0) { if (this.data && this.data.length > 0) {
this.list = this.data; this.list = this.data;
return; //return;
} }
this.keys = ""; this.keys = "";
this.intY(); this.intY();
...@@ -260,6 +261,7 @@ export default { ...@@ -260,6 +261,7 @@ export default {
return; return;
} }
this.loadUserConfig(); this.loadUserConfig();
if (this.height === 0) { if (this.height === 0) {
window.onresize = () => { window.onresize = () => {
///浏览器窗口大小变化 ///浏览器窗口大小变化
...@@ -271,6 +273,7 @@ export default { ...@@ -271,6 +273,7 @@ export default {
} else { } else {
this.tableHeight = this.height; this.tableHeight = this.height;
} }
//注册拖拽事件。 //注册拖拽事件。
this.$dragging.$on("dragend", e => { this.$dragging.$on("dragend", e => {
// console.log("dragend",e); // console.log("dragend",e);
......
i18n/locale/zh-CN.js
View file @ 7b811b92
...@@ -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/aps/aps/index.vue
View file @ 7b811b92
...@@ -206,7 +206,8 @@ export default { ...@@ -206,7 +206,8 @@ export default {
title: this.l("spare_qty"), title: this.l("spare_qty"),
align: "right", align: "right",
width: 100, width: 100,
high: true high: true,
hide: true,
}, },
{ {
key: "plan_start", key: "plan_start",
...@@ -240,7 +241,8 @@ export default { ...@@ -240,7 +241,8 @@ export default {
title: this.l("demand_start"), title: this.l("demand_start"),
align: "center", align: "center",
resizable: true, resizable: true,
width: 150 width: 150,
type:"date"
}, },
{ {
key: "demand_finish", key: "demand_finish",
...@@ -248,7 +250,8 @@ export default { ...@@ -248,7 +250,8 @@ export default {
align: "center", align: "center",
high: true, high: true,
resizable: true, resizable: true,
width: 150 width: 150,
type:"date"
}, },
{ {
key: "badjustflag", key: "badjustflag",
......
pages/mesPlan/add.vue
View file @ 7b811b92
<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"
}
]
},
disabled:false,
}; };
}, },
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 +298,123 @@ export default { ...@@ -161,17 +298,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 @ 7b811b92
...@@ -2,71 +2,57 @@ ...@@ -2,71 +2,57 @@
<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')">
<Filed :span="12" :name="l('productId')">{{entity.productId}}</Filed> <state code="plan.order.taskType" :value="entity.taskType" type="text"></state>
</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')">
<Filed :span="24" :name="l('taskRequire')">{{entity.taskRequire}}</Filed> <state code="plan.order.status" :value="entity.status" type="text"></state>
<Filed :span="12" :name="l('status')">{{entity.status}}</Filed> </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')">
<Filed <state code="plan.order.urgencyLevel" :value="entity.urgencyLevel" type="text"></state>
:span="12" </Filed>
: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) {
Api.get({ id: v }).then(r => {
this.entity = r.result;
this.$emit("on-load");
});
},
handleClose() { handleClose() {
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);
} },
}, },
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 @ 7b811b92
<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> </FormItem>
</Col> </Col>-->
<Col :span="12"> <Col span="8">
<FormItem :label="l('taskType')" prop="taskType"> <FormItem :label="l('productName')" style="width:100%" prop="productId">
<Dictionary code="mes.mes_plan.task_type" v-model="entity.taskType"></Dictionary> <Select
</FormItem> v-model="orderSearchForm.productId"
</Col> :placeholder="placeholdeinfo"
<Col :span="12"> style="width:240px;"
<FormItem :label="l('productId')" prop="productId"> >
<InputNumber v-model="entity.productId"></InputNumber> <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> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('quantity')" prop="quantity"> <FormItem :label="l('drawnNumber')" style="width:100%">
<InputNumber v-model="entity.quantity"></InputNumber> <Input v-model="orderSearchForm.drawnNumber" style="width:240px" disabled />
<Input v-model="orderSearchForm.productName" style="width:240px" v-show="false" />
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24"> <Col span="8">
<FormItem :label="l('remark')" prop="remark"> <FormItem :label="l('taskType')" style="width:100%" prop="taskType">
<Input v-model="entity.remark" type="textarea" :rows="5"></Input> <dictionary
code="plan.order.taskType"
v-model="orderSearchForm.taskType"
style="width:240px"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24"> </Row>
<FormItem :label="l('taskRequire')" prop="taskRequire"> <Row>
<Input v-model="entity.taskRequire" type="textarea" :rows="5"></Input> <Col span="8">
<FormItem :label="l('stage')" style="width:100%" prop="stage">
<dictionary code="plan.order.stage" v-model="orderSearchForm.stage" style="width:240px"></dictionary>
</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,25 @@ export default { ...@@ -128,14 +175,25 @@ export default {
data() { data() {
return { return {
disabled: false, disabled: false,
entity: {}, orderSearchForm: {},
rules: { ruleValidate: {
name: [{ required: true, message: "必填", trigger: "blur" }] name: [{ required: true, message: "必填", trigger: "blur" }]
} },
placeholdeinfo:'',
list:[],
data1:[],
}; };
}, },
props: { props: {
eid: Number row: {
type: Object,
default: () => {
return null;
}
}
},
mounted(){
this.loadTree()
}, },
methods: { methods: {
load(v) { load(v) {
...@@ -148,7 +206,7 @@ export default { ...@@ -148,7 +206,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 +230,124 @@ export default { ...@@ -172,12 +230,124 @@ export default {
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: { watch: {
eid(v) { row(v) {
if (v != 0) { if (v != null) {
this.load(v); this.orderSearchForm = this.$u.clone(this.row);
this.placeholdeinfo=this.orderSearchForm.productName
} }
} }
} }
......
pages/mesPlan/index.vue
View file @ 7b811b92
...@@ -27,11 +27,7 @@ ...@@ -27,11 +27,7 @@
<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="请输入订单编号/产品名称" v-model="easySearch.keys.value" />
placeholder="请输入关键字订单编号/产品名称"
v-model="easySearch.keys.value"
style="width:240px;"
/>
</FormItem> </FormItem>
<FormItem> <FormItem>
<Button type="primary" @click="search">查询</Button> <Button type="primary" @click="search">查询</Button>
...@@ -45,22 +41,52 @@ ...@@ -45,22 +41,52 @@
<Button type="primary" @click="addModal=true">创建</Button> <Button type="primary" @click="addModal=true">创建</Button>
</template> </template>
<template slot="batch"> <template slot="batch">
<Button type="primary" class="mr10 ml10">订单派发</Button> <Button type="primary" class="mr10 ml10" @click="openSendModal">订单派发</Button>
<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 v-model="splitModal" title="订单分解" width="1200">
<Split :row="rowData" ref="orderSplit" />
<div slot="footer">
<Button @click="splitModal = false">取消</Button>
<Button type="primary" @click="orderSplitOk">确定分解</Button>
</div>
</Modal>
<Modal v-model="sendModal" title="订单派发" width="1200">
<Send :row="rowDataArry" ref="orderSplit" />
<div slot="footer">
<Button @click="sendModal = false">取消</Button>
<!-- <Button type="primary" @click="orderSplitOk">确定分解</Button> -->
</div>
</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>
</Modal> </Modal>
<!-- 信息提示 -->
<Modal
v-model="ModalInfo"
title="信息提示"
width="600"
:mask-closable="false"
:scrollable="true"
ok-text="确定"
cancel-text="取消"
>
{{ metCodesStrTxt }}
<div slot="footer">
<Button @click="ModalInfo = false">取消</Button>
<Button type="primary" @click="modalInfoOk">确定</Button>
</div>
</Modal>
</Content> </Content>
</Layout> </Layout>
</template> </template>
...@@ -70,13 +96,17 @@ import Add from "./add"; ...@@ -70,13 +96,17 @@ import Add from "./add";
import Edit from "./edit"; import Edit from "./edit";
import Detail from "./detail"; import Detail from "./detail";
import Search from "./search"; import Search from "./search";
import Split from "./split";
import Send from "./send";
export default { export default {
name: "list", name: "list",
components: { components: {
Add, Add,
Edit, Edit,
Detail, Detail,
Search Search,
Split,
Send
}, },
data() { data() {
return { return {
...@@ -91,8 +121,11 @@ export default { ...@@ -91,8 +121,11 @@ export default {
editModal: false, editModal: false,
detailModal: false, detailModal: false,
deletelModal: false, deletelModal: false,
splitModal: false,
ModalInfo: false,
sendModal: false,
curId: 0, curId: 0,
id:"id", id: "id",
columns: [ columns: [
{ {
key: "selection", key: "selection",
...@@ -103,7 +136,7 @@ export default { ...@@ -103,7 +136,7 @@ export default {
{ {
key: "id", key: "id",
title: this.l("id"), title: this.l("id"),
hide:true, hide: true
}, },
{ {
key: "mesCode", key: "mesCode",
...@@ -112,20 +145,39 @@ export default { ...@@ -112,20 +145,39 @@ export default {
width: 240, width: 240,
easy: true, easy: true,
high: true, high: true,
tree: true tree: true,
render: (h, params) => {
let name = params.row.mesCode;
let isUpId = params.row.upId;
let isDivideMark = params.row.divideMark;
let rowChildren = params.row.children;
return h(
"div",
{
style: {
cursor: "pointer",
display: "inline",
marginLeft: isDivideMark == 0 && isUpId == 0 ? "20px" : "0px"
}
},
params.row.mesCode
);
}
}, },
{ {
key: "taskType", key: "taskType",
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",
...@@ -140,7 +192,8 @@ export default { ...@@ -140,7 +192,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",
...@@ -181,9 +234,10 @@ export default { ...@@ -181,9 +234,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",
...@@ -238,7 +292,7 @@ export default { ...@@ -238,7 +292,7 @@ export default {
"op", "op",
{ {
attrs: { oprate: "detail" }, attrs: { oprate: "detail" },
on: { click: () => this.detail(params.row.id) } on: { click: () => this.detail(params.row) }
}, },
"查看" "查看"
), ),
...@@ -246,7 +300,7 @@ export default { ...@@ -246,7 +300,7 @@ export default {
"op", "op",
{ {
attrs: { oprate: "edit" }, attrs: { oprate: "edit" },
on: { click: () => this.edit(params.row.id) } on: { click: () => this.edit(params.row) }
}, },
"编辑" "编辑"
), ),
...@@ -261,8 +315,8 @@ export default { ...@@ -261,8 +315,8 @@ export default {
h( h(
"op", "op",
{ {
attrs: { oprate: "remove" }, attrs: { oprate: "detail" },
on: { click: () => this.remove(params.row.id) } on: { click: () => this.split(params.row) }
}, },
"分解" "分解"
) )
...@@ -272,8 +326,6 @@ export default { ...@@ -272,8 +326,6 @@ export default {
], ],
listTemp: [ listTemp: [
{ {
actualFinishDate: "2020-04-09 18:36:31",
actualStartDate: "2020-04-09 17:52:42",
batchNumber: "5", batchNumber: "5",
creationTime: "2020-04-09 17:32:06", creationTime: "2020-04-09 17:32:06",
creatorUserId: 0, creatorUserId: 0,
...@@ -314,6 +366,7 @@ export default { ...@@ -314,6 +366,7 @@ export default {
upId: 0, upId: 0,
urgencyLevel: "1", urgencyLevel: "1",
_disabled: true, _disabled: true,
divideMark: 1,
children: [ children: [
{ {
actualFinishDate: "2020-04-09 18:36:31", actualFinishDate: "2020-04-09 18:36:31",
...@@ -327,7 +380,7 @@ export default { ...@@ -327,7 +380,7 @@ export default {
drawnNumber: "TY9-06-0803", drawnNumber: "TY9-06-0803",
functionaryOffice: "", functionaryOffice: "",
guestName: "", guestName: "",
id: 540, id: 541,
isDeleted: 0, isDeleted: 0,
mainDepartmentId: "", mainDepartmentId: "",
mainRoutingPeople: "", mainRoutingPeople: "",
...@@ -355,13 +408,61 @@ export default { ...@@ -355,13 +408,61 @@ export default {
taskRequire: "5", taskRequire: "5",
taskType: "1", taskType: "1",
technologyDocmentCode: "5", technologyDocmentCode: "5",
upId: 0, upId: 540,
urgencyLevel: "1", urgencyLevel: "1",
_disabled: false _disabled: false,
divideMark: 0,
children: []
},
{
actualFinishDate: "2020-04-09 18:36:31",
actualStartDate: "2020-04-09 17:52:42",
batchNumber: "5",
creationTime: "2020-04-09 17:32:06",
creatorUserId: 0,
demandFinishDate: "2020-04-10 00:00:00",
demandStartDate: "2020-04-09 00:00:00",
designer: "",
drawnNumber: "TY9-06-0803",
functionaryOffice: "",
guestName: "",
id: 542,
isDeleted: 0,
mainDepartmentId: "",
mainRoutingPeople: "",
materialId: "1",
mesCode: "DDBH_20200409_13_02",
modelVersion: "",
officeFunctionary: "",
orderQuotationStatus: 0,
outerDrawnNumber: "",
outer_Envelope_Size: "4",
printSupply: "",
productId: 27,
productName: "气源分配器壳体",
projectNumber: "5",
putintDocmentCode: "5",
quantity: 10,
remark: "555",
rootCode: "DDBH_20200409_13",
rootId: 540,
routing_Method: "1",
stage: "1",
status: 13,
taskCode: "5",
taskInputDate: "2020-04-09 17:32:06",
taskRequire: "5",
taskType: "1",
technologyDocmentCode: "5",
upId: 540,
urgencyLevel: "1",
_disabled: true,
divideMark: 0,
children: []
} }
] ]
}, },
{ {
actualFinishDate: "2020-04-09 18:36:31", actualFinishDate: "2020-04-09 18:36:31",
actualStartDate: "2020-04-09 17:52:42", actualStartDate: "2020-04-09 17:52:42",
batchNumber: "5", batchNumber: "5",
...@@ -373,7 +474,7 @@ export default { ...@@ -373,7 +474,7 @@ export default {
drawnNumber: "TY9-06-0803", drawnNumber: "TY9-06-0803",
functionaryOffice: "", functionaryOffice: "",
guestName: "", guestName: "",
id: 540, id: 543,
isDeleted: 0, isDeleted: 0,
mainDepartmentId: "", mainDepartmentId: "",
mainRoutingPeople: "", mainRoutingPeople: "",
...@@ -404,8 +505,10 @@ export default { ...@@ -404,8 +505,10 @@ export default {
upId: 0, upId: 0,
urgencyLevel: "1", urgencyLevel: "1",
_disabled: false, _disabled: false,
}, divideMark: 0,
{ children: []
},
{
actualFinishDate: "2020-04-09 18:36:31", actualFinishDate: "2020-04-09 18:36:31",
actualStartDate: "2020-04-09 17:52:42", actualStartDate: "2020-04-09 17:52:42",
batchNumber: "5", batchNumber: "5",
...@@ -417,7 +520,7 @@ export default { ...@@ -417,7 +520,7 @@ export default {
drawnNumber: "TY9-06-0803", drawnNumber: "TY9-06-0803",
functionaryOffice: "", functionaryOffice: "",
guestName: "", guestName: "",
id: 540, id: 544,
isDeleted: 0, isDeleted: 0,
mainDepartmentId: "", mainDepartmentId: "",
mainRoutingPeople: "", mainRoutingPeople: "",
...@@ -448,7 +551,101 @@ export default { ...@@ -448,7 +551,101 @@ export default {
upId: 0, upId: 0,
urgencyLevel: "1", urgencyLevel: "1",
_disabled: false, _disabled: false,
} divideMark: 0,
children: []
},
{
actualFinishDate: "2020-04-09 18:36:31",
actualStartDate: "2020-04-09 17:52:42",
batchNumber: "5",
creationTime: "2020-04-09 17:32:06",
creatorUserId: 0,
demandFinishDate: "2020-04-10 00:00:00",
demandStartDate: "2020-04-09 00:00:00",
designer: "",
drawnNumber: "TY9-06-0803",
functionaryOffice: "",
guestName: "",
id: 545,
isDeleted: 0,
mainDepartmentId: "",
mainRoutingPeople: "",
materialId: "1",
mesCode: "DDBH_20200409_16",
modelVersion: "",
officeFunctionary: "",
orderQuotationStatus: 0,
outerDrawnNumber: "",
outer_Envelope_Size: "4",
printSupply: "",
productId: 27,
productName: "气源分配器壳体",
projectNumber: "5",
putintDocmentCode: "5",
quantity: 10,
remark: "555",
rootCode: "DDBH_20200409_13",
rootId: 540,
routing_Method: "1",
stage: "1",
status: 13,
taskCode: "5",
taskInputDate: "2020-04-09 17:32:06",
taskRequire: "5",
taskType: "1",
technologyDocmentCode: "5",
upId: 0,
urgencyLevel: "1",
_disabled: false,
divideMark: 0,
children: []
},
{
actualFinishDate: "2020-04-09 18:36:31",
actualStartDate: "2020-04-09 17:52:42",
batchNumber: "5",
creationTime: "2020-04-09 17:32:06",
creatorUserId: 0,
demandFinishDate: "2020-04-10 00:00:00",
demandStartDate: "2020-04-09 00:00:00",
designer: "",
drawnNumber: "TY9-06-0803",
functionaryOffice: "",
guestName: "",
id: 546,
isDeleted: 0,
mainDepartmentId: "",
mainRoutingPeople: "",
materialId: "1",
mesCode: "DDBH_20200409_17",
modelVersion: "",
officeFunctionary: "",
orderQuotationStatus: 0,
outerDrawnNumber: "",
outer_Envelope_Size: "4",
printSupply: "",
productId: 27,
productName: "气源分配器壳体",
projectNumber: "5",
putintDocmentCode: "5",
quantity: 10,
remark: "555",
rootCode: "DDBH_20200409_13",
rootId: 540,
routing_Method: "1",
stage: "1",
status: 13,
taskCode: "5",
taskInputDate: "2020-04-09 17:32:06",
taskRequire: "5",
taskType: "1",
technologyDocmentCode: "5",
upId: 0,
urgencyLevel: "1",
_disabled: false,
divideMark: 0,
children: []
}
], ],
treeData: [], treeData: [],
treeInputSearch: "", treeInputSearch: "",
...@@ -500,7 +697,12 @@ export default { ...@@ -500,7 +697,12 @@ export default {
ownerGustList: [], //甲方客户下拉 ownerGustList: [], //甲方客户下拉
mainDeptList: [], //厂内主体部门下拉 mainDeptList: [], //厂内主体部门下拉
taskTypeList: [], //任务类型 taskTypeList: [], //任务类型
statusList: [] //状态类型 statusList: [], //状态类型
rowData: {}, //编辑、查看的当前行数据
rowDataArry:[],
ModalInfoStaut: "",
sendList: [],
metCodesStrTxt:'',
}; };
}, },
created() { created() {
...@@ -509,14 +711,14 @@ export default { ...@@ -509,14 +711,14 @@ export default {
mounted() { mounted() {
this.initTree(); this.initTree();
this.tableHeight = window.innerHeight - 220; this.tableHeight = window.innerHeight - 220;
this.$refs.CustomTable.getTableHeight(this.tableHeight); //this.$refs.CustomTable.getTableHeight(this.tableHeight);
window.onresize = () => { window.onresize = () => {
///浏览器窗口大小变化 ///浏览器窗口大小变化
return (() => { return (() => {
window.screenHeight = window.innerHeight; window.screenHeight = window.innerHeight;
this.treeHeight = window.screenHeight - 150; this.treeHeight = window.screenHeight - 150;
this.tableHeight = window.screenHeight - 220; this.tableHeight = window.screenHeight - 220;
this.$refs.CustomTable.getTableHeight(this.tableHeight); //this.$refs.CustomTable.getTableHeight(this.tableHeight);
})(); })();
}; };
}, },
...@@ -556,15 +758,112 @@ export default { ...@@ -556,15 +758,112 @@ 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;
},
split(row) {
this.splitModal = true;
this.rowData = row;
},
//确定分解
orderSplitOk() {
let returnDatalist = this.$refs.orderSplit.returnDataList();
let orderQuantity = returnDatalist.quantity;
let orderListQuantity = 0;
let quantyStatu = false; //子订单计划数是否为0或空
let dateStatu = false; //子订单开始完成时间是否为空
// alert(JSON.stringify(returnDatalist))
if (returnDatalist.items.length > 0) {
returnDatalist.items.forEach(data => {
orderListQuantity = orderListQuantity + parseFloat(data.quantity);
if (parseFloat(data.quantity) == 0 || data.quantity == "") {
quantyStatu = true;
}
if (data.demandDate[0] == "" || data.demandDate[1] == "") {
dateStatu = true;
}
});
if (dateStatu) {
this.$Message.error("子订单开始完成时间不能为空，请重新输入时间！");
return false;
}
if (quantyStatu) {
this.$Message.error("子订单计划数量不能为0，请重新输入计划数量！");
} else if (returnDatalist.quantity != orderListQuantity) {
this.$Message.error(
"计划总数量与订单数量不一致，请重新输入计划数量！"
);
} else {
this.ModalInfo = true;
this.ModalInfoStaut = "split";
this.dataListRetrun = returnDatalist;
this.metCodesStrTxt = "确定分解订单 " + returnDatalist.mesCode + "？";
}
} else {
this.$Message.error("请确定计划数量！");
}
},
modalInfoOk() {
//确定批量操作
// if (this.ModalInfoStaut == 'orderSendReview') {
// this.$http.order.batchstart(this.dataListRetrun).then((res) => {
// if (res.success) {
// this.$Message.success('订单送审成功!')
// this.easySearch('')
// } else {
// this.$Message.error('订单送审失败!')
// }
// })
// this.ModalOrderSendReview = false
// } else if (this.ModalInfoStaut == 'delOrder') {
// this.$http.order.delOrder(this.dataListRetrunParam).then((res) => {
// if (res.result) {
// this.$Message.success('删除成功!')
// this.easySearch('')
// } else {
// this.$Message.error('删除失败!')
// }
// this.$refs.createOrder.resetFields()
// this.createShow = false
// })
// } else if (this.ModalInfoStaut == 'orderSend') {
// this.$http.order.orderSend(this.dataListRetrun).then((res) => {
// if (res.result) {
// this.$Message.success('订单派发成功!')
// this.easySearch('')
// this.ModalOrderSend = false
// } else {
// this.$Message.error('订单派发失败!')
// }
// })
// } else {
this.$http.order.orderSplit(this.dataListRetrun).then(res => {
if (res.result) {
this.$Message.success("订单分解成功!");
this.easySearch("");
this.ModalOrderSplit = false;
} else {
this.$Message.error("订单分解失败!");
}
});
//}
this.ModalInfo = false;
},
//打开派发
openSendModal() {
// alert(JSON.stringify(this.sendList))
// alert(this.sendList.length)
if (this.rowDataArry.length > 0) {
this.sendModal = true;
} else {
this.$Message.error("请选择订单");
}
}, },
remove(id) { remove(id) {
this.deletelModal = true; this.deletelModal = true;
this.curId = id; this.curId = id;
...@@ -618,7 +917,7 @@ export default { ...@@ -618,7 +917,7 @@ export default {
this.orderSearchForm.productId = "-1"; this.orderSearchForm.productId = "-1";
this.orderSearchForm.productName = ""; this.orderSearchForm.productName = "";
} }
this.$refs.CustomTable.easySearch(this.orderSearchForm); //this.$refs.CustomTable.easySearch(this.orderSearchForm);
} }
}, },
//得到此树节点下所有是产品的productId //得到此树节点下所有是产品的productId
...@@ -671,10 +970,11 @@ export default { ...@@ -671,10 +970,11 @@ export default {
//new tree end //new tree end
//list start //list start
onSelect(a, b) { onSelect(a, b) {
alert(JSON.stringify(a)); //alert(JSON.stringify(a));
//批量选择 //批量选择
let selectRows = a; let selectRows = a;
this.arrPartPkId = []; this.arrPartPkId = [];
this.rowDataArry = a;
// selectRows.forEach(e => { // selectRows.forEach(e => {
// this.arrPartPkId.push(e.part_task_pk); // this.arrPartPkId.push(e.part_task_pk);
// }); // });
...@@ -683,11 +983,17 @@ export default { ...@@ -683,11 +983,17 @@ export default {
} }
}; };
</script> </script>
<style lang="less" scoped> <style lang="less">
.full { .full {
margin-top: 0; margin-top: 0;
.content { .content {
margin-top: 10px; margin-top: 10px;
.ivu-icon-ios-add:before {
content: "\f341";
}
.ivu-icon-ios-remove:before {
content: "\f33d";
}
} }
} }
</style> </style>
\ No newline at end of file
pages/mesPlan/send.vue 0 → 100644
View file @ 7b811b92
<template>
<div style="width:100%;margin:0 auto" >
<Detail ref="detailRow" :row="row1" v-show="dataList.length==1"></Detail>
<Table
border
:columns="columns1"
:data="dataList"
class="tableCommon"
v-show="dataList.length>1"
:height="tbHeight"
></Table>
<div style="width100%;margin:40px auto">
<Form
:model="orderForm"
:label-width="110"
class="margin-top-20 margin-bottom-50"
:rules="ruleValidate"
ref="formValidate"
>
<Row>
<Col span="6">
<FormItem label="生产准备" style="width:100%" prop="ProductingPreparationPeople">
<WorkShopSelect
ref="userSelected"
v-model="orderForm.ProductingPreparationPeople"
/>
</FormItem>
</Col>
<Col span="6">
<FormItem label="完成时间" style="width:100%" prop="ProductingPreparationFinishDate">
<DatePicker
v-model="orderForm.ProductingPreparationFinishDate"
type="date"
placeholder="请选择日期"
@on-change="getTimeProductPFD"
></DatePicker>
</FormItem>
</Col>
<Col span="6">
<FormItem label="订单报价人员" style="width:100%" prop="QuotationPeople">
<UserSelect
ref="userSelected"
v-model="orderForm.QuotationPeople"
/>
</FormItem>
</Col>
<Col span="6">
<FormItem label="完成时间" style="width:100%" prop="QuotationFinishDate">
<DatePicker
v-model="orderForm.QuotationFinishDate"
type="date"
placeholder="请选择日期"
@on-change="getTimeQuotationFD"
></DatePicker>
</FormItem>
</Col>
</Row>
</Form>
</div>
</div>
</template>
<script>
import Detail from "./detail";
var myDate = new Date();
export default {
name: "send",
components: {
Detail
},
data() {
return {
divHeight: "400px",
osrOneList: false, //一条数据显示详细
osrMoreList: false, //多条数据只显示列表
info: {
status: true,
orderInfo: []
},
roleTitle: "工艺员",
orderForm: {
DistributeMainRouting: null, //主工艺人员
MainRoutingFinishDate: "", //主工艺人员完成时间
MajorRoutingPeople: null, //专业工艺人员
MajorRoutingFinishDate: "", //专业工艺人员完成时间
CheckUpPeople: 1, //校对人员 暂时不用
CheckUpFinishDate: "2019-12-19", //校对人员完成时间
ProductingPreparationPeople: null, //生产准备人员
ProductingPreparationFinishDate: "", //生产准备完成时间
QuotationPeople: null, //订单报价人员
QuotationFinishDate: "" //订单报价完成时间
},
columns1: [
{
title: "订单编码",
key: "mesCode",
width: 180,
tooltip: true
},
{
title: "任务类型",
key: "taskType",
align: "center",
width: 100,
tooltip: true
},
{
title: "产品名称",
key: "productName",
tooltip: true
},
{
title: "阶段",
key: "stage",
width: 80
},
{
title: "材料",
key: "materialId",
width: 100,
tooltip: true
},
{
title: "数量",
key: "quantity",
align: "right",
width: 70
}
],
dataList: [],
row1:{},
dataListRetrun: [], //确定后返回数据
ruleValidate: {
ProductingPreparationPeople: [
{
required: true,
message: "请选择人员",
trigger: "change",
type: "number"
}
],
ProductingPreparationFinishDate: [
{
required: true,
message: "请选择时间",
trigger: "change"
}
],
QuotationPeople: [
{
required: true,
message: "请选择人员",
trigger: "change",
type: "number"
}
],
QuotationFinishDate: [
{
required: true,
message: "请选择时间",
trigger: "change"
}
]
},
rowList: [],
row1:{},
tbHeight:0,
};
},
props: {
row: {
type: Array,
default: () => {
return [];
}
}
},
methods: {
returnDataList() {
this.dataListRetrun = [];
this.dataList.forEach(item => {
let objStr = {};
objStr.id = item.id;
objStr.mesCode = item.mesCode;
objStr.DistributeMainRouting = this.orderForm.DistributeMainRouting;
objStr.MainRoutingFinishDate = this.orderForm.MainRoutingFinishDate;
objStr.MajorRoutingPeople = this.orderForm.MajorRoutingPeople;
objStr.MajorRoutingFinishDate = this.orderForm.MajorRoutingFinishDate;
objStr.CheckUpPeople = this.orderForm.CheckUpPeople;
objStr.CheckUpFinishDate = this.orderForm.CheckUpFinishDate;
objStr.ProductingPreparationPeople = this.orderForm.ProductingPreparationPeople;
objStr.ProductingPreparationFinishDate = this.orderForm.ProductingPreparationFinishDate;
objStr.QuotationPeople = this.orderForm.QuotationPeople;
objStr.QuotationFinishDate = this.orderForm.QuotationFinishDate;
this.dataListRetrun.push(objStr);
});
//返回审批数据
return this.dataListRetrun;
},
getTimeMainRFD(value) {
this.orderForm.MainRoutingFinishDate = value;
},
getTimeMajorRFD(value) {
this.orderForm.MajorRoutingFinishDate = value;
},
getTimeCheckFD(value) {
this.orderForm.CheckUpFinishDate = value;
},
getTimeProductPFD(value) {
this.orderForm.ProductingPreparationFinishDate = value;
},
getTimeQuotationFD(value) {
this.orderForm.QuotationFinishDate = value;
}
},
created() {
//var theight = window.innerHeight - 400 + "px";
// this.divHeight = theight;
},
mounted() {
// window.onresize = () => {
// ///浏览器窗口大小变化
// return (() => {
// window.screenHeight = window.innerHeight;
// this.divHeight = window.screenHeight - 400 + "px";
// })();
// };
},
watch: {
row(v) {
if (v != []) {
this.dataList = this.$u.clone(this.row);
this.row1=this.dataList[0]
this.tbHeight=0
if(this.dataList.length>3)
{
this.tbHeight=200
}
}
}
}
};
</script>
\ No newline at end of file
pages/mesPlan/split.vue 0 → 100644
View file @ 7b811b92
<template>
<div style="width:100%;overflow:auto" :style="{height:divHeight}">
<Form
:model="orderForm"
:label-width="80"
class="margin-top-20 margin-bottom-50"
:rules="ruleValidate"
ref="formValidate"
>
<Row>
<Col span="12">
<FormItem label="订单编号" style="width:100%">
<Input v-model="orderForm.mesCode" disabled style="width:240px" />
</FormItem>
</Col>
<Col span="12">
<FormItem label="产品名称" style="width:100%">
<Input v-model="orderForm.productName" disabled style="width:240px" />
</FormItem>
</Col>
</Row>
<Row>
<Col span="12">
<FormItem label="开始时间" style="width:100%">
<Input v-model="orderForm.planStartTime" disabled style="width:240px" />
</FormItem>
</Col>
<Col span="12">
<FormItem label="完成时间" style="width:100%">
<Input v-model="orderForm.planEndTime" disabled style="width:240px" />
</FormItem>
</Col>
</Row>
<Row>
<Col span="12">
<FormItem label="数量" style="width:100%">
<Input v-model="orderForm.quantity" disabled style="width:240px" />
</FormItem>
</Col>
<Col span="12">
<FormItem label="分解数量" style="width:100%" prop="splitQuantity">
<InputNumber :min="1" v-model="orderForm.splitQuantity" :step="1" style="width:180px"></InputNumber>
<Button type="primary" @click="addSplitOrder">确定</Button>
</FormItem>
</Col>
</Row>
</Form>
<Table :loading="loading" border :columns="columns1" :data="dataList" class="tableCommon">
<template slot-scope="{ row, index }" slot="slotPlanQ">
<Input type="text" v-model="row.quantity" @on-change="inputOrderCat(row,index)" />
</template>
<template slot-scope="{ row, index }" slot="slotTime">
<DatePicker
v-model="row.demandDate"
type="daterange"
placeholder="请选择日期"
style="width:240px"
transfer="true"
:options="optionsDate"
@on-change="inputOrderCat(row,index)"
></DatePicker>
</template>
</Table>
</div>
</template>
<script>
export default {
name: "split",
data() {
return {
optionsDate: {
disabledDate: date => {
let beginDateVal = new Date(this.orderForm.planStartTime);
let endDateVal = new Date(this.orderForm.planEndTime);
if (beginDateVal) {
return (
(date && date.valueOf() < beginDateVal.getTime() - 86400000) ||
date.valueOf() > endDateVal.getTime()
);
}
}
},
divHeight: "260px",
osrOneList: false, //一条数据显示详细
osrMoreList: false, //多条数据只显示列表
loading: false,
orderInfo: {
id: "", //订单id
mesCode: "", //订单编号
productName: "", //产品名称
drawingNo: "", //图号
producePic: "", //产品图号
stage: "", //阶段
orderCat: "", //任务类型
quantity: "", //数量
materail: "", //材料
printDepartment: "", //3D打印承制单位
ownerGust: "", //甲方客户
mainDept: "", //厂内责任主体部门
inhouseOffice: "", //厂内责任机关
nodeRequire: "", //任务接点要求
inputDate: "", //任务输入日期
techniqueInputDoc: "", //甲方技术输入文件
productInputDoc: "", //甲方投产输入文件
modalVersion: "", //模型版本
drawNumber: "", //模型号
ownerDesigner: "", //甲方设计人员
missionCode: "", //甲方任务号
mainRoutingPeople: "", //厂内主工艺人员
inhousePrincipal: "", //厂内机关负责人
remark: "" //备注
},
orderForm: {
mesCode: "", //订单编号
productName: "", //产品名称
stage: "", //阶段
quantity: "", //数量
planStartTime: "", //计划开始时间
planEndTime: "", //计划结束时间
splitQuantity: 2, //分解数量
splitList: [] //分解后产生的列表
},
columns1: [
{
title: "序号",
type: "index",
width: 80,
align: "right",
tooltip: true
},
{
title: "计划编号",
key: "mesCode",
tooltip: true
},
{
title: "计划数量",
key: "quantity",
align: "right",
width: 100,
slot: "slotPlanQ"
},
{
title: "开始--完成时间",
key: "demandDate",
width: 320,
align: "center",
slot: "slotTime"
}
],
dataList: [],
dataListRetrun: { id: null, quantity: null, mesCode: "", items: [] }, //确定后返回数据
ruleValidate: {
splitQuantity: [
{
required: true,
message: "请输入数量",
type: "number",
trigger: "change"
}
]
}
};
},
props: {
row: {
type: Object,
default: () => {
return null;
}
}
},
methods: {
intData(data) {
//打开modal层时给订单list赋值
//alert(JSON.stringify(data))
this.dataListRetrun.id = data[0].id;
this.dataListRetrun.quantity = data[0].quantity;
this.dataListRetrun.mesCode = data[0].mesCode;
this.orderInfo = [];
this.dataList = [];
this.orderInfo = data[0];
this.orderForm = {
mesCode: this.orderInfo.mesCode, //订单编号
productName: this.orderInfo.productName, //产品名称
stage: this.orderInfo.stage, //阶段
quantity: this.orderInfo.quantity, //数量
planStartTime: this.orderInfo.demandStartDate, //计划开始时间
planEndTime: this.orderInfo.demandFinishDate, //计划结束时间
splitQuantity: 2, //分解数量
splitList: [] //分解后产生的列表
};
},
//确定增加数量
addSplitOrder() {
if (this.orderForm.quantity >= this.orderForm.splitQuantity) {
this.dataListRetrun.items = [];
this.$refs["formValidate"].validate(valid => {
if (valid) {
this.dataList = [];
let demandDate = [];
let splitQuantity = this.orderForm.splitQuantity;
let mesCodeSon = this.orderForm.mesCode;
let planStartTime = this.orderForm.planStartTime;
let planEndTime = this.orderForm.planEndTime;
for (var i = 0; i < splitQuantity; i++) {
this.dataList.push({
mesCode:
i + 1 < 10
? mesCodeSon + "0" + (i + 1)
: mesCodeSon + "" + (i + 1),
quantity: "",
demandDate: [planStartTime, planEndTime],
demandStartDate: planStartTime,
demandFinishDate: planEndTime
});
}
this.dataListRetrun.items = this.dataListRetrun.items.concat(
this.dataList
);
}
});
} else {
this.$Message.error("分解数量大于订单数量");
}
},
inputOrderCat(row, index) {
let forDemandStartDate = this.getFormatDate(row.demandDate[0]);
let forDemandFinishDate = this.getFormatDate(row.demandDate[1]);
this.dataListRetrun.items[index].mesCode = row.mesCode;
this.dataListRetrun.items[index].quantity = row.quantity;
this.dataListRetrun.items[index].demandStartDate = forDemandStartDate;
this.dataListRetrun.items[index].demandFinishDate = forDemandFinishDate;
this.dataList[index].demandDate = [
forDemandStartDate,
forDemandFinishDate
];
},
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;
},
returnDataList() {
//返回审批数据
return this.dataListRetrun;
}
},
created() {
var theight = window.innerHeight - 400 + "px";
this.divHeight = theight;
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight;
this.divHeight = window.screenHeight - 400 + "px";
})();
};
this.orderForm = {
mesCode: this.orderInfo.mesCode, //订单编号
productName: "", //产品名称
stage: "", //阶段
quantity: "", //数量
planStartTime: "", //计划开始时间
planEndTime: "", //计划结束时间
splitQuantity: 2, //分解数量
splitList: [] //分解后产生的列表
};
},
watch: {
row(v) {
if (v != null) {
this.orderForm = this.$u.clone(this.row);
this.orderForm.planStartTime = this.orderForm.demandStartDate;
this.orderForm.planEndTime = this.orderForm.demandFinishDate;
this.orderForm.splitQuantity = 2;
this.dataListRetrun.id = this.orderForm.id;
this.dataListRetrun.quantity = this.orderForm.quantity;
this.dataListRetrun.mesCode = this.orderForm.mesCode;
}
}
}
};
</script>
\ No newline at end of file
pages/processManage/Process/processMain.vue
View file @ 7b811b92
...@@ -43,13 +43,13 @@ ...@@ -43,13 +43,13 @@
inline inline
> >
<Row> <Row>
<FormItem :label="l('code')" prop="code"> <FormItem :label="l('code')" >
<Input <Input
size="large" size="large"
v-model.trim="formValidate.code" v-model.trim="formValidate.code"
placeholder="请输入..." placeholder="请输入..."
style="width:240px" style="width:240px"
:disabled="isview" disabled="true"
/> />
</FormItem> </FormItem>
<FormItem :label="l('name')" prop="name"> <FormItem :label="l('name')" prop="name">
......
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