紧急修复了一些bug

2020-08-17 15:28:28 +08:00
parent b17ad9443e
commit a0311f57f3
122 changed files with 1235 additions and 3297 deletions
--- a/admin/src/views/systemSetting/administratorAuthority/adminList/edit.vue
+++ b/admin/src/views/systemSetting/administratorAuthority/adminList/edit.vue
@@ -7,7 +7,7 @@
      <el-form-item label="管理员密码" prop="pwd">
        <el-input
          v-model="pram.pwd"
-          placeholder="管理员密码,不更改可以不填写"
+          placeholder="管理员密码"
          clearable
          @input="handlerPwdInput"
          @clear="handlerPwdInput"
@@ -77,7 +77,7 @@ export default {
        pwd: null,
        repwd: null,
        realName: null,
-        roles: null,
+        roles: [],
        status: null,
        id: null
      },
@@ -88,7 +88,7 @@ export default {
        pwd: [{ required: true, message: '请填管理员密码', trigger: ['blur', 'change'] }],
        repwd: [{ required: true, message: '确认密码密码', validator: validatePass, trigger: ['blur', 'change'] }],
        realName: [{ required: true, message: '管理员姓名', trigger: ['blur', 'change'] }],
-        roles: [{ required: true, message: '管理员身份', trigger: ['blur', 'change'] }]
+        roles: [{ required: true, message: '管理员身份', type: 'array', trigger: ['blur', 'change'] }]
      }
    }
  },
