Skip to content

P
pda-ui
Commit 728ea620 authored by 李驰骋's avatar 李驰骋
Browse files
Options

量产制作代码调整

parent 70407814
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 316 additions and 957 deletions
src/api/mes/pro/productionMake.js
View file @ 728ea620
import request from '@/utils/request'
import request from "@/utils/request";
// 查询量产制作列表
// 查询样品制作单列表
export function listProductionMake(query) {
return request({
url: '/pro/productionMake/list',
method: 'get',
params: query
})
url: "/mes/pro/productionMake/list",
method: "get",
params: query,
});
}
// 查询量产制作详细
// 查询样品制作单详细
export function getProductionMake(productionMakeId) {
return request({
url: '/pro/productionMake/' + productionMakeId,
method: 'get'
})
url: "/mes/pro/productionMake/" + productionMakeId,
method: "get",
});
}
// 新增量产制作
// 新增样品制作单
export function addProductionMake(data) {
return request({
url: '/pro/productionMake',
method: 'post',
data: data
})
url: "/mes/pro/productionMake",
method: "post",
data: data,
});
}
// 修改量产制作
// 修改样品制作单
export function updateProductionMake(data) {
return request({
url: '/pro/productionMake',
method: 'put',
data: data
})
url: "/mes/pro/productionMake",
method: "put",
data: data,
});
}
// 删除量产制作
// 删除样品制作单
export function delProductionMake(productionMakeId) {
return request({
url: '/pro/productionMake/' + productionMakeId,
method: 'delete'
})
url: "/mes/pro/productionMake/" + productionMakeId,
method: "delete",
});
}
// 修改状态
export function dofinish(data) {
return request({
url: "/mes/pro/productionMake/modifyState",
method: "put",
data: data,
});
}
src/api/mes/pro/productionRequest.js
View file @ 728ea620
import request from "@/utils/request";
// 查询打样申请列表
// 查询量产申请列表
export function listProductionRequest(query) {
return request({
url: "/mes/pro/productionRequest/list",
......@@ -9,7 +9,7 @@ export function listProductionRequest(query) {
});
}
// 查询打样申请详细
// 查询量产申请详细
export function getProductionRequest(productionRequestId) {
return request({
url: "/mes/pro/productionRequest/" + productionRequestId,
......@@ -17,7 +17,7 @@ export function getProductionRequest(productionRequestId) {
});
}
// 新增打样申请
// 新增量产申请
export function addProductionRequest(data) {
return request({
url: "/mes/pro/productionRequest",
......@@ -26,7 +26,7 @@ export function addProductionRequest(data) {
});
}
// 修改打样申请
// 修改量产申请
export function updateProductionRequest(data) {
return request({
url: "/mes/pro/productionRequest",
......@@ -35,7 +35,7 @@ export function updateProductionRequest(data) {
});
}
// 删除打样申请
// 删除量产申请
export function delProductionRequest(productionRequestId) {
return request({
url: "/mes/pro/productionRequest/" + productionRequestId,
......@@ -46,7 +46,7 @@ export function delProductionRequest(productionRequestId) {
// 修改状态
export function dofinish(data) {
return request({
url: "/mes/pro/productionRequest/modifyState/",
url: "/mes/pro/productionRequest/modifyState",
method: "put",
data: data,
});
......
src/views/mes/pro/productionMake/components/ProogingBom.vue
View file @ 728ea620
......@@ -295,14 +295,15 @@ export default {
},
/**表单提交 */
submitForm() {
let thisObj = this;
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.optType == "add") {
this.tableData.unshift({ ...this.form });
if (thisObj.optType == "add") {
thisObj.tableData.unshift({ ...thisObj.form });
} else {
this.tableData.splice(this.currentRowIdx, 1, this.form);
thisObj.tableData.splice(thisObj.currentRowIdx, 1, thisObj.form);
}
this.showFlag = false;
thisObj.showFlag = false;
}
});
},
......
src/views/mes/pro/productiorequest/components/ProcessProd.vue
View file @ 728ea620
......@@ -146,9 +146,9 @@ export default {
};
},
computed: {
title () {
return '设置' + this.process.itemName + '物料'
}
title() {
return "设置" + this.process.itemName + "物料";
},
},
watch: {
process: {
......@@ -216,7 +216,9 @@ export default {
},
/** 提交编辑关联信息 */
submitEditConnect() {
this.tableData.splice(this.currentRowIdx, 1, this.form);
this.tableData.splice(this.currentRowIdx, 1, {
...this.form,
});
this.editConnectVisible = false;
},
},
......
src/views/mes/pro/productiorequest/components/ProogingBom.vue
View file @ 728ea620
<template>
<div>
<el-row :gutter="10" class="mb8">
<el-row :gutter="10" class="mb8" v-if="mode != 'info'">
<el-col :span="1.5">
<el-button
type="primary"
......@@ -85,7 +85,12 @@
prop="itemRemark"
min-width="120"
/>
<el-table-column label="操作" align="center" width="120">
<el-table-column
v-if="mode != 'info'"
label="操作"
align="center"
width="120"
>
<template slot-scope="{ row, $index }">
<el-button
type="text"
......@@ -116,11 +121,11 @@
>
<el-row>
<el-col :span="24">
<el-form-item label="产品" prop="itemId">
<el-form-item label="物料" prop="itemId">
<el-input
v-model="form.itemName"
readonly
placeholder="请选择产品"
placeholder="请选择物料"
>
<el-button
slot="append"
......@@ -232,7 +237,7 @@ export default {
rules: {},
/**多选 */
selection: [],
optType: 'add',
optType: "add",
/**表单初始化数据 */
form: {
quantity: "",
......@@ -247,7 +252,7 @@ export default {
bomItemRemark: "",
itemRemark: "",
},
currentRowIdx: undefined
currentRowIdx: undefined,
};
},
created() {},
......@@ -262,13 +267,13 @@ export default {
handleAdd() {
this.resetForm();
this.showFlag = true;
this.optType = 'add'
this.optType = "add";
},
/**更新行 */
updateRow(row, idx) {
Object.assign(this.form, row);
this.currentRowIdx = idx
this.optType = 'edit'
this.currentRowIdx = idx;
this.optType = "edit";
this.showFlag = true;
},
/**删除行 */
......@@ -284,7 +289,8 @@ export default {
if (row != undefined && row != null) {
this.form.itemId = row.itemId;
this.form.itemName = row.itemName;
this.form.unit = row.unitOfMeasure;
this.form.unitOfMeasure = row.unitOfMeasure;
this.form.itemRemark = row.remark;
}
},
/**表单提交 */
......@@ -317,6 +323,11 @@ export default {
itemRemark: "",
};
},
/**重置组件状态 */
resetState() {
this.resetForm();
this.tableData = [];
},
/**获取组件数据 */
getComData() {
return this.tableData;
......
src/views/mes/pro/productiorequest/components/ProogingProcess.vue
View file @ 728ea620
......@@ -8,9 +8,15 @@
prop="linkType"
align="center"
/>
<el-table-column label="工作站" prop="workstationId" align="center" />
<el-table-column label="工作站" prop="workstationName" align="center" />
<el-table-column label="标准工时" prop="stdWorkingTime" align="center" />
<el-table-column label="甘特图显示颜色" prop="colorCode" align="center" />
<el-table-column label="操作" align="center" width="150">
<el-table-column
v-if="mode != 'info'"
label="操作"
align="center"
width="150"
>
<template slot-scope="{ row, $index }">
<el-button
type="text"
......@@ -42,7 +48,7 @@
v-dialogDrag
:visible.sync="showFlag"
width="800px"
title="添加工序"
title="工序修改"
>
<el-form
ref="form"
......@@ -54,75 +60,31 @@
>
<el-row>
<el-col :span="12">
<el-form-item label="组件数量" prop="quantity">
<el-input
type="number"
v-model="form.quantity"
placeholder="请输入组件数量"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="计量单位" prop="unitOfMeasure">
<el-input
v-model="form.unitOfMeasure"
placeholder="请输入计量单位"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="报废百分比" prop="scrapPercentage">
<el-input
v-model="form.scrapPercentage"
placeholder="请输入报废百分比"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="替代组" prop="alternativeGroup">
<el-input
v-model="form.alternativeGroup"
placeholder="请输入替代组"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="替代优先级" prop="alternativePriorities">
<el-input
v-model="form.alternativePriorities"
placeholder="请输入替代优先级"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="策略" prop="alternativeStrategy">
<el-input
v-model="form.alternativeStrategy"
placeholder="请输入策略"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="使用概率" prop="alternativeProbability">
<el-form-item label="工作站" prop="workstationId">
<el-input
v-model="form.alternativeProbability"
placeholder="请输入使用概率"
></el-input>
v-model="form.workstationName"
disabled
placeholder="请选择工作站信息"
>
<el-button
slot="append"
icon="el-icon-search"
@click="handleWorkstationSelect"
></el-button>
</el-input>
<WorkstationSelect
ref="WorkstationSelect"
:processId="form.processId"
@onSelected="onWorkstationSelected"
></WorkstationSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="BOM行备注" prop="bomItemRemark">
<el-form-item label="标准工时" prop="stdWorkingTime">
<el-input
v-model="form.bomItemRemark"
placeholder="请输入BOM行备注"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物料备注" prop="itemRemark">
<el-input
v-model="form.itemRemark"
placeholder="请输入物料备注"
type="number"
v-model="form.stdWorkingTime"
placeholder="请输入标准工时"
></el-input>
</el-form-item>
</el-col>
......@@ -139,8 +101,10 @@
<script>
import ItemBomSelect from "@/components/itemBomSelect/single.vue";
import ProcessProd from "./ProcessProd.vue";
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue";
export default {
components: { ItemBomSelect, ProcessProd },
components: { ItemBomSelect, ProcessProd, WorkstationSelect },
inject: ["mode"],
props: {
bomList: {
type: Array,
......@@ -157,15 +121,9 @@ export default {
rules: {},
/**表单初始化数据 */
form: {
quantity: "",
unitOfMeasure: "",
scrapPercentage: "",
alternativeGroup: "",
alternativePriorities: "",
alternativeStrategy: "",
alternativeProbability: "",
bomItemRemark: "",
itemRemark: "",
stdWorkingTime: "",
workstationId: "",
workstationName: "",
},
currentRow: {},
currentRowIndex: undefined,
......@@ -173,9 +131,9 @@ export default {
},
methods: {
setList(rows) {
this.tableData = rows.map(item => {
item.processItemList = []
return item
this.tableData = rows.map((item) => {
item.processItemList = [];
return item;
});
},
/** 更新工序的物料信息 */
......@@ -198,6 +156,10 @@ export default {
this.$refs["form"].validate((valid) => {
if (valid) {
this.showFlag = false;
this.tableData.splice(this.currentRowIndex, 1, {
...this.currentRow,
...this.form,
});
}
});
},
......@@ -207,17 +169,27 @@ export default {
/**重置表单 */
resetForm() {
this.form = {
quantity: "",
unitOfMeasure: "",
scrapPercentage: "",
alternativeGroup: "",
alternativePriorities: "",
alternativeStrategy: "",
alternativeProbability: "",
bomItemRemark: "",
itemRemark: "",
stdWorkingTime: "",
workstationId: "",
workstationName: "",
};
},
/**重置组件状态 */
resetState() {
this.resetForm();
this.tableData = [];
},
// 查询工作站信息
handleWorkstationSelect() {
this.$refs.WorkstationSelect.showFlag = true;
},
onWorkstationSelected(row) {
if (row != undefined && row != null) {
this.form.workstationId = row.workstationId;
this.form.workstationName = row.workstationName;
this.form.stdWorkingTime = row.stdWorkingTime;
}
},
},
};
</script>
......
src/views/mes/pro/productiorequest/requestApply.vue
View file @ 728ea620
......@@ -182,27 +182,7 @@
:formatter="yesNoFmt"/>
<el-table-column label="是否禁用" align="center" prop="isDisabled"
:formatter="yesNoFmt"/>
<!-- <template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.isNeedShoeImg"
/>
</template> -->
<!-- <dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.isNeedPrototype"
/>
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.isConsiderColor"
/>
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.enableFlag"
/>
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.isDisabled" -->
/>
<el-table-column
label="申请单状态"
......@@ -431,7 +411,7 @@
this.reset();
const productionRequestId = row.productionRequestId || this.ids;
this.$router.push(
"/mes/proofing/info?productionRequestId=" + productionRequestId
"/mes/pro/productiorequest/info?productionRequestId=" + productionRequestId
);
// getproductionRequest(productionRequestId).then((response) => {
// this.form = response.data;
......@@ -511,7 +491,10 @@
// 生成制作单
generate(row) {
// 跳转到制作单界面
this.$router.push("/mes/proofing/apply");
const prototypeRequestId = row.productionRequestId || this.ids;
this.$router.push(
"/mes/pro/productionMake/apply?productionRequestId=" + prototypeRequestId
);
return;
},
};
......
src/views/mes/pro/productiorequest/requestInfoAdd.vue
View file @ 728ea620
......@@ -344,7 +344,6 @@
.then((res) => {
this.loading = false;
this.$modal.msgSuccess("提交成功！");
// 关闭页签
tabPlugins.closeOpenPage();
})
......
src/views/mes/pro/productiorequest/requestInfoEdit.vue
View file @ 728ea620
......@@ -359,6 +359,7 @@ export default {
.then(() => {
this.loading = false;
this.$modal.msgSuccess("提交成功！");
getFormInfo();
})
.catch(() => {
this.loading = false;
......
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