Merge remote-tracking branch 'origin/master'

王震

2023-11-15 a6a7b0bbf6f67fb1a2a1619296202c9e29915325

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

@@ -759,7 +759,7 @@
                    </el-table-column>
                  </el-table>
                </el-row>
                <el-row>
                <!-- <el-row>
                  <el-col :span="24"
                    ><div style="margin-top:5px;">
                      <span style="font-size:12px;">外协发料表</span>
@@ -851,7 +851,7 @@
                      </el-table-column>
                    </el-table>
                  </el-col>
                </el-row>
                </el-row> -->
              </el-tab-pane>
              <el-tab-pane label="客户订单" id="ta3" key="ta3" name="ta3">
                <CustomerOrder :orderId="dataForm.id" />