|
|
@ -119,6 +119,12 @@
|
|
|
|
prop="productDescZh"
|
|
|
|
prop="productDescZh"
|
|
|
|
width="350"
|
|
|
|
width="350"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
|
|
|
|
<!-- <el-table-column
|
|
|
|
|
|
|
|
label="产品型号"
|
|
|
|
|
|
|
|
align="left"
|
|
|
|
|
|
|
|
prop="productModel"
|
|
|
|
|
|
|
|
width="350"
|
|
|
|
|
|
|
|
/> -->
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="物料组编码"
|
|
|
|
label="物料组编码"
|
|
|
|
align="center"
|
|
|
|
align="center"
|
|
|
@ -136,6 +142,12 @@
|
|
|
|
{{ scope.row.mtart == "material_type1" ? "料罐物料" : "其他类别" }}
|
|
|
|
{{ scope.row.mtart == "material_type1" ? "料罐物料" : "其他类别" }}
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
<el-table-column
|
|
|
|
|
|
|
|
label="报工汇率"
|
|
|
|
|
|
|
|
align="center"
|
|
|
|
|
|
|
|
prop="reportRate"
|
|
|
|
|
|
|
|
width="150"
|
|
|
|
|
|
|
|
/>
|
|
|
|
<!-- 中文描述也就是产品名称 -->
|
|
|
|
<!-- 中文描述也就是产品名称 -->
|
|
|
|
<!-- <el-table-column label="英文描述" align="center" prop="productDescEn" />
|
|
|
|
<!-- <el-table-column label="英文描述" align="center" prop="productDescEn" />
|
|
|
|
<el-table-column label="产品类别" align="center" prop="productGroup">
|
|
|
|
<el-table-column label="产品类别" align="center" prop="productGroup">
|
|
|
@ -231,13 +243,13 @@
|
|
|
|
style="width: 320px"
|
|
|
|
style="width: 320px"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="产品/物料型号" prop="productModel">
|
|
|
|
<!-- <el-form-item label="产品/物料型号" prop="productModel">
|
|
|
|
<el-input
|
|
|
|
<el-input
|
|
|
|
v-model="form.productModel"
|
|
|
|
v-model="form.productModel"
|
|
|
|
placeholder="请输入产品型号"
|
|
|
|
placeholder="请输入产品型号"
|
|
|
|
style="width: 320px"
|
|
|
|
style="width: 320px"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item> -->
|
|
|
|
<el-form-item label="产品/物料组编码" prop="productGroup">
|
|
|
|
<el-form-item label="产品/物料组编码" prop="productGroup">
|
|
|
|
<el-input
|
|
|
|
<el-input
|
|
|
|
v-model="form.productGroup"
|
|
|
|
v-model="form.productGroup"
|
|
|
@ -332,6 +344,13 @@
|
|
|
|
<el-form-item label="工厂编码" prop="factoryCode">
|
|
|
|
<el-form-item label="工厂编码" prop="factoryCode">
|
|
|
|
<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
|
|
|
|
<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
|
|
|
|
</el-form-item> -->
|
|
|
|
</el-form-item> -->
|
|
|
|
|
|
|
|
<el-form-item label="报工汇率" prop="reportRate">
|
|
|
|
|
|
|
|
<el-input
|
|
|
|
|
|
|
|
v-model="form.reportRate"
|
|
|
|
|
|
|
|
placeholder="请输入报工汇率"
|
|
|
|
|
|
|
|
style="width: 320px"
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="是否启用" prop="activeFlag">
|
|
|
|
<el-form-item label="是否启用" prop="activeFlag">
|
|
|
|
<el-select
|
|
|
|
<el-select
|
|
|
|
v-model="form.activeFlag"
|
|
|
|
v-model="form.activeFlag"
|
|
|
@ -402,9 +421,27 @@
|
|
|
|
:contentStyle="CS"
|
|
|
|
:contentStyle="CS"
|
|
|
|
:label-style="LS"
|
|
|
|
:label-style="LS"
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<el-descriptions-item label="产品编号">{{
|
|
|
|
<el-descriptions-item label="产品编码">{{
|
|
|
|
form.productCode
|
|
|
|
form.productCode
|
|
|
|
}}</el-descriptions-item>
|
|
|
|
}}</el-descriptions-item>
|
|
|
|
|
|
|
|
<el-descriptions-item label="产品名称">{{
|
|
|
|
|
|
|
|
form.productDescZh
|
|
|
|
|
|
|
|
}}</el-descriptions-item>
|
|
|
|
|
|
|
|
<!-- <el-descriptions-item label="产品型号">{{
|
|
|
|
|
|
|
|
form.productModel
|
|
|
|
|
|
|
|
}}</el-descriptions-item> -->
|
|
|
|
|
|
|
|
<el-descriptions-item label="物料组编码">{{
|
|
|
|
|
|
|
|
form.productGroup
|
|
|
|
|
|
|
|
}}</el-descriptions-item>
|
|
|
|
|
|
|
|
<el-descriptions-item label="物料组名称">{{
|
|
|
|
|
|
|
|
form.productGroupName
|
|
|
|
|
|
|
|
}}</el-descriptions-item>
|
|
|
|
|
|
|
|
<el-descriptions-item label="物料类别">{{
|
|
|
|
|
|
|
|
form.mtart
|
|
|
|
|
|
|
|
}}</el-descriptions-item>
|
|
|
|
|
|
|
|
<el-descriptions-item label="报工汇率">{{
|
|
|
|
|
|
|
|
form.reportRate
|
|
|
|
|
|
|
|
}}</el-descriptions-item>
|
|
|
|
<el-descriptions-item label="品类">{{
|
|
|
|
<el-descriptions-item label="品类">{{
|
|
|
|
form.category
|
|
|
|
form.category
|
|
|
|
}}</el-descriptions-item>
|
|
|
|
}}</el-descriptions-item>
|
|
|
@ -507,7 +544,7 @@ export default {
|
|
|
|
pageSize: 10,
|
|
|
|
pageSize: 10,
|
|
|
|
productCode: null,
|
|
|
|
productCode: null,
|
|
|
|
productDescZh: null,
|
|
|
|
productDescZh: null,
|
|
|
|
productModel: null,
|
|
|
|
// productModel: null,
|
|
|
|
productDescEn: null,
|
|
|
|
productDescEn: null,
|
|
|
|
ruleCode: null,
|
|
|
|
ruleCode: null,
|
|
|
|
oldProductCode: null,
|
|
|
|
oldProductCode: null,
|
|
|
@ -541,6 +578,7 @@ export default {
|
|
|
|
convIssue: null,
|
|
|
|
convIssue: null,
|
|
|
|
appendFlag: null,
|
|
|
|
appendFlag: null,
|
|
|
|
appendPercent: null,
|
|
|
|
appendPercent: null,
|
|
|
|
|
|
|
|
reportRate: null,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
options: [
|
|
|
|
options: [
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -595,7 +633,7 @@ export default {
|
|
|
|
productId: null,
|
|
|
|
productId: null,
|
|
|
|
productCode: null,
|
|
|
|
productCode: null,
|
|
|
|
productDescZh: null,
|
|
|
|
productDescZh: null,
|
|
|
|
productModel: null,
|
|
|
|
// productModel: null,
|
|
|
|
productDescEn: null,
|
|
|
|
productDescEn: null,
|
|
|
|
ruleCode: null,
|
|
|
|
ruleCode: null,
|
|
|
|
oldProductCode: null,
|
|
|
|
oldProductCode: null,
|
|
|
@ -634,6 +672,7 @@ export default {
|
|
|
|
convIssue: null,
|
|
|
|
convIssue: null,
|
|
|
|
appendFlag: null,
|
|
|
|
appendFlag: null,
|
|
|
|
appendPercent: null,
|
|
|
|
appendPercent: null,
|
|
|
|
|
|
|
|
reportRate: null,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
this.resetForm("form");
|
|
|
|
this.resetForm("form");
|
|
|
|
},
|
|
|
|
},
|
|
|
|