3.29更新

src/api/system/info.js

@@ -10,9 +10,9 @@ export function listInfo(query) {
 }
 
 // 查询企业管理详细
-export function getInfo(enterpriseId) {
+export function getInfo(deptId) {
   return request({
-    url: '/system/info/' + enterpriseId,
+    url: '/system/info/' + deptId,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateInfo(data) {
 }
 
 // 删除企业管理
-export function delInfo(enterpriseId) {
+export function delInfo(deptId) {
   return request({
-    url: '/system/info/' + enterpriseId,
+    url: '/system/info/' + deptId,
-    method: 'delete'
+    method: 'post'
   })
 }

src/views/system/dict/index.vue

@@ -319,6 +319,7 @@ export default {
         }
       });
     },
+
     /** 删除按钮操作 */
     handleDelete(row) {
       const dictIds = row.dictId || this.ids;
@@ -329,6 +330,8 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
+
+
     /** 导出按钮操作 */
     handleExport() {
       this.download('system/dict/type/export', {

src/views/system/info/index.vue

@@ -24,54 +24,26 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+
       <el-col :span="1.5">
-        <el-button
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:info:add']">新增</el-button>
-          type="primary"
+      </el-col>
-          plain
+
-          icon="el-icon-plus"
+      <el-col :span="1.5">
-          size="mini"
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['system:info:edit']">修改</el-button>
-          @click="handleAdd"
-          v-hasPermi="['system:info:add']"
-        >新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:info:remove']">删除</el-button>
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:info:edit']"
-        >修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:info:export']">导出</el-button>
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:info:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:info:export']"
-        >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="部门id" align="center" prop="enterpriseId" />
+      <el-table-column label="id只做展示" align="center" prop="id1" />
       <el-table-column label="部门名称" align="center" prop="deptName" />
       <el-table-column label="负责人" align="center" prop="leader" />
       <el-table-column label="联系电话" align="center" prop="phone" />
@@ -94,29 +66,23 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="企业名称" prop="enterpriseName">
-          <el-input v-model="form.enterpriseName" placeholder="请输入企业名称" />
+          <el-input v-model="form.deptName" placeholder="请输入企业名称" />
         </el-form-item>
         <el-form-item label="联系人邮箱" prop="email">
           <el-input v-model="form.email" placeholder="请输入联系人邮箱" />
         </el-form-item>
-        <el-form-item label="企业地址" prop="enterpriseAddress">
-          <el-input v-model="form.enterpriseAddress" placeholder="请输入企业地址" />
-        </el-form-item>
         <el-form-item label="企业联系电话" prop="phoneNumber">
-          <el-input v-model="form.phoneNumber" placeholder="请输入企业联系电话" />
+          <el-input v-model="form.phone" placeholder="请输入企业联系电话" />
-        </el-form-item>
-        <el-form-item label="行业类型" prop="industry">
-          <el-input v-model="form.industry" placeholder="请输入行业类型" />
         </el-form-item>
+
         <el-form-item label="企业标识" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入企业标识" />
+          <el-input v-model="form.logoType" placeholder="请输入企业标识" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
         </el-form-item>
+
         <el-form-item label="负责人" prop="leader">
           <el-input v-model="form.leader" placeholder="请输入负责人" />
         </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -177,6 +143,9 @@ export default {
       listInfo(this.queryParams).then(response => {
         this.infoList = response.data.rows;
         this.total = response.data.total;
+        this.infoList.forEach((item, index) => {
+          item.id1 = index + 1;
+        });
         this.loading = false;
       });
     },
@@ -215,7 +184,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.enterpriseId)
+      this.ids = selection.map(item => item.deptId)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -228,8 +197,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const enterpriseId = row.enterpriseId || this.ids
+      const deptId = row.deptId || this.ids
-      getInfo(enterpriseId).then(response => {
+      getInfo(deptId).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改企业管理";
@@ -239,7 +208,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.enterpriseId != null) {
+          if (this.form.deptId != null) {
             updateInfo(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -257,14 +226,17 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const enterpriseIds = row.enterpriseId || this.ids;
+      const deptId = row.deptId || this.ids;
-      this.$modal.confirm('是否确认删除企业管理编号为"' + enterpriseIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除企业名字为:"' + this.ids + '"的数据项？').then(function() {
-        return delInfo(enterpriseIds);
+        return delInfo(deptId);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
+
+
+
     /** 导出按钮操作 */
     handleExport() {
       this.download('system/info/export', {