1210 15:26

编码一半千万别提包

src/views/businessManager/shopManager/shopCategory.vue

@@ -85,7 +85,6 @@ import { subjectListTree } from '@/api/specialSetting'
 import { categoryListTree, categoryUpSet, categoryUpSetDel } from '@/api/businessManager'
 export default {
   components: { pagination },
-  name: 'adminManager',
   data () {
     return {
       tableList: [],
@@ -238,10 +237,10 @@ export default {
     color: #fff;
   }
 }
-.el-date-editor.el-input {
+/deep/.el-date-editor.el-input {
   width: 100% !important;
 }
-.el-select {
+/deep/.el-select {
   width: 98% !important;
 }
 </style>

src/views/businessManager/shopManager/shopList.vue

@@ -142,6 +142,17 @@ export default {
       },
     }
   },
+  created () {
+    if (this.$route.query.searchForm) {
+      console.log('来searchForm')
+      this.$route.query.searchForm instanceof Object ? this.searchForm = this.$route.query.searchForm : this.searchForm = JSON.parse(this.$route.query.searchForm);
+    }
+    if (this.$route.query.pageInfo) {
+      console.log('来pageInfo')
+      console.log(this.$route.query.pageInfo)
+      this.$route.query.pageInfo instanceof Object ? this.pageInfo = this.$route.query.pageInfo : this.pageInfo = JSON.parse(this.$route.query.pageInfo);
+    }
+  },
   mounted () {
     this.getList()
   },
@@ -164,7 +175,7 @@ export default {
           this.messageTips('删除', res)
         })
       }).catch(() => { })
