区域管理模块增加删除

工厂模块增加区域字段
人员管理增加工厂字段

src/api/regionalManage/index.js

@@ -23,3 +23,11 @@ export async function basicAreaUpdateAPI(params) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+// 删除基本区域
+export async function basicAreaDeleteAPI(data) {
+  const res = await request.delete(`/main/basicarea/delete`, {data});
+  if (res.data.code == 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/router/index.js

@@ -41,14 +41,15 @@ router.beforeEach((to, from, next) => {
         store.commit('user/setUserInfo', res);
       });
     }
+    console.log(!store.state.user.menus);
     // 还未注册动态路由则先获取
     if (!store.state.user.menus) {
       store
         .dispatch('user/fetchUserInfo')
         .then(({ menus, homePath, authoritiesRouter }) => {
-          console.log();
           menus.forEach((item) => {
-            if (item.name == '流程管理') {
+            //匹配第一层路由名称
+            if (item.name == '配置管理') {
               item.children.push(
                 {
                   path: '/bpm/definition',
@@ -77,6 +78,7 @@ router.beforeEach((to, from, next) => {
             );
             next({ ...to, replace: true });
           }
+          console.log(router);
         })
         .catch((e) => {
           console.error(e);

src/views/enterpriseModel/regionalManage/components/area-edit.vue

@@ -10,59 +10,49 @@
   >
     <el-form ref="form" :model="form" :rules="rules" label-width="140px">
       <el-row :gutter="15">
-        <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
-          <el-form-item label="父区域：">
-            <area-select
-              :disabled="dialogType=='view'"
-              v-model="form.parentId"
-              :data="organizationList"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
-          <el-form-item label="区域等级：" prop="areaLevel">
-            <DictSelection dictName="区域等级" v-model="form.areaLevel" :disabled="dialogType=='view'"></DictSelection>
-          </el-form-item>
-        </el-col>
         <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
           <el-form-item label="区域类型：" prop="areaLevel">
             <DictSelection dictName="区域类型" v-model="form.areaType" :disabled="dialogType=='view'"></DictSelection>
           </el-form-item>
         </el-col>
         <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
-          <el-form-item label="区域名称：" prop="name">
+          <el-form-item label="区域编码：" prop="areaCode">
             <el-input
-
               clearable
               :maxlength="50"
-              v-model="form.name"
-              placeholder="请输入区域名称"
+              v-model="form.areaCode"
+              placeholder="请输入区域编码"
               :disabled="dialogType=='view'"
             />
           </el-form-item>
         </el-col>
         <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
-          <el-form-item label="区域编码：" prop="areaCode">
+          <el-form-item label="区域名称：" prop="name">
             <el-input
+
               clearable
               :maxlength="50"
-              v-model="form.areaCode"
-              placeholder="请输入区域编码"
+              v-model="form.name"
+              placeholder="请输入区域名称"
               :disabled="dialogType=='view'"
             />
           </el-form-item>
         </el-col>
         <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
-          <el-form-item label="排序：">
-            <el-input-number
-              style="width: 100%"
-              v-model="form.areaSort"
-              placeholder="请选择"
-              controls-position="right"
-              :min="1"
-            ></el-input-number>
+          <el-form-item label="区域等级：" prop="areaLevel">
+            <DictSelection dictName="区域等级" v-model="form.areaLevel" :disabled="dialogType=='view'"></DictSelection>
+          </el-form-item>
+        </el-col>
+        <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
+          <el-form-item label="父区域：">
+            <area-select
+              :disabled="dialogType=='view'"
+              v-model="form.parentId"
+              :data="organizationList"
+            />
           </el-form-item>
         </el-col>
+
         <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
           <el-form-item label="备注：">
             <el-input
@@ -72,7 +62,6 @@
             ></el-input>
           </el-form-item>
         </el-col>
-
         <el-col :span="12">
           <el-form-item label="附件：">
             <fileUpload
@@ -86,6 +75,21 @@
 
         </el-col>
 
+        <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
+          <el-form-item label="排序：">
+            <el-input-number
+              style="width: 100%"
+              v-model="form.areaSort"
+              placeholder="请选择"
+              controls-position="right"
+              :min="1"
+            ></el-input-number>
+          </el-form-item>
+        </el-col>
+
+
+
+
       </el-row>
     </el-form>
 
@@ -158,6 +162,7 @@ export default {
       },
       // 提交状态
       loading: false,
+      dialogType: false,
       title: '',
       // 是否是修改
       isUpdate: false

src/views/enterpriseModel/regionalManage/index.vue

@@ -69,7 +69,7 @@
       ref="areaEditRef"
       :data="editData"
       :parent-id="parentId"
-      :organization-list="data"
+      :organization-list="dataTree"
       @done="reload"
     />
   </div>
@@ -82,7 +82,7 @@ import {
   listOrganizations,
   removeOrganization
 } from '@/api/system/organization';
-import {basicAreaPageAPI} from "@/api/regionalManage";
+import {basicAreaDeleteAPI, basicAreaPageAPI} from "@/api/regionalManage";
 import {getByCode} from "@/api/system/dictionary-data";
 import {getFile} from "@/api/system/file";
 
@@ -95,6 +95,7 @@ export default {
       loading: false,
       // 列表数据
       data: [],
+      dataTree: [],
       // 选中数据
       current: null,
       // 是否显示表单弹窗
@@ -217,6 +218,11 @@ export default {
         idField: 'id',
         parentIdField: 'parentId'
       });
+      this.dataTree = [{
+        name:'顶级区域',
+        id: '0',
+        children:  this.data,
+      }]
       return this.data
 
     },
@@ -240,12 +246,12 @@ export default {
       });
     },
     /* 删除 */
-    remove() {
-      this.$confirm('确定要删除选中的机构吗?', '提示', {
+    remove(row) {
+      this.$confirm('确定要删除选中的区域吗?', '提示', {
         type: 'warning'
       }).then(() => {
-          const loading = this.$loading({lock: true});
-          removeOrganization([this.current.id])
+           const loading = this.$loading({lock: true});
+        basicAreaDeleteAPI([row.id])
             .then((msg) => {
               loading.close();
               this.$message.success(msg);

src/views/factoryModel/productionLine/components/edit.vue

@@ -329,6 +329,8 @@ export default {
       code: '',
       name: '',
       leaderId:'',
+      areaId: '',
+      areaName: '',
       extInfo: {
         factoryId: '',
         // principal: '', // 负责人

src/views/factoryModel/station/components/edit.vue

@@ -25,16 +25,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="区域:" prop="location_city">
-              <area-select
-                v-model="form.areaId"
-                @checkedKeys="getAreaInfo"
-                :data="areaTreeList"
-                ref="tree"
-              />
-            </el-form-item>
-          </el-col>
+
           <el-col :span="8">
             <el-form-item label="设备编码:" prop="extInfo.assetCode" v-if="form.extInfo.type == 1">
               <el-input v-model="form.extInfo.assetCode" readonly @click.native="chooseAsset" />
@@ -56,7 +47,16 @@
               </DictSelection>
             </el-form-item>
           </el-col>
-
+          <el-col :span="8">
+            <el-form-item label="区域:" prop="location_city">
+              <area-select
+                v-model="form.areaId"
+                @checkedKeys="getAreaInfo"
+                :data="areaTreeList"
+                ref="tree"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="所属厂房:" prop="extInfo.factoryId">
               <el-select v-model="form.extInfo.factoryId" placeholder="请选择" @change="change_factoryId"
@@ -210,9 +210,6 @@ export default {
       this.toTreeData(nval);
     }
   },
-  created() {
-    this.getBasicAreaList();
-  },
   data() {
     const defaultForm = function () {
       return {
@@ -351,6 +348,9 @@ export default {
       }
     }
   },
+  created() {
+    this.getBasicAreaList()
+  },
   methods: {
     chooseAsset() {
       this.$refs.productRefs.open(this.form.extInfo, '选择设备', '4')

src/views/factoryModel/workshop/components/edit.vue

@@ -173,6 +173,8 @@ export default {
         id: '',
         code: '',
         name: '',
+        areaId: '',
+        areaName: '',
         extInfo: {
           location: '',
           principalDep: '' // 负责人部门