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

src/components/FinancialModule/BasicDocuments.vue

@@ -282,7 +282,7 @@
                 </table>
                 <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-else-if="OrderSource==10">
                     <tr class="_fujiashuoming_tr">
-                        <td>签证产品编号：<span @click="jumpPage('VisaProduct',GetDetail,8)" class="_jump_page _font_bold">{{GetDetail.SourceID}}</span></td>
+                        <td>签证产品编号：<span @click="jumpPage('VisaProductOrder',GetDetail,8)" class="_jump_page _font_bold">{{GetDetail.SourceID}}</span></td>
                         <td @click="jumpPage('FinancialOrder',GetDetail,3)"> <span class="_jump_page _font_bold">签证收支</span> </td>
                     </tr>
                 </table>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2057,6 +2057,7 @@ export default {
       isShowHouse: false,
       isShowLayerRemarks: false,
       loading: true,
+      isChecked: true,
       comSelect: -1,
       remarksMsg: {
         OrderId: "0",
@@ -2313,6 +2314,13 @@ export default {
     }
   },
   methods: {
+     //是否可以修改成交单价
+      canEditUnitPrice() {
+        let userInfo = this.getLocalStorage();
+        if (userInfo != null && userInfo.EmployeeId == 1) {
+          this.isChecked = false;
+        }
+      },
     maxCommissionMinusRate: function () {
       this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace(/[^\.\d]/g,'');
       this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace('.','');
@@ -3780,6 +3788,7 @@ export default {
     this.getJyfs();
     this.getFylx();
     this.getTuanInfo();
+     this.canEditUnitPrice();
   }
 };
 </script>