Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -861,7 +861,6 @@ export default {
     rowClick(rowIndex,rowData,column){
       console.log("column",column)
       var that = this;
-      return;
       let startDate=that.year+"-"+column.start;
       let endDate="";
       let BranchId=that.msg.BranchId;

src/components/FinancialModule/addFinancialDocuments.vue

@@ -321,7 +321,7 @@
                             </td> -->
                             <td height="26px"><el-input v-model="da.Number" @keyup.native="checkInteger(da,'Number')" type="text" @blur="addList(2,daIn+1)"  @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input></td>
                             <td height="26px">
-                                <el-input v-model="da.UnitPrice"  type="text" :disabled="(msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 46 || msg.TemplateId == 53) && !ZhuiJiaTK" @keyup.native="checkPrice(da,'UnitPrice',true)" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></el-input>
+                                <el-input v-model="da.UnitPrice"  type="text" :disabled="(msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 56 || msg.TemplateId == 53) && !ZhuiJiaTK" @keyup.native="checkPrice(da,'UnitPrice',true)" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></el-input>
                             </td>
                             <td height="26px">
                                 <el-select  filterable :disabled="detailCurrDis" v-model='da.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)" class=" _border_b_1">
@@ -360,7 +360,7 @@
                             <el-input v-model="detailList.Number" type="text"  @keyup.native="checkInteger(detailList,'Number')"  @blur="addList(1)" @change="Calculation(1)" class="w80 _border_b_1"></el-input>
                         </td>
                         <td>
-                            <el-input v-model="detailList.UnitPrice" type="text" :disabled="(msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 46 || msg.TemplateId == 53) && !ZhuiJiaTK" @keyup.native="checkPrice(detailList,'UnitPrice',true)"  @blur="addList(1)" @change="Calculation(1)" class="w80 h34 _border_b_1"></el-input>
+                            <el-input v-model="detailList.UnitPrice" type="text" :disabled="(msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 56 || msg.TemplateId == 53) && !ZhuiJiaTK" @keyup.native="checkPrice(detailList,'UnitPrice',true)"  @blur="addList(1)" @change="Calculation(1)" class="w80 h34 _border_b_1"></el-input>
                         </td>
                         <td>  
                             <el-select  filterable v-model='detailList.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)" class=" _border_b_1">

src/components/commonPage/commissonBill.vue

@@ -11,24 +11,19 @@
         top:4.5rem;
         width:100%;
         text-align: center;
+        font-family: "fangzheng"!important;
     }
     .cb_year{
         color:#4E4E4C;
         font-size:2.5rem;
         font-weight: bold;
-        position: relative;
-        top:-5px;
         margin-right:1rem;
-        font-family: "PingFangSC-Fine";
     }
     .cb_month{
         font-size:2.5rem;
         color:#257BF1;
         margin:0 1rem;
-        position: relative;
-        top:-5px;
         font-weight: bold;
-        font-family: "PingFangSC-Fine";
     }
     .cb_PeoInfo{
         position: absolute;
@@ -40,6 +35,7 @@
         text-align: center;
         color:#FBA838;
         font-size:3.5rem;
+        font-family: "fangzheng"!important;
     }
     .cb_PeoInfo table{
         width:100%;
@@ -54,7 +50,7 @@
         color:#257BF1;
         font-size:2.5rem;
         font-weight: bold;
-        font-family: "PingFangSC-Fine";
+        font-family: "fangzheng";
     }
     .cb_benyue span:first-child{
         font-size:1.5rem;
@@ -62,6 +58,9 @@
     .cb_Tleft{
         width:40%;
         text-align: left;
+        font-size:30px;
+        font-weight: bold;
+        font-family: "fangzheng";
     }
     .cb_Tright{
         width:60%;
@@ -72,6 +71,7 @@
         top:25rem;
         padding:0 5rem;
         width:100%;
+        font-family: "fangzheng";
     }
     .cb_geren div{
         margin-top:1rem;
@@ -87,6 +87,7 @@
         -webkit-line-clamp: 2;
         line-clamp: 2;
         -webkit-box-orient: vertical;
+        font-family: "fangzheng";
     }
     .cb_Arrow{
         position: absolute;
@@ -98,7 +99,11 @@
     .cb_Arrow div:last-child{
         color:#C4A873;
         font-size:1.5rem;
-        font-family: "PingFangSC-Fine";
+        font-family: "fangzheng";
+    }
+    .Cb_titleSpan{
+        font-size:2.5rem;
+        font-weight:bold;
     }
 </style>
 
@@ -106,16 +111,20 @@
     <div class="cbContent" v-if="isShow">
         <div class="cb_Title">
             <span class="cb_year">{{dataList.SellGeneralContent.Year}}</span>
-            <span><img src="../../assets/img/imbg/nian.png"/></span>
+            <span class="Cb_titleSpan"> 
+                年
+            </span>
             <span class="cb_month">{{dataList.SellGeneralContent.Month}}</span>
-            <span><img src="../../assets/img/imbg/yue.png" alt=""/></span>
+            <span class="Cb_titleSpan">
+                月提成报告
+            </span>
         </div>
         <div class="cb_PeoInfo">
             <div class="cb_Name">{{dataList.UserName}}</div>
             <table>
                 <tr>
                     <td class="cb_Tleft">
-                        <img src="../../assets/img/imbg/bytc.png" alt=""/>
+                        本月提成
                     </td>
                     <td class="cb_Tright">
                         <span class="cb_benyue"><span>¥</span>{{dataList.SellGeneralContent.totalCommission}}</span>
@@ -123,7 +132,7 @@
                 </tr>
                 <tr style="display:none;">
                     <td class="cb_Tleft">
-                        <img src="../../assets/img/imbg/byxse.png" alt=""/>
+
                     </td>
                     <td class="cb_Tright">
                         <span class="cb_benyue"><span>¥</span>12523268.00</span>
@@ -132,8 +141,8 @@
             </table>
         </div>
         <div class="cb_geren">
-            <span>
-                <img src="../../assets/img/imbg/grxy.png" alt=""/>
+            <span style="font-size:30px;font-weight: bold;">
+                个人宣言
             </span>
             <div>
                 {{dataList.SellGeneralContent.ShareContent}}

src/components/index.vue

@@ -1610,6 +1610,10 @@ export default {
     setInterval(function(){
       that.getNumber();
     },600000)
+    this.MsgBus.$on('reSetMSG',function(){
+        that.getDynamic();
+        that.getMyDynamic();
+    })
 
     const permissionNow = Notification.requestPermission();
     var hiddenProperty =

src/components/sale/sale.vue

@@ -788,6 +788,8 @@
             this.Success(res.data.message);
             this.iWorkbench();
             this.resetCommission();
+            this.MsgBus.$emit('reSetMSG');
+
           }else{
             this.Error(res.data.message);
           }

src/plug/index.js

@@ -114,8 +114,8 @@ export default {
         let domainUrl = '';
         // domainUrl = "http://testapi.oytour.com";
         // domainUrl = "http://192.168.2.214:8082";
-        // domainUrl = "http://192.168.2.65:8025";
-        domainUrl = "http://192.168.2.16:8083";
+        domainUrl = "http://192.168.2.65:8025";
+        // domainUrl = "http://192.168.2.16:8083";
         let locationName = window.location.hostname;
 
         let javaUrldo="";
@@ -522,7 +522,8 @@ export default {
 
       //PDF预览
       Vue.prototype.previewPDF = function (url) {
-        window.open(this.domainManager().PDFViewUrl + url);
+        // window.open(this.domainManager().PDFViewUrl + url);
+        window.open(url);
       },
       //文件下载
       Vue.prototype.downloadFile = function (objectKey) {