Merge remote-tracking branch 'origin/master'

precision-effect-admin/src/main/java/com/zehong/web/controller/transaction/TPurchaseController.java

@@ -52,8 +52,8 @@ public class TPurchaseController extends BaseController
     {
         // 获取当前用户
         SysUser user = tokenService.getLoginUser(ServletUtils.getRequest()).getUser();
-        List<SysRole> calculator = user.getRoles().stream().filter(item ->item.getRoleKey() == "calculator").collect(Collectors.toList());
-        if (StringUtils.isNotNull(user) && !user.isAdmin() && !CollectionUtils.isEmpty(calculator)) {
+        List<SysRole> calculator = user.getRoles().stream().filter(item ->"calculator".equals(item.getRoleKey())).collect(Collectors.toList());
+        if (StringUtils.isNotNull(user) && !user.isAdmin() && CollectionUtils.isEmpty(calculator)) {
             tPurchase.setPurchaseDeptId(user.getDeptId());
         }
         startPage();

precision-effect-web/src/layout/components/Message/Message.vue

@@ -3,7 +3,7 @@
       <el-dropdown trigger="click" :popper-append-to-body="false" style="height: 30px">
 
         <div>
-          <el-badge :value= "this.msgInfo.length" :max="99" class="messageMark">
+          <el-badge :value= "this.msgInfo.length>0 ? this.msgInfo.length : ''" :max="99" class="messageMark">
              <!--<i class="el-icon-chat-dot-round" />-->
                 <i class="el-icon-message-solid messageDing"/>
            </el-badge>
@@ -44,16 +44,17 @@
     name: "message",
     data(){
         return{
-          msgInfo: {}
+          msgInfo: []
         }
     },
     created(){
       //登录成功后创建websocket
       this.$websocket.initWebSocket("ws://localhost:8668/precisionEffect/webSocket/" + this.$store.state.user.roles.join(",") + "/" + this.$store.state.user.userId);
       this.$websocket.addEvent("onmessage",(msg) =>{
-        console.log("您有新的消息请注意接收:", JSON.parse(msg.data));
-        this.msgInfo = JSON.parse(msg.data);
-        console
+        if(msg.data){
+          console.log("您有新的消息请注意接收:", JSON.parse(msg.data));
+          this.msgInfo = JSON.parse(msg.data);
+        }
       })
     },
     methods:{

precision-effect-web/src/views/purchase/components/OperatorButton.vue

 <template>
     <div style="display: inline-block;width: 50px">
-      <el-button type="text" @click="open=true" size="mini">{{getOperatorName()}}</el-button>
+      <el-button type="text" @click="openPurchaseDialog" size="mini">{{getOperatorName()}}</el-button>
       <el-dialog :title="getOperatorName()" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false" destroy-on-close>
         <component :is="currentTabComponent" :purchaseData="purchaseData" ref="currentCom" v-if="open"></component>
         <div slot="footer" class="dialog-footer" style="text-align: center" v-if="operatorName != 'purchaseDetail'">
@@ -34,13 +34,6 @@
     created(){
       this.currentTabComponent = this.operatorName;
     },
-    watch: {
-      open(newVal,oldVal){
-        if(newVal){
-          this.getPurchaseInfo();
-        }
-      }
-    },
     data(){
         return{
           open: false,
@@ -61,10 +54,11 @@
             return "";
         }
       },
-      getPurchaseInfo(){
+      openPurchaseDialog(){
         getPurchase(this.purchaseInfo.purchaseId).then(res =>{
           if(res.code == 200){
             this.purchaseData = res.data;
+            this.open = true;
           }
         })
       },

precision-effect-web/src/views/trade/components/OperatorButton.vue

 <template>
     <div style="display: inline-block;width: 50px">
-      <el-button type="text" @click="open=true" size="mini">{{getOperatorName()}}</el-button>
+      <el-button type="text" @click="openDialog" size="mini">{{getOperatorName()}}</el-button>
       <el-dialog :title="getOperatorName()" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false" destroy-on-close>
         <component :is="currentTabComponent" :tradeData="tradeData" ref="currentCom" v-if="open"></component>
         <div slot="footer" class="dialog-footer" style="text-align: center" v-if="operatorName != 'tradeDetail'">
@@ -36,13 +36,6 @@
     created(){
       this.currentTabComponent = this.operatorName;
     },
-    watch: {
-      open(newVal,oldVal){
-        if(newVal){
-          this.getTradeInfo();
-        }
-      }
-    },
     data(){
         return{
           open: false,
@@ -65,10 +58,11 @@
             return "";
         }
       },
-      getTradeInfo(){
+      openDialog(){
         getProject(this.tradeInfo.tradeId).then(res =>{
           if(res.code == 200){
             this.tradeData = res.data;
+            this.open = true;
           }
         })
       },