Merge remote-tracking branch 'origin/master'

src/views/wms/returnorderzs/index.vue

@@ -318,11 +318,11 @@
               v-if="refreshNewWorkerTable" v-loading="newWorkerLoading" class="my-print-table" :data="printData.workTable"
               border style="width: 1000px;padding-bottom: 1px;">
               <el-table-column prop="materialCode" label="物料编码" :width="150" :formatter="productCodeFormate"></el-table-column>
-              <el-table-column prop="materialDesc" label="物料描述" :width="200"></el-table-column>
+              <el-table-column prop="materialDesc" label="物料描述" :width="280"></el-table-column>
               <el-table-column prop="unit" width="55" label="单位"></el-table-column>
               <el-table-column prop="userDefined5" width="165" label="批号"></el-table-column>
-              <el-table-column prop="quantity" label="计划数量"  width="100"></el-table-column>
+              <el-table-column prop="planNumber" label="计划数量"  width="100"></el-table-column>
-              <el-table-column prop="planNumber" width="75" label="实发数量"></el-table-column>
+<!--              <el-table-column prop="planNumber" width="75" label="实发数量"></el-table-column>-->
               <el-table-column prop="routeCode" width="75" label="备注"></el-table-column>
             </el-table>
             <!-- 底部 -->