Merge remote-tracking branch 'origin/dev_新疆_大罗素马铃薯new' into dev_新疆_大罗素马铃薯new

云

2026-07-06 9c1e0958af114e4ae2bfaaade28d49753268e9f1

 src/views/productionPlan/productionPlan/index.vue

@@ -13,7 +13,7 @@
                    style="width: 160px;"
                    @keyup.enter="handleQuery" />
        </el-form-item>
        <el-form-item label="销售合同号:"
        <el-form-item label="订单号:"
                      prop="salesContractNo">
          <el-input v-model="searchForm.salesContractNo"
                    placeholder="请输入"
@@ -318,13 +318,17 @@
      },
    },
    {
      label: "销售合同号",
      label: "订单号",
      prop: "salesContractNo",
      width: "200px",
      dataType: "slot",
      slot: "salesContractNo",
    },

    {
      label: "销售总合同号",
      prop: "masterContractNo",
      width: "150px",
    },
    {
      label: "产品名称",
      prop: "productName",