Merge branch 'xiaoqin' into mergeBranch

src/SDrpManagement/ProductGroup/index.vue

@@ -1,5 +1,18 @@
 <template>
   <div class="group container normal-panel normal-margin">
+    <div style="display:flex;align-items:center;margin-bottom:16px">
+      <el-input
+          placeholder="请输入搜索内容"
+          suffix-icon="el-icon-search"
+          v-model="params.content.where.condition"
+          style="width:200px"
+          size="mini"
+          class="input-with-select inline-16"
+          @keyup.native.enter="getProductGroup(params.content.pageNumber=1)"
+          @clear="clearData"
+          clearable>
+      </el-input>
+    </div>
     <selectClass @brandChange="brandChange" @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickField="clickField" :default="true"></selectClass>
     <div v-if="Object.keys(productGroup).length > 0">
       <div class="group-list content">
@@ -134,12 +147,16 @@ export default {
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.params.content.pageSize = val
-      this.listData()
+      this.getProductGroup()
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.params.content.pageNumber = val
-      this.listData()
+      this.getProductGroup()
+    },
+    clearData(){
+      this.params.content.pageNumber = 1
+      this.getProductGroup()
     },
   },
 };

src/SManagement/setenterpriseInfo/index.vue

@@ -56,7 +56,8 @@ export default {
     return {
       activeName:'first',
       enterpriseInfo:{},
-      show:false
+      show:false,
+      userInfo:''
     }
   },
   components:{
@@ -68,14 +69,31 @@ export default {
     async enterpriseData () {
       const res = await this.$api.requested({
         "id": 20221022165203,
-        "content": {}
+        "content": {
+          sys_enterpriseid:this.userInfo.agent.sys_enterpriseid
+        }
       })
       this.enterpriseInfo = res.data
       this.show = true
-    }
+    },
+    //获取用户信息
+    async getUserInfo() {
+      let res = await this.$api.requested({
+        "classname": "common.usercenter.usercenter",
+        "method": "queryUserMsg",
+        "content": {
+        }
+      })
+      this.userInfo = res.data
+      this.enterpriseData()
+      console.log(this.userInfo);
+      
+    },
+  },
+  created () {
+    this.getUserInfo()
   },
   mounted () {
-    this.enterpriseData()
   }
 }