scorpio %!s(int64=2) %!d(string=hai) anos
pai
achega
13efb6dcae

+ 3 - 3
src/views/msg/component/msg2.vue

@@ -4,9 +4,8 @@
       {{ info.msgContent }}
     </span>
     <el-button class="ml-20" size="mini" type="text" plain @click="download"
-    >立即查看
-    </el-button
-    >
+      >立即查看
+    </el-button>
   </div>
 </template>
 
@@ -20,6 +19,7 @@ export default {
   },
   methods: {
     download() {
+      localStorage.setItem('data-type', this.info.header)
       window.open(this.info.openPage)
     }
   }

+ 13 - 9
src/views/msg/index.vue

@@ -8,11 +8,11 @@
             <template #title>
               <div class="flex flex-center flex-justify-between full-width">
                 <div
-                    class="padding-left flex flex-align-center flex-justify-start"
+                  class="padding-left flex flex-align-center flex-justify-start"
                 >
                   <div
-                      class="dot"
-                      :style="i.readFlag === 0 ? '' : 'background-color: #d6d6d6'"
+                    class="dot"
+                    :style="i.readFlag === 0 ? '' : 'background-color: #d6d6d6'"
                   />
                   <span>{{ i.titile }}</span>
                 </div>
@@ -20,10 +20,10 @@
               </div>
             </template>
             <div class="full-width flex flex-justify-start padding">
-            <span v-if="i.msgCategory === 1" class="ml-20">{{
+              <span v-if="i.msgCategory === 1" class="ml-20">{{
                 i.msgContent
               }}</span>
-              <msg2 v-else-if="i.msgCategory === 2" :info="i"/>
+              <msg2 v-else-if="i.msgCategory === 2" :info="i" />
             </div>
           </el-collapse-item>
         </el-collapse>
@@ -31,8 +31,12 @@
           <div></div>
           <div class="flex flex-center">
             <span class="mr-15">共{{ total }}条</span>
-            <el-pagination layout="prev, pager, next" :total="total" :page-size="page.size"
-                           @current-change="changePage" :current-page.sync='page.current'
+            <el-pagination
+              layout="prev, pager, next"
+              :total="total"
+              :page-size="page.size"
+              @current-change="changePage"
+              v-model:current-page="page.current"
             />
           </div>
         </div>
@@ -61,7 +65,7 @@ export default {
         current: 1,
         size: 15
       },
-      total: '',
+      total: ''
     }
   },
   created() {
@@ -85,7 +89,7 @@ export default {
       if (tmp && tmp.readFlag === 1) {
         return
       }
-      this.$api.msg.markRead({id: row}).then(res => {
+      this.$api.msg.markRead({ id: row }).then(res => {
         if (res.code === 200) {
           this.data = this.data.map(ele => {
             if (ele.id === row) {

+ 21 - 2
src/views/store/component/info2.vue

@@ -2,6 +2,10 @@
   <div>
     <div class="padding top flex flex-center flex-justify-between">
       <span>入库智能预警</span>
+      <div class="flex flex-center grey-6">
+        <el-icon><InfoFilled /></el-icon>
+        <span class="ml-5">可以根据文件名在入库附件清单中,进行查看</span>
+      </div>
     </div>
     <div class="padding-left padding-right" style="padding: 20px">
       <avue-crud
@@ -13,10 +17,10 @@
       >
         <template #menu-left>
           <div class="flex flex-center flex-justify-start padding-left">
-            <el-button type="primary" :plain="active === 2" @click="active = 1"
+            <el-button type="primary" :plain="active === 2" @click="change(1)"
               >系统问题预警</el-button
             >
-            <el-button type="primary" :plain="active === 1" @click="active = 2"
+            <el-button type="primary" :plain="active === 1" @click="change(2)"
               >项目预审问题</el-button
             >
           </div>
@@ -95,11 +99,19 @@ export default {
             label: '存在问题描述',
             prop: 'content'
           },
+          {
+            label: '文件名称',
+            prop: 'fileName'
+          },
           {
             label: '状态',
             prop: 'isFixed',
             width: 100,
             slot: true
+          },
+          {
+            label: '创建实际',
+            prop: 'createTime'
           }
         ]
       }
@@ -152,6 +164,13 @@ export default {
             this.$message.error(res.msg)
           }
         })
+    },
+    change(index) {
+      this.active = index
+      this.option.column[1].hide = false
+      if (index === 2) {
+        this.option.column[1].hide = true
+      }
     }
   }
 }

+ 0 - 68
src/views/store/component/info4.vue

@@ -1,68 +0,0 @@
-<template>
-  <div>
-    <div class="padding top flex flex-center flex-justify-between">
-      <span>入库审核要素信息提取</span>
-      <div>
-        <el-button type="primary" plain> {{ save }} </el-button>
-      </div>
-    </div>
-    <div class="padding">
-      <el-form
-        label-position="right"
-        label-width="100px"
-        :disabled="disabled"
-        style="background-color: white"
-      >
-        <div class="full-width flex flex-center flex-justify-between">
-          <el-form-item label="备案时间" class="flex-child-average">
-            <el-input v-model="form.name" />
-          </el-form-item>
-          <el-form-item label="合同签订时间" class="flex-child-average">
-            <el-input v-model="form.region" />
-          </el-form-item>
-        </div>
-        <div class="full-width flex flex-center flex-justify-between">
-          <el-form-item label="开工时间" class="flex-child-average">
-            <el-input v-model="form.type" />
-          </el-form-item>
-          <el-form-item label="合同金额" class="flex-child-average">
-            <el-input v-model="form.type" />
-          </el-form-item>
-        </div>
-        <div class="full-width flex flex-center flex-justify-between">
-          <el-form-item label="合同甲方" class="flex-child-average">
-            <el-input v-model="form.type" />
-          </el-form-item>
-          <el-form-item label="合同乙方" class="flex-child-average">
-            <el-input v-model="form.type" />
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'info',
-  data() {
-    return {
-      disabled: true,
-      save: '编辑',
-      form: {
-        name: '',
-        region: '',
-        type: ''
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.top {
-  height: 35px;
-  border-radius: var(--el-card-border-radius);
-  background-color: #f5f5f3;
-}
-</style>

+ 7 - 1
src/views/store/detail.vue

@@ -19,7 +19,7 @@
       <el-card
         shadow="hover"
         class="flex-child-average mb-20 full-width"
-        style="min-height: 650px; padding: 0; width: 99%"
+        style="min-height: 650px; padding: 0; width: 99%; margin-bottom: 80px"
       >
         <info2 :info="info"></info2>
       </el-card>
@@ -75,4 +75,10 @@ export default {
 :deep(.el-card) {
   --el-card-padding: 0 !important;
 }
+.bottom {
+  position: fixed;
+  height: 60px;
+  bottom: 0;
+  z-index: 3;
+}
 </style>