新增照片费用相关

src/components/LeaderManagement/leaderPayHotelDetail.vue

@@ -18,7 +18,7 @@
         <th>备注</th> 
       </tr>
      <template v-for='(item,index) in dataList'>
-        <template v-if="item.ReimburseList && item.ReimburseList.length">
+        <template v-if="item.ReimburseList && item.ReimburseList.ReimburseDetailsList.length">
           <tr v-for="(childItem,childIndex) in item.ReimburseList.ReimburseDetailsList" >
             <td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">{{item.CheckInDateStr}}</td>
             <td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">

src/components/SalesModule/groupTourOrder.vue

@@ -739,6 +739,11 @@
     display: block;
     cursor: pointer;
   }
+  .needfenshu{
+    margin-top: 10px;
+    display: flex;
+    align-items: center;
+  }
 </style>
 
 <template>
@@ -1781,6 +1786,9 @@
                       <div
                         @click='Discount(item.tcid),SOMsg.OrderId = item.orderId,SOMsg.OrderUnitPrice  = item.unit_Price'>
                         申请优惠</div>
+                      <div
+                        @click='ShenQingPhoto(item)'>
+                        申请照片</div>
                       <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3') && item.isCanClear==0"
                        @click='deleteItem(item)'>取消
                       </div>
@@ -1795,7 +1803,7 @@
                   </el-popover>
                 </el-tooltip>
               </el-button-group>
-              <payurlItem v-if="item.commissionSharePeople !== userId" :item="item" :showID="showID"
+              <payurlItem v-if="item.commissionSharePeople !== userId" :item="item" :showID="showID" :photoF="item.photoNum>0"
                 v-show="item.orderState!='4'&&item.orderState!='3'" v-on:childByValue="childByValue"></payurlItem>
             </td>
           </tr>
@@ -1803,11 +1811,9 @@
             <td colspan="17" class="RL_Order" style="height:20px">
               <span class="RL-remarkTitle"  v-if="item.guestList.length>0">名单:</span>
               <span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0">
-                <span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span>
+                <span v-for="(childItem) in item.guestList">{{childItem.userName}} <span v-if="childItem.isApplyPhoto == 1" style="color:red">(照)</span> &nbsp;&nbsp;</span>
+                <span v-if="item.photoNum>0">（照片一人 {{item.photoNum}}份）</span>
               </span>
-<!--              <span class="RL-redType RL-remarkCon" v-else>-->
-<!--                <span>暂无名单</span>-->
-<!--              </span>-->
               <span style="display: block">房间信息<span v-if="item.oneSex>0" style="color: #e95252">（{{item.oneSex==1?'单男':'单女'}}）</span>：{{item.orderGuestHouseStr}}</span>
              
               <div>
@@ -1954,6 +1960,21 @@
       <updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan>
     </div>
     <a id='groupTourOrder_DownLoad' target="_blank" style="display:none">1不要删除</a>
+    <el-dialog title="选择旅客" width="400px" :visible.sync="ShenQingPhotoShow" center :before-close="closeChangeMachie">
+      <div>
+        <label><input type="checkbox" v-model="SQcheckdAll">全选</label>
+      </div>
+      <div>
+        <label v-for="item in SQguestList"><input type="checkbox" :disabled="item.isApplyPhoto==1 ? true : false" v-model="item.check">{{item.userName}}({{item.sexStr}})</label>
+      </div>
+      <div class="needfenshu">
+        <label>需要份数：</label><el-input type="number" v-model="SQPhotoNum" class="w200"></el-input>
+      </div>
+      <div slot="footer" class="dialog-footer">
+          <button class="hollowFixedBtn" @click="ShenQingPhotoShow=false">{{$t('pub.cancelBtn')}}</button>
+          <button class="normalBtn" type="primary" @click="SQPhoto">{{$t('pub.sureBtn')}}</button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -2247,6 +2268,11 @@
           tcnum:'',
           isOrder:'',
         },
