Merge remote-tracking branch 'origin/master'

src/views/quality/qcProduce/index.vue

@@ -246,7 +246,17 @@
 					<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
 				</template>
 			</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">
 				<template slot-scope="scope">
 					<el-button

src/views/wms/product/index.vue

@@ -335,10 +335,10 @@
             ></el-option>
           </el-select>
         </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-form-item>
-				<el-form-item label="序列号规则代码" prop="ruleCode">
+        <!-- <el-form-item label="序列号规则代码" prop="ruleCode">
          <el-input v-model="form.ruleCode" placeholder="请输入序列号规则代码" />
        </el-form-item>
        <el-form-item label="旧产品号" prop="oldProductCode">