-      
+
     },
     messageTips (title, res) {
       if (res.code == 200) {
@@ -194,9 +205,10 @@ export default {
       if (row) {
         params.id = row.id
       }
+      let pageInfo = JSON.stringify(this.pageInfo)
       this.$router.push({
         path: '/shopManager/shopOperation',
-        query: params
+        query: { params, pageInfo }
       })
     }
   }

src/views/businessManager/shopManager/shopOperation.vue

@@ -111,7 +111,7 @@ export default {
   data () {
     return {
       categoryList: [],
-      pageType: this.$route.query.type,
+      pageType: this.$route.query.params.type,
       headers: {
         Authorization: getToken()
       },
@@ -154,7 +154,17 @@ export default {
         // discountPrice: [{ required: true, message: '请输入商品采购价', trigger: 'blur' }],
         image: [{ required: true, message: '请选择图片', trigger: 'blur' }],
         desc: [{ required: true, message: '请输入商品描述', trigger: 'blur' }]
-      }
+      },
+      Fsearch: null,
+      Frules: null
+    }
+  },
+  created () {
+    if (this.$route.query.search) {
+      this.Fsearch = this.$route.query.search;
+    }
+    if (this.$route.query.pageInfo) {
+      this.Frules = this.$route.query.pageInfo
     }
   },
   mounted () {
@@ -186,20 +196,20 @@ export default {
     messageTips (title, res) {
       if (res.code == 200) {
         this.$message.success(title + '成功')
-        this.$router.push('/shopManager/shopManager')
+        this.$router.push({ path: '/shopManager/shopManager', query: { pageInfo: this.Frules, searchForm: this.Fsearch } })
       } else {
         this.$message.error(res.msg)
       }
     },
     onCancel () {
-      this.$router.push('/shopManager/shopManager')
+      this.$router.push({ path: '/shopManager/shopManager', query: { pageInfo: this.Frules, searchForm: this.Fsearch } })
     },
     onReSet (formName) {
       this.$refs[formName].resetFields()
     },
     getList () {
       if (this.pageType == 'create') return false
-      goodsSingleQuery(this.$route.query.id).then(res => {
+      goodsSingleQuery(this.$route.query.params.id).then(res => {
         if (res.code == 200) {
           let result = res.data
           this.form = {

src/views/categroyManager/generalSettings/errorManager.vue

@@ -173,10 +173,10 @@ export default {
     color: #fff;
   }
 }
-.el-date-editor.el-input {
+/deep/.el-date-editor.el-input {
   width: 100% !important;
 }
-.el-select {
+/deep/.el-select {
   width: 98% !important;
 }
 </style>

src/views/categroyManager/insideSetting/addressManager.vue

@@ -113,7 +113,8 @@
                       prop="cooperationOrganId"
                       label="合作单位"
                       :label-width="formLabelWidth">
-          <el-select v-model="form.cooperationOrganId" @change="onCooperationChange">
+          <el-select v-model="form.cooperationOrganId"
+                     @change="onCooperationChange">
             <el-option v-for="item in cooperationList"
                        :key="item.value"
                        :label="item.label"
@@ -222,7 +223,6 @@ VueAMap.initAMapApiLoader({
 
 export default {
   components: { pagination },
-  name: 'adminManager',
   data () {
     let self = this
     return {
@@ -351,9 +351,9 @@ export default {
         })
       }
     },
-    onCooperationChange(value) {
+    onCooperationChange (value) {
       this.cooperationList.forEach(item => {
-        if(item.value == value) {
+        if (item.value == value) {
           this.selectOrganId = item.organId
         }
       })
@@ -413,7 +413,7 @@ export default {
     getBreachList () { // 获取分部列表
       // 获取当前用户分部
       getEmployeeOrgan().then(res => {
-        if(res.code == 200){
+        if (res.code == 200) {
           let branchIds = []
           res.data.forEach(item => {
             branchIds.push(item.id)
@@ -443,7 +443,7 @@ export default {
       })
 
 
-      
+
     },
     openTeaching (type, row) {
       // 重置数据

src/views/categroyManager/insideSetting/adminManager.vue

@@ -40,7 +40,6 @@ import pagination from '@/components/Pagination/index'
 import { roleQueryPage } from '@/api/systemManage'
 export default {
   components: { pagination },
-  name: 'adminManager',
   data () {
     return {
       tableList: [],
@@ -55,7 +54,7 @@ export default {
   },
   mounted () {
     // console.log(store.getters.permission)
-    this.pageInfo.page = this.$route.query.page ? this.$route.query.page : 1
+    this.pageInfo.page = this.$route.query.page ? parseInt(this.$route.query.page) : 1
     this.getList()
   },
   methods: {

src/views/categroyManager/insideSetting/adminOperation.vue

@@ -52,12 +52,12 @@ import store from '@/store'
 import { getSilder } from '@/api/silder'
 import { roleGetMenus, getRoleInfo, roleUpdate, roleAdd } from '@/api/systemManage'
 export default {
-  name: 'adminManager',
   data () {
     return {
       organId: null,
       pageType: this.$route.query.type,
       id: this.$route.query.id,
+      page: this.$route.query.page,
       isIndeterminate: false,
       data: [],
       defaultProps: {
@@ -127,10 +127,7 @@ export default {
           this.checkAll = roleData.menuIds.length >= this.slideCount
           // 是否是半选
           this.isIndeterminate = roleData.menuIds.length > 0 && roleData.menuIds.length < this.slideCount
-
-          console.time('time')
           let tSplice = this.getParent(roleData.menuIds, tempData)
-          console.timeEnd('time')
           roleData.menuIds = tSplice
           this.result = roleData
         }

src/views/categroyManager/insideSetting/branchActive.vue

@@ -52,7 +52,6 @@ import { courseScheduleRewards } from '@/api/systemManage'
 import store from '@/store'
 export default {
   components: { pagination },
-  name: 'adminManager',
   data () {
     return {
       searchForm: {

src/views/categroyManager/insideSetting/branchActiveOperation.vue

@@ -87,7 +87,6 @@ import store from '@/store'
 import { branchQueryPage, queryOrganIdList } from '@/api/specialSetting'
 import { courseScheduleRewardsQuery, getUserRole, courseScheduleRewardsAdd, courseScheduleRewardsUpdate } from '@/api/systemManage'
 export default {
-  name: 'adminManager',
   data () {
     return {
       organId: null,

src/views/categroyManager/insideSetting/branchManager.vue

@@ -155,7 +155,6 @@ let validPhone = (rule, value, callback) => {
 }
 export default {
   components: { pagination },
-  name: 'adminManager',
   data () {
     return {
       searchForm: {
@@ -203,7 +202,7 @@ export default {
 
     // 获取当前用户分部
     getEmployeeOrgan().then(res => {
-      if(res.code == 200){
+      if (res.code == 200) {
         res.data.forEach(item => {
           this.userBranchList.push({
             label: item.name,

src/views/categroyManager/insideSetting/chargeProfitManager.vue

@@ -4,7 +4,7 @@
       <div class="squrt"></div>收费分润管理
     </h2>
     <div class="m-core">
-     
+
       <el-form :inline="true"
                class="searchForm"
                @submit.native.prevent
@@ -68,47 +68,66 @@
         <el-form-item label="收费方式"
                       prop="name"
                       :label-width="formLabelWidth">
-            <el-radio v-model="form.radio" label="1">比例分润</el-radio>
-            <el-radio v-model="form.radio" label="2">收费种类</el-radio>
+          <el-radio v-model="form.radio"
+                    label="1">比例分润</el-radio>
+          <el-radio v-model="form.radio"
+                    label="2">收费种类</el-radio>
         </el-form-item>
 
         <div v-if="form.radio == 1">
-            <el-form-item label="公" :label-width="formLabelWidth">
-                <el-input></el-input>
-            </el-form-item>
-            <el-form-item label="私" :label-width="formLabelWidth">
-                <el-input></el-input>
-            </el-form-item>
+          <el-form-item label="公"
+                        :label-width="formLabelWidth">
+            <el-input></el-input>
+          </el-form-item>
+          <el-form-item label="私"
+                        :label-width="formLabelWidth">
+            <el-input></el-input>
+          </el-form-item>
         </div>
 
         <div v-if="form.radio == 2">
-            <el-form-item label="课程" :label-width="formLabelWidth">
-                <el-select placeholder="请选择方式" v-model="form.course">
-                    <el-option label="公" value="COM"></el-option>
-                    <el-option label="私" value="PER"></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="乐器" :label-width="formLabelWidth">
-                <el-select placeholder="请选择方式" v-model="form.instrment">
-                    <el-option label="公" value="COM"></el-option>
-                    <el-option label="私" value="PER"></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="辅件" :label-width="formLabelWidth">
-                <el-select placeholder="请选择方式" v-model="form.accessories">
-                    <el-option label="公" value="COM"></el-option>
-                    <el-option label="私" value="PER"></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="其它" :label-width="formLabelWidth">
-                <el-select placeholder="请选择方式" v-model="form.other">
-                    <el-option label="公" value="COM"></el-option>
-                    <el-option label="私" value="PER"></el-option>
-                </el-select>
-            </el-form-item>
+          <el-form-item label="课程"
+                        :label-width="formLabelWidth">
+            <el-select placeholder="请选择方式"
+                       v-model="form.course">
+              <el-option label="公"
+                         value="COM"></el-option>
+              <el-option label="私"
+                         value="PER"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="乐器"
+                        :label-width="formLabelWidth">
+            <el-select placeholder="请选择方式"
+                       v-model="form.instrment">
+              <el-option label="公"
+                         value="COM"></el-option>
+              <el-option label="私"
+                         value="PER"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="辅件"
+                        :label-width="formLabelWidth">
+            <el-select placeholder="请选择方式"
+                       v-model="form.accessories">
+              <el-option label="公"
+                         value="COM"></el-option>
+              <el-option label="私"
+                         value="PER"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="其它"
+                        :label-width="formLabelWidth">
+            <el-select placeholder="请选择方式"
+                       v-model="form.other">
+              <el-option label="公"
+                         value="COM"></el-option>
+              <el-option label="私"
+                         value="PER"></el-option>
+            </el-select>
+          </el-form-item>
         </div>
 
-
       </el-form>
       <span slot="footer"
             class="dialog-footer">
@@ -127,7 +146,6 @@ import store from '@/store'
 
 export default {
   components: { pagination },
-  name: 'adminManager',
   data () {
     return {
       tableList: [],
@@ -240,18 +258,18 @@ export default {
       this.formActionTitle = type
       this.chargeStatus = true
       // 修改的时候
-    //   if (type == 'update') {
-    //     this.form = {
-    //       id: data.id,
-    //       realName: data.realName,
-    //       gender: data.gender,
-    //       phone: Number(data.phone),
-    //       roleIds: data.roleIds,
-    //       organIdLists: data.organIdList ? data.organIdList : [],
-    //       jobNature: data.jobNature,
-    //       entryDate: data.entryDate
-    //     }
-    //   }
+      //   if (type == 'update') {
+      //     this.form = {
+      //       id: data.id,
+      //       realName: data.realName,
+      //       gender: data.gender,
+      //       phone: Number(data.phone),
+      //       roleIds: data.roleIds,
+      //       organIdLists: data.organIdList ? data.organIdList : [],
+      //       jobNature: data.jobNature,
+      //       entryDate: data.entryDate
+      //     }
+      //   }
     },
     onFormClose (formName) { // 关闭弹窗重置验证
       this.form = {
@@ -261,8 +279,8 @@ export default {
   }
 }
 </script>
-<style lang="scss">
-.el-button--primary {
+<style lang="scss" scoped>
+/deep/.el-button--primary {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
@@ -274,11 +292,11 @@ export default {
     color: #fff;
   }
 }
-.el-dialog__body {
+/deep/.el-dialog__body {
   padding: 0 20px;
 }
-.el-select,
-.el-date-editor.el-input {
+/deep/.el-select,
+/deep/.el-date-editor.el-input {
   width: 100% !important;
 }
 </style>

src/views/categroyManager/insideSetting/staffManager.vue

@@ -204,7 +204,6 @@ let validPhone = (rule, value, callback) => {
 }
 export default {
   components: { pagination },
-  name: 'adminManager',
   data () {
     return {
       tableList: [],
@@ -386,8 +385,8 @@ export default {
   }
 }
 </script>
-<style lang="scss">
-.el-button--primary {
+<style lang="scss" scoped>
+/deep/.el-button--primary {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
@@ -399,11 +398,11 @@ export default {
     color: #fff;
   }
 }
-.el-dialog__body {
+/deep/.el-dialog__body {
   padding: 0 20px;
 }
-.el-select,
-.el-date-editor.el-input {
+/deep/.el-select,
+/deep/.el-date-editor.el-input {
   width: 100% !important;
 }
 </style>

src/views/categroyManager/specialSetup/bannerManager.vue

@@ -39,7 +39,6 @@ import pagination from '@/components/Pagination/index'
 import store from '@/store'
 export default {
   components: { pagination },
-  name: 'adminManager',
   data () {
     return {
       tableList: [],
@@ -74,7 +73,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.el-button--primary {
+/deep/.el-button--primary {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
@@ -86,10 +85,10 @@ export default {
     color: #fff;
   }
 }
-.el-date-editor.el-input {
+/deep/.el-date-editor.el-input {
   width: 100% !important;
 }
-.el-select {
+/deep/.el-select {
   width: 98% !important;
 }
 </style>

src/views/categroyManager/specialSetup/branchSetting.vue

@@ -113,7 +113,6 @@ import { branchQueryPage, areaQueryChild, branchAdd, branchUpdate, getParentArea
 import store from '@/store'
 export default {
   components: { pagination },
-  name: 'adminManager',
   data () {
     return {
       tableList: [],
@@ -249,7 +248,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.el-button--primary {
+/deep/.el-button--primary {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
@@ -261,10 +260,10 @@ export default {
     color: #fff;
   }
 }
-.el-date-editor.el-input {
+/deep/.el-date-editor.el-input {
   width: 100% !important;
 }
-.el-select {
+/deep/.el-select {
   width: 98% !important;
 }
 </style>

src/views/categroyManager/specialSetup/charges.vue

@@ -2,47 +2,65 @@
   <div class='m-container'>
     <!-- <h2>收费类型设置</h2> -->
     <div class="m-core">
-      <div @click="onBranchOperation('create')" class='newBand'>添加</div>
+      <div @click="onBranchOperation('create')"
+           class='newBand'>添加</div>
       <div class="tableWrap">
         <el-table :data="dataList"
-                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column prop="price" label="收费标准" >
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column prop="price"
+                           label="收费标准">
           </el-table-column>
-          <el-table-column prop="name" label="分部名称" >
+          <el-table-column prop="name"
+                           label="分部名称">
             <template slot-scope="scope">
               {{ scope.row.branchNames | joinArray(',') }}
             </template>
           </el-table-column>
           <el-table-column align='center'
-                          label="操作">
+                           label="操作">
             <template slot-scope="scope">
-              <el-button @click="onBranchOperation('update', scope.row)" type="text">修改</el-button>
-              <el-button @click="onBranchDelete(scope.row)" type="text">删除</el-button>
+              <el-button @click="onBranchOperation('update', scope.row)"
+                         type="text">修改</el-button>
+              <el-button @click="onBranchDelete(scope.row)"
+                         type="text">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
       </div>
 
-      <el-dialog :title="formTitle[formActionTitle]" :visible.sync="branchStatus" @close="onFormClose('ruleForm')" width="500px">
-        <el-form :model="form" :rules="rules" ref="ruleForm">
-          <el-form-item label="收费标准" prop="price" :label-width="formLabelWidth">
-            <el-input type="number" v-model="form.price" autocomplete="off"></el-input>
+      <el-dialog :title="formTitle[formActionTitle]"
+                 :visible.sync="branchStatus"
+                 @close="onFormClose('ruleForm')"
+                 width="500px">
+        <el-form :model="form"
+                 :rules="rules"
+                 ref="ruleForm">
+          <el-form-item label="收费标准"
+                        prop="price"
+                        :label-width="formLabelWidth">
+            <el-input type="number"
+                      v-model="form.price"
+                      autocomplete="off"></el-input>
           </el-form-item>
-          <el-form-item label="所选分部" prop="branchIds" :label-width="formLabelWidth">
-            <el-select v-model="form.branchIds" multiple>
-              <el-option
-                v-for="(item, index) in branchList"
-                :key="index"
-                :label="item.label"
-                :value="item.value"
-                :disabled="item.disabled">
+          <el-form-item label="所选分部"
+                        prop="branchIds"
+                        :label-width="formLabelWidth">
+            <el-select v-model="form.branchIds"
+                       multiple>
+              <el-option v-for="(item, index) in branchList"
+                         :key="index"
+                         :label="item.label"
+                         :value="item.value"
+                         :disabled="item.disabled">
               </el-option>
-          </el-select>
+            </el-select>
           </el-form-item>
         </el-form>
-        <span slot="footer" class="dialog-footer">
+        <span slot="footer"
+              class="dialog-footer">
           <el-button @click="branchStatus = false">取 消</el-button>
-          <el-button @click="onTypesSubmit('ruleForm')" type="primary">确 定</el-button>
+          <el-button @click="onTypesSubmit('ruleForm')"
+                     type="primary">确 定</el-button>
         </span>
       </el-dialog>
     </div>
@@ -78,7 +96,7 @@ export default {
       },
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
   },
   methods: {
@@ -90,29 +108,29 @@ export default {
           let params = JSON.parse(JSON.stringify(this.dataList))
           let branchNames = []
           this.branchList.forEach(item => {
-            if(form.branchIds.includes(item.value)) {
+            if (form.branchIds.includes(item.value)) {
               branchNames.push(item.label)
             }
           })
-          if(this.formActionTitle == 'create') {
+          if (this.formActionTitle == 'create') {
             params.push({
               price: form.price,
               branchIds: form.branchIds,
               branchNames: branchNames
             })
-             sysConfigUpdate({
+            sysConfigUpdate({
               id: this.id,
               paranValue: JSON.stringify(params)
             }).then(res => {
-                if(res.code == 200) {
-                    this.$message.success('添加成功')
-                    this.branchStatus = false
-                    this.getList()
-                }
+              if (res.code == 200) {
+                this.$message.success('添加成功')
+                this.branchStatus = false
+                this.getList()
+              }
             })
-          } else if(this.formActionTitle == 'update') {
+          } else if (this.formActionTitle == 'update') {
             let tempUpdate = params.map(item => {
-              if(item.id == form.id) {
+              if (item.id == form.id) {
                 item = {
                   price: form.price,
                   branchIds: form.branchIds,
@@ -127,11 +145,11 @@ export default {
               id: this.id,
               paranValue: JSON.stringify(tempUpdate)
             }).then(res => {
-                if(res.code == 200) {
-                    this.$message.success('修改成功')
-                    this.branchStatus = false
-                    this.getList()
-                }
+              if (res.code == 200) {
+                this.$message.success('修改成功')
+                this.branchStatus = false
+                this.getList()
+              }
             })
           }
         } else {
@@ -139,8 +157,8 @@ export default {
         }
       })
     },
-    onBranchDelete(row) {
-      
+    onBranchDelete (row) {
+
       let tempBranch = JSON.parse(JSON.stringify(this.dataList))
       tempBranch.splice(row.id, 1)
 
@@ -152,33 +170,33 @@ export default {
         id: this.id,
         paranValue: JSON.stringify(temp)
       }).then(res => {
-          if(res.code == 200) {
-              this.$message.success('删除成功')
-              this.getList()
-          }
+        if (res.code == 200) {
+          this.$message.success('删除成功')
+          this.getList()
+        }
       })
     },
-    onBranchOperation(type, row) {
+    onBranchOperation (type, row) {
       this.branchStatus = true
       this.formActionTitle = type
-      if(type == 'update') {
+      if (type == 'update') {
         this.branchList.forEach(item => {
-          if(row.branchIds.includes(item.value)) {
+          if (row.branchIds.includes(item.value)) {
             item.disabled = false
           }
         })
         this.form = row
       }
     },
-    async getList () { 
+    async getList () {
       // 获取所有分部
       let branchList = await branchQueryPage({ rows: 9999, page: 1 })
-      if(branchList.code == 200) {
+      if (branchList.code == 200) {
         branchList = branchList.data.rows
       }
       // 获取对应配置
       let sysConfig = await sysConfigList({ group: 'organ_course_fee' })
-      if(sysConfig.code == 200) {
+      if (sysConfig.code == 200) {
         this.id = sysConfig.data[0].id
         sysConfig = sysConfig.data[0].paranValue ? JSON.parse(sysConfig.data[0].paranValue) : []
       }
@@ -199,7 +217,7 @@ export default {
           label: item.name,
           value: item.id
         }
-        if(sysBranchIds.includes(item.id)) {
+        if (sysBranchIds.includes(item.id)) {
           params.disabled = true
         } else {
           params.disabled = false
@@ -211,7 +229,7 @@ export default {
     },
     onFormClose (formName) { // 关闭弹窗重置验证
       this.form = {
-        price: null, 
+        price: null,
         branchIds: []
       }
       this.$refs[formName].resetFields()
@@ -220,20 +238,22 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.el-button--primary {
+/deep/.el-button--primary {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
-  &:hover, &:active, &:focus {
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
-    color: #FFF;
+    color: #fff;
   }
 }
-.el-date-editor.el-input{
+/deep/.el-date-editor.el-input {
   width: 100% !important;
 }
-.el-select {
+/deep/.el-select {
   width: 98% !important;
 }
 

src/views/categroyManager/specialSetup/chargesList.vue

@@ -227,7 +227,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.el-button--primary {
+/deep/.el-button--primary {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
@@ -239,10 +239,10 @@ export default {
     color: #fff;
   }
 }
-.el-date-editor.el-input {
+/deep/.el-date-editor.el-input {
   width: 100% !important;
 }
-.el-select {
+/deep/.el-select {
   width: 98% !important;
 }
 

src/views/categroyManager/specialSetup/jobTemplateSetting.vue

@@ -106,7 +106,6 @@ import pagination from '@/components/Pagination/index'
 import { courseHomeworkTemplateList, subjectListTree, homeWorkUpdate, homeWorkAdd, homeWorkDel } from '@/api/specialSetting'
 export default {
   components: { pagination },
-  name: 'adminManager',
   data () {
     return {
       tableList: [],
@@ -247,7 +246,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.el-button--primary {
+/deep/.el-button--primary {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
@@ -259,10 +258,10 @@ export default {
     color: #fff;
   }
 }
-.el-date-editor.el-input {
+/deep/.el-date-editor.el-input {
   width: 100% !important;
 }
-.el-select {
+/deep/.el-select {
   width: 98% !important;
 }
 </style>

src/views/categroyManager/specialSetup/musicalManager.vue

@@ -150,7 +150,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.el-popover {
+/deep/.el-popover {
   .el-form {
     display: flex;
   }
@@ -165,7 +165,7 @@ export default {
     background-color: #edeef0;
     padding-left: 36px;
   }
-  .el-button {
+  /deep/.el-button {
     float: right;
     margin-top: 10px;
     margin-right: 16px;
@@ -215,7 +215,7 @@ export default {
     color: #fff;
   }
 }
-.el-date-editor.el-input {
+/deep/.el-date-editor.el-input {
   width: 100% !important;
 }
 .el-select {

src/views/categroyManager/specialSetup/tryClass.vue

@@ -39,7 +39,6 @@ import pagination from '@/components/Pagination/index'
 import store from '@/store'
 export default {
   components: { pagination },
-  name: 'adminManager',
   data () {
     return {
       tableList: [],
@@ -86,10 +85,10 @@ export default {
     color: #fff;
   }
 }
-.el-date-editor.el-input {
+/deep/.el-date-editor.el-input {
   width: 100% !important;
 }
-.el-select {
+/deep/.el-select {
   width: 98% !important;
 }
 </style>

src/views/categroyManager/specialSetup/typesManager.vue

@@ -80,7 +80,6 @@ import pagination from '@/components/Pagination/index'
 import { chargeTypeList, subjectListTree, chargeTypeUpSet, chargeTypeDel } from '@/api/specialSetting'
 export default {
   components: { pagination },
-  name: 'adminManager',
   data () {
     return {
       tableList: [],
@@ -233,7 +232,7 @@ export default {
     color: #fff;
   }
 }
-.el-date-editor.el-input {
+/deep/.el-date-editor.el-input {
   width: 100% !important;
 }
 .el-select {

src/views/categroyManager/vipActiveList.vue

@@ -340,6 +340,14 @@ export default {
       activeId: ''
     }
   },
+  created () {
+    if (this.$route.query.searchForm) {
+      this.$route.query.searchForm instanceof Object ? this.searchForm = this.$route.query.searchForm : this.searchForm = JSON.parse(this.$route.query.searchForm);
+    }
+    if (this.$route.query.rules) {
+      this.$route.query.rules instanceof Object ? this.rules = this.$route.query.rules : this.rules = JSON.parse(this.$route.query.rules);
+    }
+  },
   mounted () {
     getEmployeeOrgan().then(res => {
       if (res.code == 200) {
@@ -647,7 +655,10 @@ export default {
       })
     },
     gotoNewActive () {
-      this.$router.push({ path: '/vipClassSet/vipNewActive?type=create' })
+      // 带参数 searchForm: { organId: null } 搜索条件 
+      let rules = JSON.stringify(this.rules)
+      let searchForm = JSON.stringify(this.searchForm)
+      this.$router.push({ path: '/vipClassSet/vipNewActive?type=create', query: { rules, searchForm } })
     }
   },
 }

src/views/categroyManager/vipNewActive.vue

@@ -228,6 +228,12 @@ export default {
     }
   },
   mounted () {
+    if (this.$route.query.rules) {
+      this.rules = this.$route.query.rules
+    }
+    if (this.$route.query.searchForm) {
+      this.searchForm = this.$route.query.searchForm
+    }
     // 首先获取课程形式
     vipGroupCategory().then(res => {
       // console.log(res);
@@ -301,7 +307,7 @@ export default {
           }).then(res => {
             if (res.code == 200) {
               this.$message.success('恭喜你,活动创建成功')
-              this.$router.push('/vipClassSet/vipActiveList')
+              this.$router.push({ path: "/vipClassSet/vipActiveList", query: { rules: this.rules, searchForm: this.searchForm } })
             }
           })
         } else {
@@ -313,7 +319,7 @@ export default {
       // 线上线下课 勾选就传不勾选就不传
       // addVipActive().then(res => { })
     },
-    onCheckAllBranch() {
+    onCheckAllBranch () {
       // 选择所有分部
       this.vipform.organ = []
       this.organList.forEach(item => {
@@ -321,7 +327,7 @@ export default {
       })
     },
     onCancel () {
-      this.$router.push("/vipClassSet/vipActiveList")
+      this.$router.push({ path: "/vipClassSet/vipActiveList", query: { rules: this.rules, searchForm: this.searchForm } })
     },
     onReSet () {
       this.vipform = {

src/views/studentManager/components/studentRecord.vue

@@ -64,9 +64,9 @@
           </template>
         </el-table-column>
         <el-table-column align='center'
-                         label="课程类型">
+                         label="班级类型">
           <template slot-scope="scope">
-            {{ scope.row.classGroupType | coursesType }}
+            {{ scope.row.classGroupType | classType }}
           </template>
         </el-table-column>
         <el-table-column align='center'

src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -267,7 +267,6 @@ let validPhone = (rule, value, callback) => {
   }
 }
 export default {
-  name: 'adminManager',
   data () {
     return {
       jobNature: jobNature,

src/views/teamDetail/components/resetClass.vue

@@ -1311,13 +1311,13 @@ export default {
   }
 }
 .resetClassForm {
-  .el-date-editor.el-input,
-  .el-date-editor.el-input__inner {
-    width: 180px;
+  /deep/.el-date-editor.el-input,
+  /deep/.el-date-editor.el-input__inner {
+    width: 180px !important;
   }
 }
-.el-date-editor.el-input,
-.el-date-editor.el-input__inner {
-  width: 100px;
+/deep/.el-date-editor.el-input,
+/deep/.el-date-editor.el-input__inner {
+  width: 100px !important;
 }
 </style>

src/views/vipClass/vipDetail/components/vipBaseInfo.vue

@@ -185,14 +185,14 @@ export default {
 </script>
 <style lang="scss" scoped>
 .vip-base {
-  .el-select {
+  /deep/.el-select {
     width: 180px !important;
   }
-  .el-date-editor.el-input,
-  .el-date-editor.el-input__inner {
+  /deep/.el-date-editor.el-input,
+  /deep/.el-date-editor.el-input__inner {
     width: 180px !important;
   }
-  .el-input {
+  /deep/.el-input {
     width: 180px !important;
   }