Merge remote-tracking branch 'origin/master'

enterprise-manager-ui/admin/src/components/FileUpload.vue

@@ -5,6 +5,7 @@
       :before-upload="handleBeforeUpload"
       :file-list="fileList"
       :limit="limit"
+      :accept="accept"
       :on-error="handleUploadError"
       :on-exceed="handleExceed"
       :on-success="handleUploadSuccess"
@@ -63,6 +64,10 @@
 <script>
 export default {
   props: {
+    accept: {
+      type: String,
+      default: "",
+    },
     // 值
     value: [String, Object, Array],
     // 大小限制(MB)

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

@@ -17,6 +17,14 @@
             v-model="form.title"
             placeholder="请输入标题"
           />
+          <Field label="视频"
+            ><fileUpload
+              v-model="form.videoUrl"
+              :fileType="['mp4', 'avi']"
+              prePath="/file/fileupload"
+              :accept="'.mp4,.avi'"
+              :fileSize="100"
+          /></Field>
           <Field :span="24" label="内容"
             ><editor v-model="form.content" :min-height="256"
           /></Field>
@@ -29,11 +37,12 @@
               prop="categoryId"
               v-model="form.categoryId"
               type="radio"
+              @change="handlechange"
               :enum-data="dict.categoryId"
               placeholder="请输入分类id"
             />
 
-            <template v-if="form.categoryId == 1">
+            <template v-if="showCompany">
               <Field
                 label="所属企业"
                 :span="40"
@@ -147,6 +156,7 @@ export default {
       companyData: [],
       relatedCompany: {},
       // 遮罩层
+      showCompany: false,
       loading: true,
       // 弹出层标题
       title: "新闻",
@@ -176,12 +186,19 @@ export default {
   },
 
   methods: {
+    handlechange(val) {
+      this.dict.categoryId[val].indexOf("企业") > -1
+        ? (this.showCompany = true)
+        : (this.showCompany = false);
+      this.showCompany ? "" : (this.form.relatedCompany = "");
+    },
     /** 编辑 */
     edit(row) {
       this.reset();
       this.query = { id: row.id };
       this.urls.currUrl = "news/edit";
       this.getData();
+
       this.pageInfo.type = "edit";
       this.title = "修改新闻";
     },
@@ -208,12 +225,19 @@ export default {
     },
     /**获取数据前弹框 */
     beforeRender(data) {
+      console.log(data);
+
       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(","))
         : "";
+      data.entity.categoryId
+        ? data.dict.categoryId[data.entity.categoryId].indexOf("企业") > -1
+          ? (this.showCompany = true)
+          : (this.showCompany = false)
+        : (this.showCompany = false);
       return data;
     },
     /**获取数据后弹框 */
@@ -230,7 +254,7 @@ export default {
       data.relatedCompany instanceof Array
         ? (data.relatedCompany = data.relatedCompany.join(","))
         : "";
-      data.categoryId != 1 ? (data.relatedCompany = "") : "";
+      this.showCompany ? "" : (data.relatedCompany = "");
       return data;
     },
     afterSubmit(data) {
@@ -252,6 +276,7 @@ export default {
         relatedCompany: "",
         publishTime: null,
       };
+      this.showCompany = false;
       this.resetForm("form");
     },
     resetForm(refName) {

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

@@ -142,9 +142,9 @@ export default {
           },
 
           {
-            label: "创建时间",
-            prop: "createTime",
-            formatter: this.formatterDate,
+            label: "发布时间",
+            prop: "publishTime",
+            formatter: this.formatterDateOnly,
             width: 140,
           },