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

src/components/Restaurant/demesticRestaurantPackage.vue

@@ -410,7 +410,7 @@
        </el-form-item>
        <el-form-item label="购买须知" prop="OtherTag">
           <!-- <el-input class="w300" type="text" v-model="addMsg.OtherTag" maxlength="200"></el-input> -->
-           <my-edit  v-on:edit-value="addMsg.InstructionsList  = arguments[0]" v-bind:editValue="addMsg.OtherTag"
+           <my-edit  v-on:edit-value="addMsg.OtherTag  = arguments[0]" v-bind:editValue="addMsg.OtherTag"
                     v-bind:toolbarShow="toolbar"  v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
        </el-form-item>
        <el-form-item label="套餐图片" prop="MealPic">
@@ -573,6 +573,10 @@ import MyEdit from "@/components/EditTemplate.vue";
         }, err => {})
       },
       saveResource() {
+        if(!this.addMsg.MealPic){
+          this.Error("请上传套餐图片")
+          return
+        }
         if(Array.isArray(this.UsageTimeListArr)){
           this.addMsg.UsageTime=this.UsageTimeListArr.toString()
         }

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -3111,16 +3111,16 @@
       </el-upload>
     </el-dialog>
 
-    <el-dialog custom-class='w450' title="op确认" :visible.sync="isShowOpSure" center>
+    <el-dialog custom-class='w450' title="取消确认" :visible.sync="isShowOpSure" center>
       <el-form label-width="110px">
         <el-form-item label="审核状态">
             <el-radio v-model="OpSureMsg.AuditState" :label="1">通过</el-radio>
             <el-radio v-model="OpSureMsg.AuditState" :label="2">拒绝</el-radio>
         </el-form-item>
-        <template v-if="OpSureMsg.AuditState==1">
-          <el-form-item label="审核备注">
+          <el-form-item label="审核备注" v-if="OpSureMsg.AuditState==2">
             <el-input type="textarea" :rows="4" v-model="OpSureMsg.Remark"></el-input>
           </el-form-item>
+        <template v-if="OpSureMsg.AuditState==1">
           <el-form-item label="是否收损">
               <el-radio v-model="OpSureMsg.IsLoss" :label="1">是</el-radio>
               <el-radio v-model="OpSureMsg.IsLoss" :label="2">否</el-radio>

src/components/TravelManager/customizedcar/costManagement.vue

@@ -68,11 +68,11 @@
         <el-table-column prop="CouponMoney" label="成本" width="80">
            <template slot-scope="scope">
               <div style="display: flex;align-items: center;">
-                  <span v-if="scope.row.OrderType==1">{{scope.row.HotelList[0].CostMoney}}</span>
-                  <span v-if="scope.row.OrderType==2">{{scope.row.DiningList[0].CostMoney}}</span>
-                  <span v-if="scope.row.OrderType==3">{{scope.row.TicketList[0].CostMoney}}</span>
-                  <span v-if="scope.row.OrderType==4">{{scope.row.CarList[0].CostMoney}}</span>
-                  <span v-if="scope.row.OrderType==5">{{scope.row.SDGoodsList[0].CostMoney}}</span>
+                  <span v-if="scope.row.OrderType==1">{{scope.row.HotelList[0].CostMoney?scope.row.HotelList[0].CostMoney:0}}</span>
+                  <span v-if="scope.row.OrderType==2">{{scope.row.DiningList[0].CostMoney?scope.row.DiningList[0].CostMoney:0}}</span>
+                  <span v-if="scope.row.OrderType==3">{{scope.row.TicketList[0].CostMoney?scope.row.TicketList[0].CostMoney:0}}</span>
+                  <span v-if="scope.row.OrderType==4">{{scope.row.CarList[0].CostMoney?scope.row.CarList[0].CostMoney:0}}</span>
+                  <span v-if="scope.row.OrderType==5">{{scope.row.SDGoodsList[0].CostMoney?scope.row.SDGoodsList[0].CostMoney:0}}</span>
               </div>
             </template>    
         </el-table-column>
@@ -121,7 +121,7 @@
       </div>
        <div style="margin-top:10px">
           <span style="margin-right:10px">客户名称</span>
-            <el-select class="w200"  v-model="finMsg.ClientID" size="small"  placeholder="请选择" @change="getName(finMsg.ClientID)">
+            <el-select class="w200"  v-model="finMsg.ClientID" size="small" filterable   placeholder="请选择" @change="getName(finMsg.ClientID)">
                 <el-option v-for="item in ClientAccountList" :key="item.ID" :label="item.Name" :value="item.ID">
                 </el-option>
             </el-select>
@@ -209,10 +209,10 @@
       this.ERPEmpId =  currentUser.ERPEmpId
     },
     mounted() {
+      this.getclientList()
       this.getList();
       this.getplat();
       this.getOrderType();
-         this.getclientList()
     },
     methods: {
    

src/components/TravelManager/customizedcar/travelOrders.vue

@@ -155,8 +155,7 @@
                             <span style="margin-right: 10px;" v-if='item.OrderType == 1'>房间数：x{{list.RoomNumber}}</span>
                             <span style="margin-right: 10px;" v-if='item.OrderType == 2 || item.OrderType == 3'>数量：x{{list.PeopleNumber}}</span>
                           </div>
-                          <div style="margin-bottom: 5px;" >单价：￥{{list.Unit_Price}} </div>
-
+                          <div style="margin-bottom: 5px;" > <span>单价：￥{{list.Unit_Price}}</span></div>
                           <div style="margin-bottom: 5px;" v-if='item.OrderType == 1'>入店时间：{{list.StartDate}} - {{list.EndDate}}</div>
                           <div style="margin-bottom: 5px;" v-if='item.OrderType == 4'>
                             上车地点：{{list.DepartAddress}}  <span style='margin:0 5px'></span> 下车地点：{{list.ArriveAddress}}</div>
@@ -2054,6 +2053,9 @@
     border-radius: 2px;
     margin-right: 4px;
   }
