Merge branch 'new' into develop

# Conflicts:
#	src/styles/element-ui.scss

src/styles/element-ui.scss

@@ -47,6 +47,10 @@
 .el-range-editor--mini.el-input__inner {
   height: 28px !important;
 }
+// 隐藏滚动条样式
+.scrollbar-wrapper::-webkit-scrollbar {
+  display: none;
+}
 .collapse {
   .el-form-item__content {
     line-height: 0 !important;

src/views/supply/policy/components/retail_form.vue

@@ -825,6 +825,10 @@ export default {
       handler(newValue, oldValue) {
         if (newValue && newValue.length) {
           newValue.forEach((item, index) => {
+            if (this.correspondId) {
+              this.goodsList[index].correspondName = this.correspondName
+              this.goodsList[index].correspondId = this.correspondId
+            }
             this.goodsList[index].compute_amount = item.price * item.qty
             this.goodsList[index].compute_flAmount =
               ((item.price - item.discAmount) * item.qty * (item.rebateRate * 100)) / 100