Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -609,12 +609,20 @@
                   style="float: right"
                 >
                   <el-button
-                    type="primary"
+                    type="warning"
                     size="mini"
                     icon="el-icon-upload"
                     :disabled="uploadPolicy.policyName === '' || loadingPolicy"
                     :loading="loadingPolicy"
                   >导 入</el-button>
+                  <el-button
+                    type="primary"
+                    size="mini"
+                    icon="el-icon-search"
+                    @click="policyOnLoad"
+                    :disabled="uploadPolicy.policyName === '' || loadingPolicy"
+                    :loading="loadingPolicy"
+                  >政策明细</el-button>
                 </el-upload>
               </template>
               <template slot="orderQuantity" slot-scope="{row}">
@@ -2766,7 +2774,7 @@ export default {
       //   //买赠促销
       //   this.contactsDataBuyFree = res.data.data.presentItemList
       // })
-      this.policyOnLoad()
+      // this.policyOnLoad()
     },
     //导入页左费用类型查询
     nodeClickCost(data) {