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

gaoluyang

6 天以前 00ef76a2e286e338fa3c648ce183e3533ce006ad

 src/views/salesOutbound/components/formDia.vue

@@ -73,6 +73,13 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="利润" prop="userName">
              <el-input v-model="form.userName" placeholder="利润" maxlength="30" type="number" />
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <template #footer>
        <div class="dialog-footer">