修改小问题点

src/views/businessManager/shopManager/shopCategory.vue

@@ -246,6 +246,6 @@ export default {
   width: 100% !important;
 }
 /deep/.el-select {
-  width: 98% !important;
+  width: 100% !important;
 }
 </style>

src/views/businessManager/shopManager/shopList.vue

@@ -208,9 +208,10 @@ export default {
         params.id = row.id
       }
       let pageInfo = JSON.stringify(this.pageInfo)
+      let paramInfo = JSON.stringify(params)
       this.$router.push({
         path: '/shopManager/shopOperation',
-        query: { params, pageInfo }
+        query: { paramInfo, pageInfo }
       })
     }
   }

src/views/businessManager/shopManager/shopOperation.vue

@@ -21,10 +21,7 @@
         </el-form-item>
         <el-form-item label="商品类型"
                       prop="type">
-          <el-select v-model="form.type"
-                     clearable
-                     filterable>
-
+          <el-select v-model="form.type">
             <el-option label="乐器"
                        value="INSTRUMENT"></el-option>
             <el-option label="辅件"
@@ -40,7 +37,6 @@
         <el-form-item label="商品分类"
                       prop="goodsCategoryId">
           <el-select v-model="form.goodsCategoryId"
-                     clearable
                      filterable>
             <el-option v-for="item in categoryList"
                        :key="item.value"
