详情页改造

src/views/modules/common/e-desc.vue

@@ -90,9 +90,9 @@
       }
     },
     beforeDestroy () {
-      if (this.observe) {
-        this.observer.disconnect()
-      }
+      // if (!this.observe || this.observe.toString() === '') return
+      // console.log('obs = ' + JSON.stringify(this.observe))
+      this.observer.disconnect()
     }
   }
 </script>

src/views/modules/cus/contract-add-or-update.vue

@@ -37,7 +37,8 @@
                 v-model="dataForm.coCode"
                 :disabled="display"
                 remote
-                placeholder="请选择">
+                placeholder="请选择"
+                @change="coListSelected">
                 <el-option
                   v-for="item in options1"
                   :key="item.value"
@@ -84,7 +85,7 @@
             </el-form-item>
         </el-row>
         <el-row class="my-row">
-          <div class="title">沟通信息表附件</div>
+          <upload-component :display="true" :title="'沟通信息表附件'" :accept="'*'" :file-obj-list="fileList1"/>
         </el-row>
         <el-row class="my-row">
           <upload-component :display="display" :title="'合同评审表'" :accept="'*'" :file-obj-list="fileList" @uploadSuccess="uploadSuccess"/>
@@ -119,6 +120,7 @@
         options1: [],
         dataList: [],
         fileList: [],
+        fileList1: [],
         stepList: [],
         logList: [],
         id: 0,
@@ -228,6 +230,10 @@
       },
       validateField (type) {
         this.$refs.dataForm.validateField(type)
+      },
+      coListSelected (item) {
+        // todo
+        console.log('item = ' + JSON.stringify(item))
       }
     }
   }

src/views/modules/msg-center/announcement-detail.vue

@@ -1,39 +1,22 @@
 <template>
   <el-dialog
     title="查看"
-    width="70%"
+    width="60%"
     :close-on-click-modal="false"
     :visible.sync="visible">
-    <el-form :model="dataForm" ref="dataForm" label-width="auto">
-      <el-row class="my-row">
-        <el-col :span="12">
-          <el-form-item label="公告主题名称">
-            <el-input v-model="dataForm.title" :disabled="display" placeholder="请输入公告主题名称"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12" style="padding-left: 20px">
-          <el-form-item label="级别" prop="level">
-             <el-input v-model="dataForm.levelName" :disabled="display" placeholder="请输入公告主题名称"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row class="my-row">
-        <el-form-item label="公告内容">
-            <el-input v-model="dataForm.content" :disabled="display" placeholder="备注说明"></el-input>
-        </el-form-item>
-      </el-row>
-      <el-row class="my-row">
-        <div class="title">公告附件</div>
-      </el-row>
-      <el-row class="my-row">
-        <a v-for="(item, index) in dataForm.attachList" :key="item.fileName + index" type="primary" :href="item.url">{{ item.fileName }}</a>
-      </el-row>
-      <el-row class="my-row">
-        <el-form-item label="备注说明">
-            <el-input v-model="dataForm.notes" :disabled="display" placeholder="备注说明"></el-input>
-        </el-form-item>
-      </el-row>
-    </el-form>
+    <div style="margin-left: 20px;margin-right: 20px">
+      <e-desc title="基本信息" column="2">
+        <e-desc-item label="公告主题名称">{{dataForm.title}}</e-desc-item>
+        <e-desc-item label="级别">{{dataForm.levelName}}</e-desc-item>
+        <e-desc-item span="2" style="min-height: 80px" label="公告内容">{{dataForm.content}}</e-desc-item>
+      </e-desc>
+      <e-desc title="详细信息" column="2">
+        <e-desc-item span="2" label="附件">
+          <a v-for="(item, index) in dataForm.attachList" :key="item.fileName + index" type="primary" :href="downloadUrl + item.url">{{ item.fileName }}</a>
+        </e-desc-item>
+        <e-desc-item span="2" style="min-height: 80px" label="备注说明">{{dataForm.notes}}</e-desc-item>
+      </e-desc>
+    </div>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">返回</el-button>
     </span>
@@ -41,22 +24,24 @@
 </template>
 
 <script>
+  import EDesc from '../common/e-desc'
+  import EDescItem from '../common/e-desc-item'
   import { getAnnouncementInfo } from '@/api/msg'
+  import { downloadUrl } from '@/api/file'
   export default {
     name: 'notice-add-or-update',
+    components: {
+      EDesc, EDescItem
+    },
     data () {
       return {
         visible: false,
-        dictType: 'material_type',
-        options: [],
-        optionLevel: [],
-        dataList: [],
         fileList: [],
+        downloadUrl: downloadUrl,
         id: 0,
         dataForm: {
           attachList: []
-        },
-        display: true
+        }
       }
     },
     methods: {
@@ -71,21 +56,6 @@
             this.dataForm = data.data
           }
         })
-      },
-      submitUpload () {
-        this.$refs.upload.submit()
-      },
-      handleRemove (file, fileList) {
-        console.log(file, fileList)
-      },
-      handlePreview (file) {
-        console.log(file)
-      },
-      // 表单提交
-      dataFormSubmit () {
-      },
-      validateField (type) {
-        this.$refs.dataForm.validateField(type)
       }
     }
   }