实现部门ID与产线ID的关联

imcs-ui/src/lang/zh/resource.js

@@ -95,6 +95,7 @@ export default {
 				mode: '产线模式',
 				remark: '备注',
 				status: '启用状态',
+				orgId: '产线部门',
 				createUser: '操作人',
 				updateTime: '修改时间'
 			},
@@ -146,7 +147,6 @@ export default {
 				productionStatus: '生产状态'
 			},
       		//【维保计划管理】列表table字段名称
-      repair:{
 				select:'选择设备',
 				code: '设备编号',
         productionresourceName: '设备名称',

imcs-ui/src/views/zuihou/resourceProductMgr/areaMgr/components/Edit.vue

@@ -35,6 +35,9 @@
           <i class="el-icon-plus" />
         </imgUpload>
       </el-form-item>
+      <el-form-item :label='$t("resource.table.area.remark")+"："' prop="remark">
+      	<el-input v-model="tenant.remark" type="textarea" :rows="3" style="width: 100%;"/>
+      </el-form-item>
       <!--<el-form-item :label='$t("resource.table.area.layoutMap")+"："' prop="layoutMap">          
           <fileUpload :acceptSize="5*1024*1024" :auto-upload="false" :limit="1" :fileOtherData="fileData" @fileLengthVaild="fileLengthVaild" @setId="setIdAndSubmit" ref="fileRef">              
               <el-button size="small" slot="trigger" type="primary" >选取文件</el-button>              
@@ -44,8 +47,17 @@
 	          		<el-image :src="tenant.imgUrl" fit="cover" />
 	        </div> 
       </el-form-item>-->
-      <el-form-item :label='$t("resource.table.area.remark")+"："' prop="remark">
-      	<el-input v-model="tenant.remark" type="textarea" :rows="3" style="width: 100%;"/>
+      <el-form-item :label='$t("resource.table.area.orgId")+"："' prop="orgId">
+      		<treeselect
+          :clear-value-text="$t('common.clear')"
+          :load-options="loadListOptions"
+          :multiple="false"
+          :options="orgList"
+          :searchable="true"
+          placeholder=" "
+          style="width:100%"
+          v-model="tenant.orgId"
+        />
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -61,11 +73,14 @@ import areaMgrApi from "@/api/resourceProductMgr/areaMgr";
 import imgUpload from "@/components/zuihou/imgUpload";
 import fileUpload from "@/components/zuihou/fileUpload"
 import elDragDialog from '@/directive/el-drag-dialog'
+import Treeselect from "@riophae/vue-treeselect"
+import orgApi from "@/api/Org.js";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: 'TenantEdit',
   directives: {elDragDialog, fileUpload},
-  components: { fileUpload, imgUpload },
+  components: { fileUpload, imgUpload, Treeselect },
   props: {
     dialogVisible: {
       type: Boolean,
@@ -89,6 +104,7 @@ export default {
       fileData: {},
       formData: {},
       imgFileList: [],  // 图片集合
+      orgList: [],
       imgFileData: {
         bizId: "",
         bizType: "AREA_LINE"
@@ -140,6 +156,7 @@ export default {
         this.width = this.initWidth()
       })()
     } 
+    this.initOrg();
   },
   methods: {
     initTenant () {
@@ -148,6 +165,7 @@ export default {
         name: '',
         layoutMap: '',
         status: '1',
+        orgId: '',
         remark:'',
       }
     },
@@ -161,6 +179,9 @@ export default {
         return '800px'
       }
     },
+    loadListOptions({ callback }) {
+      callback();
+    },
     // 附件长度校验
     fileLengthVaild (data) {
       const vm = this;
@@ -170,7 +191,7 @@ export default {
     	if(val){        
     		this.tenant = { ...val }   
     		// 附件显示
-    		this.imgFileList = [{url: val.imgUrl}];
+    		this.imgFileList = [{url: val.imgUrl}];        
     	}
       // 字典表
       this.dicts = dicts     
@@ -182,6 +203,20 @@ export default {
       this.fileData.bizType = "TRAY"
       this.fileData.isSingle = true
     },
+    initOrg() {
+        orgApi
+          .allTree({status: true})
+          .then(response => {
+            const res = response.data;
+            this.orgList = res.data;
+          })
+          .catch(() => {
+            this.$message({
+              message: this.$t("tips.getDataFail"),
+              type: "error"
+            });
+          });
+      },
     close () {
       this.$emit('close')
     },
@@ -235,23 +270,16 @@ export default {
     
     editSubmit () {      
       this.disabled = true
-      this.loading = true
-      //let id =  this.tenant.layoutMap!=null? this.tenant.layoutMap: ""
-      // this.$refs.fileRef.submitFile(id, this.tenant.id, 'TRAY')
-      // console.log("22222222222222");
+      this.loading = true      
       if(this.type == 'add') {
       	 this.save(this.tenant);
       } else {
       	this.update(this.tenant);
       }
     },
-    submitForm () {
-    	// console.log("00000000000000000000000");
+    submitForm () {    
       this.$refs.form.validate((valid) => {
-        if (valid) {          
-        	// console.log("11111111111111111");
-          // this.formData = this.tenant 
-          // localStorage.setItem("formData", JSON.stringify(this.formData));         
+        if (valid) {
           this.confirmDisabled = true
           this.editSubmit()
           // 后续提交处理