0826khmd

src/components/Finance/FeesPage.vue

@@ -442,7 +442,7 @@ export default {
     text-align: center;
 }
 .el-popup-parent--hidden .el-message-box{
-    width: 1000px;
+    width: 800px;
 }
 .message_box_alert .el-message-box__content{
     max-height: 300px;
@@ -451,6 +451,7 @@ export default {
 }
 .message_box_alert .el-message-box__btns{
     padding: 15px 20px 10px 20px;
+    
 }
 .message_box_alert .el-message-box__content::-webkit-scrollbar {
     width: 6px;

src/components/OP/HotelReservations.vue

@@ -67,11 +67,11 @@
                            
                         </template>
                     </el-table-column>
-                    <el-table-column prop="address" label="VOUCHER" width="100">
+                    <!-- <el-table-column prop="address" label="VOUCHER" width="100">
                         <template slot-scope="scope">
                             <i @click="DownloadVOUCHER(scope.$index, scope.row)">生成</i>
                         </template>
-                    </el-table-column>
+                    </el-table-column> -->
                 </el-table>
                 <div class="block">
                     <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange"
@@ -101,7 +101,7 @@
                         <el-button slot="reference">移上提示每天详细房价</el-button>
                     </el-popover>
                     <div class="form-head-btn">
-                        <!-- <el-button type="primary" @click="DownloadVOUCHER">VOUCHER</el-button> -->
+                        <el-button type="primary" @click="DownloadVOUCHER">VOUCHER</el-button>
                         <el-button type="primary" @click="ConfirmWord">确认单</el-button>
                         <el-button type="primary" @click="BookingCost">预订成本</el-button>
                         <el-button type="primary" @click="AddToggle">新增切换</el-button>
@@ -2113,7 +2113,7 @@ export default {
         
        
         DownloadVOUCHER(index,row) {
-            var url = "/api/Groups/PostHotelReservationsCreateVoucherOld"
+            var url = "/api/Groups/PostHotelReservationsCreateVoucherBatchNew"
             var that = this
             this.$axios({
                 method: 'post',
@@ -2126,7 +2126,7 @@ export default {
                     userId: that.userId ,
                     pageId: that.pageId ,
                     diId: that.OpHotelReservationsData.diId ,
-                    id: row.id
+                    id: 0
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {

src/components/OP/PickupList.vue

@@ -907,6 +907,12 @@ export default {
         },
         //保存修改api
         PostTourClientListAddOrEdit() {
+            console.log(this.tableData.length);
+            console.log(this.GroupInfo.visitPNumber);
+            if(this.tableData.length>=this.GroupInfo.visitPNumber){
+                this.$message.error("保存失败！录入的客户名单超过本团组的出访人数，请检查仔细删除多余人！");
+                return
+            }
             this.fullscreenLoading = true;
             var url = "/api/Groups/PostTourClientListAddOrEdit"
             var that = this
@@ -1052,6 +1058,10 @@ export default {
         },
         //多存api
         PostTourClientListAddMultiple(listinif) {
+            if((this.tableData.length+listinif.length)>this.GroupInfo.visitPNumber){
+                this.$message.error("保存失败！录入的客户名单超过本团组的出访人数，请检查仔细删除多余人！");
+                return
+            }
             var url = "/api/Groups/PostTourClientListAddMultiple"
             var that = this
             var data = {

src/components/OP/RoyaltyRecogn.vue

@@ -34,7 +34,7 @@
                         <div style="margin-left: 10px;">
                             <el-button @click="ComputeRoyalties" type="primary">查 询</el-button>
                             <!-- <el-button @click="derivelist" type="primary">导出提成列表</el-button> -->
-                            <el-button @click="derivelist" type="primary">确认</el-button>
+                            <el-button @click="RoyaltyConfirmByUser" type="primary">确认</el-button>
                         </div>
                     </div>
                 </el-form>
@@ -102,6 +102,22 @@
                         {{ processingprice(scope.row.price)+ ' 元' }}
                     </template>
                     </el-table-column>
+                    <el-table-column
+                    prop="price"
+                    label="是否确认"
+                    width="80">
+                    <template slot-scope="scope">
+                        {{ scope.row.isConfirm==1?'已确认':'未确认'}}
+                    </template>
+                    </el-table-column>
+                    <el-table-column
+                    prop="price"
+                    label="是否发放"
+                    width="80">
+                    <template slot-scope="scope">
+                        {{ scope.row.isSeed==1?'已发放':'未发放'}}
+                    </template>
+                    </el-table-column>
                 </el-table>
                 <div class="numpice">
                     该时间段提成总额：&nbsp;{{ numpices }} 元
@@ -354,6 +370,17 @@ export default {
         },
         //提成确认
         RoyaltyConfirmByUser(){
+            if (this.multipleSelection.length==0) {
+                this.$message({
+                    message:"请选中数据",
+                    type: 'warning'
+                });
+                return
+            }
+            let dataarr=[];
+            for(let i=0;i<this.multipleSelection.length;i++){
+                dataarr.push(this.multipleSelection[i].id);
+            }
             var url = "/api/Financial/RoyaltyConfirmByUser"
             var that = this
             this.$axios({
@@ -363,12 +390,8 @@ export default {
                     Authorization: 'Bearer '
                 },
                 data:{
-                    startData:that.getdate(this.value2[0]),
-                    endData:that.getdate(this.value2[1]),
-                    userId:that.uservalue,
-                    deparId:that.depvalue,
-                    companyId:that.value,
-                    computeRoyaltiesList:that.multipleSelection,
+                    data:dataarr,
+                    state:1,
                 }
             }).then(function (res) {
                 if(res.data.code==200){

src/components/Resource/InvitationOfficialActivityData.vue

@@ -27,7 +27,10 @@
                     </el-date-picker>
                     <el-autocomplete class="inline-input" v-model="Field" :fetch-suggestions="querySearchField"
                         placeholder="领域" clearable></el-autocomplete>
-                    <el-button type="primary" @click="QueryData" style="margin-left: 10px;">查询</el-button>
+                    <div>
+
+                        <el-button type="primary" @click="QueryData" style="margin-left: 10px;">查询</el-button>
+                    </div>
                     <div>
                         <router-link to='/home/OpInvitationOfficialActivityData'>
                             <el-button type="primary" style="margin-left: 10px;">新增</el-button>