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

src/components/FinancialModule/RecPayQuery.vue

@@ -314,6 +314,46 @@
                 multiple-sort><!-- 多个排序 -->
             </v-table>
         </div>
+
+        <el-dialog custom-class='w400' title="转交" :visible.sync="zhuanjiaoBox" center>
+            <template>
+                <el-form label-width="80px">
+                    <el-form-item label="转交人：">
+                        <!-- <el-select  filterable  v-model='zhuanjiaoMsg.CreateBy'  class="">
+                            <el-option :value="0" label="不限"></el-option>
+                            <el-option v-for='item in EmployeeList'
+                                :label='item.EmName'
+                                :value='item.EmployeeId'
+                                :key='item.EmployeeId'>
+                            </el-option>
+                        </el-select> -->
+                        <el-select
+                            v-model="zhuanjiaoMsg.CreateBy"
+                            filterable
+                            remote
+                            reserve-keyword
+                            :placeholder="$t('pub.pleaseImport')"
+                            :remote-method="remoteMethod"
+                            @change="$forceUpdate()"
+                            >
+                            <el-option
+                                v-for="item in searchList"
+                                :key="item.empId"
+                                :label="item.name"
+                                :value="item.empId">
+                                <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.postName }}</span>
+                            </el-option>
+                        </el-select>
+
+                    </el-form-item>
+                </el-form>
+                <div slot="footer" class="dialog-footer">
+                    <button class="hollowFixedBtn" @click="zhuanjiaoBox=false">{{$t('pub.cancelBtn')}}</button>
+                    <button class="normalBtn" type="primary" @click="setExchange()">{{$t('pub.saveBtn')}}</button>
+                </div>
+            </template>
+        </el-dialog>
     </div>
 </template>
 <script>
@@ -379,6 +419,21 @@ Vue.component('table-operation',{  //查看操作按钮
                 class="iconfont icon-sousuo" @click="goUrl('CapitalAllocationDetail')">
             </i>
         </el-tooltip>
+        <el-tooltip class="item" effect="dark" content="转交"  placement="top">
+            <i v-if="rowData.isExchange" style="width: 30px; 
+                height: 30px;
+                display: inline-block;
+                color: white !important;
+                border-radius: 50%;
+                text-align: center;
+                line-height: 30px;
+                margin-right: 10px;
+                cursor: pointer;
+                background-color: #47BF8C;
+                outline: none;"
+                class="iconfont icon-zhuanhuan1" @click="getExchange(rowData,index)">
+            </i>
+        </el-tooltip>
     </span>`,
     props:{
         rowData:{
@@ -403,6 +458,9 @@ Vue.component('table-operation',{  //查看操作按钮
                 query: {id:this.rowData.FrID,blank:'y',tab:this.rowData.FrID+'单据详情'}
             })
         },
+        getExchange(rowData,index){
+            this.MsgBus.$emit('getRecQuery',rowData.FrID);
+        },
     }
 })
 Vue.component('table-RecPay',{  //收支样式
@@ -709,6 +767,8 @@ export default {
             showID:false,
             active:1,
             userId:0,
+            zhuanjiaoBox:false,
+            searchList:[],
             msg:{
                 pageIndex:1,
                 pageSize:5,
@@ -761,6 +821,11 @@ export default {
                 AuditEmId:null,
                 WorkFlowId:0,
             },
+            //转交信息
+            zhuanjiaoMsg:{
+                CreateBy:'',
+                FrIDList:[]
+            },
             DataList:[],
             GetFinancLogList:[],
             StatusList:[],
@@ -871,6 +936,14 @@ export default {
         this.FinancialFlowTemplate_post_GetStatusList();
         this.getPageList();
         this.AccountType_post_GetList();
+
+        var that = this;
+        that.MsgBus.$on('getRecQuery',function(FrID){
+            that.zhuanjiaoMsg.CreateBy = '';
+            that.zhuanjiaoMsg.FrIDList = [];
+            that.zhuanjiaoMsg.FrIDList.push(FrID);
+            that.zhuanjiaoBox = true;
+        });
     },methods:{
         customCompFunc(params){
             console.log(params);
@@ -880,6 +953,32 @@ export default {
             //自己写实现
             //{gender:"",name:"asc"}
         },
+        //设置转交
+        setExchange(){
+            if(this.zhuanjiaoMsg.CreateBy==''){
+                this.Error('请选择转交人');
+                return;
+            }
+            this.apipost('Financial_post_SetFinanceCreateByCareOf',this.zhuanjiaoMsg,res=>{
+                if(res.data.resultCode==1){
+                    this.Success(res.data.message);
+                    this.zhuanjiaoBox = false;
+                }else{
+                    this.Error(res.data.message);
+                }
+            },err=>{})
+        },
+        remoteMethod(query) {  //  转交人模糊查询
+            if (query !== ''||this.addShow) {
+                this.apipost("admin_Get_Chat_All_SelectEmpName",{ EmName:query },res => {
+                    if (res.data.resultCode == 1) {
+                        this.searchList = res.data.data;
+                    }
+                },err => {});
+            } else {
+                this.searchList = [];
+            }
+        },
         // 数据筛选
         filterMethod(filters){
             console.log(filters)
@@ -937,10 +1036,17 @@ export default {
             if(!this.msg.TradeWay)this.msg.TradeWay=0;
             if(!this.msg.AccountType)this.msg.AccountType=0;
             this.loading= true;
-            console.log(this.msg)
             this.apipost('Financial_post_GetALLPageList',this.msg,res=>{
                 if(res.data.resultCode == 1) {
                     let data = res.data.data.pageData.list;
+                    let userInfo=this.getLocalStorage();
+                    data.forEach(x=>{
+                        if((","+userInfo.ActionMenuCode+",").indexOf(',Finance_CreateByCareOf,')>0){
+                            x.isExchange = true
+                        } else{
+                            x.isExchange = false
+                        }
+                    })
                     this.total = res.data.data.count;
                     if(this.total==0){
                         this.DataList=[];
@@ -1290,6 +1396,7 @@ export default {
         goEit(path,type,id,edit,Conditon,pageIndex){
             this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex} })
         }
+
     }
 }
 </script>