op提成 一键制单 单据跳转

src/components/FinancialModule/OPcommissionPeriods.vue

@@ -8,9 +8,17 @@
     display: inline-block;
     margin:10px 15px 10px 0;
   }
+  .OPcommissionPeriods .singeRowTable tr td{
+    padding: 8px 5px;
+  }
+  .OPcommissionPeriods .hoverSpan span:hover{
+    cursor: pointer;
+    text-decoration: underline;
+    color: red;
+  }
 </style>
 <template>
-  <div class="flexOne">
+  <div class="flexOne OPcommissionPeriods">
     <div>
       <ul class="opUl">
         <li>
@@ -40,7 +48,7 @@
         <td>{{item.Periods}}</td>
         <td>{{item.SumPrice}}</td>
         <td>
-          <p style="margin:6px 0">{{item.CreateByStr}}</p>
+          <p>{{item.CreateByStr}}</p>
           <p>{{item.CreateStr}}</p>
           </td>
         <td>{{item.Discription}}</td>
@@ -49,9 +57,43 @@
           <el-tooltip class="item" effect="dark" content="查看" placement="top">
             <el-button type="primary" class="CM_look" @click="goUrl('OPCommissionDetail',item.ID)" icon="iconfont icon-chakan" circle></el-button>
           </el-tooltip>
-           <el-tooltip class="item" effect="dark" content="制单" placement="top">
-            <el-button type="primary" class="CM_look" @click="goUrlZD" icon="iconfont icon-caidan-fill" circle></el-button>
+          <el-tooltip class="item" effect="dark" content="一键制单" placement="top">
+            <el-button @click="YijianZD(item)" type="danger" class="CM_look" icon="iconfont icon-mui-icon-add" circle></el-button>
           </el-tooltip>
+              
+          
+            <el-tooltip class="item" effect="dark" content="查看详情" placement="top">
+              <el-popover
+              placement="right"
+              width="400"
+              trigger="click">
+              <table class="OPcommissionPeriods singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
+                  <tr>
+                      <th>公司</th>
+                      <th>制单人</th>
+                      <th width="47%">单据</th>
+                      <th>制单时间</th>
+                  </tr>
+                  <tr v-for="(item,index) in djList" :key="index">
+                    <td>{{item.BName}}</td>
+                    <td>{{item.EmName}}</td>
+                    <td>
+                      <div class="hoverSpan" style="text-align: left;padding: 6px 4px;">
+                        <span style="margin-right:5px;margin-bottom:5px" @click="goFinal(fin)" v-for="(fin,key) in item.FinanceIdList" :key="key">{{fin}}</span>  
+                      </div>
+                    </td>
+                    <td>{{item.CreateDate}}</td>
+                  </tr>
+                  <tr v-if="djList.length==0">
+                    <td colspan="4">暂无数据</td>
+                  </tr>
+              </table>
+              <el-button @click="Chankan(item)" style="margin-left:5px" slot="reference" type="warning" class="CM_look" icon="iconfont icon-caidan-fill" circle></el-button>
+            </el-popover>
+            </el-tooltip>
+          
+          
+           
         </td>
       </tr>
     </table>
@@ -59,6 +101,16 @@
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
           layout="total,prev, pager, next, jumper" :page-size='msg.PageSize' :total='total'>
     </el-pagination>
+    <el-dialog
+    title="提示"
+    :visible.sync="dialogVisible"
+    width="30%">
+    <span>{{ErrorMessage}}</span>
+    <span slot="footer" class="dialog-footer">
+      <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+      <el-button size="mini" type="danger" @click="dialogVisible = false">确 定</el-button>
+    </span>
+  </el-dialog>
   </div>
 </template>
 
