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

云

2026-07-06 9c1e0958af114e4ae2bfaaade28d49753268e9f1

 src/views/customerService/feedbackRegistration/components/formDia.vue

@@ -38,7 +38,7 @@
              </el-form-item>
            </el-col>
            <el-col :span="4">
              <el-form-item label="关联销售单号："
              <el-form-item label="关联订单号："
                            prop="salesContractNo">
                <el-select v-model="form.salesContractNo"
                           @change="associatedSalesOrderNumberChange"
@@ -231,8 +231,8 @@
      dataType: "slot",
      slot: "shippingStatus",
    },
    { label: "快递公司", prop: "expressCompany", width: 140 },
    { label: "快递单号", prop: "expressNumber", width: 160 },
    // { label: "快递公司", prop: "expressCompany", width: 140 },
    // { label: "快递单号", prop: "expressNumber", width: 160 },
    {
      label: "发货车牌",
      prop: "shippingCarNumber",