Skip to content

M
mes-ui
Commit da178834 authored by 康振飞's avatar 康振飞
Browse files
Options

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

parents dda2d542 3608078b
Hide whitespace changes
Inline Side-by-side
Showing with 474 additions and 729 deletions
components/page/dataGrid.vue
View file @ da178834
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
@on-drag-drop="onDragDrop" @on-drag-drop="onDragDrop"
@on-selection-change="selectionChange" @on-selection-change="selectionChange"
@on-select="onSelect" @on-select="onSelect"
:loading="loading"
></Table> ></Table>
<div class="table-footer"> <div class="table-footer">
<div> <div>
...@@ -138,7 +139,8 @@ export default { ...@@ -138,7 +139,8 @@ export default {
configLoad: false, configLoad: false,
userConfig: null, //用户页面配置信息。, userConfig: null, //用户页面配置信息。,
// userId: 1 // userId: 1
userId: this.$store.state.userInfo.userId userId: this.$store.state.userInfo.userId,
loading: false
}; };
}, },
props: { props: {
...@@ -238,8 +240,8 @@ export default { ...@@ -238,8 +240,8 @@ export default {
default: 24 default: 24
}, },
//table控件children子数据控制功能 //table控件children子数据控制功能
rowKey:{ rowKey: {
type:[String,Number] type: [String, Number]
} }
}, },
created() { created() {
...@@ -251,7 +253,7 @@ export default { ...@@ -251,7 +253,7 @@ 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;
} }
...@@ -261,7 +263,7 @@ export default { ...@@ -261,7 +263,7 @@ export default {
return; return;
} }
this.loadUserConfig(); this.loadUserConfig();
if (this.height === 0) { if (this.height === 0) {
window.onresize = () => { window.onresize = () => {
///浏览器窗口大小变化 ///浏览器窗口大小变化
...@@ -273,7 +275,7 @@ export default { ...@@ -273,7 +275,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);
...@@ -287,10 +289,20 @@ export default { ...@@ -287,10 +289,20 @@ export default {
this.tableHeight = window.innerHeight - this.firstY - 60; this.tableHeight = window.innerHeight - this.firstY - 60;
} }
if (this.action) { if (this.action) {
this.$api.post(this.action, this.search).then(r => { this.loading = true;
this.list = r.result.items; this.$api
this.search.total = r.result.totalCount; .post(this.action, this.search)
}); .then(r => {
this.list = r.result.items;
this.search.total = r.result.totalCount;
this.loading = false;
})
.catch(
function(err) {
this.loading = false;
this.$Message.error("加载失败");
}.bind(this)
);
} }
}, },
columnInit() { columnInit() {
...@@ -614,5 +626,4 @@ export default { ...@@ -614,5 +626,4 @@ export default {
color: #249e91; color: #249e91;
} }
} }
</style> </style>
\ No newline at end of file
components/page/files.vue
View file @ da178834
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
:on-format-error="onFormatError" :on-format-error="onFormatError"
multiple multiple
:style="style" :style="style"
:on-progress="onProgress"
> >
<div style="padding: 20px 0;text-align:center" v-if="cloudIco"> <div style="padding: 20px 0;text-align:center" v-if="cloudIco">
<Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon> <Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>
...@@ -20,6 +21,7 @@ ...@@ -20,6 +21,7 @@
</div> </div>
<Button icon="ios-cloud-upload-outline" v-if="!cloudIco">上传文件</Button> <Button icon="ios-cloud-upload-outline" v-if="!cloudIco">上传文件</Button>
</Upload> </Upload>
<Progress :percent="per" :stroke-width="5" v-show="vshowPro"/>
<Tag <Tag
v-for="(item,index) in nameList" v-for="(item,index) in nameList"
:key="index" :key="index"
...@@ -47,7 +49,9 @@ export default { ...@@ -47,7 +49,9 @@ export default {
hbaseFileListNew: [], hbaseFileListNew: [],
formatList: ['png', 'jpg', 'gif'], formatList: ['png', 'jpg', 'gif'],
postUrl: '', postUrl: '',
style: '' style: '',
per: 0,
vshowPro: false
} }
}, },
created() {}, created() {},
...@@ -75,11 +79,17 @@ export default { ...@@ -75,11 +79,17 @@ export default {
} }
}, },
methods: { methods: {
onProgress(event, file, fileList) {
this.per = 0
this.vshowPro = true
},
// change(event) { // change(event) {
// this.$emit('on-change', event) // this.$emit('on-change', event)
// }, // },
//上传成功文件 //上传成功文件
uploadSuccess(response, file, fileList) { uploadSuccess(response, file, fileList) {
this.per = 60
this.vshowPro = true
const hbaseFileList = [] const hbaseFileList = []
const filesList = [] const filesList = []
if (file.response.status == 0) { if (file.response.status == 0) {
...@@ -89,6 +99,11 @@ export default { ...@@ -89,6 +99,11 @@ export default {
objImag.id = file.response.data.id objImag.id = file.response.data.id
filesList.push(objImag) filesList.push(objImag)
this.nameList = this.nameList.concat(filesList) this.nameList = this.nameList.concat(filesList)
this.per = 100
setTimeout(() => {
this.per = 0
this.vshowPro = false
}, 2000)
} else { } else {
this.$Message.error('上传失败，请重新上传!') this.$Message.error('上传失败，请重新上传!')
} }
......
components/page/imgUploadFile.vue
View file @ da178834
...@@ -22,9 +22,11 @@ ...@@ -22,9 +22,11 @@
:on-format-error="onFormatError" :on-format-error="onFormatError"
:show-upload-list="false" :show-upload-list="false"
:files="files" :files="files"
:on-progress="onProgress"
> >
<Button type="primary" icon="ios-cloud-upload-outline">本地上传</Button> <Button type="primary" icon="ios-cloud-upload-outline">本地上传</Button>
</Upload> </Upload>
<Progress :percent="per" :stroke-width="5" v-show="vshowPro"/>
</Col> </Col>
</Row> </Row>
</template> </template>
...@@ -86,7 +88,9 @@ export default { ...@@ -86,7 +88,9 @@ export default {
'&' + '&' +
this.parms, this.parms,
formatList: ['png', 'jpg', 'gif'], formatList: ['png', 'jpg', 'gif'],
newName: '' newName: '',
per: 0,
vshowPro: false
} }
}, },
created() { created() {
...@@ -256,11 +260,17 @@ export default { ...@@ -256,11 +260,17 @@ export default {
this.isCancas = true this.isCancas = true
this.isphoto = false this.isphoto = false
}, },
onProgress(event, file, fileList) {
this.per = 0
this.vshowPro = true
},
// change(event) { // change(event) {
// this.$emit('on-change', event.target.value) // this.$emit('on-change', event.target.value)
// }, // },
//上传成功文件 //上传成功文件
uploadSuccess(response, file, fileList) { uploadSuccess(response, file, fileList) {
this.per = 60
this.vshowPro = true
const hbaseFileList = [] const hbaseFileList = []
const filesList = [] const filesList = []
if (file.response.status == 0) { if (file.response.status == 0) {
...@@ -271,6 +281,11 @@ export default { ...@@ -271,6 +281,11 @@ export default {
this.fileUrlPath = this.downUrl + objImag.filePath this.fileUrlPath = this.downUrl + objImag.filePath
this.newName = file.response.data.fileName this.newName = file.response.data.fileName
this.$emit('on-change', JSON.stringify(filesList)) this.$emit('on-change', JSON.stringify(filesList))
this.per = 100
setTimeout(() => {
this.per = 0
this.vshowPro = false
}, 2000)
} else { } else {
this.$Message.error('上传失败，请重新上传!') this.$Message.error('上传失败，请重新上传!')
} }
......
components/page/inputFile.vue
View file @ da178834
...@@ -14,9 +14,11 @@ ...@@ -14,9 +14,11 @@
:on-format-error="onFormatError" :on-format-error="onFormatError"
:show-upload-list="false" :show-upload-list="false"
:files="files" :files="files"
:on-progress="onProgress"
> >
<Button icon="ios-cloud-upload-outline">上传文件</Button> <Button icon="ios-cloud-upload-outline">上传文件</Button>
</Upload> </Upload>
<Progress :percent="per" :stroke-width="5" v-show="vshowPro"/>
</div> </div>
</template> </template>
<script> <script>
...@@ -40,7 +42,9 @@ export default { ...@@ -40,7 +42,9 @@ export default {
'&' + '&' +
this.parms, this.parms,
formatList: ['png', 'jpg', 'gif'], formatList: ['png', 'jpg', 'gif'],
newName: '' newName: '',
per: 0,
vshowPro: false
} }
}, },
created() {}, created() {},
...@@ -60,11 +64,17 @@ export default { ...@@ -60,11 +64,17 @@ export default {
} }
}, },
methods: { methods: {
onProgress(event, file, fileList) {
this.per = 0
this.vshowPro = true
},
// change(event) { // change(event) {
// this.$emit('on-change', event.target.value) // this.$emit('on-change', event.target.value)
// }, // },
//上传成功文件 //上传成功文件
uploadSuccess(response, file, fileList) { uploadSuccess(response, file, fileList) {
this.per = 60
this.vshowPro = true
const hbaseFileList = [] const hbaseFileList = []
const filesList = [] const filesList = []
if (file.response.status == 0) { if (file.response.status == 0) {
...@@ -74,6 +84,11 @@ export default { ...@@ -74,6 +84,11 @@ export default {
filesList.push(objImag) filesList.push(objImag)
this.newName = file.response.data.fileName this.newName = file.response.data.fileName
this.$emit('on-change', JSON.stringify(filesList)) this.$emit('on-change', JSON.stringify(filesList))
this.per = 100
setTimeout(() => {
this.per = 0
this.vshowPro = false
}, 2000)
} else { } else {
this.$Message.error('上传失败，请重新上传!') this.$Message.error('上传失败，请重新上传!')
} }
......
components/page/workShopSelect.vue
View file @ da178834
...@@ -79,7 +79,7 @@ export default { ...@@ -79,7 +79,7 @@ export default {
watch: { watch: {
value(v, o) { value(v, o) {
this.name = v this.name = v
console.log(v, o) // console.log(v, o)
} }
} }
} }
......
layouts/basic-layout/tabs/index.vue
View file @ da178834
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
:closable="page.meta && page.meta.closable" :closable="page.meta && page.meta.closable"
/> />
</Tabs> </Tabs>
<Dropdown class="i-layout-tabs-close" @on-click="handleClose"> <Dropdown class="i-layout-tabs-close" @on-click="handleClose" placement="bottom-end">
<div class="i-layout-tabs-close-main"> <div class="i-layout-tabs-close-main">
<Icon type="ios-arrow-down" /> <Icon type="ios-arrow-down" />
</div> </div>
......
pages/aps/aps/components/excute.vue
View file @ da178834
...@@ -128,7 +128,6 @@ export default { ...@@ -128,7 +128,6 @@ export default {
high: true, high: true,
hide: true hide: true
}, },
{ {
key: "put_into_qty", key: "put_into_qty",
title: this.l("put_into_qty"), title: this.l("put_into_qty"),
......
pages/bug/index.vue
View file @ da178834
...@@ -398,9 +398,9 @@ export default { ...@@ -398,9 +398,9 @@ export default {
} }
param.auditUser = this.$store.state.userInfo.userName param.auditUser = this.$store.state.userInfo.userName
param.ids = [param.id] param.ids = [param.id]
param.statusNew = 5 param.statusNew = 6
if (param.id != null) { if (param.id != null) {
//增加改变状态为5/查看 //增加改变状态为6/查看
this.$http.bug.doaction(param).then((res) => { this.$http.bug.doaction(param).then((res) => {
if (res.result) { if (res.result) {
//this.search(this.searchForm) //this.search(this.searchForm)
......
pages/mesPlan/add.vue
View file @ da178834
...@@ -37,41 +37,12 @@ ...@@ -37,41 +37,12 @@
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col span="8">
<FormItem label="阶段" style="width:100%" prop="stage">
<dictionary code="plan.order.stage" v-model="orderSearchForm.stage" style="width:240px"></dictionary>
</FormItem>
</Col>
<Col span="8">
<FormItem label="材料" style="width:100%" prop="materialId">
<dictionary
code="plan.order.material"
v-model="orderSearchForm.materialId"
style="width:240px"
></dictionary>
</FormItem>
</Col>
<Col span="8"> <Col span="8">
<FormItem label="数量" style="width:100%" prop="quantity"> <FormItem label="数量" style="width:100%" prop="quantity">
<InputNumber :min="0" v-model="orderSearchForm.quantity" style="width:240px"></InputNumber> <InputNumber :min="0" v-model="orderSearchForm.quantity" style="width:240px"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
</Row>
<Row>
<Col span="8">
<FormItem label="工艺方法" style="width:100%" prop="routing_Method">
<dictionary
code="plan.order.routingMethod"
v-model="orderSearchForm.routing_Method"
style="width:240px"
></dictionary>
</FormItem>
</Col>
<Col span="8">
<FormItem label="外包络尺寸(mm)" style="width:100%">
<Input v-model="orderSearchForm.outer_Envelope_Size" style="width:240px"></Input>
</FormItem>
</Col>
<Col span="8"> <Col span="8">
<FormItem label="开始时间" style="width:100%"> <FormItem label="开始时间" style="width:100%">
<DatePicker <DatePicker
...@@ -83,8 +54,6 @@ ...@@ -83,8 +54,6 @@
></DatePicker> ></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
</Row>
<Row>
<Col span="8"> <Col span="8">
<FormItem label="完成时间" style="width:100%"> <FormItem label="完成时间" style="width:100%">
<DatePicker <DatePicker
...@@ -96,23 +65,14 @@ ...@@ -96,23 +65,14 @@
></DatePicker> ></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col span="8"> </Row>
<FormItem label="甲方客户" style="width:100%"> <Row>
<dictionary
code="plan.order.guestName"
v-model="orderSearchForm.guestName"
style="width:240px"
></dictionary>
</FormItem>
</Col>
<Col span="8"> <Col span="8">
<FormItem label="项目号" style="width:100%"> <FormItem label="项目号" style="width:100%">
<Input v-model="orderSearchForm.projectNumber" style="width:240px" /> <Input v-model="orderSearchForm.projectNumber" style="width:240px" />
</FormItem> </FormItem>
</Col> </Col>
</Row> <Col span="8">
<Row>
<Col span="8">
<FormItem label="批次号" style="width:100%"> <FormItem label="批次号" style="width:100%">
<Input v-model="orderSearchForm.batchNumber" style="width:240px" /> <Input v-model="orderSearchForm.batchNumber" style="width:240px" />
</FormItem> </FormItem>
...@@ -126,30 +86,13 @@ ...@@ -126,30 +86,13 @@
></dictionary> ></dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col span="8">
<FormItem label="甲方任务号" style="width:100%">
<Input v-model="orderSearchForm.taskCode" placeholder style="width:240px" />
</FormItem>
</Col>
</Row> </Row>
<Row> <Row>
<Col span="8"> <Col span="24">
<FormItem label="任务节点要求" style="width:100%"> <FormItem label="任务节点要求" style="width:100%">
<Input v-model="orderSearchForm.taskRequire" placeholder style="width:240px" /> <Input v-model="orderSearchForm.taskRequire" placeholder />
</FormItem>
</Col>
<Col span="8">
<FormItem label="甲方投产输入文件(编号)" style="width:100%">
<Input v-model="orderSearchForm.putintDocmentCode" placeholder style="width:240px" />
</FormItem> </FormItem>
</Col> </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"> <Col span="24">
<FormItem label="备注" style="width:100%"> <FormItem label="备注" style="width:100%">
<Input v-model="orderSearchForm.remark" placeholder type="textarea" :rows="3" /> <Input v-model="orderSearchForm.remark" placeholder type="textarea" :rows="3" />
...@@ -193,26 +136,10 @@ export default { ...@@ -193,26 +136,10 @@ export default {
productName: "", //产品名称 productName: "", //产品名称
drawnNumber: null, //图号 drawnNumber: null, //图号
taskType: null, //任务类型 taskType: null, //任务类型
stage: null, //阶段
materialId: null, //材料
quantity: 1, //数量 quantity: 1, //数量
guestName: "", //甲方客户
printSupply: "", //3D打印承制单位
functionaryOffice: "", //厂内责任机关
mainDepartmentId: "", //厂内责任主体部门ID
taskRequire: "", //任务接点要求 taskRequire: "", //任务接点要求
putintDocmentCode: "", //甲方投产输入文件编号
technologyDocmentCode: "", //甲方技术输入文件编号
outerDrawnNumber: "", //外部图号/模型号
modelVersion: "", //模型版本
taskCode: "", //甲方任务号
designer: "", //甲方设计人员
officeFunctionary: "", //厂内机关负责人
mainRoutingPeople: "", //厂内主工艺人员
routing_Method: null, //工艺方法
outer_Envelope_Size: "", //包装尺寸
demandStartDate: this.getFormatDate(nowDate), //开始时间 demandStartDate: this.getFormatDate(nowDate), //开始时间
demandFinishDate: this.getFormatDate(tomorrowDate), //完成时间 demandFinishDate: this.getFormatDateEnd(tomorrowDate), //完成时间
remark: "", //备注 remark: "", //备注
projectNumber: "", //项目号 projectNumber: "", //项目号
batchNumber: "", //批次号 batchNumber: "", //批次号
...@@ -235,22 +162,6 @@ export default { ...@@ -235,22 +162,6 @@ export default {
type: "number" type: "number"
} }
], ],
stage: [
{
required: true,
message: "请选择阶段",
type: "number",
trigger: "change"
}
],
materialId: [
{
required: true,
message: "请选择材料",
type: "number",
trigger: "change"
}
],
quantity: [ quantity: [
{ {
required: true, required: true,
...@@ -259,14 +170,6 @@ export default { ...@@ -259,14 +170,6 @@ export default {
trigger: "change" trigger: "change"
} }
], ],
routing_Method: [
{
required: true,
message: "请选择工艺方法",
type: "number",
trigger: "change"
}
]
}, },
disabled:false, disabled:false,
}; };
...@@ -279,7 +182,8 @@ export default { ...@@ -279,7 +182,8 @@ export default {
this.$refs.formValidate.validate(v => { this.$refs.formValidate.validate(v => {
if (v) { if (v) {
this.disabled = true; this.disabled = true;
Api.create(this.entity) this.orderSearchForm.status=1
Api.mesplancreate(this.orderSearchForm)
.then(r => { .then(r => {
this.disabled = false; this.disabled = false;
if (r.success) { if (r.success) {
...@@ -394,11 +298,11 @@ export default { ...@@ -394,11 +298,11 @@ export default {
}, },
getFinishedDate(value) { getFinishedDate(value) {
if (value == "") { if (value == "") {
this.orderSearchForm.demandFinishDate = this.getFormatDate( this.orderSearchForm.demandFinishDate = this.getFormatDateEnd(
tomorrowDate tomorrowDate
); );
} else { } else {
this.orderSearchForm.demandFinishDate = this.getFormatDate(value); this.orderSearchForm.demandFinishDate = this.getFormatDateEnd(value);
} }
}, },
getFormatDate(dates) { getFormatDate(dates) {
...@@ -408,7 +312,17 @@ export default { ...@@ -408,7 +312,17 @@ export default {
"-" + "-" +
this.p(d.getMonth() + 1) + this.p(d.getMonth() + 1) +
"-" + "-" +
this.p(d.getDate()); this.p(d.getDate())+ " 00:00:01";
return resDate;
},
getFormatDateEnd(dates) {
const d = new Date(dates);
const resDate =
d.getFullYear() +
"-" +
this.p(d.getMonth() + 1) +
"-" +
this.p(d.getDate())+ " 23:59:59";
return resDate; return resDate;
}, },
p(s) { p(s) {
......
pages/mesPlan/api.js
View file @ da178834
import Api from '@/plugins/request' import Api from '@/plugins/request'
export default { export default {
index: `${PlanUrl}/mesplan/paged`, index: `${PlanUrl}/mesplan/getpagedmesplans`,
paged(params) { paged(params) {
return Api.post(`${PlanUrl}/mesplan/paged`, params); return Api.post(`${PlanUrl}/mesplan/paged`, params);
}, },
...@@ -19,4 +19,37 @@ export default { ...@@ -19,4 +19,37 @@ export default {
params: params params: params
}); });
}, },
//----new 接口------
//批量删除
batchdelete(params) {
return Api.post(`${PlanUrl}/mesplan/batchdelete`, params);
},
//分页列表
getpagedmesplans(params) {
return Api.post(`${PlanUrl}/mesplan/getpagedmesplans`, params);
},
//创建订单
mesplancreate(params) {
return Api.post(`${PlanUrl}/mesplan/mesplancreate`, params);
},
//修改订单
mesorderupdate(params) {
return Api.post(`${PlanUrl}/mesplan/mesorderupdate`, params);
},
//订单派发+生成产品序号
mesorderdistribute(params) {
return Api.post(`${PlanUrl}/mesplan/mesorderdistribute`, params);
},
//删除父订单+子订单
mesorderdelete(params) {
return Api.post(`${PlanUrl}/mesplan/mesorderdelete`, params);
},
//所有最后一级子订单删除前检查
sondeletecheck(params) {
return Api.post(`${PlanUrl}/mesplan/sondeletecheck`, params);
},
//订单分解--保存子订单，除设置值外其他字段同父订单
mesorderdivide(params) {
return Api.post(`${PlanUrl}/mesplan/mesorderdivide`, params);
},
} }
pages/mesPlan/detail.vue
View file @ da178834
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
<Filed :span="12" :name="l('urgencyLevel')"> <Filed :span="12" :name="l('urgencyLevel')">
<state code="plan.order.urgencyLevel" :value="entity.urgencyLevel" type="text"></state> <state code="plan.order.urgencyLevel" :value="entity.urgencyLevel" type="text"></state>
</Filed> </Filed>
<Filed :span="12" :name="l('demandStartDate')">{{entity.demandStartDate}}</Filed> <Filed :span="12" :name="l('demandStartDate')"><DTSpan type="date" v-model="entity.demandStartDate"></DTSpan></Filed>
<Filed :span="12" :name="l('demandFinishDate')">{{entity.demandFinishDate}}</Filed> <Filed :span="12" :name="l('demandFinishDate')"><DTSpan type="date" v-model="entity.demandFinishDate"></DTSpan></Filed>
<Filed :span="12" :name="l('taskRequire')">{{entity.taskRequire}}</Filed> <Filed :span="12" :name="l('taskRequire')">{{entity.taskRequire}}</Filed>
<Filed :span="24" :name="l('remark')">{{entity.remark}}</Filed> <Filed :span="24" :name="l('remark')">{{entity.remark}}</Filed>
</Row> </Row>
......
pages/mesPlan/edit.vue
View file @ da178834
<template> <template>
<Form :model="orderSearchForm" :label-width="95" :rules="ruleValidate" ref="formValidate"> <Form :model="orderSearchForm" :label-width="95" :rules="ruleValidate" ref="formValidate">
<Row> <Row>
<!-- <Col span="24"> <Col span="8">
<FormItem label="订单编号" style="width:100%"> <FormItem label="订单编号" style="width:100%">{{this.orderSearchForm.mesCode}}</FormItem>
{{this.orderSearchForm.mesCode}} </Col>
</FormItem>
</Col>-->
<Col span="8"> <Col span="8">
<FormItem :label="l('productName')" style="width:100%" prop="productId"> <FormItem :label="l('productName')" style="width:100%" prop="productId">
<Select <Select
...@@ -30,6 +28,8 @@ ...@@ -30,6 +28,8 @@
<Input v-model="orderSearchForm.productName" style="width:240px" v-show="false" /> <Input v-model="orderSearchForm.productName" style="width:240px" v-show="false" />
</FormItem> </FormItem>
</Col> </Col>
</Row>
<Row>
<Col span="8"> <Col span="8">
<FormItem :label="l('taskType')" style="width:100%" prop="taskType"> <FormItem :label="l('taskType')" style="width:100%" prop="taskType">
<dictionary <dictionary
...@@ -39,43 +39,11 @@ ...@@ -39,43 +39,11 @@
></dictionary> ></dictionary>
</FormItem> </FormItem>
</Col> </Col>
</Row>
<Row>
<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>
</Col>
<Col span="8">
<FormItem :label="l('materialId')" style="width:100%" prop="materialId">
<dictionary
code="plan.order.material"
v-model="orderSearchForm.materialId"
style="width:240px"
></dictionary>
</FormItem>
</Col>
<Col span="8"> <Col span="8">
<FormItem :label="l('quantity')" style="width:100%" prop="quantity"> <FormItem :label="l('quantity')" style="width:100%" prop="quantity">
<InputNumber :min="0" v-model="orderSearchForm.quantity" style="width:240px"></InputNumber> <InputNumber :min="0" v-model="orderSearchForm.quantity" style="width:240px"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
</Row>
<Row>
<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>
</Col>
<Col span="8">
<FormItem :label="l('outer_Envelope_Size')" style="width:100%">
<Input v-model="orderSearchForm.outer_Envelope_Size" style="width:240px"></Input>
</FormItem>
</Col>
<Col span="8"> <Col span="8">
<FormItem :label="l('demandStartDate')" style="width:100%"> <FormItem :label="l('demandStartDate')" style="width:100%">
<DatePicker <DatePicker
...@@ -100,27 +68,19 @@ ...@@ -100,27 +68,19 @@
></DatePicker> ></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col span="8">
<FormItem :label="l('guestName')" style="width:100%">
<dictionary
code="plan.order.guestName"
v-model="orderSearchForm.guestName"
style="width:240px"
></dictionary>
</FormItem>
</Col>
<Col span="8"> <Col span="8">
<FormItem :label="l('projectNumber')" style="width:100%"> <FormItem :label="l('projectNumber')" style="width:100%">
<Input v-model="orderSearchForm.projectNumber" style="width:240px" /> <Input v-model="orderSearchForm.projectNumber" style="width:240px" />
</FormItem> </FormItem>
</Col> </Col>
</Row>
<Row>
<Col span="8"> <Col span="8">
<FormItem :label="l('batchNumber')" label="批次号" style="width:100%"> <FormItem :label="l('batchNumber')" label="批次号" style="width:100%">
<Input v-model="orderSearchForm.batchNumber" style="width:240px" /> <Input v-model="orderSearchForm.batchNumber" style="width:240px" />
</FormItem> </FormItem>
</Col> </Col>
</Row>
<Row>
<Col span="8"> <Col span="8">
<FormItem :label="l('urgencyLevel')" style="width:100%"> <FormItem :label="l('urgencyLevel')" style="width:100%">
<dictionary <dictionary
...@@ -130,26 +90,9 @@ ...@@ -130,26 +90,9 @@
></dictionary> ></dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col span="8"> <Col span="24">
<FormItem :label="l('taskCode')" style="width:100%">
<Input v-model="orderSearchForm.taskCode" placeholder style="width:240px" />
</FormItem>
</Col>
</Row>
<Row>
<Col span="8">
<FormItem :label="l('taskRequire')" style="width:100%"> <FormItem :label="l('taskRequire')" style="width:100%">
<Input v-model="orderSearchForm.taskRequire" placeholder style="width:240px" /> <Input v-model="orderSearchForm.taskRequire" placeholder />
</FormItem>
</Col>
<Col span="8">
<FormItem :label="l('putintDocmentCode')" style="width:100%">
<Input v-model="orderSearchForm.putintDocmentCode" placeholder style="width:240px" />
</FormItem>
</Col>
<Col span="8">
<FormItem :label="l('technologyDocmentCode')" style="width:100%">
<Input v-model="orderSearchForm.technologyDocmentCode" placeholder style="width:240px" />
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -177,11 +120,34 @@ export default { ...@@ -177,11 +120,34 @@ export default {
disabled: false, disabled: false,
orderSearchForm: {}, orderSearchForm: {},
ruleValidate: { ruleValidate: {
name: [{ required: true, message: "必填", trigger: "blur" }] productId: [
{
required: true,
message: "请选择产品名称",
type: "number",
trigger: "change"
}
],
taskType: [
{
required: true,
message: "请选择任务类型",
trigger: "change",
type: "number"
}
],
quantity: [
{
required: true,
message: "请输入数量",
type: "number",
trigger: "change"
}
],
}, },
placeholdeinfo:'', placeholdeinfo: "",
list:[], list: [],
data1:[], data1: []
}; };
}, },
props: { props: {
...@@ -192,8 +158,8 @@ export default { ...@@ -192,8 +158,8 @@ export default {
} }
} }
}, },
mounted(){ mounted() {
this.loadTree() this.loadTree();
}, },
methods: { methods: {
load(v) { load(v) {
...@@ -203,10 +169,11 @@ export default { ...@@ -203,10 +169,11 @@ export default {
}); });
}, },
handleSubmit() { handleSubmit() {
this.$refs.form.validate(v => { this.$refs.formValidate.validate(v => {
if (v) { if (v) {
this.disabled = true; this.disabled = true;
Api.update(this.orderSearchForm) this.orderSearchForm.status=1
Api.mesorderupdate(this.orderSearchForm)
.then(r => { .then(r => {
this.disabled = false; this.disabled = false;
if (r.success) { if (r.success) {
...@@ -252,27 +219,14 @@ export default { ...@@ -252,27 +219,14 @@ export default {
productName: "", //产品名称 productName: "", //产品名称
drawnNumber: null, //图号 drawnNumber: null, //图号
taskType: null, //任务类型 taskType: null, //任务类型
stage: null, //阶段
materialId: null, //材料
quantity: 1, //数量 quantity: 1, //数量
guestName: "", //甲方客户
printSupply: "", //3D打印承制单位
functionaryOffice: "", //厂内责任机关
mainDepartmentId: "", //厂内责任主体部门ID
taskRequire: "", //任务接点要求 taskRequire: "", //任务接点要求
putintDocmentCode: "", //甲方投产输入文件编号
technologyDocmentCode: "", //甲方技术输入文件编号
outerDrawnNumber: "", //外部图号/模型号
modelVersion: "", //模型版本
taskCode: "", //甲方任务号
designer: "", //甲方设计人员
officeFunctionary: "", //厂内机关负责人
mainRoutingPeople: "", //厂内主工艺人员
routing_Method: null, //工艺方法
outer_Envelope_Size: "", //包装尺寸
demandStartDate: this.getFormatDate(nowDate), //开始时间 demandStartDate: this.getFormatDate(nowDate), //开始时间
demandFinishDate: this.getFormatDate(tomorrowDate), //完成时间 demandFinishDate: this.getFormatDateEnd(tomorrowDate), //完成时间
remark: "" //备注 remark: "", //备注
projectNumber: "", //项目号
batchNumber: "", //批次号
urgencyLevel: null //紧急程度
}; };
}, },
loadTree() { loadTree() {
...@@ -289,7 +243,6 @@ export default { ...@@ -289,7 +243,6 @@ export default {
this.$Message.error("加载产品树失败!"); this.$Message.error("加载产品树失败!");
} }
}); });
}, },
renderContent(h, { root, node, data }) { renderContent(h, { root, node, data }) {
//渲染树的样式 //渲染树的样式
...@@ -321,11 +274,11 @@ export default { ...@@ -321,11 +274,11 @@ export default {
}, },
getFinishedDate(value) { getFinishedDate(value) {
if (value == "") { if (value == "") {
this.orderSearchForm.demandFinishDate = this.getFormatDate( this.orderSearchForm.demandFinishDate = this.getFormatDateEnd(
tomorrowDate tomorrowDate
); );
} else { } else {
this.orderSearchForm.demandFinishDate = this.getFormatDate(value); this.orderSearchForm.demandFinishDate = this.getFormatDateEnd(value);
} }
}, },
getFormatDate(dates) { getFormatDate(dates) {
...@@ -335,7 +288,19 @@ export default { ...@@ -335,7 +288,19 @@ export default {
"-" + "-" +
this.p(d.getMonth() + 1) + this.p(d.getMonth() + 1) +
"-" + "-" +
this.p(d.getDate()); this.p(d.getDate()) +
" 00:00:01";
return resDate;
},
getFormatDateEnd(dates) {
const d = new Date(dates);
const resDate =
d.getFullYear() +
"-" +
this.p(d.getMonth() + 1) +
"-" +
this.p(d.getDate()) +
" 23:59:59";
return resDate; return resDate;
}, },
p(s) { p(s) {
...@@ -347,7 +312,7 @@ export default { ...@@ -347,7 +312,7 @@ export default {
row(v) { row(v) {
if (v != null) { if (v != null) {
this.orderSearchForm = this.$u.clone(this.row); this.orderSearchForm = this.$u.clone(this.row);
this.placeholdeinfo=this.orderSearchForm.productName this.placeholdeinfo = this.orderSearchForm.productName;
} }
} }
} }
......
pages/mesPlan/index.vue
View file @ da178834
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
</Sider> </Sider>
<Content class="content"> <Content class="content">
<DataGrid <DataGrid
:action="action"
:columns="columns" :columns="columns"
ref="grid" ref="grid"
:data="listTemp"
@on-selection-change="onSelect" @on-selection-change="onSelect"
:batch="true" :batch="true"
:border="false" :border="false"
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</template> </template>
<template slot="batch"> <template slot="batch">
<Button type="primary" class="mr10 ml10" @click="openSendModal">订单派发</Button> <Button type="primary" class="mr10 ml10" @click="openSendModal">订单派发</Button>
<Button type="primary" class="mr10 ml10">批量删除</Button> <Button type="primary" class="mr10 ml10" @click="removeList">批量删除</Button>
</template> </template>
</DataGrid> </DataGrid>
<Modal v-model="addModal" title="新增" footer-hide width="1200"> <Modal v-model="addModal" title="新增" footer-hide width="1200">
...@@ -62,10 +62,10 @@ ...@@ -62,10 +62,10 @@
</div> </div>
</Modal> </Modal>
<Modal v-model="sendModal" title="订单派发" width="1200"> <Modal v-model="sendModal" title="订单派发" width="1200">
<Send :row="rowDataArry" ref="orderSplit" /> <Send :row="rowDataArry" ref="orderSend" />
<div slot="footer"> <div slot="footer">
<Button @click="sendModal = false">取消</Button> <Button @click="sendModal = false">取消</Button>
<!-- <Button type="primary" @click="orderSplitOk">确定分解</Button> --> <Button type="primary" @click="sendOk">确定派发</Button>
</div> </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">
...@@ -272,20 +272,22 @@ export default { ...@@ -272,20 +272,22 @@ export default {
title: this.l("demandStartDate"), title: this.l("demandStartDate"),
align: "left", align: "left",
high: true, high: true,
hide: true hide: true,
type: "date"
}, },
{ {
key: "demandFinishDate", key: "demandFinishDate",
title: this.l("demandFinishDate"), title: this.l("demandFinishDate"),
align: "left", align: "left",
high: true, high: true,
hide: true hide: true,
type: "date"
}, },
{ {
title: "操作", title: "操作",
key: "action", key: "action",
width: 180, width: 180,
align: "center", align: "left",
render: (h, params) => { render: (h, params) => {
return h("div", { class: "action" }, [ return h("div", { class: "action" }, [
h( h(
...@@ -300,7 +302,8 @@ export default { ...@@ -300,7 +302,8 @@ export default {
"op", "op",
{ {
attrs: { oprate: "edit" }, attrs: { oprate: "edit" },
on: { click: () => this.edit(params.row) } on: { click: () => this.edit(params.row) },
style: params.row._disabled||params.row.id!=params.row.rootId ? "display:none" : ""
}, },
"编辑" "编辑"
), ),
...@@ -308,7 +311,8 @@ export default { ...@@ -308,7 +311,8 @@ export default {
"op", "op",
{ {
attrs: { oprate: "remove" }, attrs: { oprate: "remove" },
on: { click: () => this.remove(params.row.id) } on: { click: () => this.remove(params.row) },
style: params.row._disabled ? "display:none" : ""
}, },
"删除" "删除"
), ),
...@@ -316,7 +320,8 @@ export default { ...@@ -316,7 +320,8 @@ export default {
"op", "op",
{ {
attrs: { oprate: "detail" }, attrs: { oprate: "detail" },
on: { click: () => this.split(params.row) } on: { click: () => this.split(params.row) },
style: params.row._disabled&&params.row.status!=1 ? "display:none" : ""
}, },
"分解" "分解"
) )
...@@ -324,329 +329,6 @@ export default { ...@@ -324,329 +329,6 @@ export default {
} }
} }
], ],
listTemp: [
{
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: 540,
isDeleted: 0,
mainDepartmentId: "",
mainRoutingPeople: "",
materialId: "1",
mesCode: "DDBH_20200409_13",
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: true,
divideMark: 1,
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: 541,
isDeleted: 0,
mainDepartmentId: "",
mainRoutingPeople: "",
materialId: "1",
mesCode: "DDBH_20200409_13_01",
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: 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",
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: 543,
isDeleted: 0,
mainDepartmentId: "",
mainRoutingPeople: "",
materialId: "1",
mesCode: "DDBH_20200409_14",
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: 544,
isDeleted: 0,
mainDepartmentId: "",
mainRoutingPeople: "",
materialId: "1",
mesCode: "DDBH_20200409_15",
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: 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: "",
ocolumn: [], ocolumn: [],
...@@ -657,24 +339,8 @@ export default { ...@@ -657,24 +339,8 @@ export default {
productId: "", //产品id productId: "", //产品id
productName: "", //产品名称 productName: "", //产品名称
taskType: "", //任务类型 taskType: "", //任务类型
stage: "", //阶段
materialId: "", //材料
quantity: null, //数量 quantity: null, //数量
guestName: "", //甲方客户
printSupply: "", //3D打印承制单位
functionaryOffice: "", //厂内责任机关
mainDepartmentId: "", //厂内责任主体部门ID
taskRequire: "", //任务接点要求 taskRequire: "", //任务接点要求
putintDocmentCode: "", //甲方投产输入文件编号
technologyDocmentCode: "", //甲方技术输入文件编号
outerDrawnNumber: "", //外部图号/模型号
modelVersion: "", //模型版本
taskCode: "", //甲方任务号
designer: "", //甲方设计人员
officeFunctionary: "", //厂内机关负责人
mainRoutingPeople: "", //厂内主工艺人员
routing_Method: "", //工艺方法
outer_Envelope_Size: "", //包装尺寸
demandStartDate: "", //开始时间 demandStartDate: "", //开始时间
demandFinishDate: "", //完成时间 demandFinishDate: "", //完成时间
remark: "", //备注 remark: "", //备注
...@@ -699,10 +365,13 @@ export default { ...@@ -699,10 +365,13 @@ export default {
taskTypeList: [], //任务类型 taskTypeList: [], //任务类型
statusList: [], //状态类型 statusList: [], //状态类型
rowData: {}, //编辑、查看的当前行数据 rowData: {}, //编辑、查看的当前行数据
rowDataArry:[], rowDataArry: [],
ModalInfoStaut: "", ModalInfoStaut: "",
sendList: [], sendList: [],
metCodesStrTxt:'', metCodesStrTxt: "",
actIds: [], //批量处理时ids
actMescodes: [],
delNum: 0
}; };
}, },
created() { created() {
...@@ -767,8 +436,12 @@ export default { ...@@ -767,8 +436,12 @@ export default {
this.rowData = row; this.rowData = row;
}, },
split(row) { split(row) {
this.splitModal = true; if (row.quantity > 1) {
this.rowData = row; this.splitModal = true;
this.rowData = row;
} else {
this.$Message.error("数量为1，不能进行分解");
}
}, },
//确定分解 //确定分解
orderSplitOk() { orderSplitOk() {
...@@ -777,7 +450,6 @@ export default { ...@@ -777,7 +450,6 @@ export default {
let orderListQuantity = 0; let orderListQuantity = 0;
let quantyStatu = false; //子订单计划数是否为0或空 let quantyStatu = false; //子订单计划数是否为0或空
let dateStatu = false; //子订单开始完成时间是否为空 let dateStatu = false; //子订单开始完成时间是否为空
// alert(JSON.stringify(returnDatalist))
if (returnDatalist.items.length > 0) { if (returnDatalist.items.length > 0) {
returnDatalist.items.forEach(data => { returnDatalist.items.forEach(data => {
orderListQuantity = orderListQuantity + parseFloat(data.quantity); orderListQuantity = orderListQuantity + parseFloat(data.quantity);
...@@ -809,6 +481,29 @@ export default { ...@@ -809,6 +481,29 @@ export default {
} }
}, },
modalInfoOk() { modalInfoOk() {
let itemsTemp = [];
this.dataListRetrun.items.forEach(ele => {
let objTemp = {};
objTemp.mesCode = ele.mesCode;
objTemp.quantity = Number(ele.quantity);
objTemp.demandStartDate = ele.demandStartDate + " 00:00:01";
objTemp.demandFinishDate = ele.demandFinishDate + " 23:59:59";
itemsTemp.push(objTemp);
});
let params = {
id: this.dataListRetrun.id,
items: itemsTemp
};
Api.mesorderdivide(params).then(res => {
if (res.result) {
this.$Message.success("订单分解成功!");
this.$refs.grid.load();
} else {
this.$Message.error("订单分解失败!");
}
});
this.splitModal = false;
this.ModalInfo = false;
//确定批量操作 //确定批量操作
// if (this.ModalInfoStaut == 'orderSendReview') { // if (this.ModalInfoStaut == 'orderSendReview') {
// this.$http.order.batchstart(this.dataListRetrun).then((res) => { // this.$http.order.batchstart(this.dataListRetrun).then((res) => {
...@@ -842,41 +537,123 @@ export default { ...@@ -842,41 +537,123 @@ export default {
// } // }
// }) // })
// } else { // } else {
this.$http.order.orderSplit(this.dataListRetrun).then(res => { // Api.mesorderdivide(this.dataListRetrun).then(res => {
if (res.result) { // if (res.result) {
this.$Message.success("订单分解成功!"); // this.$Message.success("订单分解成功!");
this.easySearch(""); // } else {
this.ModalOrderSplit = false; // this.$Message.error("订单分解失败!");
} else { // }
this.$Message.error("订单分解失败!"); // });
}
});
//} //}
this.ModalInfo = false;
}, },
//打开派发 //打开派发
openSendModal() { openSendModal() {
// alert(JSON.stringify(this.sendList))
// alert(this.sendList.length)
if (this.rowDataArry.length > 0) { if (this.rowDataArry.length > 0) {
this.sendModal = true; this.sendModal = true;
this.actIds = [];
this.rowDataArry.forEach(data => {
this.actIds.push(data.id);
});
} else { } else {
this.$Message.error("请选择订单"); this.$Message.error("请选择订单");
} }
}, },
remove(id) { //确定派发
sendOk() {
this.$refs.orderSplit.$refs["formValidate"].validate(valid => {
if (valid) {
let objInfo = this.$refs.orderSplit.returnData();
let params = {
ids: this.delIds
};
}
});
},
//单条删除
remove(row) {
this.delNum = 0;
this.actIds = [];
this.actIds.push(row.id);
if (row.id != row.rootId) {
this.sondeletecheck(row.rootId);
}
setTimeout(() => {
if (this.delNum > 0) {
this.$Message.error("删除的原始订单中有非新建状态的子订单！");
this.actIds = [];
return false;
}
}, 400);
this.deletelModal = true; this.deletelModal = true;
this.curId = id;
}, },
removeOk() { //批量删除
Api.delete({ id: this.curId }).then(r => { removeList() {
if (r.success) { let metCodesSingle = []; //没有子订单的订单
this.$refs.grid.load(); let metCodesFather = []; //有子订单的原始订单
this.deletelModal = false; this.actIds = [];
this.$Message.success("删除成功"); alert(JSON.stringify(this.rowDataArry))
if (this.rowDataArry.length > 0) {
this.rowDataArry.forEach(data => {
this.delNum = 0;
this.actIds.push(data.id);
if (data.id != data.rootId) {
//this.metCodesSingle.push(data.id);
this.sondeletecheck(data.rootId);
}
});
setTimeout(() => {
if (this.delNum > 0) {
this.$Message.error("删除的原始订单中有非新建状态的子订单！");
this.actIds = [];
return false;
}
}, 400);
this.deletelModal = true;
// this.actIds = [];
// this.rowDataArry.forEach(data => {
// this.actIds.push(data.id);
// });
} else {
this.$Message.error("请选择订单");
}
},
//删除前判断子订单是否能删除
sondeletecheck(code) {
let param = { id: code };
Api.sondeletecheck(param).then(res => {
if (res.result == 1) {
this.delNum += 0;
} else {
this.delNum += 1;
} }
}); });
}, },
//删除确定
removeOk() {
let params = { ids: this.actIds };
Api.mesorderdelete(params)
.then(r => {
if (r.success) {
if (r.result) {
this.$refs.grid.load();
this.deletelModal = false;
this.$Message.success("删除成功");
} else {
this.deletelModal = false;
this.$Message.error("删除失败");
}
} else {
this.deletelModal = false;
this.$Message.error("删除失败");
}
})
.catch(err => {
this.deletelModal = false;
this.$Message.error("操作失败");
});
},
removeCancel() { removeCancel() {
this.deletelModal = false; this.deletelModal = false;
}, },
......
pages/mesPlan/search.vue
View file @ da178834
<template> <template>
<Form ref="form" :model="condition" :label-width="90"> <Form ref="form" :model="condition" :label-width="100">
<Row> <Row>
<Col :span="12" :v-if="condition.id.show"> <Col :span="12" v-if="condition.id.show">
<FormItem :label="l('id')" prop="id"> <FormItem :label="l('id')" prop="id">
<Input v-model="condition.id.value"></Input> <Input v-model="condition.id.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.creationTime.show"> <Col :span="12" v-if="condition.creationTime.show">
<FormItem :label="l('creationTime')" prop="creationTime"> <FormItem :label="l('creationTime')" prop="creationTime">
<DatePicker type="daterange" v-model="condition.creationTime.value"></DatePicker> <DatePicker type="daterange" v-model="condition.creationTime.value"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.creatorUserId.show"> <Col :span="12" v-if="condition.creatorUserId.show">
<FormItem :label="l('creatorUserId')" prop="creatorUserId"> <FormItem :label="l('creatorUserId')" prop="creatorUserId">
<Input v-model="condition.creatorUserId.value"></Input> <Input v-model="condition.creatorUserId.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.lastModificationTime.show"> <Col :span="12" v-if="condition.lastModificationTime.show">
<FormItem :label="l('lastModificationTime')" prop="lastModificationTime"> <FormItem :label="l('lastModificationTime')" prop="lastModificationTime">
<DatePicker type="daterange" v-model="condition.lastModificationTime.value"></DatePicker> <DatePicker type="daterange" v-model="condition.lastModificationTime.value"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.lastModifierUserId.show"> <Col :span="12" v-if="condition.lastModifierUserId.show">
<FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId"> <FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId">
<Input v-model="condition.lastModifierUserId.value"></Input> <Input v-model="condition.lastModifierUserId.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.isDeleted.show"> <Col :span="12" v-if="condition.isDeleted.show">
<FormItem :label="l('isDeleted')" prop="isDeleted"> <FormItem :label="l('isDeleted')" prop="isDeleted">
<Input v-model="condition.isDeleted.value"></Input> <Input v-model="condition.isDeleted.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.deletionTime.show"> <Col :span="12" v-if="condition.deletionTime.show">
<FormItem :label="l('deletionTime')" prop="deletionTime"> <FormItem :label="l('deletionTime')" prop="deletionTime">
<DatePicker type="daterange" v-model="condition.deletionTime.value"></DatePicker> <DatePicker type="daterange" v-model="condition.deletionTime.value"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.deleterUserId.show"> <Col :span="12" v-if="condition.deleterUserId.show">
<FormItem :label="l('deleterUserId')" prop="deleterUserId"> <FormItem :label="l('deleterUserId')" prop="deleterUserId">
<Input v-model="condition.deleterUserId.value"></Input> <Input v-model="condition.deleterUserId.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.mesCode.show"> <Col :span="12" v-if="condition.mesCode.show">
<FormItem :label="l('mesCode')" prop="mesCode"> <FormItem :label="l('mesCode')" prop="mesCode">
<Input v-model="condition.mesCode.value"></Input> <Input v-model="condition.mesCode.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.taskType.show"> <Col :span="12" v-if="condition.taskType.show">
<FormItem :label="l('taskType')" prop="taskType"> <FormItem :label="l('taskType')" prop="taskType">
<Dictionary code="mes.mes_plan.task_type" v-model="condition.taskType.value"></Dictionary> <Dictionary code="plan.order.taskType" v-model="condition.taskType.value"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.productId.show"> <Col :span="12" v-if="condition.productId.show">
<FormItem :label="l('productId')" prop="productId"> <FormItem :label="l('productId')" prop="productId">
<Input v-model="condition.productId.value"></Input> <Input v-model="condition.productId.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.quantity.show"> <Col :span="12" v-if="condition.quantity.show">
<FormItem :label="l('quantity')" prop="quantity"> <FormItem :label="l('quantity')" prop="quantity">
<Input v-model="condition.quantity.value"></Input> <Input v-model="condition.quantity.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24" :v-if="condition.remark.show"> <Col :span="24" v-if="condition.remark.show">
<FormItem :label="l('remark')" prop="remark"> <FormItem :label="l('remark')" prop="remark">
<Input v-model="condition.remark.value"></Input> <Input v-model="condition.remark.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24" :v-if="condition.taskRequire.show"> <Col :span="12" v-if="condition.taskRequire.show">
<FormItem :label="l('taskRequire')" prop="taskRequire"> <FormItem :label="l('taskRequire')" prop="taskRequire">
<Input v-model="condition.taskRequire.value"></Input> <Input v-model="condition.taskRequire.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.status.show"> <Col :span="12" v-if="condition.status.show">
<FormItem :label="l('status')" prop="status"> <FormItem :label="l('status')" prop="status">
<Dictionary code="mes.mes_plan.status" v-model="condition.status.value"></Dictionary> <Dictionary code="plan.order.status" v-model="condition.status.value"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.divideMark.show"> <Col :span="12" v-if="condition.divideMark.show">
<FormItem :label="l('divideMark')" prop="divideMark"> <FormItem :label="l('divideMark')" prop="divideMark">
<Dictionary code="mes.mes_plan.divide_mark" v-model="condition.divideMark.value"></Dictionary> <Dictionary code="mes.mes_plan.divide_mark" v-model="condition.divideMark.value"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24" :v-if="condition.productCode.show"> <Col :span="24" v-if="condition.productCode.show">
<FormItem :label="l('productCode')" prop="productCode"> <FormItem :label="l('productCode')" prop="productCode">
<Input v-model="condition.productCode.value"></Input> <Input v-model="condition.productCode.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.productName.show"> <Col :span="12" v-if="condition.productName.show">
<FormItem :label="l('productName')" prop="productName"> <FormItem :label="l('productName')" prop="productName">
<Input v-model="condition.productName.value"></Input> <Input v-model="condition.productName.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.drawnNumber.show"> <Col :span="12" v-if="condition.drawnNumber.show">
<FormItem :label="l('drawnNumber')" prop="drawnNumber"> <FormItem :label="l('drawnNumber')" prop="drawnNumber">
<Input v-model="condition.drawnNumber.value"></Input> <Input v-model="condition.drawnNumber.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.rootId.show"> <Col :span="12" v-if="condition.rootId.show">
<FormItem :label="l('rootId')" prop="rootId"> <FormItem :label="l('rootId')" prop="rootId">
<Input v-model="condition.rootId.value"></Input> <Input v-model="condition.rootId.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.batchNumber.show"> <Col :span="12" v-if="condition.batchNumber.show">
<FormItem :label="l('batchNumber')" prop="batchNumber"> <FormItem :label="l('batchNumber')" prop="batchNumber">
<Input v-model="condition.batchNumber.value"></Input> <Input v-model="condition.batchNumber.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.projectNumber.show"> <Col :span="12" v-if="condition.projectNumber.show">
<FormItem :label="l('projectNumber')" prop="projectNumber"> <FormItem :label="l('projectNumber')" prop="projectNumber">
<Input v-model="condition.projectNumber.value"></Input> <Input v-model="condition.projectNumber.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.urgencyLevel.show"> <Col :span="12" v-if="condition.urgencyLevel.show">
<FormItem :label="l('urgencyLevel')" prop="urgencyLevel"> <FormItem :label="l('urgencyLevel')" prop="urgencyLevel">
<Dictionary code="mes.mes_plan.urgency_level" v-model="condition.urgencyLevel.value"></Dictionary> <Dictionary code="plan.order.urgencyLevel" v-model="condition.urgencyLevel.value"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.productingPreparationPeople.show"> <Col :span="12" v-if="condition.productingPreparationPeople.show">
<FormItem :label="l('productingPreparationPeople')" prop="productingPreparationPeople"> <FormItem :label="l('productingPreparationPeople')" prop="productingPreparationPeople">
<Input v-model="condition.productingPreparationPeople.value"></Input> <Input v-model="condition.productingPreparationPeople.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.productingPreparationFinishDate.show"> <Col :span="12" v-if="condition.productingPreparationFinishDate.show">
<FormItem <FormItem
:label="l('productingPreparationFinishDate')" :label="l('productingPreparationFinishDate')"
prop="productingPreparationFinishDate" prop="productingPreparationFinishDate"
...@@ -129,27 +129,27 @@ ...@@ -129,27 +129,27 @@
<DatePicker type="daterange" v-model="condition.productingPreparationFinishDate.value"></DatePicker> <DatePicker type="daterange" v-model="condition.productingPreparationFinishDate.value"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.quotationPeople.show"> <Col :span="12" v-if="condition.quotationPeople.show">
<FormItem :label="l('quotationPeople')" prop="quotationPeople"> <FormItem :label="l('quotationPeople')" prop="quotationPeople">
<Input v-model="condition.quotationPeople.value"></Input> <Input v-model="condition.quotationPeople.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.quotationFinishDate.show"> <Col :span="12" v-if="condition.quotationFinishDate.show">
<FormItem :label="l('quotationFinishDate')" prop="quotationFinishDate"> <FormItem :label="l('quotationFinishDate')" prop="quotationFinishDate">
<DatePicker type="daterange" v-model="condition.quotationFinishDate.value"></DatePicker> <DatePicker type="daterange" v-model="condition.quotationFinishDate.value"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.upId.show"> <Col :span="12" v-if="condition.upId.show">
<FormItem :label="l('upId')" prop="upId"> <FormItem :label="l('upId')" prop="upId">
<Input v-model="condition.upId.value"></Input> <Input v-model="condition.upId.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.demandStartDate.show"> <Col :span="12" v-if="condition.demandStartDate.show">
<FormItem :label="l('demandStartDate')" prop="demandStartDate"> <FormItem :label="l('demandStartDate')" prop="demandStartDate">
<DatePicker type="daterange" v-model="condition.demandStartDate.value"></DatePicker> <DatePicker type="daterange" v-model="condition.demandStartDate.value"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" :v-if="condition.demandFinishDate.show"> <Col :span="12" v-if="condition.demandFinishDate.show">
<FormItem :label="l('demandFinishDate')" prop="demandFinishDate"> <FormItem :label="l('demandFinishDate')" prop="demandFinishDate">
<DatePicker type="daterange" v-model="condition.demandFinishDate.value"></DatePicker> <DatePicker type="daterange" v-model="condition.demandFinishDate.value"></DatePicker>
</FormItem> </FormItem>
...@@ -174,28 +174,28 @@ export default { ...@@ -174,28 +174,28 @@ export default {
deleterUserId: { op: "Equal", value: null, show: false }, deleterUserId: { op: "Equal", value: null, show: false },
mesCode: { op: "Equal", value: null, show: true }, mesCode: { op: "Equal", value: null, show: true },
taskType: { op: "Equal", value: null, show: true }, taskType: { op: "Equal", value: null, show: true },
productId: { op: "Equal", value: null, show: true }, productId: { op: "Equal", value: null, show: false },
quantity: { op: "Equal", value: null, show: true }, quantity: { op: "Equal", value: null, show: true },
remark: { op: "Equal", value: null, show: true }, remark: { op: "Equal", value: null, show: false },
taskRequire: { op: "Equal", value: null, show: true }, taskRequire: { op: "Equal", value: null, show: true },
status: { op: "Equal", value: null, show: true }, status: { op: "Equal", value: null, show: true },
divideMark: { op: "Equal", value: null, show: true }, divideMark: { op: "Equal", value: null, show: false },
productCode: { op: "Equal", value: null, show: true }, productCode: { op: "Equal", value: null, show: false },
productName: { op: "Equal", value: null, show: true }, productName: { op: "Equal", value: null, show: true },
drawnNumber: { op: "Equal", value: null, show: true }, drawnNumber: { op: "Equal", value: null, show: true },
rootId: { op: "Equal", value: null, show: true }, rootId: { op: "Equal", value: null, show: false },
batchNumber: { op: "Equal", value: null, show: true }, batchNumber: { op: "Equal", value: null, show: true },
projectNumber: { op: "Equal", value: null, show: true }, projectNumber: { op: "Equal", value: null, show: true },
urgencyLevel: { op: "Equal", value: null, show: true }, urgencyLevel: { op: "Equal", value: null, show: true },
productingPreparationPeople: { op: "Equal", value: null, show: true }, productingPreparationPeople: { op: "Equal", value: null, show: false },
productingPreparationFinishDate: { productingPreparationFinishDate: {
op: "Range", op: "Range",
value: null, value: null,
show: true show: false
}, },
quotationPeople: { op: "Equal", value: null, show: true }, quotationPeople: { op: "Equal", value: null, show: false },
quotationFinishDate: { op: "Range", value: null, show: true }, quotationFinishDate: { op: "Range", value: null, show: false },
upId: { op: "Equal", value: null, show: true }, upId: { op: "Equal", value: null, show: false },
demandStartDate: { op: "Range", value: null, show: true }, demandStartDate: { op: "Range", value: null, show: true },
demandFinishDate: { op: "Range", value: null, show: true } demandFinishDate: { op: "Range", value: null, show: true }
} }
......
pages/mesPlan/send.vue
View file @ da178834
<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 border
:columns="columns1" :columns="columns1"
...@@ -20,10 +20,7 @@ ...@@ -20,10 +20,7 @@
<Row> <Row>
<Col span="6"> <Col span="6">
<FormItem label="生产准备" style="width:100%" prop="ProductingPreparationPeople"> <FormItem label="生产准备" style="width:100%" prop="ProductingPreparationPeople">
<WorkShopSelect <WorkShopSelect ref="userSelected" v-model="orderForm.ProductingPreparationPeople" />
ref="userSelected"
v-model="orderForm.ProductingPreparationPeople"
/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="6"> <Col span="6">
...@@ -38,10 +35,7 @@ ...@@ -38,10 +35,7 @@
</Col> </Col>
<Col span="6"> <Col span="6">
<FormItem label="订单报价人员" style="width:100%" prop="QuotationPeople"> <FormItem label="订单报价人员" style="width:100%" prop="QuotationPeople">
<UserSelect <UserSelect ref="userSelected" v-model="orderForm.QuotationPeople" />
ref="userSelected"
v-model="orderForm.QuotationPeople"
/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="6"> <Col span="6">
...@@ -71,21 +65,9 @@ export default { ...@@ -71,21 +65,9 @@ export default {
data() { data() {
return { return {
divHeight: "400px", divHeight: "400px",
osrOneList: false, //一条数据显示详细
osrMoreList: false, //多条数据只显示列表
info: {
status: true,
orderInfo: []
},
roleTitle: "工艺员", roleTitle: "工艺员",
orderForm: { orderForm: {
DistributeMainRouting: null, //主工艺人员 ProductingPreparationPeople: null, //生产准备
MainRoutingFinishDate: "", //主工艺人员完成时间
MajorRoutingPeople: null, //专业工艺人员
MajorRoutingFinishDate: "", //专业工艺人员完成时间
CheckUpPeople: 1, //校对人员 暂时不用
CheckUpFinishDate: "2019-12-19", //校对人员完成时间
ProductingPreparationPeople: null, //生产准备人员
ProductingPreparationFinishDate: "", //生产准备完成时间 ProductingPreparationFinishDate: "", //生产准备完成时间
QuotationPeople: null, //订单报价人员 QuotationPeople: null, //订单报价人员
QuotationFinishDate: "" //订单报价完成时间 QuotationFinishDate: "" //订单报价完成时间
...@@ -128,7 +110,7 @@ export default { ...@@ -128,7 +110,7 @@ export default {
} }
], ],
dataList: [], dataList: [],
row1:{}, row1: {},
dataListRetrun: [], //确定后返回数据 dataListRetrun: [], //确定后返回数据
ruleValidate: { ruleValidate: {
...@@ -164,8 +146,8 @@ export default { ...@@ -164,8 +146,8 @@ export default {
] ]
}, },
rowList: [], rowList: [],
row1:{}, row1: {},
tbHeight:0, tbHeight: 0
}; };
}, },
props: { props: {
...@@ -177,35 +159,14 @@ export default { ...@@ -177,35 +159,14 @@ export default {
} }
}, },
methods: { methods: {
returnDataList() { returnData() {
this.dataListRetrun = []; let objStr = {};
this.dataList.forEach(item => { objStr.ProductingPreparationPeople = this.orderForm.ProductingPreparationPeople;
let objStr = {}; objStr.ProductingPreparationFinishDate = this.orderForm.ProductingPreparationFinishDate;
objStr.id = item.id; objStr.QuotationPeople = this.orderForm.QuotationPeople;
objStr.mesCode = item.mesCode; objStr.QuotationFinishDate = this.orderForm.QuotationFinishDate;
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; return objStr;
},
getTimeMainRFD(value) {
this.orderForm.MainRoutingFinishDate = value;
},
getTimeMajorRFD(value) {
this.orderForm.MajorRoutingFinishDate = value;
},
getTimeCheckFD(value) {
this.orderForm.CheckUpFinishDate = value;
}, },
getTimeProductPFD(value) { getTimeProductPFD(value) {
this.orderForm.ProductingPreparationFinishDate = value; this.orderForm.ProductingPreparationFinishDate = value;
...@@ -216,7 +177,7 @@ export default { ...@@ -216,7 +177,7 @@ export default {
}, },
created() { created() {
//var theight = window.innerHeight - 400 + "px"; //var theight = window.innerHeight - 400 + "px";
// this.divHeight = theight; // this.divHeight = theight;
}, },
mounted() { mounted() {
// window.onresize = () => { // window.onresize = () => {
...@@ -231,11 +192,10 @@ export default { ...@@ -231,11 +192,10 @@ export default {
row(v) { row(v) {
if (v != []) { if (v != []) {
this.dataList = this.$u.clone(this.row); this.dataList = this.$u.clone(this.row);
this.row1=this.dataList[0] this.row1 = this.dataList[0];
this.tbHeight=0 this.tbHeight = 0;
if(this.dataList.length>3) if (this.dataList.length > 3) {
{ this.tbHeight = 200;
this.tbHeight=200
} }
} }
} }
......
pages/mesPlan/split.vue
View file @ da178834
...@@ -90,25 +90,8 @@ export default { ...@@ -90,25 +90,8 @@ export default {
mesCode: "", //订单编号 mesCode: "", //订单编号
productName: "", //产品名称 productName: "", //产品名称
drawingNo: "", //图号 drawingNo: "", //图号
producePic: "", //产品图号
stage: "", //阶段
orderCat: "", //任务类型 orderCat: "", //任务类型
quantity: "", //数量 quantity: "", //数量
materail: "", //材料
printDepartment: "", //3D打印承制单位
ownerGust: "", //甲方客户
mainDept: "", //厂内责任主体部门
inhouseOffice: "", //厂内责任机关
nodeRequire: "", //任务接点要求
inputDate: "", //任务输入日期
techniqueInputDoc: "", //甲方技术输入文件
productInputDoc: "", //甲方投产输入文件
modalVersion: "", //模型版本
drawNumber: "", //模型号
ownerDesigner: "", //甲方设计人员
missionCode: "", //甲方任务号
mainRoutingPeople: "", //厂内主工艺人员
inhousePrincipal: "", //厂内机关负责人
remark: "" //备注 remark: "" //备注
}, },
orderForm: { orderForm: {
......
pages/processDesign/Process/detailfiles.vue
View file @ da178834
...@@ -12,12 +12,14 @@ ...@@ -12,12 +12,14 @@
:on-exceeded-size="onExceededSize" :on-exceeded-size="onExceededSize"
:on-format-error="onFormatError" :on-format-error="onFormatError"
:action="postUrl" :action="postUrl"
:on-progress="onProgress"
> >
<div style="padding: 20px 0;text-align:center"> <div style="padding: 20px 0;text-align:center">
<Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon> <Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>
<p>将文件拖到此处，或点击上传</p> <p>将文件拖到此处，或点击上传</p>
</div> </div>
</Upload> </Upload>
<Progress :percent="per" :stroke-width="5" v-show="vshowPro"/>
<Tag <Tag
v-for="(item,index) in nameList" v-for="(item,index) in nameList"
:key="index" :key="index"
...@@ -62,7 +64,9 @@ export default { ...@@ -62,7 +64,9 @@ export default {
'jpg', 'jpg',
'gif' 'gif'
], ],
postUrl: '' postUrl: '',
per: 0,
vshowPro: false
} }
}, },
created() {}, created() {},
...@@ -72,7 +76,13 @@ export default { ...@@ -72,7 +76,13 @@ export default {
this.intFiles() this.intFiles()
}, },
onProgress(event, file, fileList) {
this.per = 0
this.vshowPro = true
},
uploadSuccess(response, file, fileList) { uploadSuccess(response, file, fileList) {
this.per = 60
this.vshowPro = true
const hbaseFileList = [] const hbaseFileList = []
const filesList = [] const filesList = []
if (file.response.status == 0) { if (file.response.status == 0) {
...@@ -82,6 +92,11 @@ export default { ...@@ -82,6 +92,11 @@ export default {
objImag.id = file.response.data.id objImag.id = file.response.data.id
filesList.push(objImag) filesList.push(objImag)
this.nameList = this.nameList.concat(filesList) this.nameList = this.nameList.concat(filesList)
this.per = 100
setTimeout(() => {
this.per = 0
this.vshowPro = false
}, 2000)
var url = `${designUrl}/routingfile/createorupdate` var url = `${designUrl}/routingfile/createorupdate`
var dataValidate = { var dataValidate = {
......
pages/processDesign/Process/processfile.vue
View file @ da178834
...@@ -12,12 +12,14 @@ ...@@ -12,12 +12,14 @@
:on-exceeded-size="onExceededSize" :on-exceeded-size="onExceededSize"
:on-format-error="onFormatError" :on-format-error="onFormatError"
:action="postUrl" :action="postUrl"
:on-progress="onProgress"
> >
<div style="padding: 20px 0;text-align:center"> <div style="padding: 20px 0;text-align:center">
<Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon> <Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>
<p>将文件拖到此处，或点击上传</p> <p>将文件拖到此处，或点击上传</p>
</div> </div>
</Upload> </Upload>
<Progress :percent="per" :stroke-width="5" v-show="vshowPro"/>
<Tag <Tag
v-for="(item,index) in nameList" v-for="(item,index) in nameList"
:key="index" :key="index"
...@@ -53,7 +55,9 @@ export default { ...@@ -53,7 +55,9 @@ export default {
'jpg', 'jpg',
'gif' 'gif'
], ],
postUrl: '' postUrl: '',
per: 0,
vshowPro: false
} }
}, },
created() {}, created() {},
...@@ -66,8 +70,13 @@ export default { ...@@ -66,8 +70,13 @@ export default {
}, },
methods: { methods: {
onProgress(event, file, fileList) {
this.per = 0
this.vshowPro = true
},
uploadSuccess(response, file, fileList) { uploadSuccess(response, file, fileList) {
this.per = 60
this.vshowPro = true
const hbaseFileList = [] const hbaseFileList = []
const filesList = [] const filesList = []
if (file.response.status == 0) { if (file.response.status == 0) {
...@@ -77,6 +86,11 @@ export default { ...@@ -77,6 +86,11 @@ export default {
objImag.id = file.response.data.id objImag.id = file.response.data.id
filesList.push(objImag) filesList.push(objImag)
this.nameList = this.nameList.concat(filesList) this.nameList = this.nameList.concat(filesList)
this.per = 100
setTimeout(() => {
this.per = 0
this.vshowPro = false
}, 2000)
} else { } else {
this.$Message.error('上传失败，请重新上传!') this.$Message.error('上传失败，请重新上传!')
} }
......
pages/processManage/Process/detailfiles.vue
View file @ da178834
...@@ -12,12 +12,14 @@ ...@@ -12,12 +12,14 @@
:on-exceeded-size="onExceededSize" :on-exceeded-size="onExceededSize"
:on-format-error="onFormatError" :on-format-error="onFormatError"
:action="postUrl" :action="postUrl"
:on-progress="onProgress"
> >
<div style="padding: 20px 0;text-align:center"> <div style="padding: 20px 0;text-align:center">
<Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon> <Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>
<p>将文件拖到此处，或点击上传</p> <p>将文件拖到此处，或点击上传</p>
</div> </div>
</Upload> </Upload>
<Progress :percent="per" :stroke-width="5" v-show="vshowPro"/>
<Tag <Tag
v-for="(item,index) in nameList" v-for="(item,index) in nameList"
:key="index" :key="index"
...@@ -62,7 +64,9 @@ export default { ...@@ -62,7 +64,9 @@ export default {
'jpg', 'jpg',
'gif' 'gif'
], ],
postUrl: '' postUrl: '',
per: 0,
vshowPro: false
} }
}, },
created() {}, created() {},
...@@ -72,7 +76,13 @@ export default { ...@@ -72,7 +76,13 @@ export default {
this.intFiles() this.intFiles()
}, },
onProgress(event, file, fileList) {
this.per = 0
this.vshowPro = true
},
uploadSuccess(response, file, fileList) { uploadSuccess(response, file, fileList) {
this.per = 60
this.vshowPro = true
const hbaseFileList = [] const hbaseFileList = []
const filesList = [] const filesList = []
if (file.response.status == 0) { if (file.response.status == 0) {
...@@ -82,6 +92,11 @@ export default { ...@@ -82,6 +92,11 @@ export default {
objImag.id = file.response.data.id objImag.id = file.response.data.id
filesList.push(objImag) filesList.push(objImag)
this.nameList = this.nameList.concat(filesList) this.nameList = this.nameList.concat(filesList)
this.per = 100
setTimeout(() => {
this.per = 0
this.vshowPro = false
}, 2000)
var url = `${designUrl}/routingfile/createorupdate` var url = `${designUrl}/routingfile/createorupdate`
var dataValidate = { var dataValidate = {
......
pages/processManage/Process/processfile.vue
View file @ da178834
...@@ -12,12 +12,14 @@ ...@@ -12,12 +12,14 @@
:on-exceeded-size="onExceededSize" :on-exceeded-size="onExceededSize"
:on-format-error="onFormatError" :on-format-error="onFormatError"
:action="postUrl" :action="postUrl"
:on-progress="onProgress"
> >
<div style="padding: 20px 0;text-align:center"> <div style="padding: 20px 0;text-align:center">
<Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon> <Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>
<p>将文件拖到此处，或点击上传</p> <p>将文件拖到此处，或点击上传</p>
</div> </div>
</Upload> </Upload>
<Progress :percent="per" :stroke-width="5" v-show="vshowPro"/>
<Tag <Tag
v-for="(item,index) in nameList" v-for="(item,index) in nameList"
:key="index" :key="index"
...@@ -53,7 +55,9 @@ export default { ...@@ -53,7 +55,9 @@ export default {
'jpg', 'jpg',
'gif' 'gif'
], ],
postUrl: '' postUrl: '',
per: 0,
vshowPro: false
} }
}, },
created() {}, created() {},
...@@ -66,8 +70,13 @@ export default { ...@@ -66,8 +70,13 @@ export default {
}, },
methods: { methods: {
onProgress(event, file, fileList) {
this.per = 0
this.vshowPro = true
},
uploadSuccess(response, file, fileList) { uploadSuccess(response, file, fileList) {
this.per = 60
this.vshowPro = true
const hbaseFileList = [] const hbaseFileList = []
const filesList = [] const filesList = []
if (file.response.status == 0) { if (file.response.status == 0) {
...@@ -77,6 +86,11 @@ export default { ...@@ -77,6 +86,11 @@ export default {
objImag.id = file.response.data.id objImag.id = file.response.data.id
filesList.push(objImag) filesList.push(objImag)
this.nameList = this.nameList.concat(filesList) this.nameList = this.nameList.concat(filesList)
this.per = 100
setTimeout(() => {
this.per = 0
this.vshowPro = false
}, 2000)
} else { } else {
this.$Message.error('上传失败，请重新上传!') this.$Message.error('上传失败，请重新上传!')
} }
......
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