页面修改

src/components/assetsman/HotelInfo.vue

@@ -116,25 +116,15 @@
             <el-input type="text" v-model="addMsg.SHotelName" maxlength="100" class="w300"></el-input>
           </el-form-item>
           <el-form-item label="国家">
-<<<<<<< HEAD
             <el-select size="small" v-model="addMsg.SCountryId" placeholder="国家"
               @change="getProvinceList(addMsg.SCountryId,1,1)" filterable>
-=======
-            <el-select size="small" v-model="addMsg.SCountryId" class="w300" placeholder="国家"
-              @change="getProvinceList(addMsg.SCountryId,1)" filterable>
->>>>>>> deee3e6a5d66b17670d2ce23bbd4ac8095b22d82
               <el-option label="すべて" :value='0'></el-option>
               <el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="省">
-<<<<<<< HEAD
             <el-select size="small" v-model="addMsg.SProvinceId" placeholder="省"
               @change="getProvinceList(addMsg.SProvinceId,2,1)" filterable>
-=======
-            <el-select size="small" v-model="addMsg.SProvinceId" class="w300" placeholder="省"
-              @change="getProvinceList(addMsg.SProvinceId,2)" filterable>
->>>>>>> deee3e6a5d66b17670d2ce23bbd4ac8095b22d82
               <el-option label="すべて" :value='0'></el-option>
               <el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
@@ -337,21 +327,6 @@
         this.addMsg.SPayType = this.payTypeChooseArray.toString();
         this.addMsg.DeskLanguage = this.deskLanguageArray.toString();
         this.addMsg.SHotelImgCover = this.HotelImageArray.toString();
-<<<<<<< HEAD
-        this.apipost(
-          "scm_post_SetSCMHotelService",
-          this.addMsg,
-          response => {
-            //修改添加接口
-            if (response.data.resultCode == 1) {
-              this.Success(response.data.message);
-            } else {
-              this.Error(response.data.message);
-            }
-          },
-          null
-        );
-=======
         if (this.isSubmit) {
           this.isSubmit = false;
           this.apipost(
@@ -369,7 +344,6 @@
             null
           );
         }
->>>>>>> deee3e6a5d66b17670d2ce23bbd4ac8095b22d82
       },
       //获取酒店配置项
       getConfig() {