Merge branch 'master' of http://223.75.76.159:9090/zq/picc-admin-portal

src/views/base/company-list.vue

@@ -49,8 +49,8 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="name" sort-by="name_" label="用户名" width="260"></el-table-column>
-      <el-table-column prop="realName" sort-by="real_name" label="企业名称" width="260"></el-table-column>
+      <el-table-column prop="createBy" label="用户名" width="100"></el-table-column>
+      <el-table-column prop="name" label="企业名称" width="200"></el-table-column>
       <el-table-column prop="legalName" sort-by="legal_name" label="法人代表" width="180"></el-table-column>
       <el-table-column prop="legalCard" sort-by="legal_card" label="法人代表身份证" width="200"></el-table-column>
       <el-table-column prop="usccCode" sort-by="uscc_code" label="证件编号" width="200"></el-table-column>

src/views/sys/dataDictionary-detail.vue

@@ -37,13 +37,6 @@
             :remote-method="queryMenu"
             style="width:300px"
           >
-            <template v-if="formModel.parentId!=null">
-              <el-option
-                :key="formModel.parentId"
-                :label="formModel.parentName"
-                :value="formModel.parentId"
-              ></el-option>
-            </template>
             <el-option
               v-for="dataDictionary in dataDictionaryListFilter"
               :key="dataDictionary.id"
