Skip to content

M
mes-ui
Commit 14d689f6 authored by 赵汉亭's avatar 赵汉亭
Browse files
Options

打样修改

parent 5cb62ca5
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 192 deletions
src/views/mes/pro/proroute/index.vue
View file @ 14d689f6
......@@ -253,13 +253,13 @@
:routeId="form.routeId"
></Routeprocess>
</el-tab-pane>
<el-tab-pane label="关联产品">
<!-- <el-tab-pane label="关联产品">
<Routeproduct
v-if="form.routeId != null"
:optType="optType"
:routeId="form.routeId"
></Routeproduct>
</el-tab-pane>
</el-tab-pane> -->
</el-tabs>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType == 'view'"
......
src/views/mes/pro/prototypeMake/prototypeMakeApply.vue
View file @ 14d689f6
......@@ -105,7 +105,7 @@
row-key="prototypeMakeId"
default-expand-all
>
<el-table-column label="样品编码" width="180" prop="prototypeMakeCode">
<el-table-column label="制作单编码" width="180" prop="prototypeMakeCode">
<template slot-scope="scope">
<el-button
size="mini"
......@@ -125,108 +125,6 @@
/>
<el-table-column label="工艺路线名称" align="center" prop="routeName">
</el-table-column>
<el-table-column label="简称" align="center" prop="abbreviation">
</el-table-column>
<el-table-column
label="样品英文名称"
width="140"
align="center"
prop="enName"
/>
<el-table-column
label="网版目数"
width="120"
align="center"
prop="screenItem"
/>
<el-table-column
label="啤版目数"
width="200"
align="center"
prop="pibanItem"
:show-overflow-tooltip="true"
/>
<el-table-column
label="模切版目数"
width="120"
align="center"
prop="diecuttingItem"
/>
<el-table-column
label="标准色号"
width="120"
align="center"
prop="standardColor"
/>
<el-table-column
label="NG原因"
width="120"
align="center"
prop="ngReason"
/>
<el-table-column label="模数" width="120" align="center" prop="module" />
<el-table-column label="列" width="120" align="center" prop="colNum" />
<el-table-column label="行" width="120" align="center" prop="rowNum" />
<el-table-column
label="搭板数"
width="120"
align="center"
prop="buttstrapNum"
/>
<el-table-column
label="列双刀位"
width="120"
align="center"
prop="coldoubleCutspacing"
/>
<el-table-column
label="行双刀位"
width="120"
align="center"
prop="rowdoubleCutspacing"
/>
<el-table-column
label="派工倍数"
width="120"
align="center"
prop="sendworkMultiple"
/>
<el-table-column
label="印张长度"
width="120"
align="center"
prop="printingPaperlenth"
/>
<el-table-column
label="印张宽度"
width="120"
align="center"
prop="printPaperwidth"
/>
<el-table-column
label="印刷正面颜色"
width="120"
align="center"
prop="frontColorName"
/>
<el-table-column
label="印刷反面颜色"
width="120"
align="center"
prop="oppositeColorName"
/>
<el-table-column
label="分配方式"
align="center"
prop="modality"
:show-overflow-tooltip="true"
/>
<el-table-column
label="表面处理"
align="center"
prop="surfaceTreatment"
/>
<el-table-column label="NG原因" align="center" prop="ngReason" />
<el-table-column
label="计划完成日期"
align="center"
......@@ -251,7 +149,6 @@
}}</span>
</template>
</el-table-column>
<el-table-column label="测试标准" align="center" prop="testStandard" />
<el-table-column label="状态" align="center" prop="prototypeMakeStatus">
<template slot-scope="scope">
<dict-tag
......@@ -260,7 +157,6 @@
/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column
label="操作"
width="200px"
......@@ -333,11 +229,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "PrototypeMake",
dicts: [
"mes_pm_status",
"mes_prototypeMake_sourcetype",
"mes_prototypeMake_type",
],
dicts: ["mes_pm_status", "mes_prototypeMake_type"],
components: {
Treeselect,
ItemSelect,
......
src/views/mes/proofing/components/ProogingBom.vue
View file @ 14d689f6
......@@ -24,12 +24,12 @@
</el-row>
<el-table :data="tableData" @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="物料名称"
align="center"
prop="itemName"
width="120"
width="500"
/>
<el-table-column
label="组件数量"
......@@ -43,48 +43,12 @@
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="操作"
......
src/views/mes/proofing/proofingApply.vue
View file @ 14d689f6
......@@ -133,41 +133,13 @@
</el-table-column>
<el-table-column
label="产品名称"
width="120"
align="center"
prop="itemName"
:show-overflow-tooltip="true"
/>
<el-table-column label="工艺路线名称" align="center" prop="routeName">
</el-table-column>
<el-table-column label="简称" align="center" prop="abbreviation">
</el-table-column>
<el-table-column
label="样品英文名称"
width="140"
align="center"
prop="enName"
/>
<el-table-column label="样品数量" width="120" align="center" prop="num" />
<el-table-column
label="打样形式"
width="200"
align="center"
prop="type"
:show-overflow-tooltip="true"
/>
<el-table-column
label="分配方式"
align="center"
prop="modality"
:show-overflow-tooltip="true"
/>
<el-table-column
label="表面处理"
align="center"
prop="surfaceTreatment"
/>
<el-table-column label="NG原因" align="center" prop="ngReason" />
<el-table-column
label="计划完成日期"
align="center"
......@@ -204,8 +176,6 @@
/>
</template>
</el-table-column>
<el-table-column label="测试标准" align="center" prop="testStandard" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column
label="操作"
width="200px"
......@@ -280,7 +250,6 @@ export default {
name: "PrototypeRequest",
dicts: [
"mes_pr_status",
"mes_prototypeRequest_sourcetype",
"mes_prototypeRequest_type",
],
components: {
......@@ -491,15 +460,14 @@ export default {
.catch(() => {});
},
// 生成制作单
generatea(row) {
// 跳转到制作单界面
const prototypeRequestId = row.prototypeRequestId || this.ids;
this.$router.push(
"/mes/pro/prototypeMake/apply?prototypeRequestId=" + prototypeRequestId
);
return;
},
generatea(row) {
// 跳转到制作单界面
const prototypeRequestId = row.prototypeRequestId || this.ids;
this.$router.push(
"/mes/pro/prototypeMake/apply?prototypeRequestId=" + prototypeRequestId
);
return;
},
},
};
</script>
src/views/mes/proofing/routebominfo.vue
View file @ 14d689f6
......@@ -61,7 +61,7 @@
<el-table v-loading="loading" :data="routeprocessList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="物料编码" align="center" fixed prop="orderNum" />
<el-table-column label="物料名称" width="150px" fixed align="center" prop="processName" />
<el-table-column label="物料名称" width="500px" fixed align="center" prop="processName" />
<el-table-column label="下一道工序" width="150px" align="center" prop="nextProcessName" />
<el-table-column label="与下一道工序关系" width="150px" align="center" prop="linkType">
<template slot-scope="scope">
......
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