+        ShenQingPhotoShow: false,
+        SQguestList: [],
+        SQcheckdAll: true,
+        SQPhotoNum: '',
+        SQOrderId: ''
       }
     },
     components: {
@@ -2268,8 +2294,68 @@
         }
         return x1 + x2
       }
+    },watch:{
+      SQcheckdAll(val) {
+        this.checkdAll(val)
+      }
     },
     methods: {
+      SQPhoto(){
+        let checkID = []
+        this.SQguestList.map(x=>{
+          if (x.check) {
+            checkID.push(x.guestId)
+          }
+        })
+        if(checkID.length < 1) {
+          this.$message.error('请选择旅客！')
+          return
+        }
+        if(!this.SQPhotoNum) {
+          this.$message.error('请输入份数！')
+          return
+        }
+        let msg = {
+          GuestIdList: checkID,
+          PhotoNum: this.SQPhotoNum,
+          OrderId: this.SQOrderId,
+        }
+        this.apipost('sellorder_get_SetOrderGuestPhoto',msg, res => {
+          if (res.data.resultCode == 1) {
+            this.getList()
+            this.ShenQingPhotoShow = false
+          }
+        },null)
+      },
+      checkdAll(val){
+        if (val) {
+          this.SQguestList.map(x=>{
+            x.check = x.isApplyPhoto == 1 ? false : true
+          })
+        } else {
+          this.SQguestList.map(x=>{
+            x.check = false
+          })
+        }
+        
+        this.SQguestList = this.SQguestList
+        this.$forceUpdate()
+      },
+      ShenQingPhoto(item){
+        if (item.guestList.length < 1) {
+          this.$message.error('暂无旅客，请添加旅客后再尝试申请！')
+          return
+        }
+        item.guestList.map(x=>{
+          x.check = x.isApplyPhoto == 1 ? false : true
+        })
+        this.SQguestList = item.guestList
+        this.SQOrderId = item.orderId
+        this.ShenQingPhotoShow = true
+      },
+      closeChangeMachie(done) {  //  弹=窗口关闭
+        done();
+      },
       setDanren(e){
         e === this.addMsg.OneSex ? this.addMsg.OneSex = 0 : this.addMsg.OneSex = e
       },

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2099,7 +2099,7 @@
                     </el-popover>
                   </el-tooltip>
                 </el-button-group>
-                <payurlItem v-if='item.isOwn==1' :item="item" :showID="showID"
+                <payurlItem v-if='item.isOwn==1' :item="item" :showID="showID" :photoF="item.photoNum>0"
                   v-show="item.orderState!='4'&&item.orderState!='3'" v-on:childByValue="childByValue"></payurlItem>
               </td>
             </tr>
@@ -2109,7 +2109,8 @@
                   v-if="item.guestList.length>0  && (item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder) ">名单:</span>
                 <span class="RL-redType RL-remarkCon"
                   v-if="item.guestList.length>0 && (item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder) ">
-                  <span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span>
+                  <span v-for="(childItem) in item.guestList">{{childItem.userName}}<span v-if="childItem.isApplyPhoto == 1" style="color:red">(照)</span>&nbsp;&nbsp;</span>
+                  <span v-if="item.photoNum>0">（照片一人 {{item.photoNum}}份）</span>
                 </span>
                 <!--              <span class="RL-redType RL-remarkCon" v-else>-->
                 <!--                <span>暂无名单</span>-->
@@ -2445,7 +2446,8 @@
                 v-if="item.guestList.length>0  && (item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder) ">名单:</span>
               <span class="RL-redType RL-remarkCon"
                 v-if="item.guestList.length>0 && (item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder) ">
-                <span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span>
+                <span v-for="(childItem) in item.guestList">{{childItem.userName}}<span v-if="childItem.isApplyPhoto == 1" style="color:red">(照)</span>&nbsp;&nbsp;</span>
+                <span v-if="item.photoNum>0">（照片一人 {{item.photoNum}}份）</span>
               </span>
               <span style="display: block">房间信息<span v-if="item.oneSex>0"
                   style="color: #e95252">（{{item.oneSex==1?'单男':'单女'}}）</span>：{{item.orderGuestHouseStr}}</span>
@@ -2667,6 +2669,21 @@
       </div>
     </el-dialog>
     <a id='groupTourOrderByTuan_DownLoad' target="_blank" style="display:none">1不要删除</a>
+    <el-dialog title="选择旅客" width="400px" :visible.sync="ShenQingPhotoShow" center :before-close="closeChangeMachie">
+      <div>
+        <label><input type="checkbox" v-model="SQcheckdAll">全选</label>
+      </div>
+      <div>
+        <label v-for="item in SQguestList"><input type="checkbox" :disabled="item.isApplyPhoto==1 ? true : false" v-model="item.check">{{item.userName}}({{item.sexStr}})</label>
+      </div>
+      <div class="needfenshu">
+        <label>需要份数：</label><el-input type="number" v-model="SQPhotoNum" class="w200"></el-input>
+      </div>
+      <div slot="footer" class="dialog-footer">
+          <button class="hollowFixedBtn" @click="ShenQingPhotoShow=false">{{$t('pub.cancelBtn')}}</button>
+          <button class="normalBtn" type="primary" @click="SQPhoto">{{$t('pub.sureBtn')}}</button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -3030,7 +3047,12 @@
           tcnum: '',
           isOrder: '',
         },
