Skip to content

M
mes-ui
Commit a04bcf3d authored by 李驰骋's avatar 李驰骋
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 728ea620 c6d584df
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2864 additions and 40 deletions
src/api/mes/md/brand.js
View file @ a04bcf3d
...@@ -23,7 +23,8 @@ export function listAllBrand(query) { ...@@ -23,7 +23,8 @@ export function listAllBrand(query) {
export function listBrandByCondition(query) { export function listBrandByCondition(query) {
return request({ return request({
url: '/mes/md/brand/listBrandByCondition', url: '/mes/md/brand/listBrandByCondition',
method: 'get' method: 'get',
params: query
}) })
} }
......
src/api/mes/pro/productionSolution.js 0 → 100644
View file @ a04bcf3d
import request from '@/utils/request'
// 查询生产方案列表
export function listProductionSolution(query) {
return request({
url: '/mes/pro/productionSolution/list',
method: 'get',
params: query
})
}
// 查询生产方案详细
export function getProductionSolution(productionSolutionId) {
return request({
url: '/mes/pro/productionSolution/' + productionSolutionId,
method: 'get'
})
}
// 新增生产方案
export function addProductionSolution(data) {
return request({
url: '/mes/pro/productionSolution',
method: 'post',
data: data
})
}
// 修改生产方案
export function updateProductionSolution(data) {
return request({
url: '/mes/pro/productionSolution',
method: 'put',
data: data
})
}
// 删除生产方案
export function delProductionSolution(productionSolutionId) {
return request({
url: '/mes/pro/productionSolution/' + productionSolutionId,
method: 'delete'
})
}
src/api/mes/pro/productionSolutionBom.js 0 → 100644
View file @ a04bcf3d
import request from '@/utils/request'
// 查询生产方案BOM列表
export function listProductionSolutionBom(query) {
return request({
url: '/mes/pro/productionSolutionBom/list',
method: 'get',
params: query
})
}
// 查询生产方案BOM详细
export function getProductionSolutionBom(bomItemId) {
return request({
url: '/mes/pro/productionSolutionBom/' + bomItemId,
method: 'get'
})
}
// 新增生产方案BOM
export function addProductionSolutionBom(data) {
return request({
url: '/mes/pro/productionSolutionBom',
method: 'post',
data: data
})
}
// 修改生产方案BOM
export function updateProductionSolutionBom(data) {
return request({
url: '/mes/pro/productionSolutionBom',
method: 'put',
data: data
})
}
// 删除生产方案BOM
export function delProductionSolutionBom(bomItemId) {
return request({
url: '/mes/pro/productionSolutionBom/' + bomItemId,
method: 'delete'
})
}
src/api/mes/pro/productionSolutionProcess.js 0 → 100644
View file @ a04bcf3d
import request from '@/utils/request'
// 查询生产方案工序列表
export function listProductionSolutionProcess(query) {
return request({
url: '/mes/pro/productionSolutionProcess/list',
method: 'get',
params: query
})
}
// 查询生产方案工序详细
export function getProductionSolutionProcess(productionSolutionProcessId) {
return request({
url: '/mes/pro/productionSolutionProcess/' + productionSolutionProcessId,
method: 'get'
})
}
// 新增生产方案工序
export function addProductionSolutionProcess(data) {
return request({
url: '/mes/pro/productionSolutionProcess',
method: 'post',
data: data
})
}
// 修改生产方案工序
export function updateProductionSolutionProcess(data) {
return request({
url: '/mes/pro/productionSolutionProcess',
method: 'put',
data: data
})
}
// 删除生产方案工序
export function delProductionSolutionProcess(productionSolutionProcessId) {
return request({
url: '/mes/pro/productionSolutionProcess/' + productionSolutionProcessId,
method: 'delete'
})
}
src/api/mes/pro/productionSolutionProcessItem.js 0 → 100644
View file @ a04bcf3d
import request from '@/utils/request'
// 查询生产方案工序物料列表
export function listProductionSolutionProcessItem(query) {
return request({
url: '/mes/pro/productionSolutionProcessItem/list',
method: 'get',
params: query
})
}
// 查询生产方案工序物料详细
export function getProductionSolutionProcessItem(productionSolutionProcessItemId) {
return request({
url: '/mes/pro/productionSolutionProcessItem/' + productionSolutionProcessItemId,
method: 'get'
})
}
// 新增生产方案工序物料
export function addProductionSolutionProcessItem(data) {
return request({
url: '/mes/pro/productionSolutionProcessItem',
method: 'post',
data: data
})
}
// 修改生产方案工序物料
export function updateProductionSolutionProcessItem(data) {
return request({
url: '/mes/pro/productionSolutionProcessItem',
method: 'put',
data: data
})
}
// 删除生产方案工序物料
export function delProductionSolutionProcessItem(productionSolutionProcessItemId) {
return request({
url: '/mes/pro/productionSolutionProcessItem/' + productionSolutionProcessItemId,
method: 'delete'
})
}
src/views/mes/md/client/components/ClientContact.vue
View file @ a04bcf3d
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
<el-table v-loading="loading" :data="contactList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="contactList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="客户id" align="center" prop="clientId" width="100"/> <el-table-column label="品牌名称" align="center" prop="brandName" width="150"/>
<el-table-column label="品牌ID" align="center" prop="brandId" width="150"/> <el-table-column label="部门" align="center" prop="department" width="100"/>
<el-table-column label="职位" align="center" prop="position" width="100"/> <el-table-column label="职位" align="center" prop="position" width="100"/>
<el-table-column label="联系人" align="center" prop="contact" width="100"/> <el-table-column label="联系人" align="center" prop="contact" width="100"/>
<el-table-column label="电话号码" align="center" prop="tel" width="150"/> <el-table-column label="电话号码" align="center" prop="tel" width="150"/>
...@@ -95,9 +95,27 @@ ...@@ -95,9 +95,27 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="品牌ID" prop="brandId" label-width="120px"> <el-form-item label="品牌名称" prop="brandName" label-width="120px">
<el-input v-model="form.brandId" placeholder="请输入品牌ID"/> <el-select
v-model="form.brandName"
filterable
remote
placeholder="请输入品牌名称"
:remote-method="remoteMethod"
:loading="loadingOptions">
<el-option
v-for="item in options"
:key="item.brandId"
:label="item.brandName"
:value="item.brandName">
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="部门" prop="department" label-width="120px">
<el-input v-model="form.department" placeholder="请输入部门"/>
</el-form-item>
<el-form-item label="职位" prop="position" label-width="120px"> <el-form-item label="职位" prop="position" label-width="120px">
<el-input v-model="form.position" placeholder="请输入职位"/> <el-input v-model="form.position" placeholder="请输入职位"/>
</el-form-item> </el-form-item>
...@@ -130,6 +148,8 @@ ...@@ -130,6 +148,8 @@
<script> <script>
import {listContact, addContact, updateContact, getContact, delContact} from '@/api/mes/md/clientContact' import {listContact, addContact, updateContact, getContact, delContact} from '@/api/mes/md/clientContact'
import {listBrandByCondition} from '@/api/mes/md/brand'
export default { export default {
props: { props: {
...@@ -137,6 +157,17 @@ export default { ...@@ -137,6 +157,17 @@ export default {
}, },
data() { data() {
return { return {
//远程搜索获取到的列表
brandList: [],
//远程搜索加载选项
loadingOptions: false,
//远程搜索选项
options: [],
//远程搜索参数
remoteQuery: {
brandName: null,
enableFlag: "Y"
},
// 遮罩层 // 遮罩层
loading: false, loading: false,
// 选中数组 // 选中数组
...@@ -165,24 +196,21 @@ export default { ...@@ -165,24 +196,21 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
brandId: [ // position: [
{required: true, trigger: 'blur'} // {required: true, trigger: 'blur'}
], // ],
position: [ // contact: [
{required: true, trigger: 'blur'} // {required: true, trigger: 'blur'}
], // ],
contact: [ // tel: [
{required: true, trigger: 'blur'} // {required: true, trigger: 'blur'}
], // ],
tel: [
{required: true, trigger: 'blur'}
],
businessType: [ businessType: [
{required: true, trigger: 'blur'} {required: true, trigger: 'blur'}
], ],
merchandiser: [ // merchandiser: [
{required: true, trigger: 'blur'} // {required: true, trigger: 'blur'}
] // ]
} }
} }
...@@ -193,6 +221,7 @@ export default { ...@@ -193,6 +221,7 @@ export default {
this.loading = true this.loading = true
this.queryParams.clientId = this.clientId this.queryParams.clientId = this.clientId
listContact(this.queryParams).then(response => { listContact(this.queryParams).then(response => {
console.log(response, 111)
this.contactList = response.rows this.contactList = response.rows
this.total = response.total this.total = response.total
}).finally(() => this.loading = false) }).finally(() => this.loading = false)
...@@ -207,7 +236,8 @@ export default { ...@@ -207,7 +236,8 @@ export default {
this.form = { this.form = {
id: null, id: null,
clientId: this.clientId, clientId: this.clientId,
brandId: null,
brandName: null,
position: null, position: null,
contact: null, contact: null,
tel: null, tel: null,
...@@ -259,12 +289,11 @@ export default { ...@@ -259,12 +289,11 @@ export default {
this.$refs['form'].validate(valid => { this.$refs['form'].validate(valid => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
updateContact(this.form).then(response => {
updateContact(this.form).then(response => { this.$modal.msgSuccess('修改成功')
this.$modal.msgSuccess('修改成功') this.open = false
this.open = false this.getList()
this.getList() })
})
} else { } else {
this.form.clientId = this.clientId this.form.clientId = this.clientId
addContact(this.form).then(response => { addContact(this.form).then(response => {
...@@ -298,6 +327,23 @@ export default { ...@@ -298,6 +327,23 @@ export default {
this.queryParams.clientId = form.clientId this.queryParams.clientId = form.clientId
this.getList() this.getList()
}, },
/** 远程搜索 */
remoteMethod(query) {
// 如果用户输入内容了，就发请求拿数据，远程搜索模糊查询
if (query !== "") {
this.remoteQuery.brandName = query;
this.loadingOptions = true; // 开始拿数据喽
// 这里模拟发请求，res就当成发请求返回来的数据吧。
listBrandByCondition(this.remoteQuery).then(response => {
if (response.code == 200) {
this.options = response.data
}
this.loadingOptions = false // 拿到数据喽
})
} else {
this.options = [];
}
}
} }
} }
</script> </script>
......
src/views/mes/md/product/components/productionPlan.vue 0 → 100644
View file @ a04bcf3d
<!--客户loss信息-->
<template>
<div class="app-container">
<el-table
v-loading="loading"
:data="productionPlanList"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="生产方案编码" align="center" prop="customerName" />
<el-table-column label="生产方案名称" align="center" prop="segmentCount" />
<el-table-column label="工艺路线编码" align="center" prop="segmentCount" />
<el-table-column label="工艺路线名称" align="center" prop="segmentCount" />
<el-table-column label="用途编码" align="center" prop="segmentCount" />
<el-table-column label="用途名称" align="center" prop="segmentCount" />
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</template>
<script>
import {
listProductionSolution,
} from "@/api/mes/pro/productionSolution";
export default {
name: "ProductionPlan",
components: {
},
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 产品生产方案表格数据
productionPlanList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
itemId: this.itemId,
},
// 表单参数
form: {},
// 表单校验
rules: {},
};
},
props: {
optType: undefined,
itemId: undefined,
},
created() {
this.getList();
},
methods: {
/** 查询产品loss配置列表 */
getList() {
this.loading = true;
listProductionSolution(this.queryParams).then((response) => {
this.productionPlanList = response.rows;
this.total = response.total;
this.loading = false;
});
},
},
};
</script>
src/views/mes/md/product/index.vue
View file @ a04bcf3d
...@@ -540,6 +540,9 @@ ...@@ -540,6 +540,9 @@
<el-tab-pane label="产品外观" name="Look"> <el-tab-pane label="产品外观" name="Look">
<Look ref="Look" :optType="optType" :itemId="form.itemId"></Look> <Look ref="Look" :optType="optType" :itemId="form.itemId"></Look>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="生产方案" name="ProductionPlan">
<ProductionPlan ref="ProductionPlan" :optType="optType" :itemId="form.itemId"></ProductionPlan>
</el-tab-pane>
<el-tab-pane label="排版参数" name="PublishedConf"> <el-tab-pane label="排版参数" name="PublishedConf">
<PublishedConf <PublishedConf
ref="PublishedConf" ref="PublishedConf"
...@@ -648,6 +651,7 @@ import SaleUnit from "./components/saleUnitCon.vue"; ...@@ -648,6 +651,7 @@ import SaleUnit from "./components/saleUnitCon.vue";
import Factory from "./components/factory.vue"; import Factory from "./components/factory.vue";
import Customer from "./components/customer.vue"; import Customer from "./components/customer.vue";
import Look from "./components/look.vue"; import Look from "./components/look.vue";
import ProductionPlan from "./components/productionPlan.vue";
import PublishedConf from "./components/publishedConf.vue"; import PublishedConf from "./components/publishedConf.vue";
import FaceColor from "./components/faceColor.vue"; import FaceColor from "./components/faceColor.vue";
import BackFaceColor from "./components/backFaceColor.vue"; import BackFaceColor from "./components/backFaceColor.vue";
...@@ -672,6 +676,7 @@ export default { ...@@ -672,6 +676,7 @@ export default {
Factory, Factory,
Customer, Customer,
Look, Look,
ProductionPlan,
PublishedConf, PublishedConf,
FaceColor, FaceColor,
BackFaceColor, BackFaceColor,
......
src/views/mes/pro/productionSolution/components/ProcessProd.vue 0 → 100644
View file @ a04bcf3d
<template>
<div class="process-prod">
<!-- 设置物料弹窗 -->
<el-dialog
:visible.sync="showProcessProd"
width="800px"
:before-close="beforeClose"
append-to-body
title="设置物料"
>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
</el-col>
</el-row>
<el-table :data="tableData">
<el-table-column label="物料名称" prop="itemName" align="center" />
<el-table-column label="单位" prop="unitOfMeasure" align="center" />
<el-table-column label="数量" prop="quantity" align="center" />
<el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150">
<template slot-scope="{ row, $index }">
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="updateRow(row, $index)"
>修改</el-button
>
<el-button
type="text"
icon="el-icon-delete"
size="small"
@click="deleteRow($index)"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
<div slot="footer">
<el-button type="primary" size="small" @click="cancleConnect"
>关闭</el-button
>
</div>
</el-dialog>
<!-- 选择Bom物料 -->
<el-dialog
:visible.sync="showFlag"
title="选择Bom物料"
width="800px"
append-to-body
>
<el-table
:data="bomList"
@current-change="handleRowChange"
@row-dblclick="handleRowDbClick"
>
<el-table-column width="50" align="center">
<template v-slot="scope">
<el-radio
v-model="selectedItemId"
:label="scope.row.itemId"
@change="handleRowChange(scope.row)"
>{{ "" }}</el-radio
>
</template>
</el-table-column>
<el-table-column label="物料名称" prop="itemName" />
<el-table-column label="单位" prop="unitOfMeasure" />
<el-table-column label="用料比例" prop="quantity" />
</el-table>
<div slot="footer">
<el-button @click="configmSelect">确认</el-button>
<el-button @click="showFlag = false">取消</el-button>
</div>
</el-dialog>
<!-- 编辑物料关联信息 -->
<el-dialog
:visible.sync="editConnectVisible"
width="400px"
title="编辑物料关联信息"
>
<el-form :model="form" inline size="small" label-width="80px">
<el-form-item label="物料名称">
<el-input disabled v-model="form.itemName"></el-input>
</el-form-item>
<el-form-item label="单位">
<el-input disabled v-model="form.unitOfMeasure"></el-input>
</el-form-item>
<el-form-item label="数量">
<el-input type="number" v-model="form.quantity"></el-input>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" :rows="3"></el-input>
</el-form-item>
</el-form>
<div slot="footer">
<el-button type="primary" size="small" @click="submitEditConnect"
>确认</el-button
>
<el-button size="small" @click="editConnectVisible = false"
>取消</el-button
>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
props: {
bomList: {
type: Array,
default: () => [],
},
process: {
type: Object,
default: () => ({}),
},
},
data() {
return {
form: {
itemName: "",
unitOfMeasure: "",
quantity: "",
remark: "",
},
currentRowIdx: undefined,
tableData: [],
selectedItemId: undefined,
selectedRows: null,
showFlag: false,
showProcessProd: false,
editConnectVisible: false,
};
},
computed: {
title() {
return "设置" + this.process.itemName + "物料";
},
},
watch: {
process: {
handler(val) {
this.tableData = val.processItemList;
},
deep: true,
},
},
methods: {
handleRowChange(row) {
if (row) {
this.selectedRows = row;
}
},
handleRowDbClick(row) {
if (row) {
this.selectedRows = row;
this.tableData.unshift(this.selectedRows);
this.showFlag = false;
}
},
/**新增按钮 */
handleAdd() {
this.showFlag = true;
},
/**确认选择关联的Bom */
configmSelect() {
if (this.selectedItemId == null || this.selectedItemId == 0) {
return;
}
this.tableData.unshift({
...this.selectedRows,
processId: this.process.processId,
});
this.showFlag = false;
},
/**编辑 */
updateRow(row, idx) {
this.resetForm();
Object.assign(this.form, row);
this.currentRowIdx = idx;
this.editConnectVisible = true;
},
deleteRow(index) {
this.tableData.splice(index, 1);
},
cancleConnect() {
this.$emit("updateItem", this.tableData);
this.showProcessProd = false;
},
beforeClose(done) {
// 更新父组件的processItemList
this.$emit("updateItem", this.tableData);
done();
},
/**重置表单 */
resetForm() {
this.form = {
itemName: "",
unitOfMeasure: "",
quantity: "",
remark: "",
};
},
/** 提交编辑关联信息 */
submitEditConnect() {
this.tableData.splice(this.currentRowIdx, 1, {
...this.form,
});
this.editConnectVisible = false;
},
},
};
</script>
<style>
.process-prod {
padding: 0 20px;
}
</style>
src/views/mes/pro/productionSolution/components/ProogingBom.vue 0 → 100644
View file @ a04bcf3d
<template>
<div>
<el-row :gutter="10" class="mb8" v-if="mode != 'info'">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
@click="handleDelete"
>删除</el-button
>
</el-col>
</el-row>
<el-table :data="tableData" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column
label="物料名称"
align="center"
prop="itemName"
width="120"
/>
<el-table-column
label="组件数量"
align="center"
prop="quantity"
width="120"
/>
<el-table-column
label="计量单位"
align="center"
prop="unitOfMeasure"
width="120"
/>
<el-table-column
label="报废百分比"
align="center"
prop="scrapPercentage"
width="120"
/>
<el-table-column
label="替代组"
align="center"
prop="alternativeGroup"
width="120"
/>
<el-table-column
label="替代优先级"
align="center"
prop="alternativePriorities"
width="120"
/>
<el-table-column
label="策略"
align="center"
prop="alternativeStrategy"
width="120"
/>
<el-table-column
label="使用概率"
align="center"
prop="alternativeProbability"
width="120"
/>
<el-table-column
label="BOM行备注"
align="center"
prop="bomItemRemark"
min-width="120"
/>
<el-table-column
label="物料备注"
align="center"
prop="itemRemark"
min-width="120"
/>
<el-table-column
v-if="mode != 'info'"
label="操作"
align="center"
width="120"
>
<template slot-scope="{ row, $index }">
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="updateRow(row, $index)"
>修改</el-button
>
<el-button
type="text"
icon="el-icon-delete"
size="small"
@click="deleteRow($index)"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
<el-dialog :visible.sync="showFlag" width="700px" title="添加BOM">
<el-form
ref="form"
:model="form"
:rules="rules"
inline
label-width="100px"
size="small"
>
<el-row>
<el-col :span="24">
<el-form-item label="物料" prop="itemId">
<el-input
v-model="form.itemName"
readonly
placeholder="请选择物料"
>
<el-button
slot="append"
icon="el-icon-search"
@click="$refs['ItemSelectRef'].showFlag = true"
></el-button>
</el-input>
<ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
</el-form-item>
</el-col>
</el-row>
<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-input
v-model="form.alternativeProbability"
placeholder="请输入使用概率"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="BOM行备注" prop="bomItemRemark">
<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="请输入物料备注"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer">
<el-button type="primary" @click="submitForm">确定</el-button>
<el-button type="default" @click="showFlag = false">取消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import ItemBomSelect from "@/components/itemBomSelect/single.vue";
import ItemSelect from "@/components/itemSelect/single.vue";
export default {
components: { ItemBomSelect, ItemSelect },
inject: ["mode"],
data() {
return {
/**弹窗状态 */
showFlag: false,
/**表格数据 */
tableData: [],
/**表单规则 */
rules: {},
/**多选 */
selection: [],
optType: "add",
/**表单初始化数据 */
form: {
quantity: "",
itemName: "",
itemId: "",
unitOfMeasure: "",
scrapPercentage: "",
alternativeGroup: "",
alternativePriorities: "",
alternativeStrategy: "",
alternativeProbability: "",
bomItemRemark: "",
itemRemark: "",
},
currentRowIdx: undefined,
};
},
created() {},
methods: {
/**多选 */
handleSelectionChange(val) {
this.selection = val;
},
/**删除操作 */
handleDelete() {},
/**添加操作 */
handleAdd() {
this.resetForm();
this.showFlag = true;
this.optType = "add";
},
/**更新行 */
updateRow(row, idx) {
Object.assign(this.form, row);
this.currentRowIdx = idx;
this.optType = "edit";
this.showFlag = true;
},
/**删除行 */
deleteRow(index) {
this.tableData.splice(index, 1);
},
onItemBomSelect(row) {
// if (row != undefined && row != null) {
// this.tableData.unshift({...row})
// }
},
onItemSelect(row) {
if (row != undefined && row != null) {
this.form.itemId = row.itemId;
this.form.itemName = row.itemName;
this.form.unitOfMeasure = row.unitOfMeasure;
this.form.itemRemark = row.remark;
}
},
/**表单提交 */
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.optType == "add") {
this.tableData.unshift({ ...this.form });
} else {
this.tableData.splice(this.currentRowIdx, 1, this.form);
}
this.showFlag = false;
}
});
},
/**重置表单 */
resetForm() {
this.form = {
itemName: "",
itemId: "",
quantity: "",
unitOfMeasure: "",
scrapPercentage: "",
alternativeGroup: "",
alternativePriorities: "",
alternativeStrategy: "",
alternativeProbability: "",
bomItemRemark: "",
itemRemark: "",
};
},
/**重置组件状态 */
resetState() {
this.resetForm();
this.tableData = [];
},
/**获取组件数据 */
getComData() {
return this.tableData;
},
},
};
</script>
<style></style>
src/views/mes/pro/productionSolution/components/ProogingProcess.vue 0 → 100644
View file @ a04bcf3d
<template>
<div>
<el-table :data="tableData">
<el-table-column label="工序名称" prop="processName" align="center" />
<el-table-column label="工序编码" prop="processCode" align="center" />
<el-table-column
label="与下一道工序关系"
prop="linkType"
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
v-if="mode != 'info'"
label="操作"
align="center"
width="150"
>
<template slot-scope="{ row, $index }">
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="openSetProd(row, $index)"
>
设置物料
</el-button>
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="updateRow(row, $index)"
>修改</el-button
>
</template>
</el-table-column>
</el-table>
<ProcessProd
:process="currentRow"
:bomList="bomList"
ref="ProcessProdRef"
@updateItem="updateItem"
/>
<el-dialog
v-dialogDrag
:visible.sync="showFlag"
width="800px"
title="工序修改"
>
<el-form
ref="form"
:model="form"
:rules="rules"
inline
label-width="100px"
size="small"
>
<el-row>
<el-col :span="12">
<el-form-item label="工作站" prop="workstationId">
<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="标准工时" prop="stdWorkingTime">
<el-input
type="number"
v-model="form.stdWorkingTime"
placeholder="请输入标准工时"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer">
<el-button type="primary" @click="submitForm">确定</el-button>
<el-button type="default" @click="showFlag = false">取消</el-button>
</div>
</el-dialog>
</div>
</template>
<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, WorkstationSelect },
inject: ["mode"],
props: {
bomList: {
type: Array,
default: () => [],
},
},
data() {
return {
/**弹窗状态 */
showFlag: false,
/**表格数据 */
tableData: [],
/**表单规则 */
rules: {},
/**表单初始化数据 */
form: {
stdWorkingTime: "",
workstationId: "",
workstationName: "",
},
currentRow: {},
currentRowIndex: undefined,
};
},
methods: {
setList(rows) {
this.tableData = rows.map((item) => {
item.processItemList = [];
return item;
});
},
/** 更新工序的物料信息 */
updateItem(items) {
this.tableData[this.currentRowIndex].processItemList = items;
},
openSetProd(row, idx) {
this.currentRow = row;
this.currentRowIndex = idx;
this.$refs["ProcessProdRef"].showProcessProd = true;
},
/**更新行 */
updateRow(row, idx) {
Object.assign(this.form, row);
this.currentRowIndex = idx;
this.showFlag = true;
},
/**表单提交 */
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
this.showFlag = false;
this.tableData.splice(this.currentRowIndex, 1, {
...this.currentRow,
...this.form,
});
}
});
},
getComData() {
return this.tableData;
},
/**重置表单 */
resetForm() {
this.form = {
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>
<style></style>
src/views/mes/pro/productionSolution/proofingApply.vue 0 → 100644
View file @ a04bcf3d
This diff is collapsed.
src/views/mes/pro/productionSolution/proofingInfo.vue 0 → 100644
View file @ a04bcf3d
This diff is collapsed.
src/views/mes/pro/productionSolution/routebominfo.vue 0 → 100644
View file @ a04bcf3d
This diff is collapsed.
src/views/mes/pro/productionSolution/routeprocess.vue 0 → 100644
View file @ a04bcf3d
This diff is collapsed.
src/views/mes/pro/prototypeMake/prototypeMakeApply.vue
View file @ a04bcf3d
...@@ -207,13 +207,13 @@ ...@@ -207,13 +207,13 @@
label="印刷正面颜色" label="印刷正面颜色"
width="120" width="120"
align="center" align="center"
prop="front_color_id" prop="frontColorName"
/> />
<el-table-column <el-table-column
label="印刷反面颜色" label="印刷反面颜色"
width="120" width="120"
align="center" align="center"
prop="opposite_color_id" prop="oppositeColorName"
/> />
<el-table-column <el-table-column
label="分配方式" label="分配方式"
...@@ -437,7 +437,9 @@ export default { ...@@ -437,7 +437,9 @@ export default {
printingPaperlenth: null, printingPaperlenth: null,
printPaperwidth: null, printPaperwidth: null,
frontColorId: null, frontColorId: null,
frontColorName: null,
oppositeColorId: null, oppositeColorId: null,
oppositeColorName: null,
ngReason: null, ngReason: null,
remark: null, remark: null,
prototypeMakeStatus: null, prototypeMakeStatus: null,
......
src/views/mes/pro/prototypeMake/prototypeMakeInfo.vue
View file @ a04bcf3d
...@@ -443,6 +443,7 @@ export default { ...@@ -443,6 +443,7 @@ export default {
.then(({ data }) => { .then(({ data }) => {
Object.assign(this.form, data); Object.assign(this.form, data);
this.bomList = data.bomList; this.bomList = data.bomList;
this.itemId = data.itemId;
// 设置组件数据 // 设置组件数据
this.$refs["ProogingBomRef"].tableData = data.bomList; this.$refs["ProogingBomRef"].tableData = data.bomList;
this.$refs["ProogingProcessRef"].tableData = data.processList; this.$refs["ProogingProcessRef"].tableData = data.processList;
...@@ -459,7 +460,13 @@ export default { ...@@ -459,7 +460,13 @@ export default {
this.bomList = data.bomList; this.bomList = data.bomList;
// 设置组件数据 // 设置组件数据
this.$refs["ProogingBomRef"].tableData = data.bomList; this.$refs["ProogingBomRef"].tableData = data.bomList;
this.$refs["ProogingProcess"].tableData = data.processList; this.$refs["ProogingProcessRef"].tableData = data.processList;
this.prototypeRequestId = data.prototypeRequestId;
getPrototypeRequest(id).then(({ data }) => {
Object.assign(this.form, data);
// this.bomList = data.bomList;
// this.itemId = data.itemId;
});
}) })
.finally(() => { .finally(() => {
this.loading = false; this.loading = false;
...@@ -584,11 +591,11 @@ export default { ...@@ -584,11 +591,11 @@ export default {
//this.form.itemId = element.itemId; //this.form.itemId = element.itemId;
this.form.frontColorId = element.colorId; this.form.frontColorId = element.colorId;
this.form.frontColorName = element.colorName; this.form.frontColorName = element.colorName;
this.form.face = "front"; // this.form.face = "front";
var retFlag = false; // var retFlag = false;
const idx = this.faceColorList.findIndex( // const idx = this.faceColorList.findIndex(
(itm) => itm.colorId == element.colorId // (itm) => itm.colorId == element.colorId
); // );
}); });
} }
}, },
...@@ -599,11 +606,11 @@ export default { ...@@ -599,11 +606,11 @@ export default {
//this.form.itemId = element.itemId; //this.form.itemId = element.itemId;
this.form.oppositeColorId = element.colorId; this.form.oppositeColorId = element.colorId;
this.form.oppositeColorName = element.colorName; this.form.oppositeColorName = element.colorName;
this.form.face = "front"; // this.form.face = "front";
var retFlag = false; // var retFlag = false;
const idx = this.faceColorList.findIndex( // const idx = this.faceColorList.findIndex(
(itm) => itm.colorId == element.colorId // (itm) => itm.colorId == element.colorId
); // );
}); });
} }
}, },
......
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