Skip to content

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

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

parents 56f858f0 40bf3fd1
Show whitespace changes
Inline Side-by-side
Showing with 881 additions and 940 deletions
assets/css/base.less
View file @ 2c8fbb84
...@@ -1296,7 +1296,7 @@ html [type=button] { ...@@ -1296,7 +1296,7 @@ html [type=button] {
left: 0; left: 0;
text-align: center; text-align: center;
padding: 20px 0; padding: 20px 0;
background: #08080894; background: #080808;
div { div {
height: 25px; height: 25px;
......
i18n/locale/zh-CN.js
View file @ 2c8fbb84
...@@ -920,7 +920,7 @@ export default { ...@@ -920,7 +920,7 @@ export default {
productId: '产品Id', productId: '产品Id',
quantity: '数量', quantity: '数量',
remark: '备注', remark: '备注',
taskRequire: '任务节点要求', taskRequire: '任务要求',
status: '订单状态', status: '订单状态',
divideMark: '分解标记:1-已分解;0-未分解', divideMark: '分解标记:1-已分解;0-未分解',
productCode: '产品序号:No1~No99', productCode: '产品序号:No1~No99',
...@@ -930,13 +930,13 @@ export default { ...@@ -930,13 +930,13 @@ export default {
batchNumber: '批次号', batchNumber: '批次号',
projectNumber: '项目号', projectNumber: '项目号',
urgencyLevel: '紧急程度', urgencyLevel: '紧急程度',
productingPreparationPeople: '生产准备(主制车间)', productingPreparationPeople: '生产车间',
productingPreparationFinishDate: '生产准备完成时间', productingPreparationFinishDate: '生产完成时间',
quotationPeople: '订单报价人员', quotationPeople: '订单报价人员',
quotationFinishDate: '订单报价完成时间', quotationFinishDate: '订单报价完成时间',
upId: '父订单id', upId: '父订单id',
demandStartDate: '投料时间', demandStartDate: '开始时间',
demandFinishDate: '节点时间', demandFinishDate: '完成时间',
//tempTitle------ //tempTitle------
stage: '阶段', stage: '阶段',
materialId: '材料', materialId: '材料',
......
pages/aps/plan/index.vue
View file @ 2c8fbb84
...@@ -150,9 +150,9 @@ export default { ...@@ -150,9 +150,9 @@ export default {
modalAccessory: false, modalAccessory: false,
columns: [{ columns: [{
key: "selection", key: "selection",
title: "#", title: '多选',
type: "selection", type: "selection",
width: 70, width: 50,
align: "center", align: "center",
}, },
{ {
...@@ -259,13 +259,13 @@ export default { ...@@ -259,13 +259,13 @@ export default {
high: true, high: true,
hide: true, hide: true,
}, },
{ // {
key: "spareQty", // key: "spareQty",
title: this.l("spareQty"), // title: this.l("spareQty"),
align: "left", // align: "left",
high: true, // high: true,
hide: true, // hide: true,
}, // },
{ {
key: "isPreschedule", key: "isPreschedule",
title: this.l("isPreschedule"), title: this.l("isPreschedule"),
...@@ -274,28 +274,28 @@ export default { ...@@ -274,28 +274,28 @@ export default {
high: true, high: true,
code: "aps.plan.ispreschedule", code: "aps.plan.ispreschedule",
}, },
{ // {
key: "demandStart", // key: "demandStart",
title: this.l("demandStart"), // title: this.l("demandStart"),
align: "left", // align: "left",
high: true, // high: true,
hide: true, // hide: true,
}, // },
{ // {
key: "demandFinish", // key: "demandFinish",
title: this.l("demandFinish"), // title: this.l("demandFinish"),
align: "left", // align: "left",
high: true, // high: true,
hide: true, // hide: true,
}, // },
{ // {
key: "partNamePro", // key: "partNamePro",
title: this.l("partNamePro"), // title: this.l("partNamePro"),
align: "left", // align: "left",
easy: true, // easy: true,
high: true, // high: true,
hide: true, // hide: true,
}, // },
{ {
title: "操作", title: "操作",
key: "action", key: "action",
......
pages/handle/examine1/index.vue
View file @ 2c8fbb84
<template> <template>
<div style="padding:30px 0"> <div style="padding:30px 0">
<Detail :idVal="detailId" /> <Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" @node-click="show"/> <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" @node-click="show" />
<!-- <Footer :idVal="detailId" :footerStatu="footerStatu" @showModalCheckOk='modalCheckOk=true'></Footer> --> <!-- <Footer :idVal="detailId" :footerStatu="footerStatu" @showModalCheckOk='modalCheckOk=true'></Footer> -->
<div class="footers" v-if="footerStatu === '2'" style="text-align:left;"> <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
<Form <Form :model="formMyCheck" :label-width="100" :rules="ruleValidate" inline ref="formValidate">
:model="formMyCheck"
:label-width="100"
:rules="ruleValidate"
inline
ref="formValidate"
>
<Row> <Row>
<Col span="18"> <Col span="18">
<FormItem label="审批意见："> <FormItem label="审批意见：">
...@@ -20,44 +14,20 @@ ...@@ -20,44 +14,20 @@
<Radio label="终止"></Radio> <Radio label="终止"></Radio>
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem <FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId">
label="驳回节点：" <Select style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
v-if="formMyCheck.radioSp === '驳回'"
prop="rejectToNodeId"
>
<Select
style="width:200px"
clearable
transfer
placeholder="请选择驳回节点"
v-model="formMyCheck.rejectToNodeId"
>
<Option value class="option-text">请选择驳回节点</Option> <Option value class="option-text">请选择驳回节点</Option>
<Option <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
v-for="(item, index) in nodeList"
:value="item.value"
:label="item.label"
:key="index"
:disabled="item.statu > 0 ? false : true"
></Option>
</Select> </Select>
<RadioGroup type="button" size="small" @on-change="changeToNode"> <RadioGroup type="button" size="small" @on-change="changeToNode">
<Radio label="1">上一节点</Radio> <Radio label="1">上一节点</Radio>
<Radio label="2">第一节点</Radio> <Radio label="2">第一节点</Radio>
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem <FormItem label="原因：" v-if="
label="原因："
v-if="
formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止' formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'
" " prop="comment">
prop="comment" <Input v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请输入原因" />
>
<Input
v-model="formMyCheck.comment"
style="width:400px;margin-left:10px"
placeholder="请输入原因"
/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="6" style="text-align:right;padding-right:40px"> <Col span="6" style="text-align:right;padding-right:40px">
...@@ -66,33 +36,18 @@ ...@@ -66,33 +36,18 @@
</Row> </Row>
</Form> </Form>
</div> </div>
<!-- 订单审里通过form --> <!-- 订单审核通过form -->
<Modal <Modal v-model="modalCheckOk" title="订单审核" width="800" :scrollable="true">
v-model="modalCheckOk" <Form :model="formMyCheck" :label-width="100" v-if="false">
title="订单审里"
width="800"
:scrollable="true"
>
<Form :model="formMyCheck" :label-width="100">
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem label="工时：" style="width:100%"> <FormItem label="工时：" style="width:100%">
<InputNumber <InputNumber v-model="formMyCheck.workHours" :step="1" :min="2" style="width:240px" />
v-model="formMyCheck.workHours"
:step="1"
:min="2"
style="width:240px"
/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="打印周期：" style="width:100%"> <FormItem label="打印周期：" style="width:100%">
<InputNumber <InputNumber v-model="formMyCheck.printPeriod" :step="1" :min="2" style="width:240px" />
v-model="formMyCheck.printPeriod"
:step="1"
:min="2"
style="width:240px"
/>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -109,17 +64,17 @@ ...@@ -109,17 +64,17 @@
</Col> </Col>
</Row> </Row>
</Form> </Form>
<br />
<h4>
您确定 <span class="new-red">通过</span> 此订单审批？
</h4>
<br />
<div slot="footer"> <div slot="footer">
<Button @click="modalCheckOk = false">取消</Button> <Button @click="modalCheckOk = false">取消</Button>
<Button type="primary" @click="checkOk" v-show="footerStatue">确定</Button> <Button type="primary" @click="checkOk" v-show="footerStatue">确定</Button>
</div> </div>
</Modal> </Modal>
<Modal <Modal v-model="modalCheckNo" title="订单审批" width="800" :scrollable="true">
v-model="modalCheckNo"
title="订单审批"
width="800"
:scrollable="true"
>
<br /> <br />
<h4> <h4>
您确定 <span class="new-red">{{ statuTitle }}</span> 此订单审批？ 您确定 <span class="new-red">{{ statuTitle }}</span> 此订单审批？
...@@ -130,8 +85,9 @@ ...@@ -130,8 +85,9 @@
<Button type="primary" @click="checkFalse">确定</Button> <Button type="primary" @click="checkFalse">确定</Button>
</div> </div>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
import Api from '../api' import Api from '../api'
import Detail from './detail' import Detail from './detail'
...@@ -156,7 +112,7 @@ export default { ...@@ -156,7 +112,7 @@ export default {
rejectToNodeId: null rejectToNodeId: null
}, },
modalCheckOk: false, modalCheckOk: false,
footerStatue:true, footerStatue: true,
modalCheckNo: false, modalCheckNo: false,
detailId: null, detailId: null,
statuTitle: '', statuTitle: '',
...@@ -173,31 +129,30 @@ export default { ...@@ -173,31 +129,30 @@ export default {
nextNodeUserIdList: [], //通过时提交的下一个节点UserId nextNodeUserIdList: [], //通过时提交的下一个节点UserId
testObj: {}, testObj: {},
ruleValidate: { ruleValidate: {
rejectToNodeId: [ rejectToNodeId: [{
{
required: true, required: true,
message: '请选择驳回节点', message: '请选择驳回节点',
type: 'number', type: 'number',
trigger: 'change' trigger: 'change'
} }],
], comment: [{
comment: [
{
required: true, required: true,
message: '请输入原因', message: '请输入原因',
trigger: 'blur' trigger: 'blur'
} }]
]
} }
} }
}, },
props: {}, props: {},
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch('loadDictionary') // 加载数据字典
// await store.dispatch("loadUsers");//加载缓存的用户 // await store.dispatch("loadUsers");//加载缓存的用户
}, },
created() { created() {
this.currentUserId=this.$store.state.userInfo.userId this.currentUserId = this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id') this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu') this.footerStatu = this.$http.common.getquerystring('statu')
this.getDetailInfos(this.detailId) this.getDetailInfos(this.detailId)
...@@ -205,31 +160,29 @@ export default { ...@@ -205,31 +160,29 @@ export default {
methods: { methods: {
nextCheckOk() { nextCheckOk() {
if (this.formMyCheck.radioSp == '通过') { if (this.formMyCheck.radioSp == '通过') {
this.footerStatue=true this.footerStatue = true
this.modalCheckOk = true this.modalCheckOk = true
} else if (this.formMyCheck.radioSp == '驳回') { } else if (this.formMyCheck.radioSp == '驳回') {
this.$refs['formValidate'].validate((valid) => { this.$refs['formValidate'].validate((valid) => {
if (valid) { if (valid) {
this.modalCheckNo = true this.modalCheckNo = true
this.statuTitle = '驳回' this.statuTitle = '驳回'
} else { } else {}
}
}) })
} else { } else {
this.$refs['formValidate'].validate((valid) => { this.$refs['formValidate'].validate((valid) => {
if (valid) { if (valid) {
this.modalCheckNo = true this.modalCheckNo = true
this.statuTitle = '终止' this.statuTitle = '终止'
} else { } else {}
}
}) })
} }
}, },
show(a){ show(a) {
this.footerStatue=false this.footerStatue = false
let contextDate=JSON.parse(a.contextData) let contextDate = JSON.parse(a.contextData)
this.formMyCheck=contextDate this.formMyCheck = contextDate
this.modalCheckOk=true this.modalCheckOk = true
}, },
getDetailInfos(idVal) { getDetailInfos(idVal) {
...@@ -241,8 +194,8 @@ export default { ...@@ -241,8 +194,8 @@ export default {
this.testObj = r this.testObj = r
if (r.success) { if (r.success) {
this.currentNodeID = r.result.currentNodeId this.currentNodeID = r.result.currentNodeId
this.passId=r.result.currentRecordId this.passId = r.result.currentRecordId
this.nextNodeUserIdList=this.$refs.userProcess.immutData//获取下一节点的审核人 this.nextNodeUserIdList = this.$refs.userProcess.immutData //获取下一节点的审核人
this.getNodes(r.result.nodes) this.getNodes(r.result.nodes)
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
...@@ -301,12 +254,13 @@ export default { ...@@ -301,12 +254,13 @@ export default {
id: this.passId, id: this.passId,
comment: '', comment: '',
nextOperationIdList: this.nextNodeUserIdList, nextOperationIdList: this.nextNodeUserIdList,
data: { data: null,
workHours: this.formMyCheck.workHours, // {
printPeriod: this.formMyCheck.printPeriod, // workHours: this.formMyCheck.workHours,
equipment: this.formMyCheck.equipment, // printPeriod: this.formMyCheck.printPeriod,
materialWeight: this.formMyCheck.materialWeight // equipment: this.formMyCheck.equipment,
} // materialWeight: this.formMyCheck.materialWeight
//}
} }
Api.pass(param).then((r) => { Api.pass(param).then((r) => {
if (r.success) { if (r.success) {
......
pages/mesPlan/add.vue
View file @ 2c8fbb84
...@@ -106,7 +106,7 @@ export default { ...@@ -106,7 +106,7 @@ export default {
productId: null, //产品id productId: null, //产品id
productName: "", //产品名称 productName: "", //产品名称
drawnNumber: null, //图号 drawnNumber: null, //图号
taskType: null, //任务类型 taskType: 1, //任务类型
quantity: 1, //数量 quantity: 1, //数量
taskRequire: "", //任务接点要求 taskRequire: "", //任务接点要求
demandStartDate: this.getFormatDate(nowDate), //开始时间 demandStartDate: this.getFormatDate(nowDate), //开始时间
...@@ -114,7 +114,7 @@ export default { ...@@ -114,7 +114,7 @@ export default {
remark: "", //备注 remark: "", //备注
projectNumber: "", //项目号 projectNumber: "", //项目号
batchNumber: "", //批次号 batchNumber: "", //批次号
urgencyLevel: null, //紧急程度 urgencyLevel: 1, //紧急程度
bomId: null, bomId: null,
}, },
ruleValidate: { ruleValidate: {
...@@ -147,7 +147,9 @@ export default { ...@@ -147,7 +147,9 @@ export default {
wfstatu: 1, wfstatu: 1,
}; };
}, },
created() {},
mounted() { mounted() {
let params = { let params = {
id: "123327da-42b3-41f6-b785-cf933f137a95", id: "123327da-42b3-41f6-b785-cf933f137a95",
}; };
...@@ -161,8 +163,8 @@ export default { ...@@ -161,8 +163,8 @@ export default {
} }
} }
}); });
this.loadTree(); this.loadTree();
}, },
methods: { methods: {
handleSubmit() { handleSubmit() {
...@@ -173,6 +175,7 @@ export default { ...@@ -173,6 +175,7 @@ export default {
.then((r) => { .then((r) => {
if (r.success) { if (r.success) {
this.$Message.success("保存成功"); this.$Message.success("保存成功");
this.resetFields();
this.$emit("on-ok"); this.$emit("on-ok");
} else { } else {
this.$Message.error("保存失败"); this.$Message.error("保存失败");
...@@ -215,10 +218,11 @@ export default { ...@@ -215,10 +218,11 @@ export default {
}, },
resetFields() { resetFields() {
this.orderSearchForm = { this.orderSearchForm = {
productId: null, //产品id productId: null, //产品id
productName: "", //产品名称 productName: "", //产品名称
drawnNumber: null, //图号 drawnNumber: null, //图号
taskType: null, //任务类型 taskType: 1, //任务类型
quantity: 1, //数量 quantity: 1, //数量
taskRequire: "", //任务接点要求 taskRequire: "", //任务接点要求
demandStartDate: this.getFormatDate(nowDate), //开始时间 demandStartDate: this.getFormatDate(nowDate), //开始时间
...@@ -226,7 +230,7 @@ export default { ...@@ -226,7 +230,7 @@ export default {
remark: "", //备注 remark: "", //备注
projectNumber: "", //项目号 projectNumber: "", //项目号
batchNumber: "", //批次号 batchNumber: "", //批次号
urgencyLevel: null, //紧急程度 urgencyLevel: 1, //紧急程度
}; };
}, },
loadTree() { loadTree() {
......
pages/mesPlan/detail.vue
View file @ 2c8fbb84
<template> <template>
<div class="orderDetail"> <div class="orderDetail">
<Row> <Row>
<Col span="8"> <Col span="8">
<span class="fwBold">{{l('mesCode')}}</span> <span class="fwBold">{{l('mesCode')}}</span>
...@@ -7,7 +7,9 @@ ...@@ -7,7 +7,9 @@
</Col> </Col>
<Col span="8"> <Col span="8">
<span class="fwBold">{{l('taskType')}}</span> <span class="fwBold">{{l('taskType')}}</span>
<p> <state code="plan.order.taskType" :value="entity.taskType" type="text"></state></p> <p>
<state code="plan.order.taskType" :value="entity.taskType" type="text"></state>
</p>
</Col> </Col>
<Col span="8"> <Col span="8">
<span class="fwBold">{{l('quantity')}}</span> <span class="fwBold">{{l('quantity')}}</span>
...@@ -17,7 +19,9 @@ ...@@ -17,7 +19,9 @@
<Row> <Row>
<Col span="8"> <Col span="8">
<span class="fwBold">{{l('status')}}</span> <span class="fwBold">{{l('status')}}</span>
<p><state code="plan.order.status" :value="entity.status" type="text"></state></p> <p>
<state code="plan.order.status" :value="entity.status" type="text"></state>
</p>
</Col> </Col>
<Col span="8"> <Col span="8">
<span class="fwBold">{{l('productName')}}</span> <span class="fwBold">{{l('productName')}}</span>
...@@ -39,23 +43,47 @@ ...@@ -39,23 +43,47 @@
</Col> </Col>
<Col span="8"> <Col span="8">
<span class="fwBold">{{l('urgencyLevel')}}</span> <span class="fwBold">{{l('urgencyLevel')}}</span>
<p><state code="plan.order.urgencyLevel" :value="entity.urgencyLevel" type="text"></state></p> <p>
<state code="plan.order.urgencyLevel" :value="entity.urgencyLevel" type="text"></state>
</p>
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col span="8"> <Col span="8">
<span class="fwBold">{{l('demandStartDate')}}</span> <span class="fwBold">{{l('demandStartDate')}}</span>
<p><DTSpan type="date" v-model="entity.demandStartDate"></DTSpan></p> <p>
<DTSpan type="date" v-model="entity.demandStartDate"></DTSpan>
</p>
</Col> </Col>
<Col span="8"> <Col span="8">
<span class="fwBold">{{l('demandFinishDate')}}</span> <span class="fwBold">{{l('demandFinishDate')}}</span>
<p><DTSpan type="date" v-model="entity.demandFinishDate"></DTSpan></p> <p>
<DTSpan type="date" v-model="entity.demandFinishDate"></DTSpan>
</p>
</Col> </Col>
<Col span="8"> <Col span="8">
<span class="fwBold">{{l('taskRequire')}}</span> <span class="fwBold">{{l('taskRequire')}}</span>
<p>{{entity.taskRequire}}</p> <p>{{entity.taskRequire}}</p>
</Col> </Col>
</Row> </Row>
<Row>
<Col span="8">
<span class="fwBold">{{l('productingPreparationPeople')}}</span>
<p>
<WorkShopName v-model="entity.productingPreparationPeople" v-if="entity.productingPreparationPeople>0"></WorkShopName>
</p>
</Col>
<Col span="8">
<span class="fwBold">{{l('quotationPeople')}}</span>
<p>
<User v-model="entity.quotationPeople" v-if="entity.quotationPeople>0"></User>
</p>
</Col>
<Col span="8">
<span class="fwBold">&nbsp;</span>
<p>&nbsp;</p>
</Col>
</Row>
<Row class="lastRow"> <Row class="lastRow">
<Col span="24"> <Col span="24">
<span class="fwBold">{{l('remark')}}</span> <span class="fwBold">{{l('remark')}}</span>
...@@ -63,8 +91,9 @@ ...@@ -63,8 +91,9 @@
</Col> </Col>
</Row> </Row>
</div> </div>
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
export default { export default {
...@@ -100,20 +129,21 @@ export default { ...@@ -100,20 +129,21 @@ export default {
} }
}; };
</script> </script>
<style lang="less"> <style lang="less">
.orderDetail .orderDetail {
{
line-height: 30px; line-height: 30px;
width: 90%; width: 90%;
margin: 0 auto; margin: 0 auto;
.ivu-row{
.ivu-row {
padding-top: 20px; padding-top: 20px;
padding-bottom: 20px; padding-bottom: 20px;
border-bottom:#ccc solid 1px; border-bottom: #ccc solid 1px;
} }
.lastRow
{ .lastRow {
border-bottom:none; border-bottom: none;
} }
} }
</style> </style>
pages/mesPlan/edit.vue
View file @ 2c8fbb84
...@@ -163,15 +163,16 @@ export default { ...@@ -163,15 +163,16 @@ export default {
.then((r) => { .then((r) => {
if (r.success) { if (r.success) {
this.$Message.success("保存成功"); this.$Message.success("保存成功");
//this.resetFields()
this.$emit("on-ok"); this.$emit("on-ok");
} else { } else {
this.$Message.error("保存失败"); this.$Message.error("保存失败");
} }
}) })
.catch((err) => { // .catch((err) => {
this.$Message.error("保存失败"); // this.$Message.error("保存失败");
console.warn(err); // console.warn(err);
}); // });
} }
}); });
}, },
......
pages/mesPlan/index.vue
View file @ 2c8fbb84
...@@ -141,15 +141,11 @@ export default { ...@@ -141,15 +141,11 @@ export default {
id: "id", id: "id",
columns: [{ columns: [{
key: "selection", key: "selection",
title: '多选',
type: "selection", type: "selection",
width: 50, width: 50,
align: "center" align: "center"
}, },
{
key: "id",
title: this.l("id"),
hide: true
},
{ {
key: "mesCode", key: "mesCode",
title: this.l("mesCode"), title: this.l("mesCode"),
......
pages/mesPlan/send.vue
View file @ 2c8fbb84
<template> <template>
<div style="width:100%;margin:0 auto"> <div style="width:100%;margin:0 auto">
<Detail ref="detailRow" :row="row1" v-show="dataList.length==1"></Detail> <Detail ref="detailRow" :row="row1" v-show="dataList.length==1"></Detail>
<Table <Table border :columns="columns1" :data="dataList" class="tableCommon" v-show="dataList.length>1" :height="tbHeight"></Table>
border
:columns="columns1"
:data="dataList"
class="tableCommon"
v-show="dataList.length>1"
:height="tbHeight"
></Table>
<div style="width100%;margin:40px auto"> <div style="width100%;margin:40px auto">
<Form <Form :model="orderForm" :label-width="140" class="margin-top-20 margin-bottom-50" :rules="ruleValidate" ref="formValidate">
:model="orderForm"
:label-width="110"
class="margin-top-20 margin-bottom-50"
:rules="ruleValidate"
ref="formValidate"
>
<Row> <Row>
<Col span="6"> <Col span="6">
<FormItem label="生产车间" style="width:100%" prop="ProductingPreparationPeople"> <FormItem label="生产车间" style="width:100%" prop="ProductingPreparationPeople">
...@@ -24,13 +11,8 @@ ...@@ -24,13 +11,8 @@
</FormItem> </FormItem>
</Col> </Col>
<Col span="6"> <Col span="6">
<FormItem label="完成时间" style="width:100%" prop="ProductingPreparationFinishDate"> <FormItem label="生产完成时间" style="width:100%" prop="ProductingPreparationFinishDate">
<DatePicker <DatePicker v-model="orderForm.ProductingPreparationFinishDate" type="date" placeholder="请选择日期" @on-change="getTimeProductPFD"></DatePicker>
v-model="orderForm.ProductingPreparationFinishDate"
type="date"
placeholder="请选择日期"
@on-change="getTimeProductPFD"
></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col span="6"> <Col span="6">
...@@ -39,19 +21,14 @@ ...@@ -39,19 +21,14 @@
</FormItem> </FormItem>
</Col> </Col>
<Col span="6"> <Col span="6">
<FormItem label="完成时间" style="width:100%" prop="QuotationFinishDate"> <FormItem label="订单报价完成时间" style="width:100%" prop="QuotationFinishDate">
<DatePicker <DatePicker v-model="orderForm.QuotationFinishDate" type="date" placeholder="请选择日期" @on-change="getTimeQuotationFD"></DatePicker>
v-model="orderForm.QuotationFinishDate"
type="date"
placeholder="请选择日期"
@on-change="getTimeQuotationFD"
></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
</Form> </Form>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
...@@ -72,8 +49,7 @@ export default { ...@@ -72,8 +49,7 @@ export default {
QuotationPeople: null, //订单报价人员 QuotationPeople: null, //订单报价人员
QuotationFinishDate: "" //订单报价完成时间 QuotationFinishDate: "" //订单报价完成时间
}, },
columns1: [ columns1: [{
{
title: this.l("mesCode"), title: this.l("mesCode"),
key: "mesCode", key: "mesCode",
width: 180, width: 180,
...@@ -113,36 +89,28 @@ export default { ...@@ -113,36 +89,28 @@ export default {
dataListRetrun: [], //确定后返回数据 dataListRetrun: [], //确定后返回数据
ruleValidate: { ruleValidate: {
ProductingPreparationPeople: [ ProductingPreparationPeople: [{
{
required: true, required: true,
message: "请选择人员", message: "请选择人员",
trigger: "change", trigger: "change",
type: "number" type: "number"
} }],
], ProductingPreparationFinishDate: [{
ProductingPreparationFinishDate: [
{
required: true, required: true,
message: "请选择时间", message: "请选择时间",
trigger: "change" trigger: "change"
} }],
], QuotationPeople: [{
QuotationPeople: [
{
required: true, required: true,
message: "请选择人员", message: "请选择人员",
trigger: "change", trigger: "change",
type: "number" type: "number"
} }],
], QuotationFinishDate: [{
QuotationFinishDate: [
{
required: true, required: true,
message: "请选择时间", message: "请选择时间",
trigger: "change" trigger: "change"
} }]
]
}, },
rowList: [], rowList: [],
row1: {}, row1: {},
......
pages/mesPlan/split.vue
View file @ 2c8fbb84
<template> <template>
<div style="width:100%;overflow:auto" :style="{height:divHeight}"> <div style="width:100%;overflow:auto" :style="{height:divHeight}">
<Form <Form :model="orderForm" :label-width="80" class="margin-top-20 margin-bottom-50" :rules="ruleValidate" ref="formValidate">
:model="orderForm"
:label-width="80"
class="margin-top-20 margin-bottom-50"
:rules="ruleValidate"
ref="formValidate"
>
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem label="订单编号" style="width:100%"> <FormItem label="订单编号" style="width:100%">
...@@ -50,18 +44,10 @@ ...@@ -50,18 +44,10 @@
<Input type="text" v-model="row.quantity" @on-change="inputOrderCat(row,index)" /> <Input type="text" v-model="row.quantity" @on-change="inputOrderCat(row,index)" />
</template> </template>
<template slot-scope="{ row, index }" slot="slotTime"> <template slot-scope="{ row, index }" slot="slotTime">
<DatePicker <DatePicker v-model="row.demandDate" type="daterange" placeholder="请选择日期" style="width:240px" :transfer="true" :options="optionsDate" @on-change="inputOrderCat(row,index)"></DatePicker>
v-model="row.demandDate"
type="daterange"
placeholder="请选择日期"
style="width:240px"
:transfer="true"
:options="optionsDate"
@on-change="inputOrderCat(row,index)"
></DatePicker>
</template> </template>
</Table> </Table>
</div> </div>
</template> </template>
<script> <script>
...@@ -104,8 +90,7 @@ export default { ...@@ -104,8 +90,7 @@ export default {
splitQuantity: 2, //分解数量 splitQuantity: 2, //分解数量
splitList: [] //分解后产生的列表 splitList: [] //分解后产生的列表
}, },
columns1: [ columns1: [{
{
title: "序号", title: "序号",
type: "index", type: "index",
width: 80, width: 80,
...@@ -133,16 +118,19 @@ export default { ...@@ -133,16 +118,19 @@ export default {
} }
], ],
dataList: [], dataList: [],
dataListRetrun: { id: null, quantity: null, mesCode: "", items: [] }, //确定后返回数据 dataListRetrun: {
id: null,
quantity: null,
mesCode: "",
items: []
}, //确定后返回数据
ruleValidate: { ruleValidate: {
splitQuantity: [ splitQuantity: [{
{
required: true, required: true,
message: "请输入数量", message: "请输入数量",
type: "number", type: "number",
trigger: "change" trigger: "change"
} }]
]
} }
}; };
}, },
...@@ -178,7 +166,7 @@ export default { ...@@ -178,7 +166,7 @@ export default {
//确定增加数量 //确定增加数量
addSplitOrder() { addSplitOrder() {
if (this.orderForm.splitQuantity < 2||this.orderForm.splitQuantity==undefined) { if (this.orderForm.splitQuantity < 2 || this.orderForm.splitQuantity == undefined) {
this.dataList = []; this.dataList = [];
return; return;
} }
...@@ -194,10 +182,8 @@ export default { ...@@ -194,10 +182,8 @@ export default {
let planEndTime = this.orderForm.planEndTime; let planEndTime = this.orderForm.planEndTime;
for (var i = 0; i < splitQuantity; i++) { for (var i = 0; i < splitQuantity; i++) {
this.dataList.push({ this.dataList.push({
mesCode: mesCode: i + 1 < 10 ?
i + 1 < 10 mesCodeSon + "0" + (i + 1) : mesCodeSon + "" + (i + 1),
? mesCodeSon + "0" + (i + 1)
: mesCodeSon + "" + (i + 1),
quantity: "", quantity: "",
demandDate: [planStartTime, planEndTime], demandDate: [planStartTime, planEndTime],
demandStartDate: planStartTime, demandStartDate: planStartTime,
...@@ -265,6 +251,7 @@ export default { ...@@ -265,6 +251,7 @@ export default {
splitQuantity: 2, //分解数量 splitQuantity: 2, //分解数量
splitList: [] //分解后产生的列表 splitList: [] //分解后产生的列表
}; };
this.dataList = []
}, },
watch: { watch: {
row(v) { row(v) {
...@@ -276,6 +263,7 @@ export default { ...@@ -276,6 +263,7 @@ export default {
this.dataListRetrun.id = this.orderForm.id; this.dataListRetrun.id = this.orderForm.id;
this.dataListRetrun.quantity = this.orderForm.quantity; this.dataListRetrun.quantity = this.orderForm.quantity;
this.dataListRetrun.mesCode = this.orderForm.mesCode; this.dataListRetrun.mesCode = this.orderForm.mesCode;
this.dataList = []
} }
} }
} }
......
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