项目配置 代码调整

src/views/system/projectManage/add.vue

@@ -10,9 +10,6 @@
       <el-form-item label="项目描述:" prop="description">
         <el-input v-model="formModel.description" style="width: 260px;" />
       </el-form-item>
-      <el-form-item label="关联项目:" prop="viewShow">
-        <el-switch v-model="formModel.viewShow" />
-      </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
@@ -31,8 +28,7 @@ export default {
                 id: '',
                 code: '', // 项目编码
                 name: '', // 项目名称
-                description: '', // 描述
-                viewShow:false // 是否可关联项目下拉选择，0否，1是
+                description: '' // 描述
             },
             loading: false
         };
@@ -64,7 +60,6 @@ export default {
                 this.formModel.code = row.code;
                 this.formModel.name = row.name;
                 this.formModel.description = row.description;
-                this.formModel.viewShow = !!row.viewShow;
             } else {
                 this.$nextTick(() => {
                     this.$refs.ruleForm.resetFields();
@@ -76,8 +71,7 @@ export default {
                 id: '',
                 code: '', // 项目编码
                 name: '', // 项目名称
-                description: '', // 描述
-                viewShow:false // 是否可关联项目下拉选择，0否，1是
+                description: '' // 描述
             };
             this.$refs.ruleForm.resetFields();
             this.dialogVisible = false;
@@ -88,7 +82,6 @@ export default {
                 if (valid) {
                     this.loading = true;
                     const data = Object.assign({}, this.formModel);
-                    data.viewShow = data.viewShow ? 1 : 0;
                     // 检查项目code
                     checkBackProjectExist({code:data.code}).then(res=>{
                         if (!res.data) {

src/views/system/projectManage/index.vue

@@ -51,10 +51,14 @@ export default {
                         prop: 'description'
                     },
                     {
-                        title: '关联项目选择',
-                        prop: 'viewShow',
-                        type: 'tag',
-                        columnValue: (row) => { return row.viewShow ? '是' : '否'; },
+                        title: '默认组织',
+                        prop: 'defaultOrgName'
+                    },
+                    {
+                        title: '关联组织',
+                        prop: 'orgList',
+                        type: 'tagMore',
+                        columnValue: (row) => { return row.orgList; },
                         tagType: (row) => { return 'success'; }
                     },
                     {