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

src/components/Hotel/HotelWorkList.vue

@@ -16,35 +16,49 @@
       </ul>
     </div>
     <div class="hotelProductManage2_tableBox" style="margin-bottom: 20px;">
-      <span style="color:#FFFFFF; background-color:green ; padding: 2px 4px; border-radius: 5px;">OK</span> 
+      <span style="color:#FFFFFF; background-color:green ; padding: 2px 4px; border-radius: 5px;">OK</span>
       <span style="color:#FFFFFF; background-color:#3333CC; padding: 2px 4px; border-radius: 5px;">暂定</span>
-      <span style="color:#FFFFFF; background-color:red; padding: 2px 4px; border-radius: 5px;">未操作</span> 
+      <span style="color:#FFFFFF; background-color:red; padding: 2px 4px; border-radius: 5px;">未操作</span>
+      <span style="color:#FFFFFF; background-color:#000; padding: 2px 4px; border-radius: 5px;">无库存</span>
     </div>
-    <el-table :data="dataList" style="width:100%" border v-loading='loading' height="700">
-      <el-table-column fixed label="酒店名称" min-width="180">
-        <template slot-scope="scope">
-          <div style="text-decoration: underline;cursor:pointer" @click="GotoHotel(scope.row.Hotel)">
-            {{scope.row.HotelName}}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column v-for='(item,index) in dataList[0].DayList' :label="item.DateStr" :key='index' min-width="150">
-        <template slot-scope="scope">
-          <template v-if="scope.row.DayList[index].IsHaveStock==0">
-            <div style="background-color: #000!important;width:100%;height:100%;"></div>
+    <template v-if="isShow">
+      <el-table :data="dataList" style="width:100%" border v-loading='loading' height="700">
+        <el-table-column fixed label="酒店名称" min-width="180">
+          <template slot-scope="scope">
+            <div style="text-decoration: underline;cursor:pointer" @click="GotoHotel(scope.row.Hotel)">
+              {{scope.row.HotelName}}
+            </div>
           </template>
-          <template v-else v-for="childItem in scope.row.DayList[index].HotelJourneyOrderList">
-            <div style="white-space:nowrap;color:red;" :title="childItem.TCID+'【未操作】'" v-if="childItem.DMCState==0">{{childItem.BookGroup}}</div>
-            <div style="white-space:nowrap;color:green;" :title="childItem.TCID+'【OK】'" v-if="childItem.DMCState==1">{{childItem.BookGroup}}</div>
-            <div style="white-space:nowrap;color:#3333CC;" :title="childItem.TCID+'【暂定】'" v-if="childItem.DMCState==2">{{childItem.BookGroup}}</div>
+        </el-table-column>
+        <el-table-column v-for='(item,index) in dataList[0].DayList' :label="item.DateStr" :key='index' min-width="150">
+          <template slot-scope="scope">
+            <template v-if="scope.row.DayList[index].IsHaveStock==0">
+              <div style="background-color:#000!important;width:50px;height:100%;margin:0,padding:0;color:#FFFFFF">无库存
+              </div>
+            </template>
+            <template v-else v-for="childItem in scope.row.DayList[index].HotelJourneyOrderList">
+              <template
+                v-if="scope.row.DayList[index].HotelJourneyOrderList&&scope.row.DayList[index].HotelJourneyOrderList.length>0">
+                <div style="white-space:nowrap;color:red;" :title="childItem.TCID+'【未操作】'" v-if="childItem.DMCState==0">
+                  {{childItem.BookGroup}}</div>
+                <div style="white-space:nowrap;color:green;" :title="childItem.TCID+'【OK】'"
+                  v-if="childItem.DMCState==1">
+                  {{childItem.BookGroup}}</div>
+                <div style="white-space:nowrap;color:#3333CC;" :title="childItem.TCID+'【暂定】'"
+                  v-if="childItem.DMCState==2">{{childItem.BookGroup}}</div>
+              </template>
+              <template v-else>
+                 <a style="text-decoration:underline;cursor:pointer;">添加酒店</a>
+              </template>
+            </template>
           </template>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="noDataNotice" v-if="dataList.length==0">
-      <i class="iconfont icon-kong"></i>
-      <p>{{$t("active.ld_noData")}}</p>
-    </div>
+        </el-table-column>
+      </el-table>
+      <div class="noDataNotice" v-if="dataList.length==0">
+        <i class="iconfont icon-kong"></i>
+        <p>{{$t("active.ld_noData")}}</p>
+      </div>
+    </template>
   </div>
 </template>
 <script>
@@ -59,6 +73,7 @@
         defaultSelectValue: 0,
         dataList: [],
         loading: false,
+        isShow: false,
       };
     },
     methods: {
@@ -83,7 +98,8 @@
             this.loading = false;
             if (res.data.resultCode == 1) {
               this.dataList = res.data.data;
-              //console.log("this.dataList", this.dataList);
+              this.isShow = true;
+              console.log("this.dataList", this.dataList);
             } else {
               this.Error(res.data.message);
             }

src/components/VisaCenter/addVisaNew.vue

@@ -271,6 +271,7 @@
                         </el-form-item>
                         <el-form-item label="在职证明" prop="IncumbencyCertificationType">
                              <el-select v-model="item.IncumbencyCertificationType" placeholder="请选择">
+                                <el-option label="不选" :value="0"></el-option>
                                 <el-option label="已确认为真" :value="1"></el-option>
                                 <el-option label="已确认为假" :value="2"></el-option>
                                 <el-option label="无法确认" :value="3"></el-option>
@@ -278,6 +279,7 @@
                         </el-form-item>
                         <el-form-item label=" 银行流水" prop="AccountStatementType">
                             <el-select v-model="item.AccountStatementType" placeholder="请选择">
+                                <el-option label="不选" :value="0"></el-option>
                                 <el-option label="已确认为真" :value="1"></el-option>
                                 <el-option label="已确认为假" :value="2"></el-option>
                                 <el-option label="无法确认" :value="3"></el-option>