页面修改

src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue

@@ -671,6 +671,17 @@
                       <template slot="prepend">{{$t('sm.jihedidian')}}</template>
                     </el-input>
                   </el-form-item>
+                  <el-form-item prop="EmergencyContact">
+                    <el-input :placeholder="$t('pub.pleaseImport')" class="w290 ComSeat"
+                      v-model="priceData.EmergencyContact">
+                      <template slot="prepend">紧急联系人</template>
+                    </el-input>
+                  </el-form-item>
+                  <el-form-item>
+                    <el-input :placeholder="$t('pub.pleaseImport')" class="w460 ComSeat" v-model="priceData.GatherTag">
+                      <template slot="prepend">{{$t('op.JHbiaoshi')}}</template>
+                    </el-input>
+                  </el-form-item>
                   <el-form-item>
                     <span class="TP_Sendprepend" style="margin-left:0;width:120px;">{{$t('sm.xiaoshouzt')}}</span>
                     <el-select class="w180" v-model="priceData.TCSaleState">
@@ -678,11 +689,6 @@
                       </el-option>
                     </el-select>
                   </el-form-item>
-                  <el-form-item>
-                    <el-input :placeholder="$t('pub.pleaseImport')" class="w460 ComSeat" v-model="priceData.GatherTag">
-                      <template slot="prepend">{{$t('op.JHbiaoshi')}}</template>
-                    </el-input>
-                  </el-form-item>
                   <el-form-item style="display:none;">
                     <el-input :placeholder="$t('pub.pleaseImport')" class="w460 ComSeat"
                       v-model="priceData.AirportService">
@@ -1122,8 +1128,10 @@
                 ContractUrl: "",
                 ContractArray: [],
                 OutBranchId: 0,
+                EmergencyContact: "",
                 GatherTime: "",
                 GatherAddress: "",
+                GatherTag: "", //集合标识
                 AdImage: "",
                 YSeat: 0,
                 CSeat: 0,
@@ -1151,7 +1159,7 @@
                 ),
                 //删除的绑定的航班编号
                 DeleteAirticketIds: "",
-                GatherTag: "", //集合标识
+               
                 AirportService: "", //机场服务
                 //可销售机票数量
                 CanSellTicketNum: 0,
@@ -1211,6 +1219,7 @@
               GatherAddress: '',
               GatherTag: '',
               GatherTime: '',
+              EmergencyContact: '',
               Inventory: 0,
               IsB2B: 0,
               IsB2C: 0,
@@ -1240,6 +1249,7 @@
               VisaPrice: 0,
               YSeat: 0,
               OPRemark: "",
+
             }
             this.returnPriceList.push(obj);
           })

src/plug/index.js

@@ -261,8 +261,8 @@ export default {
         if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('clientConfirm') === -1 &&
           this.$route.name.indexOf('confirmationOrderDownLoadNew') === -1 && this.$route.name.indexOf('PrintPage') === -1 &&
           this.$route.name.indexOf('TravelContractConfirm') === -1 && this.$route.name.indexOf('ViittoContractConfirm') === -1 &&
-          this.$route.name.indexOf('OrderProfitLossList') === -1 && this.$route.name.indexOf('clientProtocol') === -1
-          && this.$route.name.indexOf('clientDisclaimerProtocol')===-1
+          this.$route.name.indexOf('OrderProfitLossList') === -1 && this.$route.name.indexOf('clientProtocol') === -1 &&
+          this.$route.name.indexOf('clientDisclaimerProtocol') === -1
         ) {
           let previousPathInfo = {
             path: this.$route.name,
@@ -327,9 +327,7 @@ export default {
               guestId: guestId,
             }
           })
-        }
-        else if(this.$route.path=="/clientDisclaimerProtocol") 
-        {
+        } else if (this.$route.path == "/clientDisclaimerProtocol") {
           let TCID = this.$route.query.TCID;
           let OrderId = this.$route.query.OrderId;
           let GuestId = this.$route.query.GuestId;
@@ -341,8 +339,7 @@ export default {
               GuestId: GuestId,
             }
           })
-        }
-        else if (this.$route.path == "/TravelContractConfirm") {
+        } else if (this.$route.path == "/TravelContractConfirm") {
           let ContractId = this.$route.query.ContractId;
           this.$router.push({
             name: "TravelContractConfirm",
@@ -1060,15 +1057,17 @@ export default {
       //文件上传
       Vue.prototype.uploadImg = function (path, base64Str, successCall, faildCall) {
         var apiurl = this.domainManager().UploadUrl + '/Upload/UploadBase64?fileType=1&fileLimit=5&&filePath=' + path;
-        this.$http.post(apiurl, {
-          MyFile: base64Str
-        }, {
+        var formData = new FormData();
+        formData.append("myfile", base64Str);
+        this.$http.post(apiurl, formData, {
           headers: {
             "Content-Type": "application/x-www-form-urlencoded;"
           },
         }).then(function (res) {
-
-        })
+          if (successCall) {
+            successCall(res)
+          }
+        }, faildCall);
       },
       //证件识别
       Vue.prototype.UploadCard = function (type, base64Str, successCall, faildCall) {
@@ -1170,13 +1169,13 @@ export default {
             xhr.send();
           });
           getBlob.then(blob => {
-            if (window.navigator.msSaveOrOpenBlob) {      
+            if (window.navigator.msSaveOrOpenBlob) {
               navigator.msSaveBlob(blob, filename);
               resultJson.resultCode = 1;
               if (callBack) {
                 callBack(resultJson)
               }
-            } else {     
+            } else {
               resultJson.resultCode = 1;
               if (callBack) {
                 callBack(resultJson)