fix:销售出库、销售退货、转移调拨、装箱管理、SN码、外协发料、外协入库、工艺流程和检测模板的单位名称问题解决
This commit is contained in:
parent
bcbd1ee603
commit
4d5ea536e7
@ -82,7 +82,7 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="产品物料名称" width="150px" align="center" prop="itemName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
|
||||
<el-table-column label="单位" align="center" prop="unitName" />
|
||||
<el-table-column label="操作" align="center" v-if="optType !='view'" width="100px" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
@ -129,8 +129,8 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="单位" prop="unitOfMeasure">
|
||||
<el-input v-model="form.unitOfMeasure" placeholder="请选择产品" disabled/>
|
||||
<el-form-item label="单位" prop="unitName">
|
||||
<el-input v-model="form.unitName" placeholder="请选择产品" disabled/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -283,6 +283,7 @@ export default {
|
||||
this.form.itemName = obj.itemName;
|
||||
this.form.specification = obj.specification;
|
||||
this.form.unitOfMeasure = obj.unitOfMeasure;
|
||||
this.form.unitName = obj.unitName
|
||||
}
|
||||
},
|
||||
// 取消按钮
|
||||
|
@ -19,7 +19,7 @@
|
||||
<el-table-column label="BOM物料编号" width="120" align="center" prop="itemCode" />
|
||||
<el-table-column label="BOM物料名称" width="200" align="center" prop="itemName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="规格型号" align="center" prop="itemSpc" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
|
||||
<el-table-column label="单位" align="center" prop="unitName" />
|
||||
<el-table-column label="物料/产品" align="center" prop="itemOrProduct" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.mes_item_product" :value="scope.row.itemOrProduct"/>
|
||||
|
@ -42,7 +42,7 @@
|
||||
<el-table-column label="产品物料名称" align="center" width="120px" prop="itemName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="最低检测数" align="center" width="100px" prop="quantityCheck" />
|
||||
<el-table-column label="单位" align="center" width="100px" prop="unitOfMeasure" />
|
||||
<el-table-column label="单位" align="center" width="100px" prop="unitName" />
|
||||
<el-table-column label="最大不合格数" align="center" prop="quantityUnqualified" />
|
||||
<el-table-column label="最大致命缺陷率" align="center" prop="crRate" >
|
||||
<template slot-scope="scope">
|
||||
@ -126,8 +126,8 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="单位" prop="unitOfMeasure">
|
||||
<el-input v-model="form.unitOfMeasure" readonly="readonly" />
|
||||
<el-form-item label="单位" prop="unitName">
|
||||
<el-input v-model="form.unitName" readonly="readonly" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -351,6 +351,7 @@ export default {
|
||||
this.form.itemName = obj.itemName;
|
||||
this.form.specification = obj.specification;
|
||||
this.form.unitOfMeasure = obj.unitOfMeasure;
|
||||
this.form.unitName = obj.unitName
|
||||
}
|
||||
},
|
||||
}
|
||||
|
@ -41,7 +41,7 @@
|
||||
<el-table-column label="产品物料编码" width="120px" align="center" prop="itemCode" />
|
||||
<el-table-column label="产品物料名称" width="120px" align="center" prop="itemName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
|
||||
<el-table-column label="单位" align="center" prop="unitName" />
|
||||
<el-table-column label="领料数量" align="center" prop="quantityIssued" />
|
||||
<el-table-column label="批次号" align="center" prop="batchCode" />
|
||||
<el-table-column label="仓库名称" align="center" prop="warehouseName" />
|
||||
@ -110,8 +110,8 @@
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="单位" prop="unitOfMeasure">
|
||||
<el-input v-model="form.unitOfMeasure" readonly="readonly" />
|
||||
<el-form-item label="单位" prop="unitName">
|
||||
<el-input v-model="form.unitName" readonly="readonly" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
@ -366,6 +366,7 @@ export default {
|
||||
this.form.areaName = obj.areaName;
|
||||
this.form.quantityIssued = obj.quantityOnhand;
|
||||
this.form.quantityMax = obj.quantityOnhand;
|
||||
this.form.unitName = obj.unitName
|
||||
}
|
||||
},
|
||||
}
|
||||
|
@ -41,7 +41,7 @@
|
||||
<el-table-column label="产品物料编码" width="120" align="center" prop="itemCode" />
|
||||
<el-table-column label="产品物料名称" width="150" align="center" prop="itemName" />
|
||||
<el-table-column label="规格型号" align="center" prop="specification" />
|
||||
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
|
||||
<el-table-column label="单位" align="center" prop="unitName" />
|
||||
<el-table-column label="入库数量" align="center" prop="quantityRecived" />
|
||||
<el-table-column label="批次号" width="100" align="center" prop="batchCode" />
|
||||
<el-table-column label="仓库" width="100" align="center" prop="warehouseName" />
|
||||
@ -104,8 +104,8 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="单位" prop="unitOfMeasure">
|
||||
<el-input v-model="form.unitOfMeasure" readonly="readonly" />
|
||||
<el-form-item label="单位" prop="unitName">
|
||||
<el-input v-model="form.unitName" readonly="readonly" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -427,6 +427,7 @@ export default {
|
||||
this.form.itemName = obj.itemName;
|
||||
this.form.specification = obj.specification;
|
||||
this.form.unitOfMeasure = obj.unitOfMeasure;
|
||||
this.form.unitName = obj.unitName
|
||||
}
|
||||
},
|
||||
//IQC检验单选择
|
||||
|
@ -31,7 +31,7 @@
|
||||
<el-table-column label="产品物料编码" width="120px" align="center" prop="itemCode" />
|
||||
<el-table-column label="产品物料名称" width="150px" align="center" prop="itemName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="规格型号" width="150px" align="center" prop="specification" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
|
||||
<el-table-column label="单位" align="center" prop="unitName" />
|
||||
<el-table-column label="装箱数量" align="center" prop="quantityPackage" />
|
||||
<el-table-column label="生产工单编号" width="150px" align="center" prop="workorderCode" />
|
||||
<el-table-column label="批次号" align="center" prop="batchCode" />
|
||||
@ -103,8 +103,8 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="单位" prop="unitOfMeasure">
|
||||
<el-input v-model="form.unitOfMeasure" readonly="readonly" />
|
||||
<el-form-item label="单位" prop="unitName">
|
||||
<el-input v-model="form.unitName" readonly="readonly" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -290,6 +290,7 @@ export default {
|
||||
this.form.itemName = row.productName;
|
||||
this.form.specification = row.specification;
|
||||
this.form.unitOfMeasure = row.unitOfMeasure;
|
||||
this.form.unitName = obj.unitName
|
||||
}
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
|
@ -41,7 +41,7 @@
|
||||
<el-table-column label="产品编码" width="120px" align="center" prop="itemCode" />
|
||||
<el-table-column label="产品名称" width="150px" align="center" prop="itemName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
|
||||
<el-table-column label="单位" align="center" prop="unitName" />
|
||||
<el-table-column label="出库数量" align="center" prop="quantitySalse" />
|
||||
<el-table-column label="批次号" width="120px" align="center" prop="batchCode" />
|
||||
<el-table-column label="仓库名称" align="center" prop="warehouseName" />
|
||||
@ -94,8 +94,8 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="单位" prop="unitOfMeasure">
|
||||
<el-input v-model="form.unitOfMeasure" placeholder="请输入单位" />
|
||||
<el-form-item label="单位" prop="unitName">
|
||||
<el-input v-model="form.unitName" placeholder="请输入单位" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -421,6 +421,7 @@ export default {
|
||||
this.form.areaName = obj.areaName;
|
||||
this.form.quantitySalse = obj.quantityOnhand;
|
||||
this.form.quantityMax = obj.quantityOnhand;
|
||||
this.form.unitName = obj.unitName
|
||||
}
|
||||
},
|
||||
//OQC检验单选择
|
||||
|
@ -30,7 +30,7 @@
|
||||
<el-table-column label="产品编码" width="120" align="center" prop="itemCode" />
|
||||
<el-table-column label="产品名称" width="150" align="center" prop="itemName" />
|
||||
<el-table-column label="规格型号" width="150" align="center" prop="specification" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
|
||||
<el-table-column label="单位" align="center" prop="unitName" />
|
||||
<el-table-column label="退货数量" align="center" prop="quantityRted" />
|
||||
<el-table-column label="批次号" align="center" prop="batchCode" />
|
||||
<el-table-column label="仓库" align="center" prop="warehouseName" />
|
||||
@ -88,8 +88,8 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="单位" prop="unitOfMeasure">
|
||||
<el-input v-model="form.unitOfMeasure" placeholder="请输入单位" />
|
||||
<el-form-item label="单位" prop="unitName">
|
||||
<el-input v-model="form.unitName" placeholder="请输入单位" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -266,6 +266,7 @@ export default {
|
||||
this.form.itemName = obj.itemName;
|
||||
this.form.specification = obj.specification;
|
||||
this.form.unitOfMeasure = obj.unitOfMeasure;
|
||||
this.form.unitName = obj.unitName
|
||||
}
|
||||
},
|
||||
// 取消按钮
|
||||
|
@ -68,7 +68,7 @@
|
||||
<el-table-column label="产品编码" align="center" prop="itemCode" />
|
||||
<el-table-column label="产品名称" align="center" prop="itemName" />
|
||||
<el-table-column label="规格型号" align="center" prop="specification" />
|
||||
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
|
||||
<el-table-column label="单位" align="center" prop="unitName" />
|
||||
<el-table-column label="批次号" align="center" prop="batchCode" />
|
||||
<el-table-column label="SN码数量" align="center" prop="snNum" >
|
||||
<template slot-scope="scope">
|
||||
@ -308,6 +308,7 @@ export default {
|
||||
this.form.itemName = obj.itemName;
|
||||
this.form.specification = obj.specification;
|
||||
this.form.unitOfMeasure = obj.unitOfMeasure;
|
||||
this.form.unitName = obj.unitName
|
||||
}
|
||||
},
|
||||
}
|
||||
|
@ -33,7 +33,7 @@
|
||||
<el-table-column label="产品物料编码" width="120px" align="center" prop="itemCode" />
|
||||
<el-table-column label="产品物料名称" width="150px" align="center" prop="itemName" />
|
||||
<el-table-column label="规格型号" align="center" prop="specification" />
|
||||
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
|
||||
<el-table-column label="单位" align="center" prop="unitName" />
|
||||
<el-table-column label="转移数量" align="center" prop="quantityTransfer" />
|
||||
<el-table-column label="生产工单" align="center" prop="workorderCode" />
|
||||
<el-table-column label="供应商编码" width="100px" align="center" prop="vendorCode" />
|
||||
@ -91,8 +91,8 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="单位" prop="unitOfMeasure">
|
||||
<el-input v-model="form.unitOfMeasure" readonly="readonly" />
|
||||
<el-form-item label="单位" prop="unitName">
|
||||
<el-input v-model="form.unitName" readonly="readonly" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -442,6 +442,7 @@ export default {
|
||||
this.form.workorderId = obj.workorderId;
|
||||
this.form.workorderCode = obj.workorderCode;
|
||||
this.fromWarehouse = obj.warehouseName +" / "+ obj.locationName +" / "+ obj.areaName;
|
||||
this.form.unitName = obj.unitName
|
||||
}
|
||||
},
|
||||
//选择默认的仓库、库区、库位
|
||||
|
Loading…
Reference in New Issue
Block a user