序列号报工

src/views/mes/pro/process/index.vue

@@ -110,7 +110,7 @@
       </el-table-column>
       <el-table-column label="是否序列号报工" align="center" prop="isSerialReport">
         <template slot-scope="scope">
-          {{ scope.row.isSerialReport === '1'? '是': '否' }}
+          {{ (scope.row.isSerialReport && Number(scope.row.isSerialReport) === 1)? '是': '否' }}
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>

src/views/mes/pro/workorder/indexApply.vue

@@ -204,8 +204,7 @@
       </el-table-column>
       <el-table-column label="单位" align="center" prop="unitOfMeasure" />
       <el-table-column label="工单数量" align="center" prop="quantity" />
-      <el-table-column label="开始序列码" align="center" prop="startSerial" width="100px" />
-      <el-table-column label="结束序列码" align="center" prop="endSerial" width="100px" />
+      <el-table-column label="已排产数量" align="center" prop="quantityScheduled"/>
       <el-table-column label="调整数量" align="center" prop="quantityChanged" />
       <el-table-column label="已生产数量" align="center" width="100px" prop="quantityProduced" />
       <el-table-column label="批次号" align="center" width="100px" prop="batchCode" />

src/views/mes/pro/workorder/proofingInfo.vue

@@ -192,13 +192,8 @@
             </el-form-item>
           </el-col>
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
-            <el-form-item label="开始序列码" prop="startSerial">
-              <el-input v-model="form.startSerial" :disabled="mode == 'make'" placeholder="请输入开始序列码" />
-            </el-form-item>
-          </el-col>
-          <el-col :lg="6" :md="8" :sm="12" :xs="12">
-            <el-form-item label="结束序列码" prop="endSerial">
-              <el-input v-model="form.endSerial" :disabled="mode == 'make'" placeholder="请输入结束序列码" />
+            <el-form-item label="已排产数量" prop="quantityScheduled">
+              <el-input v-model="form.quantityScheduled" disabled />
             </el-form-item>
           </el-col>
           <el-col :lg="18" :md="16" :sm="24" :xs="24">