@@ -65,7 +58,7 @@ import Constant from "@/constant";
 import dataDictionaryApi from "@/api/sys/dataDictionary";
 
 export default {
-  props: ["dictId", "modalTitle"],
+  props: ["dictId", "modalTitle","catalog"],
   data() {
     var validateValue = (rule, value, callback) => {
         if(this.formModel.dataType == '2' && value==='') {
@@ -99,10 +92,19 @@ export default {
   },
   computed: {
     dataDictionaryListFilter() {
-      var self = this;
-      return self.dataDictionaryList.filter(dataDictionary => {
-        return dataDictionary.id;
+      var list = [];
+
+      var map = {};
+
+      this.dataDictionaryList.forEach((item)=>{
+        map[item.id] = item;
       });
+
+      for(var key in map){
+        list.push(map[key]);
+      }
+
+      return list;
     }
   },
   methods: {
@@ -160,10 +162,12 @@ export default {
       });
     }
   },
-  mounted: function() {
+  async mounted() {
     var self = this;
     self.loading = true;
-    this.queryMenu("");
+    
+    await this.queryMenu("");
+
     (function() {
       if (self.dictId.length == 0) {
         return dataDictionaryApi.create();
@@ -177,6 +181,22 @@ export default {
 
         if (jsonData.result) {
           self.formModel = jsonData.data;
+
+          // 增加初始值
+          if(jsonData.data.parentId!=null){
+            self.dataDictionaryList.push({
+              id: jsonData.data.parentId,
+              name: jsonData.data.parentName
+            });
+          }
+          else if(this.catalog!=null && this.catalog.id!=null){
+            self.formModel.parentId = this.catalog.id; 
+
+            self.dataDictionaryList.push({
+              id: this.catalog.id,
+              name: this.catalog.name
+            });
+          }
         } else {
           self.$message.error(jsonData.message + "");
         }

src/views/sys/dataDictionary-list.vue

@@ -17,6 +17,23 @@
       <el-form-item label="名称" prop="name">
         <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
       </el-form-item>
+      <el-form-item label="所属目录" prop="parentId">
+        <el-select
+            size="mini"
+            v-model="queryModel.parentId"
+            filterable
+            remote
+            placeholder="请输入关键词"
+            :remote-method="queryMenu"
+          >
+            <el-option
+              v-for="item in queryMenuResult"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -79,8 +96,22 @@
       ></el-table-column>
       <el-table-column label="操作">
         <template slot-scope="{row}">
-          <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
-          <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+          <el-row v-if="row.dataType=='1'">
+            <el-col :span="12">
+              <el-button size="mini" type="text" @click="showData(row)">查看数据</el-button>
+            </el-col>
+            <el-col :span="12">
+              <el-button size="mini" type="text" @click="addData(row)">新增数据</el-button>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-button size="mini" type="text" @click="handleEdit(row)">编辑</el-button>
+            </el-col>
+            <el-col :span="12">
+              <el-button size="mini" type="text" @click="handleDelete(row)">删除</el-button>
+            </el-col>
+          </el-row>
         </template>
       </el-table-column>
     </el-table>
@@ -95,6 +126,7 @@
     <dataDictionary-detail
       v-if="showModal"
       :dictId="dictId"
+      :catalog="catalog"
       :modalTitle="modalTitle"
       @close="onDetailModalClose"
     ></dataDictionary-detail>
@@ -138,10 +170,27 @@ export default {
       multipleSelection: [],
       showModal: false,
       modalTitle: "",
-      businessKey: ""
+      businessKey: "",
+      queryMenuResult: []
     };
   },
   methods: {
+    queryMenu(keywords) {
+      var formData = new FormData();
+      formData.append("keywords", keywords);
+      formData.append("dataType", "1");
+      formData.append("limit", 10);
+
+      return dataDictionaryApi.query(formData).then(response => {
+        var jsonData = response.data;
+
+        if (jsonData.result) {
+          this.queryMenuResult = jsonData.data;
+        } else {
+          this.$message.error(jsonData.message + "");
+        }
+      });
+    },
     changePage(pageIndex) {
       var self = this;
 
@@ -153,6 +202,7 @@ export default {
       formData.append("pageIndex", self.pageIndex);
       formData.append("pageSize", self.pageSize);
       formData.append("name", self.queryModel.name);
+      formData.append("parentId", self.queryModel.parentId);
 
       if (this.field != null) {
         formData.append("field", this.field);
@@ -193,6 +243,7 @@ export default {
     },
     handleReset(name) {
       this.$refs[name].resetFields();
+      this.queryMenu('');
     },
     handleAdd() {
       this.modalTitle = "新增";
@@ -262,10 +313,24 @@ export default {
       if (refreshed) {
         this.changePage(this.pageIndex);
       }
-    }
+    },
+    addData(row) {
+      this.modalTitle = "新增";
+      this.dictId = "";
+      this.catalog = row;
+      this.showModal = true;
+    },
+    showData(row){
+        this.queryMenuResult.length=0; //清空
+        this.queryMenuResult.push(row);
+
+        this.queryModel.parentId = row.id;
+        this.changePage(1);
+    },
   },
   mounted: function() {
     this.changePage(1);
+    this.queryMenu('');
   },
   components: {
     "dataDictionary-detail": DataDictionaryDetail

src/views/sys/menu-detail.vue

@@ -75,7 +75,7 @@ import Constant from "@/constant";
 import menuApi from "@/api/sys/menu";
 
 export default {
-  props: ["menuId","modalTitle"],
+  props: ["menuId","modalTitle","parentMenu"],
   data() {
     return {
       formModel : {},
@@ -203,10 +203,21 @@ export default {
         self.formModel = jsonData.data;
 
         // 增加初始值
-        self.menuList.push({
-          id: jsonData.data.parentId,
-          menuName: jsonData.data.parentName
-        });  
+        if(jsonData.data.parentId!=null){
+          self.menuList.push({
+            id: jsonData.data.parentId,
+            menuName: jsonData.data.parentName
+          });
+        }
+        else if(this.parentMenu!=null && this.parentMenu.id!=null){
+          self.formModel.parentId = this.parentMenu.id; 
+
+          self.menuList.push({
+            id: this.parentMenu.id,
+            menuName: this.parentMenu.menuName
+          });
+        }
+
       } else {
         self.$message.error(jsonData.message + "");
       }

src/views/sys/menu-list.vue

@@ -18,13 +18,14 @@
         <el-input type="text" size="mini" v-model="queryModel.menuName"></el-input>
       </el-form-item>
       <el-form-item label="菜单类型" prop="menuType">
-        <el-select v-model="queryModel.menuType">
+        <el-select v-model="queryModel.menuType" size="mini">
           <el-option label="后端接口" value="1"></el-option>
           <el-option label="前端页面" value="2"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="上级菜单" prop="parentId">
         <el-select
+            size="mini"
             v-model="queryModel.parentId"
             filterable
             remote
@@ -101,9 +102,22 @@
       <el-table-column prop="updateTime" label="更新时间" :sortable="true" width="180"></el-table-column>
       <el-table-column label="操作" width="250" fixed="right">
         <template slot-scope="{row}">
-          <el-button size="mini" type="success" @click="showSubmenu(row)">下级菜单</el-button>
-          <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
-          <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+          <el-row>
+            <el-col :span="12">
+          <el-button size="mini" type="text" @click="showSubmenu(row)">下级菜单</el-button>
+            </el-col>
+            <el-col :span="12">
+          <el-button size="mini" type="text" @click="addSubmenu(row)">新增子菜单</el-button>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-button size="mini" type="text" @click="handleEdit(row)">编辑</el-button>
+            </el-col>
+            <el-col :span="12">
+              <el-button size="mini" type="text" @click="handleDelete(row)">删除</el-button>
+            </el-col>
+          </el-row>
         </template>
       </el-table-column>
     </el-table>
@@ -122,6 +136,7 @@
         @close="onDetailModalClose"
         :menuId="menuId"
         :modalTitle="modalTitle"
+        :parentMenu="parentMenu"
       ></menu-detail>
 
   </div>
@@ -157,7 +172,8 @@ export default {
       multipleSelection: [],
       showDetailModal: false,
       menuId: "",
-      queryMenuResult: []
+      queryMenuResult: [],
+      parentMenu: {}
     };
   },
   methods: {
@@ -224,6 +240,7 @@ export default {
     },
     handleReset(name) {
       this.$refs[name].resetFields();
+      this.queryMenu();
     },
     handleAdd() {
       var self = this;
@@ -321,6 +338,14 @@ export default {
 
         this.queryModel.parentId = row.id;
         this.changePage(1);
+    },
+    addSubmenu(row){
+      var self = this;
+
+      self.modalTitle = "新增";
+      self.menuId = "";
+      self.parentMenu = row;
+      self.showDetailModal = true;
     }
   },
   mounted: function() {