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

src/pages/financial/PlatformAccount.vue

@@ -997,7 +997,7 @@ export default {
     downMuban() {
       let msg=this.msg;
       let userInfo = this.getLocalStorage();
-      msg.UId=userInfo.EmployeeId;
+      msg.UId=userInfo.Id;
       this.GetLocalFile(
         "BankAccount_post_OutToExcelPlatform",
         msg,

src/pages/financial/accountingWork.vue

@@ -278,7 +278,7 @@
         SingleList: [],
         schoolMsg: {
           pageIndex: 1,
-          pageSize: 12,
+          pageSize: 999,
           rowsPerPage: 12,
           SName: "",
           Status: '-1'

src/pages/financial/financalDocument/CapitalAllocation.vue

@@ -282,8 +282,8 @@
     created(){
       this.getList()
       let userInfo = this.getLocalStorage();    // 读取缓存数据
-      this.getCompanyMsg.RB_Group_Id = this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id;    // 集团ID
-      this.EmId=userInfo.EmployeeId;
+      this.getCompanyMsg.RB_Group_Id = this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.Group_Id;    // 集团ID
+      this.EmId=userInfo.Id;
       let ActionMenuCode=userInfo.ActionMenuCode;
       // if(ActionMenuCode.indexOf('F_CreateBranchMoneyAllot')!=-1){
       //   this.btnShow=true;
@@ -324,6 +324,7 @@
         if(!this.msg.Status)this.msg.Status=0;
         if(!this.msg.FrID)this.msg.FrID=0;
         this.msg.EmployeeId=this.EmId;
+        
         this.GetLocalFile("Financial_get_OutToFundTransfer", this.msg,this.$t('fnc.zjdbbiao')+".xls");} ,
       getCompanyList: function () { //获取公司列表
         getSchoolPage(this.schoolMsg).then(res => {

src/pages/financial/financalDocument/ChoiceAddFinancialDocuments.vue

@@ -123,56 +123,49 @@
          if(this.active==1){
           // 手配费 收款单参数Handmsg
           if(this.$route.query.Handmsg){
-            let tempStr = '/financial/financalDocument/addReceivablesDocuments' + '?Handmsg=' + this.Handmsg + '&tradeWay=' +this.tradeWay +'&platformAccount='+this.platformAccount+'&id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
-            // this.$router.push({ name: "addReceivablesDocuments",query:{"Handmsg":this.Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}})
             this.$router.push({
-                path: tempStr
+                path: '/financial/financalDocument/addReceivablesDocuments',
+                query:{"Handmsg":this.Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}
             });
           }
           // 财务收据
           else if(this.$route.query.czmsg){
             let Handmsg=this.$route.query.czmsg;
-            let tempStr = '/financial/financalDocument/addReceivablesDocuments' + '?Handmsg=' + this.Handmsg + '&tradeWay=' +this.tradeWay +'&platformAccount='+this.platformAccount+'&id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
-            // this.$router.push({ name: "addReceivablesDocuments",query:{"Handmsg":Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}})
             this.$router.push({
-                path: tempStr
+                path: '/financial/financalDocument/addReceivablesDocuments',
+                query:{"Handmsg":Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}
             });
           }
           else{
-            let tempStr = '/financial/financalDocument/addReceivablesDocuments'+ '?tradeWay=' +this.tradeWay +'&platformAccount='+this.platformAccount+'&id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
             this.$router.push({
-                path: tempStr
+                path: '/financial/financalDocument/addReceivablesDocuments',
+                query:{"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}
             });
-            // this.$router.push({ name: "addReceivablesDocuments",query:{"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}})
           }
         }else if(this.active==2){
           // 付款单参数czmsg
           // 领队报账  预付款冲抵  返款制单
           if(this.$route.query.czmsg){
-            let tempStr = '/financial/financalDocument/' + path + '?czmsg=' +this.czmsg +'&id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
             this.$router.push({
-                path: tempStr
+                path: '/financial/financalDocument/' + path,
+                query:{"czmsg":this.czmsg,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}
             });
-            // this.$router.push({ name: path,query:{"czmsg":this.czmsg,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}})
           }else{
-            let tempStr = '/financial/financalDocument/' + path + '?id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
             this.$router.push({
-                path: tempStr
+                path: '/financial/financalDocument/' + path,
+                query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}
             });
-            // this.$router.push({ name: path,query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}})
           }
         }else if(this.active==4){
-          let tempStr = '/financial/financalDocument/' + path + '?id='+id+'&Name='+Name+'&Type='+2+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
           this.$router.push({
-            path: tempStr
+            path: '/financial/financalDocument/' + path,
+            query:{"id":id,"Name":Name,"Type":2,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}
           });
-          // this.$router.push({ name: path,query:{"id":id,"Name":Name,"Type":2,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}})
         }else {
-          let tempStr = '/financial/financalDocument/addFinancialGZDocuments' + '?id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
           this.$router.push({
-            path: tempStr
+            path: '/financial/financalDocument/addFinancialGZDocuments',
+            query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增挂账单'}
           });
-          // this.$router.push({ name: "addFinancialGZDocuments",query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增挂账单'}})
         }
       },
       getFlowChart(id){  //获取流程图
@@ -288,8 +281,8 @@
     }
     ,mounted(){
       let userInfo = this.getLocalStorage();
-      this.DepartID = userInfo.RB_Department_Id;
-      this.EmployeeId = userInfo.EmployeeId;
+      this.DepartID = userInfo.DeptId;
+      this.EmployeeId = userInfo.Id;
       this.templateID = this.$route.query.templateID ? JSON.parse(this.$route.query.templateID) : null
       this.OrderSource = this.$route.query.OrderSource ? this.$route.query.OrderSource : null
       this.showTab = this.$route.query.Type?this.$route.query.Type:0;
@@ -315,7 +308,6 @@
 
       this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1;
       this.orderObj = this.$route.query.orderObj;
-      console.log(this.orderObj ,'this.orderObj ')
       this.Handmsg = this.$route.query.Handmsg?this.$route.query.Handmsg:this.Handmsg;
       this.czmsg = this.$route.query.czmsg?this.$route.query.czmsg:this.czmsg;
 

src/pages/financial/financalDocument/addReceivablesDocuments.vue

@@ -367,7 +367,7 @@
         <p class="rb_tit">{{BillName}}
           (<el-select filterable v-model='msg.RB_Branch_Id' @change="admin_get_DepartmentGetList(msg.RB_Branch_Id)"
             class="w120 _border_b_1">
-            <el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key='item.Id'
+            <el-option v-for='item in companyList' :label='item.SName' :value='item.SId' :key='item.SId'
               :disabled="item.disabled">
             </el-option>
           </el-select>)
@@ -580,8 +580,8 @@
           <div>
             <p>{{$t('fnc.fygsbumen')}}：<span>
                 <el-select filterable v-model='msg.RB_Depart_Id' class="w135 _border_b_1">
-                  <el-option v-for='item in departmentList' :label='item.DepartmentName' :value='item.DepartmentID'
-                    :key='item.DepartmentID'>
+                  <el-option v-for='item in departmentList' :label='item.DeptName' :value='item.DeptId'
+                    :key='item.DeptId'>
                   </el-option>
                 </el-select>
               </span></p>
@@ -668,6 +668,11 @@
 <script>
   import myFlowChartModule from "../components/FlowChartModule.vue";
   import TicketingModule from "../components/TicketingModule.vue";
+  import {getSchoolPage} from '../../../api/school/index'
+  import {getDeptList} from '../../../api/system/dept'
+  import {
+    UploadSelfFile
+  } from '../../../api/common/common'
   export default {
     data() {
       return {
@@ -805,6 +810,13 @@
         tradeWay: '',
         platformAccount: '',
         Handmsg: {},
+        schoolMsg:{
+          pageIndex: 1,
+          pageSize: 99999,
+          rowsPerPage: 12,
+          SName: "",
+          Status: '-1'
+        }
       }
     },
     methods: {
@@ -972,13 +984,14 @@
         newArr.push(file.file)
         let path = "/Upload/Temporary/"
         this.$message.info(this.$t('tips.shangchuanzhong'))
-        this.UploadSelfFileT(path, newArr, x => {
+        UploadSelfFile('Temporary', file.file, x => {
+          console.log(x)
           let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0);
           this.saveMsg.push({
-            Content: x.data.FilePath,
+            Content: x.FileUrl,
             ID: 0,
             Type: fileTypeNumber,
-            Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
+            Url:  x.FileUrl,
           })
           this.Success(this.$t('tips.scchenggong'))
           if (this.bankType == 13 && x.data.Ocr.length > 0) {
@@ -1291,6 +1304,7 @@
         this.msg.OrderTradeWay = this.tradeWay;
         this.msg.PlatformAccountId = this.platformAccount;
         this.loading = true;
+
         this.apipost('Financial_post_Set', this.msg, res => {
           if (res.data.resultCode == 1) {
             this.$confirm(this.$t('tips.czcgsfjxzhidan'), this.$t('tips.tips'), {
@@ -1299,7 +1313,7 @@
               type: 'warning'
             }).then(() => {
               this.$router.push({
-                name: 'addReceivablesDocuments',
+                path: '/financial/financalDocument/addReceivablesDocuments',
                 query: {
                   "id": this.$route.query.id,
                   "Name": this.$route.query.Name,
@@ -1312,12 +1326,13 @@
               });
             }).catch(() => {
               this.$router.push({
-                name: 'FinancialDocuments',
+                path: '/financial/financalDocument/ChoiceAddFinancialDocuments',
                 query: {
                   'Type': this.$route.query.Type,
                   'InPay': this.$route.query.InPay
                 }
               });
+
             });
 
           } else {
@@ -1575,14 +1590,20 @@
             let ParentCompanyId = userInfo.ParentCompanyId;
 
             this.msg.RB_Branch_Id = this.msg.RB_Branch_Id == 0 || this.msg.RB_Branch_Id == ParentCompanyId ? this
-              .getLocalStorage().RB_Branch_id : this.msg.RB_Branch_Id;
+              .getLocalStorage().School_Id : this.msg.RB_Branch_Id;
+
             if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length > 0) {
               this.msg.RB_Branch_Id = this.orderObj.companyIDList[0];
             } else if (this.$route.query.companyID) {
+              if(this.$route.query.companyID!=='undefined'){
                 this.msg.RB_Branch_Id = parseInt(this.$route.query.companyID);
+              }else {
+                this.msg.RB_Branch_Id = this.getLocalStorage().School_Id;
+
+              }
             }
             this.admin_get_DepartmentGetList(this.msg.RB_Branch_Id);
-            this.msg.RB_Depart_Id = this.msg.RB_Depart_Id ? this.getLocalStorage().RB_Department_Id : this.msg
+            this.msg.RB_Depart_Id = this.msg.RB_Depart_Id ? this.getLocalStorage().DeptId : this.msg
               .RB_Depart_Id;
             this.FinancialFlowTemplate_post_GetProcessList(data.TemplateId);
             this.Financial_post_GetCostTypeList(data.TemplateId, 2);
@@ -1681,25 +1702,27 @@
         }, err => {})
       },
       admin_get_DepartmentGetList(Bid, T) { // 获取部门
+        // this.departmentMsg.RB_Branch_Id =  this.msg.RB_Branch_Id
         this.departmentMsg.RB_Branch_Id = -1;
         this.msg.RB_Depart_Id = '';
-        this.apipost('admin_get_DepartmentGetList', this.departmentMsg, res => {
-          if (res.data.resultCode == 1) {
-            this.departmentList = res.data.data;
+        getDeptList(this.departmentMsg).then(res => {
+          if (res.Code == 1) {
+              this.departmentList = res.Data;
               if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length > 0) {
 
               } else {
-              this.msg.RB_Depart_Id = this.msg.RB_Depart_Id ? this.msg.RB_Depart_Id : this.getLocalStorage()
-                .RB_Department_Id;
+                this.msg.RB_Depart_Id = this.msg.RB_Depart_Id ? this.msg.RB_Depart_Id : this.getLocalStorage().DeptId;
               }
             }
-        }, err => {})
+        }).catch(() => {
+
+        })
       },
       getCompany() { // 获取公司
-        this.apipost('admin_get_BranchGetList', this.companyMsg, res => {
-          let data = res.data.data;
+        getSchoolPage(this.schoolMsg).then(res => {
+          let data = res.Data.PageData;
           let Status = false;
-          if (this.$route.query.companyID !== '-1' && this.$route.query.companyID !== undefined) {
+          if (this.$route.query.companyID !== '-1' && this.$route.query.companyID !== undefined&& this.$route.query.companyID !== 'undefined') {
             Status = true;
             data.forEach(x => {
               x.disabled = true;
@@ -1712,13 +1735,14 @@
                 if (y.disabled === false) {
                   y.disabled = false
                 } else {
-                  y.disabled = x !== y.Id;
+                  y.disabled = x !== y.SId;
                 }
               })
             });
           }
           this.companyList = data;
           if (!Status) {
+
             let id = this.$route.query.id;
             this.apipost('FinancialFlowTemplate_post_GetTemplateBranch', {
               ID: id
@@ -1730,7 +1754,7 @@
                   data.forEach(x => {
                     x.disabled = true;
                     BranchList.forEach(y => {
-                      if (x.Id == y) {
+                      if (x.SId == y) {
                         x.disabled = false;
                       }
                     })
@@ -1740,15 +1764,19 @@
               }
             }, err => {})
           }
-        }, err => {})
+
+        }).catch(() => {
+
+        })
       },
     },
     created() {
       let that = this;
       this.tradeWay = this.$route.query.tradeWay ? this.$route.query.tradeWay : 0;
       this.platformAccount = this.$route.query.platformAccount ? this.$route.query.platformAccount : 0;
-      this.orderObj = this.$route.query.orderObj ? JSON.parse(this.$route.query.orderObj) : null;
-      this.Handmsg = this.$route.query.Handmsg ? JSON.parse(this.$route.query.Handmsg) : null;
+      this.orderObj = this.$route.query.orderObj&&  this.$route.query.orderObj!='undefined' ? JSON.parse(this.$route.query.orderObj) : null;
+      this.Handmsg = this.$route.query.Handmsg && this.$route.query.Handmsg!='undefined' ? JSON.parse(this.$route.query.Handmsg) : null;
+
 
       if (this.orderObj != null && this.orderObj.OrderSource === 8 && this.orderObj.tipObj == 1) {
         that.Description = "旅客名单：";
@@ -1763,11 +1791,11 @@
     mounted() {
       let userInfo = this.getLocalStorage();
       this.department = userInfo.DepartName;
-      this.emplyeeName = userInfo.emName;
-      this.EmployeeId = userInfo.EmployeeId;
-      this.DepartIDs = this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
-      this.RB_Branch_Id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
-      this.companyMsg.RB_Group_Id = this.departmentMsg.RB_Group_Id = userInfo.RB_Group_id;
+      this.emplyeeName = userInfo.GroupName;
+      this.EmployeeId = userInfo.Id;
+      this.DepartIDs = this.msg.RB_Depart_Id = userInfo.DeptId;
+      this.RB_Branch_Id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = userInfo.School_Id;
+      this.companyMsg.RB_Group_Id = this.departmentMsg.RB_Group_Id = userInfo.Group_Id;
       const myDate = new Date();
       this.yaer = myDate.getFullYear(); //获取完整的年份(4位,1970-????)
       this.month = myDate.getMonth() + 1; //获取当前月份(0-11,0代表1月)
@@ -1780,6 +1808,8 @@
       this.msg.Cmd = this.$route.query.Cmd ? this.$route.query.Cmd : '';
       this.getCompany();
       if (this.$route.query.edit) {
+        console.log(this.$route.query.edit,'this.$route.query.edit')
+
         this.edit = this.$route.query.edit;
         this.msg.FrID = this.$route.query.FrID;
         this.Financial_post_Get(parseInt(this.$route.query.FrID), 0);

src/router/routes.js

@@ -276,6 +276,11 @@ const routes = [{
         component: () =>
           import("pages/financial/financalDocument/CapitalAllocationDetail.vue")
       },
+      {
+        path: "/financial/financalDocument/addFinancialDocuments",  //新增财务单据
+        component: () =>
+        import("pages/financial/financalDocument/addFinancialDocuments.vue")
+      },
       {
         path: "/test", //API测试
         component: () =>

src/utils/erpindex.js

@@ -151,7 +151,9 @@ export default{
         "cmd": cmd,
         "timestamp": timestamp,
         "token": token,
-        "sign": md5Str
+        "sign": md5Str,
+        "groupId":tokenData.data.Group_Id,
+        "requestFrom":6
       }
       this.$http.post(apiurl, postData, {
         responseType: 'arraybuffer'
@@ -271,6 +273,35 @@ export default{
           x1 = x1.replace(rgx, '$1' + ',' + '$2');
         }
         return x1 + x2;
+      },
+      //验证只能输入整数【负数：isMinus传true】
+      Vue.prototype.checkInteger = function (item, filed, isMinus) {
+        var value = "" + item[filed]; //转字符串
+        var t = value.charAt(0);
+        value = value.replace(this.$commonUtils.Regex.isInteger, "");
+        //是否允许负数
+        if (isMinus && t == '-') {
+          value = '-' + value;
+        }
+        item[filed] = value;
+      },
+      //验证只能输入2位小数【负数：isMinus传true】
+      Vue.prototype.checkPrice = function (item, filed, isMinus) {
+        var value = "" + item[filed]; //转字符串
+        var t = value.charAt(0);
+        value = value.replace(/[^\d.]/g, ""); //清除“数字”和“.”以外的字符
+        value = value.replace(/\.{2,}/g, "."); //只保留第一个. 清除多余的
+        value = value
+          .replace(".", "$#$")
+          .replace(/\./g, "")
+          .replace("$#$", ".");
+        value = value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3'); //只能输入两个小数
+        //如果第一位是负号，则允许添加   如果不允许添加负号 可以把这块注释掉
+        //是否允许负数
+        if (isMinus && t == '-') {
+          value = '-' + value;
+        }
+        item[filed] = value;
       }
 
   }