فهرست منبع

Merge branch 'develop_yh13' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh14

# Conflicts:
#	public/version.json
lilei 2 سال پیش
والد
کامیت
6d1825fee3
3فایلهای تغییر یافته به همراه7 افزوده شده و 4 حذف شده
  1. 1 1
      public/version.json
  2. 3 3
      src/components/tools/UserMenu.vue
  3. 3 0
      src/views/purchasingManagement/purchaseOrderNew/edit.vue

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1677477078161
+  "version": 1677479543565
 }

+ 3 - 3
src/components/tools/UserMenu.vue

@@ -63,9 +63,9 @@
       <p class="help-cont" @click="screen">
         <a-popover placement="bottom">
         <template slot="content">
-          <span>{{ isFullscreen?'全屏':'取消全屏' }}</span>
+          <span>{{ isFullscreen?'取消全屏':'全屏' }}</span>
         </template>
-        <a-icon :type="isFullscreen?'fullscreen':'fullscreen-exit'" style="font-size:14px;margin: 0 5px;color: #666;"/>
+        <a-icon :type="isFullscreen?'fullscreen-exit':'fullscreen'" style="font-size:14px;margin: 0 5px;color: #666;"/>
       </a-popover>
       </p>
 
@@ -183,7 +183,7 @@ export default {
         return false
       }
       screenfull.toggle()
-      this.isFullscreen = screenfull.isFullscreen
+      this.isFullscreen = !this.isFullscreen
     },
     // 切换角色
     changeRoles (sn) {

+ 3 - 0
src/views/purchasingManagement/purchaseOrderNew/edit.vue

@@ -531,6 +531,9 @@ export default {
       }else{
         this.setTableH()
       }
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {