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

src/components/SalesModule/groupTourOrder.vue

@@ -1743,10 +1743,12 @@
               </span>
               <i v-if='item.confirmFileList.length>0&&item.commissionSharePeople !== userId' @click="deleteFile(item)"
                 style="margin-left: 5px;" class="el-icon-error color999"></i>
-              <el-upload v-if='item.confirmFileList.length==0&&item.commissionSharePeople !== userId'
-                :http-request="uploadFileBtn" :multiple="false" :show-file-list="false" action=''>
-                <el-button size="small" type="danger" @click='getItem(item)'>上传</el-button>
-              </el-upload>
+              <template v-if="item.contractNum.length==0">
+                <el-upload v-if='item.confirmFileList.length==0&&item.commissionSharePeople !== userId'
+                  :http-request="uploadFileBtn" :multiple="false" :show-file-list="false" action=''>
+                  <el-button size="small" type="danger" @click='getItem(item)'>上传</el-button>
+                </el-upload>
+              </template>
             </td>
             <td class="groupTourOrderIcon">
               <el-button-group v-if="item.commissionSharePeople !== userId">
@@ -1851,14 +1853,16 @@
                     </span>
 
               </div>
-              <!-- <div v-if="item.ContractNum.length==0">
+              <div v-if="item.contractNum.length==0&&item.confirmFileList.length==0">
                 <span class="GO_Contract" @click="goContract(item,{})">领取合同</span>
-              </div> -->
-              <!-- <div v-else>
-                <span v-for="sItem in childItem.ContractNum" class="GO_Contract" @click="goContract(item,sItem)">
-                    {{sItem.Client_Name+''+sItem.ContractNum}}
-                </span>
-              </div> -->
+              </div>
+              <div v-else>
+                <template v-if="item.contractNum&&item.contractNum.length>0">
+                  <span v-for="sItem in item.contractNum" class="GO_Contract" @click="goContract(item,sItem)">
+                      {{sItem.client_Name+''+sItem.contractNum}}
+                  </span>
+                </template>
+              </div>
             </td>
           </tr>
           <tr>
@@ -2410,7 +2414,7 @@
           name: 'TravelContractNew',
           query: {
             TCID: item.tcid,
-            guestId:sItem.GuestId,
+            guestId:sItem.guestId,
             orderID:item.orderId,
             blank: 'y'
           }
@@ -2428,7 +2432,6 @@
         });
       },
       getRedBag(item){
-        console.log("111")
         let msg={
           CustomerId:item.customerId,
           pageIndex: 1,
@@ -3951,6 +3954,7 @@
               this.loading = false
               this.total = res.data.data.count
               this.list = res.data.data.pageData;
+              console.log(res,'ressss');
             } else {
               this.$message.error(res.data.message)
             }

src/components/TravelContractDetail.vue

@@ -311,7 +311,7 @@
                     <span class="icon"><i class="iconfont icon-wenjian"></i></span>
                     <h2>合同详情
                         <span>
-                            <input type="button" class="TCbtn-info" v-if="dataList.status==1" @click="getinvalid()" value="作废" style="display:none;" />
+                            <input type="button" class="TCbtn-info" v-if="dataList.status==1" @click="getinvalid()" value="作废"/>
                             <input type="button" class="TCbtn-info" v-if="dataList.companySignature==''" @click="isShowFade=true,GetQrCode()" value="客户签字" />
                             <input type="button" class="TCbtn-info" v-if="dataList.companySignature!=''"  value="下载" @click="toContractPDF(dataList.contractNum)" />
                         </span>

src/components/TravelContractNew.vue

@@ -235,10 +235,10 @@
                 <input type="button" v-if="CtObj.status==1&&CtObj.auditContract==0" class="TCbtn-info" @click="sendAudit()" value="提交审核"/>
                 <input type="button" v-if="CtObj.status==1&&CtObj.auditContract==3" class="TCbtn-info" @click="sendAudit()" value="审核已被驳回,重新提交"/>
                 <input type="button" class="TCbtn-info" v-if="CtObj.status==1" @click="goUrl()"  value="预览">
-                <input type="button" class="TCbtn-info" v-if="CtObj.status==1" @click="getinvalid()" value="作废" style="display:none;">
+                <input type="button" class="TCbtn-info" v-if="CtObj.auditContract==2" @click="getinvalid()" value="作废">
                 <input type="button" class="TCbtn-info" @click="dialogVisible=true,getGuestList()" value="复制合同"/>
                 <input type="button" class="TCbtn-info" v-if="CtObj.status==1" @click="msgDialog=true,getMsgList()" value="发送短信"/>
-                <input type="button" v-if="CtObj.auditContract==0||CtObj.auditContract==3" class="btn-warning" @click="submitForm('CtObj')" value="保存"/>
+                <input type="button" v-if="CtObj.auditContract!=2" class="btn-warning" @click="submitForm('CtObj')" value="保存"/>
             </div>
         </div>
         <el-form label-width="180px" :model="CtObj" :rules="rules" ref="CtObj">
@@ -1637,6 +1637,7 @@
                 type: 'warning'
             }).then(() => {
                 this.CtObj.status=0;
+                this.CtObj.auditContract=0;
                 this.apiJavaPost("/api/contract/dosaveOrUpdate",this.CtObj,res => {
                     if (res.data.resultCode === 1) {
                         this.Success(res.data.message);

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1915,10 +1915,10 @@
               <!--                <span>暂无名单</span>-->
               <!--              </p>-->
               <span>房间信息：{{item.OrderGuestHouseStr}}</span>
-              <div v-if="item.ContractNum.length==0">
+              <!-- <div v-if="item.ContractNum.length==0">
                 <span class="GO_Contract" @click="goContract(item,{})">领取合同</span>
-              </div>
-              <div v-else>
+              </div> -->
+              <div v-if="item.ContractNum&&item.ContractNum.length>0">
                 <span v-for="sItem in item.ContractNum" class="GO_Contract" @click="goContract(item,sItem)">
                     {{sItem.Client_Name+''+sItem.ContractNum}}
                 </span>
@@ -2262,10 +2262,10 @@
                       style="text-decoration:underline;color:blue;cursor:pointer" v-for="(id,i) in childItem.TipFrId"
                       :key="i">{{id}}</span>
                   </span>
-                  <div v-if="childItem.ContractNum.length==0">
+                  <!-- <div v-if="childItem.ContractNum.length==0">
                     <span class="GO_Contract" @click="goContract(childItem,{})">领取合同</span>
-                  </div>
-                  <div v-else>
+                  </div> -->
+                  <div v-if="childItem.ContractNum&&childItem.ContractNum.length>0">
                     <span v-for="sItem in childItem.ContractNum" class="GO_Contract" @click="goContract(childItem,sItem)">
                         {{sItem.Client_Name+''+sItem.ContractNum}}
                     </span>

src/components/activity/Rotationchart.vue

@@ -158,6 +158,7 @@
                 <el-option label="自由行" :value="4"></el-option>
                 <el-option label="当地游" :value="5"></el-option>
                 <el-option label="APP首页" :value="6"></el-option>
+                <el-option label="APP积分商城" :value="7"></el-option>
             </el-select>
         </el-form-item>
         <el-form-item>
@@ -238,6 +239,7 @@
                     <el-option label="自由行" :value="4"></el-option>
                     <el-option label="当地游" :value="5"></el-option>
                     <el-option label="APP首页" :value="6"></el-option>
+                    <el-option label="APP积分商城" :value="7"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="排序">