Skip to content

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

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

parents 6dbe1722 83b011d2
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 48 deletions
pages/aps/plan/index.vue
View file @ 8e74c365
......@@ -63,6 +63,10 @@
<p>&nbsp;</p>
<p>&nbsp;</p>
</Modal>
<Modal v-model="orderSupportModal" title="配套下发" footer-hide width="1300">
<orderSupport ref="orderSupport"></orderSupport>
</Modal>
</div>
</template>
<script>
......@@ -72,6 +76,7 @@ import Edit from "./edit";
import Detail from "./detail";
import Search from "./search";
import Dispatch from "./dispatch";
import orderSupport from "../../produce/orderSupport";
export default {
name: "list",
components: {
......@@ -79,7 +84,8 @@ export default {
Edit,
Detail,
Search,
Dispatch
Dispatch,
orderSupport
},
data() {
return {
......@@ -96,6 +102,7 @@ export default {
deletelModal: false,
dispatchModal: false,
scheduleModal: false,
orderSupportModal: false,
curId: 0,
columns: [
{
......@@ -289,6 +296,24 @@ export default {
: params.row.mainRoutingSetStatus == 1
? "移入排产"
: ""
),
h(
"op",
{
attrs: { oprate: "detail" },
style: {
color: params.row.mainRoutingSetStatus == 0 ? "red" : ""
},
on: {
click: () =>
params.row.isSupportingFinish == 2|| params.row.isSupportingFinish == 3
? this.supportDis(params.row)
: null
}
},
params.row.isSupportingFinish == 2|| params.row.isSupportingFinish == 3
? "配套派发"
: ""
)
]);
}
......@@ -411,6 +436,11 @@ export default {
this.scheduleModal = true;
}
},
supportDis(value) {
this.orderSupportModal=true,
this.$refs.orderSupport.loaddata(value.id);
},
scheduleOk() {
let params = { ids: this.listBatchIds };
Api.moveinbatch(params)
......
pages/processManage/setProcess/components/orderMaterial.vue
View file @ 8e74c365
......@@ -88,7 +88,7 @@
</Col>
<Col :span="12">
<FormItem :label="l('quantity')" prop="quantity">
<InputNumber v-model="formprocessValidate.quantity"></InputNumber>
<InputNumber v-model="formprocessValidate.singlequantity"></InputNumber>
</FormItem>
</Col>
......@@ -269,7 +269,7 @@ export default {
spec: "",
categories: "",
quantity: 1,
singlequantity: 0,
singlequantity: 1,
quantity_unit: "",
estimated_part_height: 0,
height_unit: "",
......@@ -465,7 +465,8 @@ export default {
for (let i = 0; i < this.formValidate1.length; i++) {
let obj = this.formValidate1[i];
obj.quantity = obj.quantity * columnTop[0].quantity;
}
});
} else {
......@@ -479,6 +480,12 @@ export default {
this.isview = false;
this.formValidate1 = response.result.orderMaterialList;
for (let i = 0; i < this.formValidate1.length; i++) {
let obj = this.formValidate1[i];
obj.quantity = obj.quantity * this.dataTop[0].quantity;
}
});
// this.calcplatesnum();
......@@ -581,17 +588,17 @@ export default {
}, 5);
return;
}
this.formprocessValidate.quantity=this.formprocessValidate.singlequantity *this.dataTop[0].quantity;
if (this.formValidate.id == 0) {
if (this.editindex == -1) {
this.formprocessValidate.singlequantity=this.formprocessValidate / columnTop[0].quantity;
let curData = {};
let curData = {};
curData = JSON.parse(JSON.stringify(this.formprocessValidate));
this.formValidate1.push(curData);
} else {
let curData = {};
let curData = {};
curData = JSON.parse(JSON.stringify(this.formprocessValidate));
this.formValidate1[this.editindex] = curData;
......
pages/produce/orderSupport.vue
View file @ 8e74c365
......@@ -25,7 +25,7 @@
</FormItem>
</Row>-->
<Row>
<Col span="12">
<Col span="10">
<FormItem label="文档编号" prop="code">
<Input
size="large"
......@@ -36,11 +36,14 @@
/>
</FormItem>
</Col>
<Col span="12">
<FormItem label="配套完成时间" prop="code">
<DatePicker type="date" v-model="supportFinishDate"></DatePicker>
<Col span="10">
<FormItem label="配套完成时间" prop="materialPlanFinishDate">
<DatePicker v-if="codeisview" type="date" v-model="formValidate.materialPlanFinishDate"></DatePicker>
</FormItem>
</Col>
<Col span="4">
<Button v-if="codeisview" type="primary" @click="Savedata()">确定</Button>
</Col>
</Row>
</Form>
......@@ -53,36 +56,29 @@
></state>
</template>
</Table>
<Modal
v-model="newModel"
title="查看物料项"
:mask-closable="false"
@on-ok="ok"
@on-cancel="cancel"
width="830px"
:footer-hide="isview"
>
<Modal v-model="newModel" title="查看物料项" :mask-closable="false" width="830px">
<Form ref="formprocessValidate" :model="formprocessValidate" :label-width="120" inline>
<Row>
<Col :span="12">
<FormItem :label="l('materialNumber')" prop="materialNumber">
<Input v-model="formprocessValidate.materialNumber"></Input>
<Input :disabled="true" v-model="formprocessValidate.materialNumber"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('nameMaterial')" prop="nameMaterial">
<Input v-model="formprocessValidate.name"></Input>
<Input :disabled="true" v-model="formprocessValidate.name"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('quantity')" prop="quantity">
<InputNumber v-model="formprocessValidate.quantity"></InputNumber>
<InputNumber :disabled="true" v-model="formprocessValidate.quantity"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('materialType')" prop="materialType">
<Dictionary
:disabled="true"
code="mes_xingchi_resource.material.materialReType"
v-model="formprocessValidate.material_type"
></Dictionary>
......@@ -90,32 +86,32 @@
</Col>
<Col :span="12">
<FormItem :label="l('brand')" prop="brand">
<Input v-model="formprocessValidate.pate_number"></Input>
<Input :disabled="true" v-model="formprocessValidate.pate_number"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('specifications')" prop="specifications">
<Input v-model="formprocessValidate.spec"></Input>
<Input :disabled="true" v-model="formprocessValidate.spec"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('xhgg')" prop="xhgg">
<Input v-model="formprocessValidate.xhgg"></Input>
<Input :disabled="true" v-model="formprocessValidate.xhgg"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('texture')" prop="texture">
<Input v-model="formprocessValidate.texture"></Input>
<Input :disabled="true" v-model="formprocessValidate.texture"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('procurementStandards')" prop="procurementStandards">
<Input v-model="formprocessValidate.procurementStandards"></Input>
<Input :disabled="true" v-model="formprocessValidate.procurementStandards"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('qualityGrade')" prop="qualityGrade">
<Input v-model="formprocessValidate.qualityGrade"></Input>
<Input :disabled="true" v-model="formprocessValidate.qualityGrade"></Input>
</FormItem>
</Col>
</Row>
......@@ -142,7 +138,47 @@ export default {
newModel: false,
approvalStatus: 0,
editindex: -1,
supportFinishDate: "",
ruleValidate: {
materialPlanFinishDate: [
{ required: true, message: "配套完成时间不能为空", trigger: "blur" }
]
// name: [
// { required: true, message: '文件名称不能为空', trigger: 'blur' }
// ],
// file_template: [
// { required: true, message: '请选择文件模板', trigger: 'change' }
// ]
/*
gdspec: [
{ required: true, message: '请选择刮刀规格', trigger: 'change' }
],
gdquantity: [
{
required: true,
message: '刮刀数量不能为空',
trigger: 'blur',
type: 'number'
}
],
jbquantity: [
{
required: true,
message: '基板总量不能为空',
trigger: 'blur',
type: 'number'
}
],
fmquantity: [
{
required: true,
message: '预估粉末总量不能为空',
trigger: 'blur',
type: 'number'
}
]*/
},
formValidate: {
id: 0,
code: "",
......@@ -155,6 +191,7 @@ export default {
order_comb_id: 0,
orderids: "",
routingHeaderId: 0,
materialPlanFinishDate: "",
productingPreparationPeople: "",
ordercodes: "",
approvalStatus: 0
......@@ -218,17 +255,17 @@ export default {
align: "center",
render: (h, params) => {
if (this.isview) {
return h("div", this.dataTop[params.index].actual_quantity);
return h("div", this.formValidate1[params.index].actual_quantity);
} else {
return h("div", [
h("InputNumber", {
props: {
value: this.dataTop[params.index].actual_quantity,
value: this.formValidate1[params.index].actual_quantity,
min: 1
},
on: {
"on-change": event => {
this.dataTop[params.index].actual_quantity = event;
this.formValidate1[params.index].actual_quantity = event;
}
}
})
......@@ -285,7 +322,7 @@ export default {
high: true
},
{
title: "操作",
title: "查看",
key: "id",
align: "center",
render: (h, params) => {
......@@ -335,26 +372,40 @@ export default {
this.newModel = true;
},
loaddata(orderid) {
var url =
`${designUrl}/ordersupport/getbyid?id=` + this.formValidate.id;
service.get(`${url}`).then(response => {
this.formValidate = response.result.orderMaterial;
this.isview = true;
this.codeisview = true;
this.formValidate1 = response.result.orderMaterialList;
var url = `${designUrl}/ordermateriallist/getbyorderid?id=` + orderid;
service.get(`${url}`).then(response => {
this.formValidate = response.result.orderMaterial;
this.codeisview = true;
this.formValidate1 = response.result.orderMaterialList;
if (this.formValidate.status == 1) {
for (let i = 0; i < this.formValidate1.length; i++) {
let obj = this.formValidate1[i];
obj.actual_quantity = obj.quantity;
}
});
}
});
},
SaveLd() {},
Savedata() {
this.$refs["formprocessValidate"].validate(v => {
if (v) {
let parmes = {
orderMaterialList: this.formValidate1,
finishDate: this.formValidate.materialPlanFinishDate
};
let url = `${designUrl}/ordersupport/updateordermaterialactualquantity`;
service.put(`${url}`, parmes).then(res => {
if (res.success) {
this.$Message.success("操作成功");
this.$parent.$parent.$refs.grid.reload(
this.$parent.$parent.easySearch
);
}
});
}
});
},
editFun(params) {
this.editindex = params.index;
......
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