显示物料英文描述、质检结果YN改为“合格”“不合格”显示

master
陈恒杰 4 months ago
parent ef74d016a8
commit 26230b7e43

@ -246,7 +246,17 @@
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检验结果" align="center" prop="checkResult" /> <!-- <el-table-column label="检验结果" align="center" prop="checkResult" />-->
<el-table-column label="检验结果" align="center" prop="checkResult">
<template slot-scope="scope">
<span v-if="scope.row.checkResult === 'Y'"></span>
<span v-else-if="scope.row.checkResult === 'N'">不合格</span>
<span v-else>{{ scope.row.checkResult }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button

@ -335,64 +335,64 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="英文描述" prop="productDescEn"> <el-form-item label="英文描述" prop="productDescEn">
<el-input v-model="form.productDescEn" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.productDescEn" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
<el-form-item label="序列号规则代码" prop="ruleCode"> <!-- <el-form-item label="序列号规则代码" prop="ruleCode">
<el-input v-model="form.ruleCode" placeholder="请输入序列号规则代码" /> <el-input v-model="form.ruleCode" placeholder="请输入序列号规则代码" />
</el-form-item> </el-form-item>
<el-form-item label="旧产品号" prop="oldProductCode"> <el-form-item label="旧产品号" prop="oldProductCode">
<el-input v-model="form.oldProductCode" placeholder="请输入旧产品号" /> <el-input v-model="form.oldProductCode" placeholder="请输入旧产品号" />
</el-form-item> </el-form-item>
<el-form-item label="散件产品号" prop="partsProductCode"> <el-form-item label="散件产品号" prop="partsProductCode">
<el-input v-model="form.partsProductCode" placeholder="请输入散件产品号" /> <el-input v-model="form.partsProductCode" placeholder="请输入散件产品号" />
</el-form-item> </el-form-item>
<el-form-item label="69码" prop="skuBarcode"> <el-form-item label="69码" prop="skuBarcode">
<el-input v-model="form.skuBarcode" placeholder="请输入69码" /> <el-input v-model="form.skuBarcode" placeholder="请输入69码" />
</el-form-item> </el-form-item>
<el-form-item label="毛重" prop="grossWeight"> <el-form-item label="毛重" prop="grossWeight">
<el-input v-model="form.grossWeight" placeholder="请输入毛重" /> <el-input v-model="form.grossWeight" placeholder="请输入毛重" />
</el-form-item> </el-form-item>
<el-form-item label="净重" prop="netWeight"> <el-form-item label="净重" prop="netWeight">
<el-input v-model="form.netWeight" placeholder="请输入净重" /> <el-input v-model="form.netWeight" placeholder="请输入净重" />
</el-form-item> </el-form-item>
<el-form-item label="皮重" prop="tareWeight"> <el-form-item label="皮重" prop="tareWeight">
<el-input v-model="form.tareWeight" placeholder="请输入皮重" /> <el-input v-model="form.tareWeight" placeholder="请输入皮重" />
</el-form-item> </el-form-item>
<el-form-item label="体积" prop="volume"> <el-form-item label="体积" prop="volume">
<el-input v-model="form.volume" placeholder="请输入体积" /> <el-input v-model="form.volume" placeholder="请输入体积" />
</el-form-item> </el-form-item>
<el-form-item label="单价" prop="unitPrice"> <el-form-item label="单价" prop="unitPrice">
<el-input v-model="form.unitPrice" placeholder="请输入单价" /> <el-input v-model="form.unitPrice" placeholder="请输入单价" />
</el-form-item> </el-form-item>
<el-form-item label="产品组" prop="productGroup"> <el-form-item label="产品组" prop="productGroup">
<el-input v-model="form.productGroup" placeholder="请输入产品组" /> <el-input v-model="form.productGroup" placeholder="请输入产品组" />
</el-form-item> </el-form-item>
<el-form-item label="${comment}" prop="productGroupName"> <el-form-item label="${comment}" prop="productGroupName">
<el-input v-model="form.productGroupName" placeholder="请输入${comment}" /> <el-input v-model="form.productGroupName" placeholder="请输入${comment}" />
</el-form-item> </el-form-item>
<el-form-item label="用户自定义1" prop="userDefined1"> <el-form-item label="用户自定义1" prop="userDefined1">
<el-input v-model="form.userDefined1" placeholder="请输入用户自定义1" /> <el-input v-model="form.userDefined1" placeholder="请输入用户自定义1" />
</el-form-item> </el-form-item>
<el-form-item label="用户自定义2" prop="userDefined2"> <el-form-item label="用户自定义2" prop="userDefined2">
<el-input v-model="form.userDefined2" placeholder="请输入用户自定义2" /> <el-input v-model="form.userDefined2" placeholder="请输入用户自定义2" />
</el-form-item> </el-form-item>
<el-form-item label="用户自定义3" prop="userDefined3"> <el-form-item label="用户自定义3" prop="userDefined3">
<el-input v-model="form.userDefined3" placeholder="请输入用户自定义3" /> <el-input v-model="form.userDefined3" placeholder="请输入用户自定义3" />
</el-form-item> </el-form-item>
<el-form-item label="${comment}" prop="userDefined4"> <el-form-item label="${comment}" prop="userDefined4">
<el-input v-model="form.userDefined4" placeholder="请输入${comment}" /> <el-input v-model="form.userDefined4" placeholder="请输入${comment}" />
</el-form-item> </el-form-item>
<el-form-item label="${comment}" prop="userDefined5"> <el-form-item label="${comment}" prop="userDefined5">
<el-input v-model="form.userDefined5" placeholder="请输入${comment}" /> <el-input v-model="form.userDefined5" placeholder="请输入${comment}" />
</el-form-item> </el-form-item>
<el-form-item label="${comment}" prop="userDefined6"> <el-form-item label="${comment}" prop="userDefined6">
<el-input v-model="form.userDefined6" placeholder="请输入${comment}" /> <el-input v-model="form.userDefined6" placeholder="请输入${comment}" />
</el-form-item> </el-form-item>
<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-form-item label="报工折算率" prop="reportRate">
<el-input-number <el-input-number
:min="0" :min="0"

Loading…
Cancel
Save