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

src/components/Hotel/roomSure.vue

@@ -87,6 +87,13 @@
             </div>
           </template>
         </el-table-column>
+        <el-table-column label="出发日期" prop="StartDate" width="150">
+          <template #default="{row}">
+            <div v-if="row.isFirst" class="w120 link">
+              <p @click="goUrlT('productQuery', row.parent.TCNUM, '产品查询')" class="hlink">{{row.parent.StartDate}}</p>
+            </div>
+          </template>
+        </el-table-column>
 
         <el-table-column label="出团公司" prop="OutBranchName" width="120">
           <template #default="{row}">
@@ -153,11 +160,14 @@
         <el-table-column label="操作" prop="actions" width="200">
           <template #default="{row}">
             <div v-if="row.isFirst">
-              <el-link v-if="!row.parent.IsEdit" type="primary" @click="row.parent.IsEdit = true">修改</el-link>
-              <el-button type="text" v-if="row.parent.IsEdit" @click="saveBookNum(row.parent)" :loading="saveLoading">保存
-              </el-button>
-              <el-button type="text" style="color:red" v-if="row.parent.IsEdit" @click="row.parent.IsEdit = false">关闭
-              </el-button>
+              <template v-if="row.parent.IsEditHotel">
+                <el-link v-if="!row.parent.IsEdit" type="primary" @click="row.parent.IsEdit = true">修改</el-link>
+                <el-button type="text" v-if="row.parent.IsEdit" @click="saveBookNum(row.parent)" :loading="saveLoading">
+                  保存
+                </el-button>
+                <el-button type="text" style="color:red" v-if="row.parent.IsEdit" @click="row.parent.IsEdit = false">关闭
+                </el-button>
+              </template>
             </div>
           </template>
         </el-table-column>
@@ -274,7 +284,7 @@
         // 需要合并的列（根据上面 el-table-column 的顺序）：0..8 以及最后一列动作 (共 10 列)
         // 我们只按列属性判断，合并那些基于父级显示的列
         const mergeCols = ['DMCNum', 'TCNUM', 'OutBranchName', 'LeaderName', 'GuideName', 'LtName', 'seat', 'UseTime',
-          'NewHotelName', 'actions'
+          'NewHotelName', 'actions','StartDate'
         ];
         if (row.isFirst && mergeCols.includes(column.property)) {
           return [span, 1];
@@ -470,9 +480,7 @@
 
 </script>
 <style>
-   
-
-  .ownScrollbarStyle   .hlink   {
+  .ownScrollbarStyle .hlink {
     text-decoration: underline;
     cursor: pointer;
   }