@@ -103,7 +103,8 @@ export default {
    handleGetRoleList() {
      const _pram = {
        page: 1,
-        limit: constants.page.limit[4]
+        limit: constants.page.limit[4],
+        status: 1
      }
      roleApi.getRoleList(_pram).then(data => {
        this.roleList = data
--- a/admin/src/views/systemSetting/administratorAuthority/adminList/index.vue
+++ b/admin/src/views/systemSetting/administratorAuthority/adminList/index.vue
@@ -3,7 +3,7 @@
    <el-card class="box-card">
      <el-form inline size="small">
        <el-form-item>
-          <el-select v-model="listPram.realName" placeholder="身份" clearable class="selWidth">
+          <el-select v-model="listPram.roles" placeholder="身份" clearable class="selWidth">
            <el-option
              v-for="item in roleList.list"
              :key="item.id"
@@ -33,10 +33,10 @@
          </el-select>
        </el-form-item>
        <el-form-item>
-          <el-input v-model="listPram.roleName" placeholder="姓名或者账号" clearable class="selWidth"/>
+          <el-input v-model="listPram.realName" placeholder="姓名或者账号" clearable class="selWidth"/>
        </el-form-item>
        <el-form-item>
-          <el-button size="mini" type="primary" @click.native="handleGetAdminList">查询</el-button>
+          <el-button size="mini" type="primary" @click="handleSearch">查询</el-button>
        </el-form-item>
      </el-form>
      <el-form inline>
@@ -136,7 +136,7 @@ export default {
        roles: null,
        status: null,
        page: 1,
-        limit: constants.page.limit[1]
+        limit: constants.page.limit[0]
      },
      roleList: [],
      menuList: [],
@@ -152,12 +152,18 @@ export default {
    this.handleGetRoleList()
  },
  methods: {
+    handleSearch() {
+      this.listPram.page = 1
+      this.handleGetAdminList()
+    },
    handleSizeChange(val) {
      this.listPram.limit = val
+      this.handleGetAdminList()
      this.handleGetRoleList(this.listPram)
    },
    handleCurrentChange(val) {
      this.listPram.page = val
+      this.handleGetAdminList()
      this.handleGetRoleList(this.listPram)
    },
    handleGetRoleList() {
@@ -171,15 +177,15 @@ export default {
    },
    handlerOpenDel(rowData) {
      this.$confirm('确认删除当前数据').then(() => {
-        const _pram = { id: rowData.id, isDel: 1, roles: Array.of(rowData.roles) }
-        systemAdminApi.adminUpdate(_pram).then(data => {
+        const _pram = { id: rowData.id}
+        systemAdminApi.adminDel(_pram).then(data => {
          this.$message.success('删除数据成功')
          this.handleGetAdminList()
        })
      })
    },
    handleGetAdminList() {
-      systemAdminApi.adminList(this.listPram).then(data => {
+      systemAdminApi.adminList( this.listPram ).then(data => {
        this.listData = data
        // this.handlerGetMenuList()
      })
--- a/admin/src/views/systemSetting/administratorAuthority/identityManager/index.vue
+++ b/admin/src/views/systemSetting/administratorAuthority/identityManager/index.vue
@@ -88,7 +88,7 @@ export default {
        updateTime: null,
        level: null,
        page: 1,
-        limit: constants.page.limit[1],
+        limit: constants.page.limit[0],
        roleName: null,
        rules: null,
        status: null
--- a/admin/src/views/systemSetting/logistics/companyList/index.vue
+++ b/admin/src/views/systemSetting/logistics/companyList/index.vue
@@ -4,9 +4,19 @@
      <div slot="header" class="clearfix">
        <div class="container">
          <el-form ref="form" inline :model="form">
-            <el-form-item label="搜索：">
-              <el-input v-model="form.name" placeholder="请输入内容" class="selWidth"  size="small">
-                <el-button slot="append" size="small" icon="el-icon-search" @click="getExpressList" />
+            <el-form-item label="状态">
+              <el-select v-model="form.isShow" placeholder="状态" clearable @change="handlerSearch" class="selWidth">
+                <el-option
+                  v-for="item in constants.switchStatus"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="关键字：">
+              <el-input v-model="form.keywords" placeholder="请输入关键字" class="selWidth"  size="small">
+                <el-button slot="append" size="small" icon="el-icon-search" @click="handlerSearch" />
              </el-input>
            </el-form-item>
          </el-form>
@@ -67,7 +77,7 @@
      </el-table>
      <div class="block-pagination">
        <el-pagination
-          :page-sizes="[12, 20, 40, 60]"
+          :page-sizes="[20, 40, 60, 80]"
          :page-size="tableData.limit"
          :current-page="tableData.page"
          layout="total, sizes, prev, pager, next, jumper"
@@ -78,7 +88,7 @@
      </div>
    </el-card>
    <el-dialog
-      title="提示"
+      title="添加物流公司"
      :visible.sync="dialogVisible"
      width="700px"
      :before-close="handleClose"
@@ -92,19 +102,22 @@
 import parser from '@/components/FormGenerator/components/parser/Parser'
 import * as systemFormConfigApi from '@/api/systemFormConfig.js'
 import * as logistics from '@/api/logistics.js'
+import * as constants from '@/utils/constants.js'
 export default {
  name: 'CompanyList',
  components: { parser },
  data() {
    return {
+      constants,
      // 表单
      formConf: { fields: [] },
      form: {
-        name: ''
+        keywords: '',
+        isShow: null
      },
      tableData: {},
      page: 1,
-      limit: 12,
+      limit: 20,
      loading: false,
      dialogVisible: false,
      fromType: 'add',
@@ -118,13 +131,18 @@ export default {
    this.getExpressList()
  },
  methods: {
+    handlerSearch() {
+      this.page = 1
+      this.getExpressList()
+    },
    //  获取物流公司列表
    getExpressList() {
      this.loading = true
      logistics.expressList({
        page: this.page,
        limit: this.limit,
-        keywords: this.form.name
+        keywords: this.form.keywords,
+        isShow: this.form.isShow
      }).then(res => {
        this.loading = false
        this.tableData = res
@@ -182,7 +200,6 @@ export default {
        })
      } else {
        data.id = this.editId
-        console.log(data)
        logistics.expressUpdate(data).then(res => {
          this.handleClose()
          this.getExpressList()
--- a/admin/src/views/systemSetting/logistics/shippingTemplates/index.vue
+++ b/admin/src/views/systemSetting/logistics/shippingTemplates/index.vue
@@ -4,8 +4,8 @@
      <div slot="header" class="clearfix">
        <div class="container">
          <el-form ref="form" inline :model="form">
-            <el-form-item label="搜索：">
-              <el-input v-model="form.name" placeholder="请输入内容" class="selWidth" size="small">
+            <el-form-item label="模板名称：">
+              <el-input v-model="form.keywords" placeholder="请输入模板名称" class="selWidth" size="small">
                <el-button slot="append" icon="el-icon-search" @click="handleSearch" />
              </el-input>
            </el-form-item>
@@ -26,7 +26,7 @@
        />
        <el-table-column
          label="模板名称"
-          min-width="150"
+          min-width="180"
          prop="name"
        />
        <el-table-column
@@ -47,11 +47,11 @@
            <p>{{ row.appoint | statusFilter }}</p>
          </template>
        </el-table-column>
-        <el-table-column
-          min-width="120"
-          label="指定区域不配送"
-          prop="type"
-        />
+        <!--<el-table-column-->
+          <!--min-width="120"-->
+          <!--label="指定区域不配送"-->
+          <!--prop="type"-->
+        <!--/>-->
        <el-table-column
          label="排序"
          min-width="100"
@@ -76,7 +76,7 @@
      </el-table>
      <div class="block-pagination">
        <el-pagination
-          :page-sizes="[12, 20, 40, 60]"
+          :page-sizes="[20, 40, 60, 80]"
          :page-size="tableData.limit"
          :current-page="tableData.page"
          layout="total, sizes, prev, pager, next, jumper"
@@ -117,11 +117,11 @@ export default {
    return {
      dialogVisible: false,
      form: {
-        name: ''
+        keywords: ''
      },
      tableData: '',
      page: 1,
-      limit: 12,
+      limit: 20,
      loading: false
    }
  },
@@ -136,6 +136,7 @@ export default {
      this.$refs.addTemplates.changType(0, this.te)
    },
    handleSearch() {
+      this.page = 1
      this.getDataList()
    },
    // 分页
@@ -151,7 +152,7 @@ export default {
    getDataList() {
      this.loading = true
      logistics.shippingTemplatesList({
-        name: this.form.name,
+        keywords: this.form.keywords,
        page: this.page,
        limit: this.limit
      }).then(res => {
--- a/admin/src/views/systemSetting/setting/index.vue
+++ b/admin/src/views/systemSetting/setting/index.vue
@@ -1,8 +1,7 @@
 <template>
  <div class="divBox">
    <el-card class="box-card">
-      {{activeNamel1}}
-      <el-tabs v-model="activeNamel1" @tab-click="handleTabClick">
+      <el-tabs v-model="activeNamel1" @tab-click="handleTabClick"  v-loading="loading">
        <el-tab-pane
          v-for="tab,index in treeList"
          :key="index"
@@ -26,7 +25,6 @@
          </template>
          <!--        正常配置渲染-->
          <template v-else>
-            {{activeNamel2}}
            <el-tabs v-if="tab.child.length > 0" v-model="activeNamel2"
                     type="border-card" @tab-click="handleItemTabClick">
              <el-tab-pane
@@ -75,6 +73,7 @@ export default {
  components: {Template, parser },
  data() {
    return {
+      loading: false,
      formConf: { content: { fields: [] }, id: null, render: false, isEdit: false },
      formConfChild: { content: { fields: [] }, id: null, render: false, isEdit: false },
      activeNamel1: null,
@@ -88,7 +87,6 @@ export default {
    }
  },
  mounted() {
-    console.log(this.$route.path.split("/")[1])
    this.handlerGetTreeList()
    this.getCurrentUploadSelectedFlag()
  },
@@ -137,11 +135,15 @@ export default {
      this.currentEditId = id
      this.formConf.content = { fields: [] }
      this.formConf.render = false
+      this.loading = true
      systemFormConfigApi.getFormConfigInfo(formPram).then(data => {
        const { id, name, info, content } = data
        this.formConf.content = JSON.parse(content)
        this.formConf.id = id
        this.handlerGetSettingInfo(id, 1)
+        this.loading = false
+      }).catch(() =>{
+        this.loading = false
      })
    },
    handleItemTabClick(tab, event) { //这里对tabs=tab.name和radio=id做了兼容
@@ -154,11 +156,15 @@ export default {
      this.currentEditId = id
      this.formConfChild.content = { fields: [] }
      this.formConfChild.render = false
+      this.loading = true
      systemFormConfigApi.getFormConfigInfo(formPram).then(data => {
        const { id, name, info, content } = data
        this.formConfChild.content = JSON.parse(content)
        this.formConfChild.id = id
        this.handlerGetSettingInfo(id, 2)
+        this.loading = false
+      }).catch(() =>{
+        this.loading = false
      })
    },
    handlerGetSettingInfo(id, level) {
@@ -203,6 +209,7 @@ export default {
    },
    handlerGetTreeList() {
      const _pram = { type: constants.categoryType[5].value, status: -1 }
+      this.loading = true
      categoryApi.treeCategroy(_pram).then(data => {
        this.treeList = this.handleAddArrt(data)
        if (this.treeList.length > 0) this.activeNamel1 = this.treeList[0].extra
@@ -214,6 +221,9 @@ export default {
        } else {
          this.handlerGetLevel1FormConfig(this.treeList[0].extra)
        }
+        this.loading = false
+      }).catch(() =>{
+        this.loading = false
      })
    },
    handleAddArrt(treeData) {