取消部分页面适用机构

src/modules/base/components/ModifyCardInfo.vue

@@ -3,7 +3,6 @@
     class="modify-card-info"
     :visible.sync="modalIsShow"
     :title="title"
-    top="10px"
     width="600px"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
@@ -66,9 +65,6 @@
           :show-common-card="false"
         ></card-rule-select>
       </el-form-item>
-      <el-form-item prop="orgIds" label="适用机构范围：">
-        <select-orgs v-model="modalForm.orgIds" ref="SelectOrgs"></select-orgs>
-      </el-form-item>
     </el-form>
 
     <div slot="footer">
@@ -85,7 +81,6 @@ import { updateCard } from "../api";
 import { attachmentDetail } from "../../login/api";
 import { CARD_CREATE_METHOD_TYPE } from "../../../constants/enumerate";
 import UploadFileView from "@/components/UploadFileView";
-import SelectOrgs from "./SelectOrgs";
 
 const initModalForm = {
   id: null,
@@ -95,13 +90,12 @@ const initModalForm = {
   remark: "",
   cardRuleId: "",
   attachmentId: "",
-  status: "STAGE",
-  orgIds: []
+  status: "STAGE"
 };
 
 export default {
   name: "modify-card-info",
-  components: { UploadFileView, SelectOrgs },
+  components: { UploadFileView },
   props: {
     instance: {
       type: Object,
@@ -167,19 +161,6 @@ export default {
             message: "请选择题卡规则",
             trigger: "change"
           }
-        ],
-        orgIds: [
-          {
-            required: true,
-            validator: (rule, value, callback) => {
-              if (value.length) {
-                callback();
-              } else {
-                callback(new Error("请选择适用机构"));
-              }
-            },
-            trigger: "change"
-          }
         ]
       },
       // upload
@@ -193,11 +174,9 @@ export default {
     initData(val) {
       this.modalForm = this.$objAssign(initModalForm, val);
       if (val.id) {
-        this.modalForm.orgIds = val.orgs.map(item => item.id);
         if (this.modalForm.createMethod !== "UPLOAD") return;
         this.getAttachment();
       } else {
-        this.modalForm.orgIds = [];
         if (this.modalForm.createMethod !== "UPLOAD") return;
         this.$nextTick(() => {
           this.$refs.UploadFileView.setAttachmentName("");

src/modules/base/components/ModifyCardRule.vue

@@ -143,13 +143,6 @@
           :disabled="!editable"
         ></el-input>
       </el-form-item>
-      <el-form-item prop="orgIds" label="适用机构范围：">
-        <select-orgs
-          v-model="modalForm.orgIds"
-          ref="SelectOrgs"
-          :disabled="!editable"
-        ></select-orgs>
-      </el-form-item>
     </el-form>
 
     <div slot="footer">
@@ -168,7 +161,6 @@
 <script>
 import { EXAM_NUMBER_STYLE, PAPER_TYPE } from "@/constants/enumerate";
 import { saveCardRule } from "../api";
-import SelectOrgs from "./SelectOrgs";
 import CardTitleRuleEdit from "./CardTitleRuleEdit";
 
 const initModalForm = {
@@ -185,13 +177,12 @@ const initModalForm = {
   titleRule: "",
   attention: "",
   objectiveAttention: "",
-  subjectiveAttention: "",
-  orgIds: []
+  subjectiveAttention: ""
 };
 
 export default {
   name: "modify-card-rule",
-  components: { SelectOrgs, CardTitleRuleEdit },
+  components: { CardTitleRuleEdit },
   props: {
     instance: {
       type: Object,
@@ -303,19 +294,6 @@ export default {
             message: "主观题注意事项最多只能输入26个汉字",
             trigger: "change"
           }
-        ],
-        orgIds: [
-          {
-            required: true,
-            validator: (rule, value, callback) => {
-              if (value.length) {
-                callback();
-              } else {
-                callback(new Error("请选择适用机构"));
-              }
-            },
-            trigger: "change"
-          }
         ]
       },
       fieldSourses: [
@@ -339,9 +317,6 @@ export default {
       if (val.id) {
         this.modalForm.requiredFields = JSON.parse(val.requiredFields);
         this.modalForm.extendFields = JSON.parse(val.extendFields);
-        this.modalForm.orgIds = val.orgs.map(item => item.id);
-      } else {
-        this.modalForm.orgIds = [];
       }
     },
     visibleChange() {

src/modules/base/components/ModifyTemplate.vue

@@ -3,7 +3,6 @@
     class="modify-template"
     :visible.sync="modalIsShow"
     :title="title"
-    top="10px"
     width="600px"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
@@ -69,13 +68,6 @@
           ref="UploadFileView"
         ></upload-file-view>
       </el-form-item>
-      <el-form-item prop="orgIds" label="适用机构范围：">
-        <select-orgs
-          v-model="modalForm.orgIds"
-          ref="SelectOrgs"
-          :disabled="!editable"
-        ></select-orgs>
-      </el-form-item>
     </el-form>
 
     <div slot="footer">
@@ -95,7 +87,6 @@
 import { updateTemplate } from "../api";
 import { attachmentDetail } from "../../login/api";
 import UploadFileView from "@/components/UploadFileView";
-import SelectOrgs from "./SelectOrgs";
 
 const initModalForm = {
   id: null,
@@ -103,8 +94,7 @@ const initModalForm = {
   type: "GENERIC",
   remark: "",
   classify: "",
-  attachmentId: "",
-  orgIds: []
+  attachmentId: ""
 };
 
 const TEMPLATE_CLASSIFY = {
@@ -114,7 +104,7 @@ const TEMPLATE_CLASSIFY = {
 
 export default {
   name: "modify-template",
-  components: { UploadFileView, SelectOrgs },
+  components: { UploadFileView },
   props: {
     instance: {
       type: Object,
@@ -180,19 +170,6 @@ export default {
             message: "请上传模板文件",
             trigger: "change"
           }
-        ],
-        orgIds: [
-          {
-            required: true,
-            validator: (rule, value, callback) => {
-              if (value.length) {
-                callback();
-              } else {
-                callback(new Error("请选择适用机构"));
-              }
-            },
-            trigger: "change"
-          }
         ]
       },
       // upload
@@ -206,10 +183,8 @@ export default {
     initData(val) {
       this.modalForm = this.$objAssign(initModalForm, val);
       if (val.id) {
-        this.modalForm.orgIds = val.orgs.map(item => item.id);
         this.getAttachment();
       } else {
-        this.modalForm.orgIds = [];
         this.$nextTick(() => {
           this.$refs.UploadFileView.setAttachmentName("");
         });

src/modules/base/views/CardManage.vue

@@ -71,11 +71,6 @@
         <el-table-column prop="type" label="类型">
           <span slot-scope="scope">{{ scope.row.type | cardTypeFilter }}</span>
         </el-table-column>
-        <el-table-column prop="orgNames" label="适用机构">
-          <template slot-scope="scope">
-            <more-text :data="scope.row.orgNames"></more-text>
-          </template>
-        </el-table-column>
         <el-table-column prop="createMethod" label="创建方式">
           <span slot-scope="scope">{{
             scope.row.createMethod | cardCreateMethodTypeFilter
@@ -205,10 +200,7 @@ export default {
         datas.createEndTime = this.createTime[1];
       }
       const data = await cardListPage(datas);
-      this.cardList = data.records.map(item => {
-        item.orgNames = item.orgs.map(org => org.name);
-        return item;
-      });
+      this.cardList = data.records;
       this.total = data.total;
     },
     toPage(page) {
@@ -243,8 +235,7 @@ export default {
         createMethod: row.createMethod,
         remark: row.remark,
         cardRuleId: row.cardRuleId,
-        attachmentId: row.attachmentId,
-        orgIds: row.orgs.map(item => item.id)
+        attachmentId: row.attachmentId
       });
       this.$refs.ModifyCard.open();
     },

src/modules/base/views/CardRuleManage.vue

@@ -69,11 +69,6 @@
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="name" label="题卡规则名称"></el-table-column>
-        <el-table-column prop="orgs" label="适用机构">
-          <template slot-scope="scope">
-            <more-text :data="scope.row.orgNames"></more-text>
-          </template>
-        </el-table-column>
         <el-table-column prop="remark" label="备注">
           <span slot-scope="scope">{{
             scope.row.remark | defaultFieldFilter
@@ -222,10 +217,7 @@ export default {
       if (datas.enable !== null && datas.enable !== "")
         datas.enable = !!datas.enable;
       const data = await cardRuleListPage(datas);
-      this.rules = data.records.map(item => {
-        item.orgNames = item.orgs.map(org => org.name);
-        return item;
-      });
+      this.rules = data.records;
       this.total = data.total;
     },
     toPage(page) {

src/modules/base/views/TemplateManage.vue

@@ -77,11 +77,6 @@
             {{ scope.row.classify | templateClassifyFilter }}
           </template>
         </el-table-column>
-        <el-table-column prop="orgs" label="适用机构">
-          <template slot-scope="scope">
-            <more-text :data="scope.row.orgNames"></more-text>
-          </template>
-        </el-table-column>
         <el-table-column prop="remark" label="备注">
           <span slot-scope="scope">{{
             scope.row.remark | defaultFieldFilter
@@ -220,10 +215,7 @@ export default {
       if (datas.enable !== null && datas.enable !== "")
         datas.enable = !!datas.enable;
       const data = await templateListPage(datas);
-      this.templates = data.records.map(item => {
-        item.orgNames = item.orgs.map(org => org.name);
-        return item;
-      });
+      this.templates = data.records;
       this.total = data.total;
     },
     toPage(page) {