@@ -102,7 +98,7 @@ import { categoryListTree, goodsAdd, goodsUpdate, goodsSingleQuery } from '@/api
 // import store from '@/store'
 import { getToken } from '@/utils/auth'
 let validPrice = (rule, value, callback) => {
-  if (!value.toString()) {
+  if (!value) {
     callback(new Error('请输入金额'))
   } else if (value < 0) {
     callback(new Error('输入金额必须大于0'))
@@ -116,7 +112,7 @@ export default {
   data () {
     return {
       categoryList: [],
-      pageType: this.$route.query.params.type,
+      pageType: null,
       headers: {
         Authorization: getToken()
       },
@@ -165,11 +161,17 @@ export default {
     }
   },
   created () {
-    if (this.$route.query.search) {
-      this.Fsearch = this.$route.query.search;
+    let query = this.$route.query
+    if(query.paramInfo) {
+      let paramInfo = JSON.parse(query.paramInfo)
+      this.pageType = paramInfo.type
+      this.id = paramInfo.id
+    }
+    if (query.search) {
+      this.Fsearch = query.search;
     }
-    if (this.$route.query.pageInfo) {
-      this.Frules = this.$route.query.pageInfo
+    if (query.pageInfo) {
+      this.Frules = query.pageInfo
     }
   },
   mounted () {
@@ -214,7 +216,7 @@ export default {
     },
     getList () {
       if (this.pageType == 'create') return false
-      goodsSingleQuery(this.$route.query.params.id).then(res => {
+      goodsSingleQuery(this.id).then(res => {
         if (res.code == 200) {
           let result = res.data
           this.form = {

src/views/categroyManager/insideSetting/addressManager.vue

@@ -449,9 +449,13 @@ export default {
       }
     },
     getList () {
-      let params = this.searchForm
-      params.rows = this.pageInfo.limit
-      params.page = this.pageInfo.page
+      let searchForm = this.searchForm
+      let params = {
+        search: searchForm.search ? searchForm.search : null,
+        organId: searchForm.organId ? searchForm.organId : null,
+        rows: this.pageInfo.limit,
+        page: this.pageInfo.page
+      }
       schoolQueryPage(params).then(res => {
         if (res.code == 200 && res.data) {
           this.tableList = res.data.rows

src/views/categroyManager/insideSetting/adminOperation.vue

@@ -7,7 +7,7 @@
     <div class="m-core">
       <el-form ref="form"
                label-width="120px"
-               width="500px">
+               style="width: 500px">
         <el-form-item label="角色名称"
                       prop="roleName">
           <el-input v-model="result.roleName"></el-input>
@@ -140,6 +140,8 @@ export default {
     },
     onCheckAll (val) {
       if (val) {
+        // 先去掉半选
+        this.isIndeterminate = false
         this.$refs.tree.setCheckedNodes(this.data)
       } else {
         this.$refs.tree.setCheckedNodes([])

src/views/categroyManager/insideSetting/branchManager.vue

@@ -281,15 +281,6 @@ export default {
     },
     openTeaching (type, rows) {
       // 重置数据
-      this.form = {
-        id: null,
-        name: null, // 教学点名称
-        linkman: null, // 来源
-        job: null,  // 费用
-        mobileNo: null, // 合作单位
-        ownershipType: null,
-        organId: null
-      }
       this.teachingStatus = true
       this.formActionTitle = type
       // 修改的时候赋值

src/views/categroyManager/insideSetting/chargeProfitManager.vue

@@ -89,7 +89,7 @@
                     :label="2">收费种类</el-radio>
         </el-form-item>
 
-        <div v-show="form.type == 1">
+        <div v-if="form.type == 1">
           <el-form-item label="公"
                         prop="comScale"
                         :label-width="formLabelWidth">
@@ -108,13 +108,10 @@
           </el-form-item>
         </div>
 
-        <div v-show="form.type == 2">
+        <div v-if="form.type == 2">
           <el-form-item label="课程"
-                        required
                         :label-width="formLabelWidth">
             <el-select placeholder="请选择方式"
-                       clearable
-                       filterable
                        v-model="form.courseFee">
               <el-option label="公"
                          value="COM"></el-option>
@@ -123,11 +120,8 @@
             </el-select>
           </el-form-item>
           <el-form-item label="乐器"
-                        required
                         :label-width="formLabelWidth">
             <el-select placeholder="请选择方式"
-                       filterable
-                       clearable
                        v-model="form.instrumentFee">
               <el-option label="公"
                          value="COM"></el-option>
@@ -136,11 +130,8 @@
             </el-select>
           </el-form-item>
           <el-form-item label="辅件"
-                        required
                         :label-width="formLabelWidth">
             <el-select placeholder="请选择方式"
-                       clearable
-                       filterable
                        v-model="form.accessoriesFee">
               <el-option label="公"
                          value="COM"></el-option>
@@ -149,11 +140,8 @@
             </el-select>
           </el-form-item>
           <el-form-item label="其它"
-                        required
                         :label-width="formLabelWidth">
             <el-select placeholder="请选择方式"
-                       filterable
-                       clearable
                        v-model="form.otherFee">
               <el-option label="公"
                          value="COM"></el-option>
@@ -165,9 +153,7 @@
         <el-form-item label="所属分部"
                       prop="organId"
                       :label-width="formLabelWidth">
-          <el-select v-model="form.organId"
-                     clearable
-                     filterable>
+          <el-select v-model="form.organId">
             <el-option v-for="item in branchList"
                        :key="item.value"
                        :label="item.label"
@@ -371,13 +357,10 @@ export default {
     onFormClose (formName) { // 关闭弹窗重置验证
       this.form = {
         type: 1,
-        comScale: null,
-        perScale: null,
         courseFee: 'COM',
         instrumentFee: 'COM',
         accessoriesFee: 'COM',
-        otherFee: 'COM',
-        organId: ''
+        otherFee: 'COM'
       }
       this.$refs[formName].resetFields()
     }

src/views/categroyManager/insideSetting/staffManager.vue

@@ -89,7 +89,6 @@
           </el-table-column>
           <el-table-column align='center'
                            label="所属部门">
-
             <span style="display: inline-block;width: 100%;overflow: hidden;white-space: nowrap; text-overflow: ellipsis;"
                   slot-scope="scope">
               <el-popover placement="top-start"
@@ -347,9 +346,15 @@ export default {
       this.getList()
     },
     getList () {
-      let params = this.searchForm
-      params.rows = this.pageInfo.limit
-      params.page = this.pageInfo.page
+      let searchForm = this.searchForm
+      let params = {
+        search: searchForm.search ? searchForm.search : null,
+        jobNature: searchForm.jobNature ? searchForm.jobNature : null,
+        organId: searchForm.organId ? searchForm.organId : null,
+        roleId: searchForm.roleId ? searchForm.roleId : null,
+        rows: this.pageInfo.limit,
+        page: this.pageInfo.page
+      }
       queryEmployByOrganId(params).then(res => {
         if (res.code == 200 && res.data) {
           this.tableList = res.data.rows

src/views/categroyManager/specialSetup/musicalManager.vue

@@ -102,6 +102,9 @@ export default {
         name: this.oneTypeName
       }).then(res => {
         this.messageTips('添加', res)
+        if(res.code == 200) {
+          this.oneTypeName = null
+        }
       })
     },
     onSave (item, index) {
@@ -112,6 +115,9 @@ export default {
         name: this.inputValue[index]
       }).then(res => {
         this.messageTips('添加', res)
+        if(res.code == 200) {
+          this.inputValue[index] = null
+        }
       })
     },
     subjectDelete (item) { // 删除分类

src/views/categroyManager/specialSetup/typesManager.vue

@@ -92,7 +92,7 @@ export default {
         update: '修改收费类型'
       },
       typeStatus: false, // 添加教学点 
-      formLabelWidth: '120px',
+      formLabelWidth: '100px',
       form: {
         name: null, // 
         subjectIds: []
@@ -238,6 +238,6 @@ export default {
   width: 100% !important;
 }
 .el-select {
-  width: 98% !important;
+  width: 100% !important;
 }
 </style>