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

src/components/FinancialModule/accountingWork.vue

@@ -22,6 +22,21 @@
                     ></el-option>
                     </el-select>
                 </span>
+                <span>
+                    <em>线路</em>
+                    <el-select class="w200"
+                    filterable
+                    v-model="msg.LineID"
+                    >
+                    <el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
+                    <el-option
+                        v-for="(item,index) in LineList"
+                        :label="item.LineName"
+                        :value="item.LineID"
+                        :key="index+60000"
+                    ></el-option>
+                    </el-select>
+                </span>
                 </li>
                <li>
                     <button class="normalBtn" @click="getList" >查询</button>
@@ -42,6 +57,7 @@
                         <th>{{$t('system.query_company')}}</th>
                         <th>{{$t('fnc.w_ywrenyuan')}}</th>
                         <th>流程</th>
+                        <th>线路</th>
                         <th>{{$t('fnc.w_fzfangxiang')}}</th>
                         <th>{{$t('system.table_operation')}}</th>
                     </tr>
@@ -54,6 +70,9 @@
                         <td>
                             <span v-for="(i,ix) in item.TemplateList" :key="ix+5000">{{i.Name}} <span v-if="ix!=item.TemplateList.length-1">,</span> </span>
                         </td>
+                        <td>
+                            <span v-for="(i,ix) in item.LineList" :key="ix+7000">{{i.Name}} <span v-if="ix!=item.LineList.length-1">,</span> </span>
+                        </td>
                         <td>
                             <span v-if="item.Direct==1">{{$t('fnc.shoukuan')}}</span>
                             <span v-else-if="item.Direct==2">{{$t('fnc.zhikuan')}}</span>
@@ -198,6 +217,24 @@
                                 </el-select>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="5">
+                            <el-form-item label="线路">
+                                <el-select
+                                    v-model="addMsg.LineListArr"
+                                    filterable
+                                    multiple
+                                    collapse-tags
+                                    @change="$forceUpdate()"
+                                    :placeholder="$t('pub.pleaseImport')">
+                                    <el-option
+                                        v-for="(item,index) in LineList"
+                                        :key="index+700"
+                                        :label="item.LineName"
+                                        :value="item.LineID">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
                        <el-col :span="6">
                             <el-form-item :label="$t('fnc.w_fzfangxiang')" prop="Direct">
                                 <el-radio v-model="addMsg.Direct" :label="1">{{$t('fnc.w_shou')}}</el-radio>
@@ -245,6 +282,7 @@ export default {
                 listArr:[],
                 BranchId:'',
                 Direct:'',
+                LineList:[]
             },  
             type:-1,
             addShow:false,
@@ -299,6 +337,7 @@ export default {
                 Status:'0',
             },
             SingleList:[],
+            LineList:[],
         }
     },created(){
         let userInfo = this.getLocalStorage();
@@ -313,6 +352,7 @@ export default {
         this.tableSize = this.msg.pageSize = parseInt(cH/45);
         this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id;    //集团ID
         this.getSingleList();
+        this.getLineList();
     },methods:{
         getSingleList(){  // 获取费用类型
 			this.apipost('FinancialFlowTemplate_post_GetSingleList',{},res=>{
@@ -321,6 +361,15 @@ export default {
                 }else{}
 			},err=>{})
 		},
+        getLineList(){
+            this.apipost("line_post_GetAllList", {}, res => {
+                if (res.data.resultCode == 1) {
+                this.LineList = res.data.data;
+                } else {
+                this.$message.error(res.data.message);
+                }
+            });
+        },
         switchMethod(t){
             this.msg.pageIndex = 1;
             if(t===1){
@@ -392,9 +441,22 @@ export default {
                     }
                 })      
             })
+            let LineListArr=this.addMsg.LineListArr;
+            let lineArr =[];
+            LineListArr.forEach(item=>{
+                this.LineList.forEach(val=>{
+                    let obj={};
+                    if(item==val.LineID){
+                        obj.Id=val.LineID;
+                        obj.Name=val.LineName;
+                        lineArr.push(obj);
+                    }
+                })      
+            })
                     
             this.addMsg.emList = list4;
             this.addMsg.TemplateList = newArr;
+            this.addMsg.LineList = lineArr;
             this.apipost('Window_post_SetAccountant',this.addMsg,r=>{
                 if(r.data.resultCode==1){
                     this.$message.success(r.data.message);
@@ -478,6 +540,7 @@ export default {
                     this.addMsg = data;
                     this.addMsg.listArr = [];
                     this.addMsg.TemplateListArr = [];
+                    this.addMsg.LineListArr=[];
                     if(data.emList&&data.emList.length>0){
                         data.emList.forEach(x=>{
                             this.remoteMethod(x.emName);
@@ -489,6 +552,11 @@ export default {
                             this.addMsg.TemplateListArr.push(x.Id)
                         })                        
                     }
+                    if(data.LineList&&data.LineList.length>0){
+                        data.LineList.forEach(x=>{
+                            this.addMsg.LineListArr.push(x.Id)
+                        })                        
+                    }
                     this.addMsg.accountant_list = [];
                     this.addShow = true;                    
                 } else {
@@ -510,7 +578,9 @@ export default {
                 TemplateListArr:[],
                 TemplateList:[],
                 BranchId:'',
-                Direct:''
+                Direct:'',
+                LineList:[],
+                LineListArr:[]
             }
             this.CostIdS = [];
             this.searchList = [];