+  .vue-line-clamp span{
+    font-size:16px;font-weight:bold
+  }
 
 
 </style>

src/plug/index.js

@@ -115,6 +115,7 @@ export default {
       Vue.prototype.domainManager = function () {
         let domainUrl = '';
         let mallUrl = ""; //商城API
+        let lxymallUrl = '';//国内游api
         let locationName = window.location.hostname;
         // domainUrl = "http://127.0.0.1";
         domainUrl="http://192.168.20.17:8015";
@@ -123,13 +124,15 @@ export default {
         javaUrldo = locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000";
         //商城API
         // mallUrl = "http://192.168.1.48:8019";
-        mallUrl = "http://192.168.20.9:8088";
+       
         if (locationName.indexOf('testerp.oytour') !== -1) {
           domainUrl = "http://testapi.oytour.com";
           mallUrl = "https://mallapi.oytour.com";
+          lxymallUrl = "https://erpmallapi.oytour.com";
         } else if (locationName.indexOf('oytour') !== -1) {
           domainUrl = "http://reborn.oytour.com";
           mallUrl = "https://mallapi.oytour.com";
+          lxymallUrl = "https://erpmallapi.oytour.com";
         }
         var obj = {
           //主地址
@@ -161,6 +164,7 @@ export default {
           //Java接口本站文件流下载地址
           JavaLocalFileStreamDownLoadUrl: javaUrldo,
           mallUrl: mallUrl,
+          lxymallUrl:lxymallUrl
         };
         return obj;
       },
@@ -1308,7 +1312,7 @@ export default {
     },
     //HTTP提交数据 5-18新的 司导旅行新加的
     Vue.prototype.lxymallapipost = function (cmd, msg, successCall, faildCall, isOnline) {
-      var apiurl = this.domainManager().mallUrl + cmd;
+      var apiurl = this.domainManager().lxymallUrl + cmd;
       var postData = this.GetNewPostData(cmd, msg, "");
       this.$http.post(apiurl, postData, {
         headers: {