Răsfoiți Sursa

修改区域

Z 1 an în urmă
părinte
comite
37ff0a63b9

+ 17 - 12
src/views/factoryModel/factoryManagement/components/edit.vue

@@ -137,12 +137,13 @@
 </template>
 
 <script>
-import { cityDataLabel } from 'ele-admin/packages/utils/regions';
-import { listOrganizations } from '@/api/system/organization';
-import { saveOrUpdate } from '@/api/factoryModel';
-import { getUserPage } from '@/api/system/organization';
+import {cityDataLabel} from 'ele-admin/packages/utils/regions';
+import {listOrganizations} from '@/api/system/organization';
+import {saveOrUpdate} from '@/api/factoryModel';
+import {getUserPage} from '@/api/system/organization';
 import AreaSelect from "@/views/enterpriseModel/regionalManage/components/area-cascader.vue";
 import {basicAreaPageAPI} from "@/api/regionalManage";
+
 export default {
   components: {AreaSelect},
   props: {
@@ -172,7 +173,7 @@ export default {
           location: [],
           locationDetail: ''
         },
-        areaIdList:[],
+        areaIdList: [],
         enabled: 1,
         parentId: 0,
         leaderId: '',
@@ -182,19 +183,19 @@ export default {
     return {
       defaultForm,
       // 表单数据
-      form: { ...defaultForm() },
+      form: {...defaultForm()},
       // 表单验证规则
       rules: {
-        code: [{ required: true, message: '请输入', trigger: 'blur' }],
-        name: [{ required: true, message: '请输入', trigger: 'blur' }],
-        groupId: [{ required: true, message: '请输入', trigger: 'blur' }],
+        code: [{required: true, message: '请输入', trigger: 'blur'}],
+        name: [{required: true, message: '请输入', trigger: 'blur'}],
+        groupId: [{required: true, message: '请输入', trigger: 'blur'}],
         leaderId: {
           required: true,
           message: '请输入',
           trigger: 'change'
         },
         'extInfo.principalDep': [
-          { required: true, message: '请输入', trigger: 'change' }
+          {required: true, message: '请输入', trigger: 'change'}
         ]
       },
       visible: false,
@@ -287,7 +288,7 @@ export default {
       });
     },
     restForm() {
-      this.form = { ...this.defaultForm() };
+      this.form = {...this.defaultForm()};
       this.$nextTick(() => {
         this.$refs.form.clearValidate();
       });
@@ -312,7 +313,8 @@ export default {
 
     },
     getAreaInfo(nodeInfo) {
-       this.form.areaName = nodeInfo[0].pathLabels.join('/')
+      this.form.areaName = nodeInfo[0]?.pathLabels.join('/') || ''
+      this.form.areaId = this.form.areaId || ''
     },
     // 获取公司数据
     getGs() {
@@ -331,6 +333,7 @@ export default {
     },
     // 获取人员
     getUserPage() {
+      if (!this.form.extInfo.principalDep) return this.options.leaderId = []
       let par = {
         groupId: this.form.extInfo.principalDep,
         size: 999
@@ -345,10 +348,12 @@ export default {
 <style lang="scss" scoped>
 .location-warp {
   display: flex;
+
   .detail {
     margin-left: 10px;
   }
 }
+
 :deep(
     .el-dialog:not(.ele-dialog-form)
       .el-dialog__body

+ 3 - 1
src/views/factoryModel/plant/components/edit.vue

@@ -406,7 +406,8 @@ export default {
 
     },
     getAreaInfo(nodeInfo) {
-      this.form.areaName = nodeInfo[0].pathLabels.join('/')
+      this.form.areaName = nodeInfo[0]?.pathLabels.join('/') || ''
+      this.form.areaId = this.form.areaId || ''
     },
     open(type, row) {
       this.type = type;
@@ -488,6 +489,7 @@ export default {
     },
     // 获取人员
     getUserPage() {
+      if (!this.form.extInfo.principalDep) return this.options.leaderId = []
       let par = {
         groupId: this.form.extInfo.principalDep,
         size: 999

+ 3 - 1
src/views/factoryModel/productionLine/components/edit.vue

@@ -494,7 +494,8 @@ export default {
 
     },
     getAreaInfo(nodeInfo) {
-      this.form.areaName = nodeInfo[0].pathLabels.join('/')
+      this.form.areaName = nodeInfo[0]?.pathLabels.join('/') || ''
+      this.form.areaId = this.form.areaId || ''
     },
     /* 保存编辑 */
     save() {
@@ -547,6 +548,7 @@ export default {
     },
     // 获取人员
     getUserPage() {
+      if (!this.form.extInfo.principalDep) return this.options.leaderId = []
       let par = {
         groupId: this.form.extInfo.principalDep,
         size: 999

+ 4 - 5
src/views/factoryModel/station/components/edit.vue

@@ -88,7 +88,7 @@
             </el-form-item>
           </el-col>
 
-    
+
           <el-col :span="8">
             <el-form-item label="负责人部门:" prop="extInfo.principalDep">
               <ele-tree-select clearable :data="groupList" filterable v-model="form.extInfo.principalDep"
@@ -438,7 +438,8 @@ export default {
 
     },
     getAreaInfo(nodeInfo) {
-      this.form.areaName = nodeInfo[0].pathLabels.join('/')
+      this.form.areaName = nodeInfo[0]?.pathLabels.join('/') || ''
+      this.form.areaId = this.form.areaId || ''
     },
     /* 保存编辑 */
     save() {
@@ -527,9 +528,7 @@ export default {
     },
     // 获取人员
     getUserPage() {
-      if (!this.form.extInfo.principalDep) {
-        return
-      }
+      if (!this.form.extInfo.principalDep) return this.options.leaderId = []
       let par = {
         groupId: this.form.extInfo.principalDep,
         size: 999

+ 2 - 1
src/views/factoryModel/workshop/components/edit.vue

@@ -268,7 +268,8 @@ export default {
 
     },
     getAreaInfo(nodeInfo) {
-      this.form.areaName = nodeInfo[0].pathLabels.join('/')
+      this.form.areaName = nodeInfo[0]?.pathLabels.join('/') || ''
+      this.form.areaId = this.form.areaId || ''
     },
     /* 保存编辑 */
     save() {