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

src/components/Complaints/ComplaintsDetail.vue

@@ -236,7 +236,7 @@
             </li>
             <li
               v-if="ComplainInfo.DisposeStatus===4&&(getLocalStorage().EmployeeId===ComplainDetial[ComplainDetial.length-1].CreateBy||authority.indexOf('S_Complain_Finance')!=-1)">
-              <span>单据详情：</span>
+              <span>赔偿列表：</span>
               <span v-for="compensation in ComplainCompensation" class="CD_dealResult" href="javascript:void(0)"
                     @click="setFinance(compensation)">{{compensation.CompensateMoney}}</span>
             </li>

src/components/SalesModule/productQuery.vue

@@ -933,7 +933,7 @@
           CommissionShareMoney: '0',
           OrderForm: '1',
           SonControlID: '-1',
-          IsShowMessagesMoney: '1'
+          IsShowMessagesMoney: '2'
         },
         employeeMsg: {
           BranchId: '-1',
@@ -1704,7 +1704,7 @@
         this.ScenicRefundMoney = 0;
         this.addMsg.CommissionSharePeople = '-1'
         this.addMsg.CommissionShareMoney = '0'
-        this.addMsg.IsShowMessagesMoney = '1'
+        this.addMsg.IsShowMessagesMoney = '2'
         this.remarkMsg = {
           zc: '',
           bzc: '',