Merge remote-tracking branch 'origin/master'

enterprise-manager-ui/admin/src/views/news/drawershow.vue

@@ -32,6 +32,21 @@
               :enum-data="dict.categoryId"
               placeholder="请输入分类id"
             />
+
+            <template v-if="form.categoryId == 1">
+              <Field
+                label="所属企业"
+                :span="40"
+                prop="relatedCompany"
+                v-model="form.relatedCompany"
+                :multiple="true"
+                type="select"
+                style="width: 100%"
+                :enumData="relatedCompany"
+                placeholder="请选择所属企业"
+              />
+            </template>
+
             <Field :span="20" label="封面">
               <imageUpload
                 v-model="form.titleLogoPath"
@@ -116,9 +131,21 @@ export default {
   components: {},
   created() {
     this.changePath("news");
+    this.$post("/company/list").then((res) => {
+      if (res.code == 1) {
+        this.companyData = res.data.data;
+        let obj = {};
+        res.data.data.forEach((v, i) => {
+          obj[v.id] = v.companyName;
+        });
+        this.relatedCompany = obj;
+      }
+    });
   },
   data() {
     return {
+      companyData: [],
+      relatedCompany: {},
       // 遮罩层
       loading: true,
       // 弹出层标题
@@ -133,6 +160,9 @@ export default {
         categoryId: [
           { required: true, message: "请选择频道类型", trigger: "blur" },
         ],
+        relatedCompany: [
+          { required: true, message: "请选择所关联企业", trigger: "blur" },
+        ],
         title: [
           { required: true, message: "请输入标题", trigger: "blur" },
           { max: 512, message: "最多只能录入512个字符", trigger: "blur" },
@@ -181,6 +211,9 @@ export default {
       data.entity.deptId && data.entity.deptId != ""
         ? (data.entity.deptId = String(data.entity.deptId))
         : "";
+      data.entity.relatedCompany && data.entity.relatedCompany != ""
+        ? (data.entity.relatedCompany = data.entity.relatedCompany.split(","))
+        : "";
       return data;
     },
     /**获取数据后弹框 */
@@ -194,6 +227,9 @@ export default {
         return v.response ? v.response.url : v.url.substr(v.url.indexOf("f"));
       });
       data.titleLogoPath = arr.join(",");
+      data.relatedCompany instanceof Array
+        ? (data.relatedCompany = data.relatedCompany.join(","))
+        : "";
       return data;
     },
     afterSubmit(data) {
@@ -212,6 +248,7 @@ export default {
         top: 0,
         deptId: "",
         viewNums: 0,
+        relatedCompany: "",
         publishTime: null,
       };
       this.resetForm("form");