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

src/views/claimSettlement/detailsPage.vue

@@ -10,7 +10,7 @@
           >返回列表
         </el-button>
       </div>
-      <div class="add-customer-btn">
+      <div class="add-customer-btn" v-if="form.claimSourceType==1">
         <el-button
           class="el-button--small-yh"
           style="margin-left: 6px"
@@ -85,6 +85,7 @@ export default {
       editBtn: false,
       editDis: false,
       form: {
+        claimSourceType:1,
         claimAttachmentList: [],
         bladeClaimAuditList: [],
       },
@@ -112,18 +113,12 @@ export default {
                 label: "门店",
                 value: 2,
               },
-              {
-                label: "终端消费者",
-                value: 3,
-              },
-            ],
-            rules: [
-              {
-                required: true,
-                message: " ",
-                trigger: "blur",
-              },
+              // {
+              //   label: "终端消费者",
+              //   value: 3,
+              // },
             ],
+            disabled: true,
           },
           {
             label: "来源方名称",

src/views/claimSettlement/index.vue

@@ -89,10 +89,6 @@ export default {
               {
                 label: "门店",
                 value: 2
-              },
-              {
-                label: "终端消费者",
-                value: 3
               }
             ],
             overHidden: true

src/views/goodsManage/index.vue

@@ -306,6 +306,7 @@ export default {
       });
     },
     searchReset() {
+      this.$refs.tree.setCurrentKey(null);
       this.query = this.$options.data().query;
       this.onLoad(this.page);
     },