0822jd

src/components/Finance/royaltypg.vue

@@ -355,6 +355,35 @@ export default {
                 }
             })
         },
+        //提成通知
+        RoyaltyConfirmByFin(){
+            var url = "/api/Financial/RoyaltyConfirmByFin"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    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,
+                }
+            }).then(function (res) {
+                if(res.data.code==200){
+                    
+                }else{
+                    that.$message({
+                        message: res.data.msg,
+                        type: 'warning'
+                    });
+                }
+            })
+        },
     },
     mounted(){
         this.daraSource()

src/components/OP/HotelReservations.vue

@@ -67,12 +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"
@@ -102,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,8 +2112,8 @@ export default {
         },
         
        
-        DownloadVOUCHER() {
-            var url = "/api/Groups/PostHotelReservationsCreateVoucher"
+        DownloadVOUCHER(index,row) {
+            var url = "/api/Groups/PostHotelReservationsCreateVoucherOld"
             var that = this
             this.$axios({
                 method: 'post',
@@ -2127,7 +2126,7 @@ export default {
                     userId: that.userId ,
                     pageId: that.pageId ,
                     diId: that.OpHotelReservationsData.diId ,
-                    id: 0
+                    id: row.id
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {

src/components/OP/RoyaltyRecogn.vue

@@ -5,17 +5,17 @@
                 <el-form label-width="50px">
                     <div class="royaltypg-hand-search">
                         <el-form-item label="公司">
-                            <el-select  @change="Corporationchange" v-model="value" placeholder="请选择公司">
+                            <el-select disabled @change="Corporationchange" v-model="value" placeholder="请选择公司">
                               <el-option v-for="(iten,index) in CorporationOption" :key="index" :label="iten.companyName" :value="iten.companyId"></el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="部门">
-                            <el-select  @change="depchange" v-model="depvalue" placeholder="请选择部门">
+                            <el-select disabled @change="depchange" v-model="depvalue" placeholder="请选择部门">
                               <el-option v-for="(item,index) in depOption" :key="index" :label="item.depName" :value="item.depId"></el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="人员">
-                            <el-select  filterable v-model="uservalue" placeholder="请选择人员">
+                            <el-select disabled filterable v-model="uservalue" placeholder="请选择人员">
                                 <el-option v-for="(item,index) in userOption" :key="index" :label="item.cnName" :value="item.id"></el-option>
                             </el-select>
                         </el-form-item>
@@ -147,6 +147,7 @@ export default {
             depvalue:'',
             depvalues:'',
             uservalue:'',
+            uservalues:'',
             value2:[],
             CorporationOption:[],
             depOption:[],
@@ -257,10 +258,12 @@ export default {
                     this.depOption=this.CorporationOption[i].subDep;
                 }
             }
-            console.log(this.depOption);
             for(let j=0;j<this.depOption.length;j++){
-
+                if(this.depvalues==this.depOption[j].depName){
+                    this.depvalue=this.depOption[j].depId
+                }
             }
+            this.depchange(this.depvalue)
         },
         //部门切换
         depchange(val){
@@ -283,7 +286,8 @@ export default {
                 }
             }).then(function (res) {
                 if(res.data.code==200){
-                    that.userOption=res.data.data
+                    that.userOption=res.data.data;
+                    that.uservalue=that.uservalues;
                 }else{
                     that.$message({
                         message: res.data.msg,
@@ -344,7 +348,7 @@ export default {
     created(){
     },
     mounted(){
-        this.uservalue = JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
+        this.uservalues = JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
         this.depvalues = JSON.parse(localStorage.getItem('userinif')).userInfo.depName;
         this.values = JSON.parse(localStorage.getItem('userinif')).userInfo.companyName;
         this.daraSource();