1

src/components/Restaurant/domesticRestaurantList.vue

@@ -224,7 +224,9 @@
   .restaurantList .comCursorUrl {
     cursor: pointer;
   }
-
+  .restaurantList .el-button{
+    width: 29px;
+}
   /* 餐厅列表 */
 
 </style>
@@ -242,10 +244,10 @@
         <li>
           <span>
             <em>{{$t('system.quety_area')}}</em>
-            <el-select v-model="msg.QCountry" clearable class="w150" filterable
+            <!-- <el-select v-model="msg.QCountry" clearable class="w150" filterable
               @change="getProvinceList(msg.QCountry,1)" :placeholder="$t('hotel.hotel_country')">
               <el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
-            </el-select>
+            </el-select> -->
             <el-select v-model="msg.QProvince" class="w150" filterable @change="getProvinceList(msg.QProvince,2)"
               :placeholder="$t('hotel.hotel_province')">
               <el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
@@ -314,7 +316,7 @@
         </li>
       </ul>
     </div>
-    <div class="hotelResource clearfix" v-loading="loading">
+     <!-- <div class="hotelResource clearfix" v-loading="loading">
       <div class="resourceList" v-for="(item,index) in tableData" :key="index">
         <div class="reTopInfo" :class="{'comCursorUrl':item.URL}" @click="OpenNewUrl(item.URL)">
           <img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png">
@@ -366,7 +368,62 @@
             class="hotelBtn">{{$t('restaurant.res_package')}}</button>
         </div>
       </div>
-    </div>
+    </div>  -->
+    <el-table :data="tableData" tooltip-effect="dark" style="width: 100%;min-height:450px;" v-loading="loading">
+      <el-table-column prop="Name" label="餐厅名称">
+        <template slot-scope="scope">
+          <div style="display:flex;align-items:center;">
+            <div>
+              <img v-if="!scope.row.PicPath" src="../../assets/img/bg_c3@3x.png" style="width:60px;height:45px;">
+              <img v-else :src="scope.row.PicPath" style="width:60px;height:45px;" />
+            </div>
+            <div style="margin-left:5px;">{{scope.row.Name}}</div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="OpenPlatformList" label="开放平台">
+        <template slot-scope="scope">
+          <el-tag  v-for="(item,index) in scope.row.OpenPlatformList" v-if="item.Name" size="small" style="margin:0 5px 5px 0;" :key="index">{{item.Name}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="OpenPlatformList" label="是否上架">
+        <template slot-scope="scope">
+          <div v-if="scope.row.IsShelves===0">上架</div>
+          <div v-if="scope.row.IsShelves===1">下架</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="地址">
+        <template slot-scope="scope">
+          {{scope.row.ProvinceName}}
+          <template v-if="scope.row.CityName&&scope.row.CityName!=''">
+            -{{scope.row.CityName}}
+          </template>
+          <template v-if="scope.row.DistrictName&&scope.row.DistrictName!=''">
+            -{{scope.row.DistrictName}}
+          </template>
+        </template>
+      </el-table-column>
+      <el-table-column prop="UpdateName" label="修改人">
+      </el-table-column>
+      <el-table-column prop="UpdateTimeStr" label="修改时间">
+      </el-table-column>
+      <el-table-column label="操作" width="150">
+        <template slot-scope="scope">
+          <el-tooltip class="item" effect="dark" content="修改" placement="top">
+            <el-button @click="goSubInfo('demesticRestaurantInfoManage',scope.row.ID)" type="primary" icon="el-icon-edit" circle>
+            </el-button>
+          </el-tooltip>
+          <el-tooltip class="item" effect="dark" content="套餐" placement="top">
+            <el-button @click="goUrl('demesticRestaurantPackage',scope.row.ID)" type="success"
+              icon="iconfont icon-menpiao1" circle></el-button>
+          </el-tooltip>
+          <el-tooltip class="item" effect="dark" content="删除" placement="top">
+            <el-button @click="isdelete(scope.row.ID)" style="font-size:12px;" type="danger"
+              icon="iconfont icon-remove" circle></el-button>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
       :page-size="msg.pageSize" layout="total,prev, pager, next, jumper" :total="msg.total"></el-pagination>
   </div>
@@ -384,7 +441,7 @@
         cityList: "",
         district: "",
         Ids: [],
-        tableData: "",
+        tableData: [],
         deleteID: "",
         EmployeeList: [], //员工列表
         DiningTypeList: [],
@@ -461,7 +518,7 @@
         } else if (type == 3) {
           this.msg.QDistrict = "";
         }
-        if (this.msg.QCountry !== "") {
+        // if (this.msg.QCountry !== "") {
           this.apipost(
             "dict_post_Destination_GetChildList",
             msg,
@@ -476,18 +533,18 @@
             },
             err => {}
           );
-        }
+        // }
       },
       //获取国家
-      getCountryList() {
-        this.apipost(
-          "dict_post_Destination_GetCountry", {},
-          res => {
-            this.countryList = res.data.data;
-          },
-          err => {}
-        );
-      },
+      // getCountryList() {
+      //   this.apipost(
+      //     "dict_post_Destination_GetCountry", {},
+      //     res => {
+      //       this.countryList = res.data.data;
+      //     },
+      //     err => {}
+      //   );
+      // },
       //获取国内餐厅列表
       selectResource() {
         this.loading = true;
@@ -631,7 +688,8 @@
     mounted() {
       this.getEmployeeList();
       this.GetHotelPirceStockAuth();
-      this.getCountryList();
+      // this.getCountryList();
+      this.getProvinceList(2,1);
       this.selectResource();
       this.GetDiningTypeList();
       this.GetDiningPriceTypeList();

src/components/scenicSpot/domesticTicketManagement.vue

@@ -310,8 +310,8 @@
           </el-select>
         </el-form-item> -->
         <el-form-item label="是否上架" prop="IsShelves">
-          <el-radio v-model="addMsg.IsShelves" :label="1">是</el-radio>
-          <el-radio v-model="addMsg.IsShelves" :label="0">否</el-radio>
+          <el-radio v-model="addMsg.IsShelves" :label="1">下架</el-radio>
+          <el-radio v-model="addMsg.IsShelves" :label="0">上架</el-radio>
         </el-form-item>
         <el-form-item label="是否闪入园" prop="IsSameDayBuy">
           <el-radio v-model="addMsg.IsSameDayBuy" :label="1">是</el-radio>