-        SciencNameList:[]
+        SciencNameList:[],
+        ShenQingPhotoShow: false,
+        SQguestList: [],
+        SQcheckdAll: true,
+        SQPhotoNum: '',
+        SQOrderId: ''
       };
     },
     components: {
@@ -3038,6 +3060,10 @@
       payurlItem1: payURL1,
       tripDownLoadCommon: tripDownLoadCommon,
       updateSalesMan: updateSalesMan
+    },watch:{
+      SQcheckdAll(val) {
+        this.checkdAll(val)
+      }
     },
     filters: {
       priceFormat(value) {
@@ -3054,6 +3080,62 @@
       }
     },
     methods: {
+       SQPhoto(){
+        let checkID = []
+        this.SQguestList.map(x=>{
+          if (x.check) {
+            checkID.push(x.guestId)
+          }
+        })
+        if(checkID.length < 1) {
+          this.$message.error('请选择旅客！')
+          return
+        }
+        if(!this.SQPhotoNum) {
+          this.$message.error('请输入份数！')
+          return
+        }
+        let msg = {
+          GuestIdList: checkID,
+          PhotoNum: this.SQPhotoNum,
+          OrderId: this.SQOrderId,
+        }
+        this.apipost('sellorder_get_SetOrderGuestPhoto',msg, res => {
+          if (res.data.resultCode == 1) {
+            this.getList()
+            this.ShenQingPhotoShow = false
+          }
+        },null)
+      },
+      checkdAll(val){
+        if (val) {
+          this.SQguestList.map(x=>{
+            x.check = x.isApplyPhoto == 1 ? false : true
+          })
+        } else {
+          this.SQguestList.map(x=>{
+            x.check = false
+          })
+        }
+        
+        this.SQguestList = this.SQguestList
+        this.$forceUpdate()
+      },
+      ShenQingPhoto(item){
+        if (item.guestList.length < 1) {
+          this.$message.error('暂无旅客，请添加旅客后再尝试申请！')
+          return
+        }
+        item.guestList.map(x=>{
+          x.check = x.isApplyPhoto == 1 ? false : true
+        })
+        this.SQguestList = item.guestList
+        this.SQOrderId = item.orderId
+        this.ShenQingPhotoShow = true
+      },
+      closeChangeMachie(done) {  //  弹=窗口关闭
+        done();
+      },
       // OP备注赋值
       OPRemark(item){
         this.apipost('sellorder_post_GetOrderEntity',{ID:item.orderId}, res => {

src/components/SalesVisa/VisaProductEditOrder.vue

@@ -120,7 +120,7 @@
 				<th width="8%">实收</th>
 				<th width="8%">退款</th>
 				<th width="8%">平台税金</th>
-				<th width="8%">预计提成</th>
+				<!-- <th width="8%">预计提成</th> -->
 				<th width="8%">报名日期</th>
 				<th width="8%">状态</th>
 				<th width="10%">操作</th>
@@ -144,9 +144,9 @@
 				<td>
 				<span>￥{{moneyFormat(item.platformTax)}}</span>	
 				</td>
-				<td>
+				<!-- <td>
 					<span class="peopleNum">￥{{moneyFormat(item.commission)}}</span>
-				</td>
+				</td> -->
 				<td>{{item.createTime}}</td>
 				<td>{{item.visaOrderStatus==1?"正常":"取消"}}</td>
 				   <td class="groupTourOrderIcon">
@@ -207,7 +207,7 @@
 			</tr>
 			</tbody>
 			<tr v-show="dataList.length==0">
-					<td v-show="dataList.length==0" colspan="12" align="center">暂无数据</td>
+					<td v-show="dataList.length==0" colspan="11" align="center">暂无数据</td>
 			</tr>
 		</table>
      

src/components/TravelManager/TravelList/TravelPassengerList3.vue

@@ -85,10 +85,8 @@
     border-bottom: 1px solid #dcdcdc;
     border-top: 1px solid #dcdcdc;
     display: flex;
-    align-items: center;
     justify-content: center;
   }
-
   .time-box .el-col.active {
     color: #e95252;
     border-bottom: 1px solid #e95252;

src/components/commonPage/payURL.vue

@@ -34,15 +34,16 @@
 		       	 	<el-option  label="二维码" value="1"></el-option>
 		       	 	<el-option  label="团队收款" value="2"></el-option>
 		       	 	<el-option v-if='item.orderState===1'  label="团队退款" value="3"></el-option>
-					<el-option label="团队小费" value="4"></el-option>
-		     	 </el-select>
+							<el-option label="团队小费" value="4"></el-option>
+							<el-option v-if="photoF" label="照片服务费" value="5"></el-option>
+					</el-select>
 		</el-popover>
 	</div>
 </template>
 
 <script>
 	export default {
-		props: ["item","showID"],
+		props: ["item","showID","photoF"],
 		data() {
 			return {
 				value:'',
@@ -162,7 +163,27 @@
 						name: 'ChoiceAddFinancialDocuments',
 						query:{
 							"Type":1,
-							"companyID":obj.outBranchId,
+							"companyID": obj.outBranchId,
+							"path": "",
+							'blank':'y',
+							'orderObj':JSON.stringify(orderObj)
+						}
+					});
+				}else if (this.value === '5') {
+					this.visible=false
+					let orderObj = {
+						OrderID:obj.orderId,
+						OrderSource: 8,
+						CallType: 2,
+						Obj: {},
+						TCIDList: []
+					}
+					this.$router.push({
+						name: 'ChoiceAddFinancialDocuments',
+						query:{
+							"Type": 1,
+							"companyID": 49,
+							"templateID": JSON.stringify([79]),
 							"path": "",
 							'blank':'y',
 							'orderObj':JSON.stringify(orderObj)

src/components/leaderPay2.vue

@@ -453,7 +453,7 @@ input[type="number"] {
               <td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
                 {{subItem.Remarks}}
               </td>
-              <td v-if="childIndex==0 && subIndex ==0" :rowspan="item.row"><span class="cursorpointer text-decoratio" @click="godetail('hotel', subItem)">明细</span></td>
+              <td v-if="childIndex==0 && subIndex ==0" :rowspan="item.row"><span class="cursorpointer text-decoration" @click="godetail('hotel', subItem)">明细</span></td>
             </tr>
           </template>
         </template>

src/router/config.js

@@ -1043,6 +1043,14 @@ export default {
                                 title: '金融机构管理'
                             },
                         },
+                        {
+                            path: '/MakingPhotos', //获取订单需制作照片列表
+                            name: 'MakingPhotos',
+                            component: resolve => require(['@/components/systemManagement/MakingPhotos'], resolve),
+                            meta: {
+                                title: '制作照片'
+                            },
+                        },
                         {
                             path: '/pictureResourceManagement', //图片资源管理
                             name: 'pictureResourceManagement',