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

src/components/FinancialModule/TradeCommission/commissionDialog.vue

@@ -31,7 +31,14 @@
         ||objNew.CreateTime?DetailsOfRoyalty():''">
             <span class="fz15 fbold">
               <!-- {{objNew.commissionCurrency?objNew.commissionCurrency:objNew.CurrencyName!='人民币'?objNew.CurrencyName:'￥'}} -->
-              <template v-if="OP">{{ moneyFormat(objNew.OPCommission) }} </template>
+              <template v-if="OP">
+                  <template v-if="objNew.OPCommission">
+                    {{ moneyFormat(objNew.OPCommission) }}
+                  </template>
+                  <template v-if="objNew.opCommission">
+                    {{ moneyFormat(objNew.opCommission) }}
+                  </template>
+              </template>
               <template v-else>{{ objNew.commissionMoney?moneyFormat(objNew.commissionMoney):objNew.SellCommission }}</template>
               </span>
         </span>

src/components/SalesVisa/VisaProductOrder.vue

@@ -649,7 +649,7 @@
 
   .VisaProductTable tr td {
     height: 60px;
-    padding-left: 25px;
+    padding-left: 5px;
     border: 1px solid #cccccc;
     font-size: 14px;
     color: #333;
@@ -1456,6 +1456,12 @@
       },
     },
     mounted() {
+      let userInfo = this.getLocalStorage()
+      let ActionMenuCode = userInfo.ActionMenuCode;
+      // 判断是否销售
+      if (ActionMenuCode.indexOf('isEditAmount') != -1) {
+        this.IsSupperOrderEdit = true
+      }
       this.GetSupperOrderEditAuth();
       let userinfo = this.getLocalStorage();
       this.EmployeeId = userinfo.EmployeeId;

src/components/SalesVisa/components/visaOrderList.vue

@@ -535,7 +535,7 @@
                   </div>
                   <div class="cblack fz14 mr" :class="{ cF1416C: scope.row.isFinish == 0,c20C997: scope.row.isFinish == 1 }">
                     <template v-if="scope.row.isFinish == 1">
-                      已完结 / {{scope.row.finishTime}}
+                      已完结 <template v-if="scope.row.finishTime">/ {{scope.row.finishTime}}</template>
                     </template>
                     <template v-else>
                       未完结
@@ -654,7 +654,7 @@
                         <span class="float-l">销售：<span class="cF1416C">￥</span></span>
                         <commissionDialog :objNew="scope.row" :OP="0"></commissionDialog>
                       </div>
-                      <div class="width100-float-l" v-if="scope.row.opCommission&&item.opCommission>0">
+                      <div class="width100-float-l" v-if="scope.row.opCommission&&scope.row.opCommission>0">
                         <span class="float-l">OP：<span class="cF1416C">￥</span></span>
                         <commissionDialog :objNew="scope.row" :OP="1"></commissionDialog>
                       </div>