Skip to content

M
mes-ui
Commit 1fde66f1 authored by 沈翠玲's avatar 沈翠玲
Browse files
Options

删除不想要的字段

parent 0c23d252
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1175 deletions
src/views/mes/pro/feedback/index.vue
View file @ 1fde66f1
...@@ -70,8 +70,6 @@ ...@@ -70,8 +70,6 @@
<el-table-column label="产品物料编码" width="120" align="center" prop="sapItemCode" /> <el-table-column label="产品物料编码" width="120" align="center" prop="sapItemCode" />
<el-table-column label="产品物料名称" min-width="250" show-overflow-tooltip align="center" prop="itemName" /> <el-table-column label="产品物料名称" min-width="250" show-overflow-tooltip align="center" prop="itemName" />
<el-table-column label="规格型号" width="100" align="center" prop="specification" /> <el-table-column label="规格型号" width="100" align="center" prop="specification" />
<el-table-column label="指令号" width="120" align="center" prop="clientCmd" />
<el-table-column label="标准SIZE" width="120" align="center" prop="standardSize" />
<el-table-column label="报工数量" align="center" prop="feedbackTime" width="180"> <el-table-column label="报工数量" align="center" prop="feedbackTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ getSumNumber(scope.row) }}</span> <span>{{ getSumNumber(scope.row) }}</span>
...@@ -85,7 +83,6 @@ ...@@ -85,7 +83,6 @@
<span>{{ parseTime(scope.row.feedbackTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.feedbackTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核人" width="100" align="center" prop="recordNick" />
<el-table-column label="操作" align="center" fixed="right" width="160px" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" fixed="right" width="160px" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-query" @click="handleView(scope.row)" <el-button size="mini" type="text" icon="el-icon-query" @click="handleView(scope.row)"
...@@ -203,8 +200,6 @@ ...@@ -203,8 +200,6 @@
<el-input-number :min="0" v-model="form.machineTime" placeholder="请输入加工工时" /> <el-input-number :min="0" v-model="form.machineTime" placeholder="请输入加工工时" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="报工人" prop="nickName"> <el-form-item label="报工人" prop="nickName">
<el-input v-model="form.nickName" placeholder="请选择报工人"> <el-input v-model="form.nickName" placeholder="请选择报工人">
...@@ -220,14 +215,6 @@ ...@@ -220,14 +215,6 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item label="审核人" prop="recordNick">
<el-input v-model="form.recordNick" placeholder="请选择审核人">
<el-button slot="append" @click="handleUser2Select" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
<UserSingleSelect ref="user2Select" @onSelected="onUser2Selected"></UserSingleSelect>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
...@@ -650,16 +637,7 @@ export default { ...@@ -650,16 +637,7 @@ export default {
onUserSelected(row) { onUserSelected(row) {
this.form.nickName = row.nickName; this.form.nickName = row.nickName;
this.form.userName = row.userName; this.form.userName = row.userName;
}, }
//点击人员选择按钮
handleUser2Select() {
this.$refs.user2Select.showFlag = true;
},
//人员选择返回
onUser2Selected(row) {
this.form.recordUser = row.userName;
this.form.recordNick = row.nickName;
},
} }
}; };
</script> </script>
src/views/mes/pro/productionSolution/components/ProogingProcess.vue
View file @ 1fde66f1
...@@ -25,9 +25,7 @@ ...@@ -25,9 +25,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="基本数量" prop="quantity" align="center" /> <el-table-column label="基本数量" prop="quantity" align="center" />
<el-table-column label="固化时间" prop="solidifyTime" align="center" />
<el-table-column label="计量单位" prop="unitOfMeasure" align="center" /> <el-table-column label="计量单位" prop="unitOfMeasure" align="center" />
<el-table-column label="雇员数量" prop="employeesNum" align="center" />
<el-table-column label="关键工序" prop="keyFlag" align="center"> <el-table-column label="关键工序" prop="keyFlag" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
...@@ -44,95 +42,6 @@ ...@@ -44,95 +42,6 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="封切机开边" prop="sacmForEdgeOpening" align="center">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.sacmForEdgeOpening"
/>
</template>
</el-table-column>
<el-table-column label="封切机粘贴复合" prop="sacmForPasteComposite" align="center">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.sacmForPasteComposite"
/>
</template>
</el-table-column>
<el-table-column label="封切机热复合" prop="sacmForThermalComposite" align="center">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.sacmForThermalComposite"
/>
</template>
</el-table-column>
<el-table-column label="封切机贴标" prop="sacmForLabeling" align="center">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.sacmForLabeling"
/>
</template>
</el-table-column>
<el-table-column label="封切机装扣" prop="sacmForBuckleUp" align="center">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.sacmForBuckleUp"
/>
</template>
</el-table-column>
<el-table-column label="封切机压痕" prop="sacmForCreasing" align="center">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.sacmForCreasing"
/>
</template>
</el-table-column>
<el-table-column label="封切机风琴" prop="sacmForOrgan" align="center">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.sacmForOrgan"
/>
</template>
</el-table-column>
<el-table-column label="封切机热切" prop="sacmForThermalCutting" align="center">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.sacmForThermalCutting"
/>
</template>
</el-table-column>
<el-table-column label="封切机热自合" prop="sacmForThermalSelfFusion" align="center">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.sacmForThermalSelfFusion"
/>
</template>
</el-table-column>
<el-table-column label="封切机压齿" prop="sacmForMolarTooth" align="center">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.sacmForMolarTooth"
/>
</template>
</el-table-column>
<el-table-column label="封切机分切" prop="sacmForSlitting" align="center">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.sacmForSlitting"
/>
</template>
</el-table-column>
<el-table-column label="工序备注" prop="processRemark" align="center" />
<el-table-column <el-table-column
v-if="mode != 'info'" v-if="mode != 'info'"
label="操作" label="操作"
...@@ -291,13 +200,6 @@ ...@@ -291,13 +200,6 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="固化时间" label-width="120px" prop="solidifyTime">
<el-input v-model="form.solidifyTime" placeholder="请输入固化时间">
<i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">MIN</i>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="单位转换比例" prop="unitConvert"> <el-form-item label="单位转换比例" prop="unitConvert">
...@@ -308,15 +210,6 @@ ...@@ -308,15 +210,6 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="雇员数量" prop="employeesNum">
<el-input
type="number"
v-model="form.employeesNum"
placeholder="请输入雇员数量"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="加工方式" prop="processingMethod"> <el-form-item label="加工方式" prop="processingMethod">
<el-select <el-select
...@@ -405,72 +298,6 @@ ...@@ -405,72 +298,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-form-item>
<el-checkbox
v-model="form.sacmForEdgeOpening"
true-label="Y"
false-label="N"
>开边</el-checkbox>
<el-checkbox
v-model="form.sacmForPasteComposite"
true-label="Y"
false-label="N"
>粘贴符合</el-checkbox>
<el-checkbox
v-model="form.sacmForThermalComposite"
true-label="Y"
false-label="N"
>热复合</el-checkbox>
<el-checkbox
v-model="form.sacmForLabeling"
true-label="Y"
false-label="N"
>粘标</el-checkbox>
<el-checkbox
v-model="form.sacmForBuckleUp"
true-label="Y"
false-label="N"
>装扣</el-checkbox>
<el-checkbox
v-model="form.sacmForCreasing"
true-label="Y"
false-label="N"
>压痕</el-checkbox>
<el-checkbox
v-model="form.sacmForOrgan"
true-label="Y"
false-label="N"
>风琴</el-checkbox>
<el-checkbox
v-model="form.sacmForThermalCutting"
true-label="Y"
false-label="N"
>热切</el-checkbox>
<el-checkbox
v-model="form.sacmForThermalSelfFusion"
true-label="Y"
false-label="N"
>热自合</el-checkbox>
<el-checkbox
v-model="form.sacmForMolarTooth"
true-label="Y"
false-label="N"
>压齿</el-checkbox>
<el-checkbox
v-model="form.sacmForSlitting"
true-label="Y"
false-label="N"
>分切</el-checkbox>
</el-form-item>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
v-model="form.remark"
placeholder="请输入工序备注"
></el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer"> <div slot="footer">
......
src/views/mes/pro/productionSolution/components/ProogingSpecificationSheet.vue deleted 100644 → 0
View file @ 0c23d252
<template>
<div>
<el-form
class="page-form"
:model="form"
ref="form"
size="small"
:inline="true"
label-width="8em"
>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="规格书类型" prop="specificationSheetType">
<el-select
v-model="form.specificationSheetType"
placeholder="请选择分配方式"
>
<el-option
v-for="dict in dict.type.specification_sheet_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
<!-- <el-radio-group v-model="form.specificationSheetType">
<el-radio
v-for="dict in dict.type.specification_sheet_type"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group> -->
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="品牌" prop="brandName">
<el-input v-model="form.brandName" placeholder />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="英文名称" prop="enName">
<el-input v-model="form.enName" placeholder> </el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="单位" prop="unitOfMeasure"
><el-input v-model="form.unitOfMeasure" placeholder> </el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="采购单位" prop="purchaseUnit"
><el-input v-model="form.purchaseUnit" placeholder> </el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="换算值" prop="conversionValue"
><el-input v-model="form.conversionValue" placeholder> </el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="单层厚(丝)" prop="singleLayerThick"
><el-input
v-model="form.singleLayerThick"
placeholder
type="number"
:precision="2"
>
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="单重(KG)" prop="singleWeight"
><el-input
v-model="form.singleWeight"
placeholder
type="number"
:precision="2"
>
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="层数" prop="layerNum"
><el-input
v-model="form.layerNum"
placeholder
type="number"
:precision="2"
>
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="长度cm" prop="length"
><el-input
v-model="form.length"
placeholder
type="number"
:precision="2"
>
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="高度cm" prop="height"
><el-input
v-model="form.height"
placeholder
type="number"
:precision="2"
>
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="宽度cm" prop="width"
><el-input
v-model="form.width"
placeholder
type="number"
:precision="2"
>
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="印张长度" prop="printingPaperlenth"
><el-input
v-model="form.printingPaperlenth"
placeholder
type="number"
:precision="2"
>
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="印张宽度" prop="printPaperwidth"
><el-input
v-model="form.printPaperwidth"
placeholder
type="number"
:precision="2"
>
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="派工倍数" prop="sendworkMultiple"
><el-input
v-model="form.sendworkMultiple"
placeholder
type="number"
:precision="2"
>
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="印刷正面颜色" prop="frontColorName"
><el-input v-model="form.frontColorName" placeholder> </el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="印刷背面颜色" prop="oppositeColorName">
<el-input v-model="form.oppositeColorName" placeholder> </el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="仓库" prop="storePlace">
<el-input v-model="form.storePlace" placeholder> </el-input>
</el-form-item>
</el-col>
<!-- <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="是否附样品" prop="isAddSimple">
<el-select
v-model="form.isAddSimple"
placeholder="请选择是否附样品"
>
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
<el-radio-group v-model="form.isAddSimple">
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col> -->
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="是否唯一码产品" prop="isUniqueCode">
<el-radio-group v-model="form.isUniqueCode">
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="不考虑型体配色" prop="isConsiderColor">
<!-- <el-select
v-model="form.isConsiderColor"
placeholder="请选择是否不考虑型体配色"
>
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select> -->
<el-radio-group v-model="form.isConsiderColor">
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12">
<el-form-item label="实物样/参考样" prop="isAddSimple">
<el-select v-model="form.isAddSimple" disabled>
<el-option label="无" value="无"></el-option>
<el-option label="实物样" value="实物样"></el-option>
<el-option label="参考样" value="参考样"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12">
<el-form-item label="AI/PDF文档" prop="aiOrPdfDocuments">
<el-select v-model="form.aiOrPdfDocuments" disabled>
<el-option label="无" value="无"></el-option>
<el-option label="AI文档" value="AI文档"></el-option>
<el-option label="PDF文档" value="PDF文档"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="配方" prop="formula"
><el-input v-model="form.formula" placeholder> </el-input>
</el-form-item>
</el-col>
<!-- <el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="产品材质" prop="productMaterial"
><el-input v-model="form.productMaterial" placeholder> </el-input>
</el-form-item>
</el-col> -->
<!-- <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="打样形式" prop="type">
<el-select v-model="form.type" placeholder="请选择打样形式">
<el-option
v-for="dict in dict.type.pro_proof_form"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="分配方式" prop="modality">
<el-select v-model="form.modality" placeholder="请选择分配方式">
<el-option
v-for="dict in dict.type.pro_distribution_profing"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="表面处理" prop="surfaceTreatment"
><el-input
v-model="form.surfaceTreatment"
placeholder="请输入表面处理"
></el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="测试标准" prop="testStandard"
><el-input v-model="form.testStandard" placeholder> </el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="网版目数" prop="screenItem"
><el-input v-model="form.screenItem" placeholder type="number">
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="啤版目数" prop="pibanItem"
><el-input v-model="form.pibanItem" placeholder type="number">
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="模切版目数" prop="diecuttingItem"
><el-input v-model="form.diecuttingItem" placeholder type="number">
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="标准色号" prop="standardColor"
><el-input v-model="form.standardColor" placeholder> </el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="模数" prop="module"
><el-input v-model="form.module" placeholder type="number">
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="列" prop="colNum"
><el-input v-model="form.colNum" placeholder type="number">
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="行" prop="rowNum"
><el-input v-model="form.rowNum" placeholder type="number">
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="搭板数" prop="buttstrapNum"
><el-input
v-model="form.buttstrapNum"
placeholder
type="number"
:precision="2"
>
</el-input>
</el-form-item>
</el-col> -->
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="列双刀位" prop="coldoubleCutspacing"
><el-input
v-model="form.coldoubleCutspacing"
placeholder
type="number"
:precision="2"
>
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="行双刀位" prop="rowdoubleCutspacing"
><el-input
v-model="form.rowdoubleCutspacing"
placeholder
type="number"
:precision="2"
>
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="排版行数" prop="rowNum"
><el-input
v-model="form.rowNum"
placeholder
type="number"
:precision="2"
>
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="角型" prop="shape">
<el-select v-model="form.shape" placeholder="请选择样品形状">
<el-option
v-for="dict in dict.type.product_shape"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="角度(mm)" prop="angle">
<el-input
v-model="form.angle"
placeholder
type="number"
:precision="2"
>
</el-input>
</el-form-item>
</el-col>
<!-- <el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="孔径(mm)" prop="aperture"
><el-input
v-model="form.aperture"
placeholder
type="number"
:precision="2"
>
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="厚度mm" prop="thick"
><el-input
v-model="form.thick"
placeholder
type="number"
:precision="2"
>
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="是否防霉" prop="isMould">
<el-select v-model="form.isMould" placeholder="请选择是否防霉">
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
<el-radio-group v-model="form.isMould">
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="是否写码" prop="isCoding">
<el-select v-model="form.isCoding" placeholder="请选择是否写码">
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
<el-radio-group v-model="form.isCoding">
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="体系认证" prop="certification"
><el-input v-model="form.certification" placeholder> </el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="样品形状" prop="shape">
<el-select v-model="form.shape" placeholder="请选择样品形状">
<el-option
v-for="dict in dict.type.product_shape"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="样品形状大小" prop="shapeSize">
<el-input
v-model="form.shapeSize"
placeholder
type="number"
:precision="2"
></el-input>
</el-form-item>
</el-col> -->
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="吹膜宽度" prop="blownFilmWidth"
><el-input
v-model="form.blownFilmWidth"
placeholder
type="number"
:precision="2"
>
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="吹膜厚度" prop="blownFilmThickness"
><el-input
v-model="form.blownFilmThickness"
placeholder
type="number"
:precision="2"
>
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="印刷宽度" prop="printingWidth">
<el-input
v-model="form.printingWidth"
placeholder
type="number"
:precision="2"
></el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="Inlay" prop="inlay">
<el-input v-model="form.inlay" placeholder />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="产品材质" prop="productMaterial">
<el-input v-model="form.productMaterial" placeholder />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="凹印_胶版油槽数" prop="dieSunkOffsetOilTankNum">
<el-input v-model="form.dieSunkOffsetOilTankNum" placeholder >
<i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">个</i>
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="印刷方式" prop="printingMethod">
<el-input v-model="form.printingMethod" placeholder />
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-col :span="23">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
:rows="3"
v-model="form.remark"
placeholder
></el-input>
</el-form-item>
</el-col>
</el-row> -->
<el-row>
<el-col :md="8" :xs="12">
<el-form-item label="产品正面" prop="frontImg">
<ImageUpload
:limit="1"
:value="form.frontImg"
fieldName="frontImg"
:fileSize="5"
@onUploaded="handleImgUploaded"
@onRemoved="handleImgRemoved"
></ImageUpload>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="产品背面" prop="backImg">
<ImageUpload
:limit="1"
:value="form.backImg"
fieldName="backImg"
:fileSize="5"
@onUploaded="handleImgUploaded"
@onRemoved="handleImgRemoved"
></ImageUpload>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="客户确认人" prop="customerConfirmedBy">
<el-input v-model="form.customerConfirmedBy" placeholder></el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="客户确认日期" prop="customerConfirmedDate">
<el-input
v-model="form.customerConfirmedDate"
placeholder
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="研发核准人" prop="rdApprovedBy">
<el-input v-model="form.rdApprovedBy" placeholder></el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="研发审核人" prop="rdReviewedBy">
<el-input v-model="form.rdReviewedBy" placeholder></el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="研发制定人" prop="rdPreparedBy">
<el-input v-model="form.rdPreparedBy" placeholder></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</template>
<script>
// import ItemBomSelect from "@/components/itemBomSelect/single.vue";
// import ProcessProd from "./ProcessProd.vue";
// import ProcessQcindex from "./ProcessQcindex.vue";
// import ProcessTool from "./ProcessTool.vue";
// import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue";
export default {
// components: {
// ItemBomSelect,
// ProcessProd,
// ProcessQcindex,
// ProcessTool,
// WorkstationSelect,
// },
inject: ["mode"],
dicts: [
"sys_yes_no",
"specification_sheet_type",
"product_shape",
"pro_proof_form",
"pro_distribution_profing",
],
props: {
bomList: {
type: Array,
default: () => [],
},
},
data() {
return {
/**弹窗状态 */
showFlag: false,
/**表格数据 */
tableData: [],
/**表单规则 */
rules: {},
/**表单初始化数据 */
form: {
specificationSheetId: "",
productionSolutionId: "",
specificationSheetType: "",
brandName: "",
enName: "",
unitOfMeasure: "",
conversionValue: "",
singleLayerThick: "",
singleWeight: "",
layerNum: "",
width: "",
height: "",
printingPaperlenth: "",
printPaperwidth: "",
sendworkMultiple: "",
frontColorName: "",
oppositeColorName: "",
length: "",
storePlace: "",
isAddSimple: "",
isUniqueCode: "",
isConsiderColor: "",
formula: "",
productMaterial: "",
coldoubleCutspacing: "",
rowdoubleCutspacing: "",
isFillet: "",
isAllotype: "",
isRightAngle: "",
angle: "",
frontImg: "",
backImg: "",
blownFilmWidth: "",
blownFilmThickness: "",
printingWidth: "",
inlay: "",
customerConfirmedBy: "",
customerConfirmedDate: "",
rdApprovedBy: "",
rdReviewedBy: "",
rdPreparedBy: "",
purchaseUnit: "",
rowNum: "",
isCreateSpec: "",
isNeedShoeImg: "",
dieSunkOffsetOilTankNum: "",
printingMethod: "",
},
currentRow: {},
currentRowIndex: undefined,
};
},
methods: {
/**更新行 */
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.form.splice(this.currentRowIndex, 1, {
...this.currentRow,
...this.form,
});
}
});
},
getComData() {
return this.form;
},
/**重置表单 */
resetForm() {
this.form = {
specificationSheetId: "",
productionSolutionId: "",
specificationSheetType: "",
brandName: "",
enName: "",
unitOfMeasure: "",
conversionValue: "",
singleLayerThick: "",
singleWeight: "",
layerNum: "",
width: "",
height: "",
printingPaperlenth: "",
printPaperwidth: "",
sendworkMultiple: "",
frontColorName: "",
oppositeColorName: "",
length: "",
storePlace: "",
isAddSimple: "",
isUniqueCode: "",
isConsiderColor: "",
formula: "",
productMaterial: "",
coldoubleCutspacing: "",
rowdoubleCutspacing: "",
isFillet: "",
isAllotype: "",
isRightAngle: "",
angle: "",
frontImg: "",
backImg: "",
blownFilmWidth: "",
blownFilmThickness: "",
printingWidth: "",
inlay: "",
customerConfirmedBy: "",
customerConfirmedDate: "",
rdApprovedBy: "",
rdReviewedBy: "",
rdPreparedBy: "",
purchaseUnit: "",
rowNum: "",
isCreateSpec: "",
isNeedShoeImg: "",
dieSunkOffsetOilTankNum: "",
printingMethod: "",
};
},
/**重置组件状态 */
resetState() {
this.resetForm();
},
/**查看行 */
searchRow(row, idx) {
this.form = Object.assign(this.form, row);
this.currentRowIdx = idx;
this.optType = "detail";
this.showFlag = true;
},
//图片上传成功
handleImgUploaded(imgUrl, obj) {
this.form[obj.$attrs.fieldName] = imgUrl;
},
//图片移除
handleImgRemoved(imgUrl, obj) {
this.form[obj.$attrs.fieldName] = null;
},
},
};
</script>
<style></style>
src/views/mes/pro/productionSolution/proofingInfo.vue
View file @ 1fde66f1
...@@ -73,28 +73,6 @@ ...@@ -73,28 +73,6 @@
<el-input v-model="form.itemName" disabled placeholder></el-input> <el-input v-model="form.itemName" disabled placeholder></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="组件号" prop="groupCounter">
<el-input
v-model="form.groupCounter"
disabled
placeholder
></el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="SAP生产用途" prop="sapUsageId">
<el-select v-model="form.sapUsageId" placeholder="请选择SAP用途">
<el-option
v-for="dict in dict.type.production_solution_usage"
:key="dict.value"
:label="dict.label"
:value="dict.value"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="有效起始日期" prop="startDate"> <el-form-item label="有效起始日期" prop="startDate">
<el-date-picker <el-date-picker
...@@ -119,24 +97,6 @@ ...@@ -119,24 +97,6 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="最小批量" prop="minLot">
<el-input-number
:min="1"
v-model="form.minLot"
placeholder="请输入最小批量"
/>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="最大批量" prop="maxLot">
<el-input-number
:min="1"
v-model="form.maxLot"
placeholder="请输入最大批量"
/>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="单位" prop="unitOfMeasure"> <el-form-item label="单位" prop="unitOfMeasure">
<el-input <el-input
...@@ -168,12 +128,6 @@ ...@@ -168,12 +128,6 @@
<el-tab-pane label="工艺"> <el-tab-pane label="工艺">
<ProogingProcess ref="ProogingProcessRef" :bomList="bomList" /> <ProogingProcess ref="ProogingProcessRef" :bomList="bomList" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="规格书">
<ProogingSpecificationSheet
ref="ProogingSpecificationSheetRef"
:specificationSheet="specificationSheet"
/>
</el-tab-pane>
</el-tabs> </el-tabs>
</PageWrapper> </PageWrapper>
</div> </div>
...@@ -183,7 +137,6 @@ ...@@ -183,7 +137,6 @@
// import { genCode } from "@/api/system/autocode/rule"; // import { genCode } from "@/api/system/autocode/rule";
import ProogingBom from "./components/ProogingBom.vue"; import ProogingBom from "./components/ProogingBom.vue";
import ProogingProcess from "./components/ProogingProcess.vue"; import ProogingProcess from "./components/ProogingProcess.vue";
import ProogingSpecificationSheet from "./components/ProogingSpecificationSheet.vue";
import ItemSelect from "@/components/itemSelect/single.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
import RoutesProcessSelect from "@/components/routesProcessSelect/index.vue"; import RoutesProcessSelect from "@/components/routesProcessSelect/index.vue";
import { listRouteprocess } from "@/api/mes/pro/routeprocess"; import { listRouteprocess } from "@/api/mes/pro/routeprocess";
...@@ -201,8 +154,7 @@ export default { ...@@ -201,8 +154,7 @@ export default {
ProogingBom, ProogingBom,
ProogingProcess, ProogingProcess,
ItemSelect, ItemSelect,
RoutesProcessSelect, RoutesProcessSelect
ProogingSpecificationSheet,
}, },
dicts: ["production_solution_type", "production_solution_usage"], dicts: ["production_solution_type", "production_solution_usage"],
provide() { provide() {
...@@ -265,6 +217,7 @@ export default { ...@@ -265,6 +217,7 @@ export default {
return titles[this.mode]; return titles[this.mode];
}, },
}, },
created() { created() {
if (this.$route.query && this.$route.query.productionSolutionId && this.productionSolutionId !== this.$route.query.productionSolutionId) { if (this.$route.query && this.$route.query.productionSolutionId && this.productionSolutionId !== this.$route.query.productionSolutionId) {
this.productionSolutionId = this.$route.query.productionSolutionId this.productionSolutionId = this.$route.query.productionSolutionId
...@@ -292,8 +245,6 @@ export default { ...@@ -292,8 +245,6 @@ export default {
this.$refs["ProogingBomRef"].form2 = data.bomHead; this.$refs["ProogingBomRef"].form2 = data.bomHead;
this.$refs["ProogingBomRef"].tableData = data.bomHead.bomItemList; this.$refs["ProogingBomRef"].tableData = data.bomHead.bomItemList;
this.$refs["ProogingProcessRef"].tableData = data.processList; this.$refs["ProogingProcessRef"].tableData = data.processList;
this.$refs["ProogingSpecificationSheetRef"].form =
data.specificationSheet;
}) })
.finally(() => { .finally(() => {
this.loading = false; this.loading = false;
...@@ -332,13 +283,10 @@ export default { ...@@ -332,13 +283,10 @@ export default {
saveForm() { saveForm() {
const bomHead = this.$refs.ProogingBomRef.getComData(); const bomHead = this.$refs.ProogingBomRef.getComData();
const processList = this.$refs.ProogingProcessRef.getComData(); const processList = this.$refs.ProogingProcessRef.getComData();
const specificationSheet =
this.$refs.ProogingSpecificationSheetRef.getComData();
const params = { const params = {
...this.form, ...this.form,
bomHead, bomHead,
processList, processList
specificationSheet,
}; };
this.loading = true; this.loading = true;
if (this.mode == "apply") { if (this.mode == "apply") {
...@@ -398,7 +346,6 @@ export default { ...@@ -398,7 +346,6 @@ export default {
}; };
this.$refs["ProogingBomRef"].resetState(); this.$refs["ProogingBomRef"].resetState();
this.$refs["ProogingProcessRef"].resetState(); this.$refs["ProogingProcessRef"].resetState();
this.$refs["ProogingSpecificationSheetRef"].resetState();
}, },
}, },
}; };
......
src/views/mes/pro/scheduleList/index.vue
View file @ 1fde66f1
...@@ -73,22 +73,6 @@ ...@@ -73,22 +73,6 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="编排单号" prop="arrangeCode">
<el-input
v-model="queryParams.arrangeCode"
placeholder="请输入编排单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="编排人员" prop="arrangeUsername">
<el-input
v-model="queryParams.arrangeUsername"
placeholder="请输入编排人员"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工单编码" prop="workorderCode"> <el-form-item label="工单编码" prop="workorderCode">
<el-input <el-input
v-model="queryParams.workorderCode" v-model="queryParams.workorderCode"
...@@ -157,17 +141,7 @@ ...@@ -157,17 +141,7 @@
<el-table v-loading="loading" :data="maintenanceList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="maintenanceList" @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="编排单号" width="120" prop="arrangeCode"> <el-table-column label="任务单编码" width="120" prop="taskCode">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="taskWorkunitId= scope.row.taskWorkunitId, isOrder = false, arrangCodeVisible = true"
>{{ scope.row.arrangeCode }}</el-button
>
</template>
</el-table-column>
<el-table-column label="任务单编码" width="120" prop="taskCode">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
......
src/views/mes/pro/workorder/indexApply.vue
View file @ 1fde66f1
...@@ -116,54 +116,11 @@ ...@@ -116,54 +116,11 @@
v-hasPermi="['mes:pro:workorder:edit']">导入 v-hasPermi="['mes:pro:workorder:edit']">导入
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-plus" size="mini" :disabled="multiple" @click="handleToolNumCheck"
v-hasPermi="['mes:pro:workorder:dofinish']">刀模版具齐套检查
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-plus" size="mini" :disabled="multiple" @click="handleCombination"
v-hasPermi="['pro:combination:add']">订单组合
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-edit" size="mini" @click="()=>handleCombination('del')"
>取消组合
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-plus" size="mini" :disabled="multiple" @click="handleArrange"
v-hasPermi="['mes:pro:workorder:dofinish']">生产编排
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-edit" size="mini" @click="()=>handleArrange('del')"
>取消编排
</el-button>
</el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleMake" <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleMake"
v-hasPermi="['mes:pro:workorder:make']">生产补单 v-hasPermi="['mes:pro:workorder:make']">生产补单
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5">
<!-- <el-button
type="warning"
plain
icon="el-icon-plus"
size="mini"
:disabled="multiple"
@click="handleDofinish"
v-hasPermi="['mes:pro:workorder:dofinish']"
>生成任务单
</el-button> -->
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-plus" size="mini" :disabled="single" @click="handleCommandClick"
v-hasPermi="['mes:pro:workorder:dofinish']">生产打样下达
</el-button>
</el-col>
<el-col :span="1.2"> <el-col :span="1.2">
<el-button type="warning" plain size="mini" v-print="printContent" id="printbtn" style="display: none" <el-button type="warning" plain size="mini" v-print="printContent" id="printbtn" style="display: none"
>打印工单 >打印工单
...@@ -235,20 +192,6 @@ ...@@ -235,20 +192,6 @@
<dict-tag :options="dict.type.mes_workorder_type" :value="scope.row.workorderType" /> <dict-tag :options="dict.type.mes_workorder_type" :value="scope.row.workorderType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="组合单号" width="180" align="center" prop="combinationCode" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="showCombDetail(scope.row, scope.row.combinationCode)">{{
scope.row.combinationCode }}
</el-button>
</template>
</el-table-column>
<el-table-column label="编排单号" width="100px" align="center" prop="arrangeCode" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="showArrangDetail(scope.row, scope.row.arrangeCode)">{{
scope.row.arrangeCode }}
</el-button>
</template>
</el-table-column>
<el-table-column label="订单编号" width="140" align="center" prop="salesVoucher" /> <el-table-column label="订单编号" width="140" align="center" prop="salesVoucher" />
<el-table-column label="产品分类" width="200" align="center" prop="itemTypeName" :show-overflow-tooltip="true" /> <el-table-column label="产品分类" width="200" align="center" prop="itemTypeName" :show-overflow-tooltip="true" />
<el-table-column label="产品编号" width="120" align="center" prop="sapItemCode" /> <el-table-column label="产品编号" width="120" align="center" prop="sapItemCode" />
......
src/views/mes/pro/workorder/proofingInfo.vue
View file @ 1fde66f1
...@@ -191,31 +191,6 @@ ...@@ -191,31 +191,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="派工倍数" :disabled="mode == 'make'" prop="dispatchMultiple">
<el-input
v-model="form.dispatchMultiple"
:disabled="mode == 'make'"
placeholder="请输入派工倍数"
/>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="排班行数" prop="rowNum">
<el-input v-model="form.rowNum" :disabled="mode == 'make'" placeholder="请输入排版行数" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="单重" prop="singleWeight">
<el-input v-model="form.singleWeight" :disabled="mode == 'make'" placeholder="请输入单重" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="厚度(丝)" prop="thickness">
<el-input v-model="form.thickness" :disabled="mode == 'make'" placeholder="请输入厚度(丝)" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="开始序列码" prop="startSerial"> <el-form-item label="开始序列码" prop="startSerial">
<el-input v-model="form.startSerial" :disabled="mode == 'make'" placeholder="请输入开始序列码" /> <el-input v-model="form.startSerial" :disabled="mode == 'make'" placeholder="请输入开始序列码" />
......
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