Browse Source

修复小bug

shaogen1995 4 years ago
parent
commit
f1f750cfa6

+ 3 - 0
src/assets/style/initial.css

@@ -22,4 +22,7 @@ a {
 .ww{
 .ww{
   width: 1142px;
   width: 1142px;
   margin: 0 auto;
   margin: 0 auto;
+}
+.right{
+  max-width: 1723px;
 }
 }

+ 8 - 2
src/views/collect/collect0.vue

@@ -362,8 +362,14 @@ export default {
           }
           }
         }
         }
         .table {
         .table {
-          max-height: 640px;
-          overflow: auto;
+                    /deep/.el-table__body-wrapper{
+            max-height: 560px;
+            max-width: 1634px;
+            overflow-y: auto;
+          }
+
+          // max-height: 640px;
+          // overflow: auto;
           padding: 24px;
           padding: 24px;
           .smimg {
           .smimg {
             text-align: center;
             text-align: center;

+ 2 - 1
src/views/holding/holding0_DiaEdit.vue

@@ -462,7 +462,7 @@ export default {
       // { name: '666.png', url: '666' }
       // { name: '666.png', url: '666' }
     },
     },
     // 上传附件
     // 上传附件
-    successFujian (file) {
+    async successFujian (file) {
       // 上传成功
       // 上传成功
       // console.log(333333, file)
       // console.log(333333, file)
       // console.log(666666, this.ruleForm.fileIds)
       // console.log(666666, this.ruleForm.fileIds)
@@ -472,6 +472,7 @@ export default {
         this.temp = this.ruleForm.fileIds.split(',')
         this.temp = this.ruleForm.fileIds.split(',')
         this.$message.success('上传成功')
         this.$message.success('上传成功')
         this.tableData.push({ name: file.data.fileName, updateTime: file.timestamp.slice(0, 10), filePath: file.data.filePath })
         this.tableData.push({ name: file.data.fileName, updateTime: file.timestamp.slice(0, 10), filePath: file.data.filePath })
+        await holdingAdd(this.ruleForm)
       }
       }
     },
     },
     handleRemove (file) {
     handleRemove (file) {

+ 7 - 2
src/views/holding/holding3.vue

@@ -457,8 +457,13 @@ export default {
           }
           }
         }
         }
         .table {
         .table {
-          max-height: 640px;
-          overflow: auto;
+          /deep/.el-table__body-wrapper{
+            max-height: 560px;
+            max-width: 1634px;
+            overflow-y: auto;
+          }
+          // max-height: 640px;
+          // overflow: auto;
           padding: 24px;
           padding: 24px;
           .smimg {
           .smimg {
             text-align: center;
             text-align: center;

+ 3 - 1
src/views/holding/holding3_DiaEdit.vue

@@ -299,6 +299,7 @@
 import axios from '@/utils/request'
 import axios from '@/utils/request'
 import { getHolding3Edit } from '../../apis/holding3'
 import { getHolding3Edit } from '../../apis/holding3'
 import {
 import {
+  holdingAdd,
   getGoodsNumType,
   getGoodsNumType,
   getGoodsType,
   getGoodsType,
   detailsById,
   detailsById,
@@ -468,7 +469,7 @@ export default {
       // { name: '666.png', url: '666' }
       // { name: '666.png', url: '666' }
     },
     },
     // 上传附件
     // 上传附件
-    successFujian (file) {
+    async successFujian (file) {
       // 上传成功
       // 上传成功
       // console.log(666666, this.ruleForm.fileIds)
       // console.log(666666, this.ruleForm.fileIds)
       if (file.code === 0) {
       if (file.code === 0) {
@@ -482,6 +483,7 @@ export default {
         // const c = myDate.getDate()
         // const c = myDate.getDate()
         // console.log(999, a, b + 1, c)
         // console.log(999, a, b + 1, c)
         this.tableData.push({ name: file.data.fileName, updateTime: file.timestamp.slice(0, 10), filePath: file.data.filePath, type: this.affixVal })
         this.tableData.push({ name: file.data.fileName, updateTime: file.timestamp.slice(0, 10), filePath: file.data.filePath, type: this.affixVal })
+        await holdingAdd(this.ruleForm)
       }
       }
     },
     },
     handleRemove (file) {
     handleRemove (file) {

+ 9 - 1
src/views/holding/holding3_look.vue

@@ -223,7 +223,7 @@
           </div>
           </div>
           <!-- 底部的返回按钮 -->
           <!-- 底部的返回按钮 -->
           <div class="btn">
           <div class="btn">
-            <el-button type="primary" @click="begEdit">申请编辑</el-button>
+            <el-button type="primary" @click="begEdit" v-if="userLogo">申请编辑</el-button>
             <el-button @click="$router.go(-1)">返 回</el-button>
             <el-button @click="$router.go(-1)">返 回</el-button>
           </div>
           </div>
         </div>
         </div>
@@ -248,6 +248,7 @@ export default {
   data () {
   data () {
     // 这里存放数据
     // 这里存放数据
     return {
     return {
+      userLogo: false,
       isShowED: false,
       isShowED: false,
       rukuTxt: '',
       rukuTxt: '',
       isShow: false,
       isShow: false,
@@ -311,6 +312,13 @@ export default {
   created () {
   created () {
     // 获取服务器前缀地址
     // 获取服务器前缀地址
     this.baseURL = axios.defaults.baseURL
     this.baseURL = axios.defaults.baseURL
+    // 获取用户角色权限标识
+    let temp = localStorage.getItem('daliCK')
+    temp = JSON.parse(temp)
+    if (temp) {
+      const temp2 = temp.role[0]
+      if (temp2 === 'sys_audit' || temp2 === 'sys_admin' || temp2 === 'sys_edit') this.userLogo = true // 超级管理员和保管部主任
+    }
   },
   },
   // 生命周期 - 挂载完成(可以访问DOM元素)
   // 生命周期 - 挂载完成(可以访问DOM元素)
   async mounted () {
   async mounted () {

+ 1 - 3
src/views/holding/holding4_audit.vue

@@ -326,12 +326,10 @@ export default {
         overflow: auto;
         overflow: auto;
       }
       }
     .con_txt{
     .con_txt{
-      height: 40px;
       display: flex;
       display: flex;
       &>div {
       &>div {
         border: 1px solid #ccc;
         border: 1px solid #ccc;
-        height: 100%;
-        line-height: 40px;
+        padding: 8px 0;
         padding-left: 18px;
         padding-left: 18px;
       }
       }
     }
     }

+ 1 - 3
src/views/holding/holding4_look.vue

@@ -272,12 +272,10 @@ export default {
         overflow: auto;
         overflow: auto;
       }
       }
     .con_txt{
     .con_txt{
-      height: 40px;
       display: flex;
       display: flex;
       &>div {
       &>div {
         border: 1px solid #ccc;
         border: 1px solid #ccc;
-        height: 100%;
-        line-height: 40px;
+        padding: 8px 0;
         padding-left: 18px;
         padding-left: 18px;
       }
       }
     }
     }