Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

云

2 天以前 db4fb428b570e024b64f0a866f974483b21a66f3

Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

 src/views/salesManagement/returnOrder/components/formDia.vue

@@ -32,7 +32,7 @@
              </el-form-item>
            </el-col>
            <el-col :span="4">
              <el-form-item label="关联出库单号：" prop="shippingId">
              <el-form-item label="关联发货单号：" prop="shippingId">
                <el-select v-model="form.shippingId" filterable placeholder="请选择出库单号" @change="outboundNoChange">
                  <el-option
                    v-for="item in outboundOptions"