Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

王震

2023-12-29 b3cdb967634dddba8a88bca2550f7e07c9ac262c

 src/views/plan/manufacturingorder/productorder-form.vue

@@ -478,7 +478,7 @@
                          </el-table>
                        </el-card>
                      </el-tab-pane>
                      <el-tab-pane
                     <!--  <el-tab-pane
                        label="检测标准"
                        key="tb1"
                        id="tb1"
@@ -491,7 +491,7 @@
                          :moRoutingOperationId="moRoutingOperationId"
                          @refreshTestStandardInfo="refreshTestStandardInfo"
                        ></testStandardTable>
                      </el-tab-pane>
                      </el-tab-pane> -->
                      <!-- <el-tab-pane
                        label="抽检规则"
                        key="tb2"
@@ -692,13 +692,13 @@
                      label="单位"
                    />

                    <el-table-column
                    <!-- <el-table-column
                      prop="discNum"
                      width="150"
                      header-align="center"
                      align="center"
                      label="盘数(盘)"
                    />
                    /> -->

                    <!-- <el-table-column
                      prop="version"