@@ -67,6 +119,8 @@ import moment from "moment"
   export default {
     data() {
       return {
+        dialogVisible:false,
+        ErrorMessage:'',
         Month:moment().format("YYYY-MM"),
         msg: {
           PageIndex: 1,
@@ -79,6 +133,7 @@ import moment from "moment"
         currentPage: 1,
         btnLoading:false,
         btnShow:false,
+        djList:[],
       }
     },
     mounted() {
@@ -91,26 +146,49 @@ import moment from "moment"
       this.getList();
     },
     methods: {
-      goUrlZD(){
-        let orderObj = {
-          OrderID: 0,
-          OrderSource: 8,
-          Obj: {},
-          SourceID: 0,
-          CostType: 112,
-          SelectState:true,
-        }
-        let id=[29,31];
+      goFinal(fin){
+        document.querySelector("#app").click();
         this.$router.push({
-            name: 'ChoiceAddFinancialDocuments',
+            name: 'FinancialDocumentsDetail',
             query: {
-              Type: 2,
-              templateID: JSON.stringify(id),
+              id: fin,
               'blank': 'y',
-              'orderObj': JSON.stringify(orderObj)
             }
           })
       },
+      Chankan(item){
+        this.apipost(
+          "Financial_post_GetOPCommissionBetchImportList",
+          {PeriodsId:item.ID},
+          res => {
+            if(res.data.resultCode==1){
+              this.djList=res.data.data;
+            }else{
+              this.Error(res.data.message);
+            }
+          },
+          null
+        );
+      },
+      YijianZD(item){
+        this.loading=true;
+        this.apipost(
+          "Financial_post_SetOPCommissionBetchImport",
+          {PeriodsId:item.ID},
+          res => {
+            this.loading=false;
+            if(res.data.resultCode==1){
+              this.Success(res.data.message)
+              this.getList();
+            }else{
+              this.dialogVisible=true;
+              this.ErrorMessage=res.data.message;
+            }
+          },
+          null
+        );
+        
+      },
       handleCurrentChange(val) {
         this.msg.PageIndex = val;
         this.getList();

src/components/Ticketing/TicketManager.vue

@@ -2275,7 +2275,7 @@
 
   <!-- 机票服务费 -->
 <el-dialog width="1000px" title="保存" :visible.sync="moneyR" center>
-    <el-form :rules="TicketServerules" class="Rform" ref="form" :model="Ticketform" label-width="67px">
+    <el-form class="Rform" ref="form" :model="Ticketform" label-width="67px">
         <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;margin-bottom:15px" cellspacing="0" cellpadding="0" v-loading="loading">
                 <tr>
                     <th>团号</th>
@@ -2381,14 +2381,6 @@
           PayDate:'',
           CurrencyId:1,
         },
-        TicketServerules:{
-            ImportType: [
-                { required: true, message: '请选择导入类型', trigger: 'change' }
-            ],
-            IsPublic: [
-                { required: true, message: '请选择付款类型', trigger: 'change' }
-            ],
-        },
 
         ticketMsg:{
           OldAirId:"",
@@ -2811,70 +2803,7 @@
               this.$message.success(this.$t('tips.scchenggong'))
           }, 1);
       },
-      financeinfo_post_GetClientTypeList(){  // 获取对象类型
-          this.apipost('financeinfo_post_GetClientTypeList',{}, res => {
-              if(res.data.resultCode == 1) {
-                  this.ClientTypeList = res.data.data;
-              }
-          }, err => {})
-      },
-      financeinfo_post_GetClientAccountList(t,i){  //获取付款 对象类型  新增用
-        let msg = {
-            ID:0,
-            Type:t,
-            ObjID:0,
-            CardNum:''
-        }
-        if(i>=0){
-            msg.ID=i;
-        }else{
-            this.msg.ClientID='';
-            this.msg.AccountNumber='';
-            this.msg.RemitterName='';
-            this.msg.IsLeader=1;
-        }
-        this.apipost('financeinfo_post_GetClientAccountList',msg, res => {
-            if(res.data.resultCode == 1) {
-                let data = res.data.data;
-                let ClientAccountList = [];
-                if(i){
-                    data.forEach(x=>{
-                        let obj = {
-                            ID:x.ID,
-                            Name:x.AccountHolder + + `（${x.AccountAlias}）`,
-                            Nom:x.CardNum,
-                            OpenBankName:x.OpenBankName,
-                            allName:x.CardNum+" "+x.OpenBankName,
-                            ObjID:x.ObjID,
-                        }
-                        ClientAccountList.push(obj)
-                    })
-                    this.ClientAccountListS = ClientAccountList;
-                }else{
-                    data.forEach(x=>{
-                        let obj = {
-                            ID:x.ID,
-                            Name:x.AccountHolder + `（${x.AccountAlias}）`,
-                            Nom:x.CardNum,
-                            OpenBankName:x.OpenBankName,
-                            ObjID:x.ObjID,
-                        }
-                        ClientAccountList.push(obj)
-                    })
-                    this.ClientAccountList = ClientAccountList;
-                }
-            }
-        }, err => {})
-      },
-      GetClientAccountList(i){ //获取客户名称并且根据费用类型和付款对象获取客户账号
-          this.msg.AccountNumber='';
-          this.ClientAccountList.forEach(x=>{
-              if(x.ID==i){
-                  this.msg.RemitterName=x.Name;
-                  this.financeinfo_post_GetClientAccountList(this.msg.ClientType,x.ID);
-              }
-          })
-      },
+     
       TicketFinalTranfer(){
         if(this.ticketMsg.NewAirId==""){
           this.Error("请输入新机票编码");
@@ -3812,7 +3741,6 @@
       this.GetPlatform();
       this.getDownList();
       this.getEmployeeList();
-      this.financeinfo_post_GetClientTypeList();
       this.getCurrencyType();
     }
   };