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

src/assets/common/lang/EN/fill.js

@@ -4912,6 +4912,7 @@ export const obj = {
       caigoucb: 'Procurement costs ',
       yunfeizhic: 'Freight expenses ',
       baoxianzc: 'Insurance expenditure ',
+      baoxianmd: 'Insurance List',
       zongfanyo: 'homestay ',
       yifangyo: 'refunded ',
       dindyhje: 'Order discount Amount ',
@@ -8169,6 +8170,18 @@ export const obj = {
   },
   seeMySelfCompany:' Only view the company information you have filled in. ',
   duizhnagkm: 'Reconciliation Accounts',
+  v103:{
+    qichuyue: 'Opening balance',
+    xinzenliushuiu: 'New Transaction Volume',    
+    yinhangshouru: 'Bank Income',    
+    yinhangzhichu: 'Bank Expenditure',    
+    liushui: 'Flowing Water',    
+    liushukemu: 'Flowing Account',    
+    qingxuanzlskm: 'Please select the transaction account',    
+    yongtu: 'Purpose',    
+    danjusr: 'Document Income',    
+    danjuzc: 'Expenditure on receipts',
+  },
   //#endregion
 }
 export default obj;

src/assets/common/lang/Japan/fill.js

@@ -4912,6 +4912,7 @@ export const obj = {
       caigoucb: '調達コスト',
       yunfeizhic: '運賃支出',
       baoxianzc: '保険支出',
+      baoxianmd: '保険リスト',
       zongfanyo: '総コミッション',
       yifangyo: '既にコミッションに戻った',
       dindyhje: 'オーダー割引金額',
@@ -8169,6 +8170,18 @@ export const obj = {
   },
   seeMySelfCompany: '自分が記入した会社の情報だけを見ます',
   duizhnagkm: '帳簿科目」です',
+  v103:{
+    qichuyue: '期初残高',
+    xinzenliushuiu: '水が増えます',
+    yinhangshouru: '銀行の収入',
+    yinhangzhichu: '銀行支出',
+    liushui: '流れる水',
+    liushukemu: 'フロー科目',
+    qingxuanzlskm: '流水科目を選択してください',
+    yongtu: '用途',
+    danjusr: '帳票収入',
+    danjuzc: '帳票支出',
+  },
   //#endregion
 }
 export default obj;

src/assets/common/lang/zhCN/fill.js

@@ -4912,6 +4912,7 @@ export const obj = {
       caigoucb: '采购成本',
       yunfeizhic: '运费支出',
       baoxianzc: '保险支出',
+      baoxianmd: '保险名单',
       zongfanyo: '总返佣',
       yifangyo: '已返佣',
       dindyhje: '订单优惠金额',

src/assets/common/lang/zhTW/fill.js

@@ -4912,6 +4912,7 @@ export const obj = {
       caigoucb: '採購成本',
       yunfeizhic: '運費支出',
       baoxianzc: '保險支出',
+      baoxianmd: '保險名單',
       zongfanyo: '總返傭',
       yifangyo: '已返傭',
       dindyhje: '訂單優惠金額',
@@ -8169,6 +8170,18 @@ export const obj = {
   },
   seeMySelfCompany:'只查看自己填寫的公司信息',
   duizhnagkm: '對賬科目',
+  v103:{
+    qichuyue: '期初余額',
+    xinzenliushuiu: '新增流水',
+    yinhangshouru: '銀行收入',
+    yinhangzhichu: '銀行支出',
+    liushui: '流水',
+    liushukemu: '流水科目',
+    qingxuanzlskm: '請選擇流水科目',
+    yongtu: '用途',
+    danjusr: '單據收入',
+    danjuzc: '單據支出',
+  },
   //#endregion
 }
 export default obj;

src/components/FinancialModule/BankStatementReconciliation/comm/SubjectList.vue

@@ -3,7 +3,8 @@
         <el-dialog :title="$t('objFill.duizhnagkm')+$t('ground.liebiao')" width="500px" 
         :visible.sync="showState" center @close="close">
         
-        <el-table :data="SubjectList" style="width: 100%;max-height: 400px;"
+        <el-table :data="SubjectList" style="width: 100%;"
+        height="400px"
             v-loading="loading" border>
                 <el-table-column prop="Name" :label="$t('system.query_airName')" align="center"></el-table-column>
                 <el-table-column prop="Sort" :label="$t('system.table_rank')" width="100" align="center"></el-table-column>

src/components/FinancialModule/BankStatementReconciliation/index.vue

@@ -4,7 +4,7 @@
         padding-bottom: 0;
         margin-top: 20px;
     }
-    .page_CompanyAccDetail .query-box li:last-child{top: 34px;}
+    .page_CompanyAccDetail .query-box li:last-child{top: 43px;}
     ._shoufu_date input.el-input__inner{padding: 0px 0 0 27px;}
     .page_CompanyAccDetail .el-date-editor .el-range-separator{width: 9% !important;}
     .page_CompanyAccDetail .el-date-editor--daterange.el-input__inner{width: auto !important;}
@@ -299,6 +299,7 @@ export default {
     },
     changeDataBan(){
         this.isShowBankSta = false
+        this.getSubjectList()
         this.getList();
     },
     addBankStatement(){

src/components/FinancialModule/BasicDocuments.vue

@@ -1789,6 +1789,16 @@ class="w135 _border_b_1">
                   </div>
                 </div>
               </div>
+              <div v-if="isShowAttachment&&item.AuditDescription.indexOf('出纳')!=-1" style="display: flex;margin-top: 10px;">
+                <div style="display: flex;align-items: center;">
+                  <span style="font-size: 14px;">流水科目：</span>
+                  <div>
+                    <el-select v-model="AuditOrRefundMsg.BankSubjectId" :placeholder="$t('pub.pleaseSel')" clearable filterable  style="width: 100%;">
+                      <el-option v-for="item in BankSubjectList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
+                    </el-select>
+                  </div>
+                </div>
+              </div>
               <textarea v-if="item.SpecialNode!=2||AuditOrRefundMsg.Status=='3'" class="_textarea"
                 v-model="AuditOrRefundMsg.Description" :placeholder="$t('pub.pleaseImport')+'...'"></textarea>
               <!-- <textarea v-if="AuditOrRefundMsg.Status=='3'&&item.SpecialNode!=0" class="_textarea" v-model="AuditOrRefundMsg.Description" :placeholder="$t('pub.pleaseImport')+'...'"></textarea> -->
@@ -2350,7 +2360,8 @@ class="w135 _border_b_1">
           FCostTypeId:'1851',
           BankAccountId:'40',
           AccountNumber:'',
-          CheckPeriod:''
+          CheckPeriod:'',
+          BankSubjectId:''
         },
         AuditListData: {
           AuditList: []
@@ -2466,6 +2477,7 @@ class="w135 _border_b_1">
         clientBankAccountData:{},
         helpBranchData:{},
         isSeeOrderLog:0,
+        BankSubjectList:[]
       }
     },
     components: {
@@ -4089,7 +4101,9 @@ else if (Type==2) {
             }
             this.GetDetail.AuditSteps.forEach(x => {
               if (x.NextStep == 1 && (x.SpecialNode == 1 || x.SpecialNode == 2)) {
-                this.isShowAttachment = true
+                this.isShowAttachment = true;
+                this.getSubjectList();
+                if(this.GetDetail.BankSubjectId&&this.GetDetail.BankSubjectId>0){this.AuditOrRefundMsg.BankSubjectId = this.GetDetail.BankSubjectId;}
               }
             })
             this.StandCurrBranchId = this.GetDetail.RB_Branch_Id
@@ -4383,6 +4397,14 @@ else if (Type==2) {
           }
         });
       },
+      getSubjectList(){
+          this.apipost('Financial_post_GetBankSubjectList',{}, res => {
+                if(res.data.resultCode == 1) {
+                    let data = res.data.data;
+                    this.BankSubjectList = data;
+                }
+            }, err => {})
+        },
     },
     created() {
       if (this.$route.query.pageIndex) {

src/components/FinancialModule/accDetail/AccountStatementDetail.vue

@@ -135,13 +135,26 @@
                           <el-switch v-model="msg.IsSelectCNTG" inactive-text="" active-value="true" ></el-switch>
                             </el-form-item>
                     </el-col>
-
+                    <el-col :span="4" :gutter="35">
+                        <el-form-item label="流水对账科目">
+                            <el-select  filterable  v-model='msg.BankSubjectId'>
+                                <el-option label="不限" :value='0'></el-option>
+                                <el-option label="只看未绑定" :value='-2'></el-option>
+                                <el-option v-for='item in SubjectList'
+                                    :label='item.Name'
+                                    :value='item.Id'
+                                    :key='item.Id'>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
                 </el-row>
             </el-form>
 			<ul>
 				<li>
           <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
           <input type="button" class="normalBtn" :value="$t('visa.v_daochu')"  @click="Export"/>
+          <input type="button" class="normalBtn" value="绑定流水科目"  @click="showSubject=true"/>
           </li>
 			</ul>
 		</div>
@@ -151,6 +164,7 @@
                     <th width="60"><input type="checkbox" v-if="isShowCheckAll" v-model="isCheckAll" @change="checkAllOrder()"/></th>
                     <th>{{$t('fnc.jiaoyiriqi')}}</th>
                     <th>{{$t('fnc.djleixing')}}</th>
+                    <th>流水科目</th>
                     <th width="440">{{$t('objFill.v101.FinancialModule.guanldhhbsh')}}</th>
                     <th width="340">{{$t('objFill.v101.FinancialModule.shoufkdx')}}</th>
                     <th>{{$t('hotel.hotel_Currency')}}</th>
@@ -160,7 +174,7 @@
                     <th>{{$t('fnc.yueacc')}}</th>
                 </tr>
                 <tr>
-                    <td :colspan="9">{{$t('fnc.a_qcyue')}}：</td>
+                    <td :colspan="10">{{$t('fnc.a_qcyue')}}：</td>
                     <td>{{moneyFormat(StartMoney)}}</td>
                 </tr>
                 <tr v-for="(item,index) in DataList">
@@ -170,6 +184,7 @@
                     <td>{{item.AllotDate}}</td>
                     <td>{{(item.FType==1?$t('restaurant.res_income'):item.FType==2?$t('restaurant.res_outcome'):item.FType==4?$t('objFill.tiaobo'):'-')}}</td>
                     <!-- <td>{{item.FrIdStr}}</td> -->
+                    <td>{{item.SubjectName}}</td>
                     <td>
                       <span v-for="(qitem,qindex) in item.FrIdList" class="cursorpointer" :class="item.FType === 1 ? 'CAcc_bg_green' :item.FType === 2 ? 'CAcc_bg_red':'CAcc_bg_bule'" @click="goUrlNew(item.FType,qitem)">{{(qindex>0?',':'') + qitem}}</span>
                     </td>
@@ -181,7 +196,7 @@
                     <td>{{ moneyFormat(item.EndMoney) }}</td>
                 </tr>
                 <tr>
-                    <td :colspan="7">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
+                    <td :colspan="8">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
                     <td>{{ InMoney == 0 ? '-' : moneyFormat(InMoney) }}</td>
                     <td>{{ OutMoney == 0 ? '-' : moneyFormat(OutMoney) }}</td>
                     <td>{{ moneyFormat(allMoney) }}</td>
@@ -189,6 +204,24 @@
             </table>
         </div>
 
+        <!-- 修改科目 -->
+        <el-dialog title="修改流水科目" width="300px" :visible.sync="showSubject" center>
+        <el-form class="cdForm" label-width="90px">
+          <el-form-item label="流水科目" prop="SubjectId">
+            <template>
+              <el-select filterable v-model='SubjectId' :placeholder="$t('pub.pleaseSel')" class="w135 _border_b_1">
+                <el-option v-for='item in SubjectList' :label='item.Name' :value='item.Id' :key='item.Id'>
+                </el-option>
+              </el-select>
+            </template>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button class="hollowFixedBtn" @click="showSubject=false">{{$t('pub.cancelBtn')}}</el-button>
+          <el-button class="normalBtn" type="primary" @click="BindSubject()">{{$t('pub.sureBtn')}}</el-button>
+        </div>
+      </el-dialog>
+
     </div>
 </template>
 <script>
@@ -221,6 +254,7 @@ export default {
                 BankList:[],
                 Is_Cashier:-1,
                 IsSelectCNTG:false,
+                BankSubjectId:0
             },
             Type:1,
             AccountId:'',
@@ -278,6 +312,9 @@ export default {
             isCheckAll:false,
             //是否显示全选框
             isShowCheckAll:false,
+            showSubject:false,
+            SubjectId:0,
+            SubjectList:[]
         }
     },
     created(){
@@ -313,7 +350,7 @@ export default {
                     Type:this.Type,
                     AccountId:this.AccountId
                 })
-      this.bankaccount_post_GetList();
+      this.bankaccount_post_GetList();      
       this.getList();
 
     }
@@ -393,6 +430,14 @@ export default {
                 }
             }, err => {})
         },
+        getSubjectList(){
+          this.apipost('Financial_post_GetBankSubjectList',{}, res => {
+                if(res.data.resultCode == 1) {
+                    let data = res.data.data;
+                    this.SubjectList = data;
+                }
+            }, err => {})
+        },
         BankAccount_post_GetAccountType(){   //获取账户类型列表
             this.apipost('BankAccount_post_GetAccountType',{}, res => {
                 if(res.data.resultCode == 1) {
@@ -625,6 +670,27 @@ export default {
           }
         }, err => {})
       },
+      //绑定科目
+      BindSubject(){
+        let FrIdList =[];
+        this.DataList.forEach((x,index)=>{
+          if(x.check){
+            FrIdList.push(x.FrIdStr)
+          }
+        })
+        if(FrIdList.length<=0){ this.$message.error('请选择单据后再试');return;}
+        if(this.SubjectId<=0){this.$message.error('请选择科目后再试');return;}
+
+        this.apipost('Financial_post_SetBatchFBankSubject',{SubjectId:this.SubjectId,FrIds:FrIdList.join(',')}, res => {
+                if(res.data.resultCode == 1) {
+                  this.$message.success(res.data.message);
+                  this.showSubject=false;
+                  this.getList();
+                }else{
+                  this.$message.error(res.data.message)
+                }
+            }, err => {})
+      }
     },
     mounted(){
 
@@ -632,6 +698,7 @@ export default {
         this.AccountType_post_GetList();
         this.BankAccount_post_GetAccountType();
         this.Financial_post_GetBranchAccountList();
+        this.getSubjectList();
     }
 }
 </script>

src/components/FinancialModule/platformFinancial.vue

@@ -61,7 +61,8 @@
                   <button class="hollowFixedBtn" @click="resetPageIndex()">{{$t('pub.searchBtn')}}</button>
                   <button class="normalBtn" @click="method5(0)">{{$t('visa.v_daochu')}}</button>
                   <button class="normalBtn" @click="method5(1)">汇总{{$t('visa.v_daochu')}}</button>
-              </li>
+                  <button class="hollowFixedBtn" @click="outerVisible=true">{{$t('objFill.daoru')}}</button>
+                  </li>
           </ul>
       </div>
 
@@ -151,6 +152,12 @@
               <span v-else>{{ scope.row.ComplaintMoney }}</span>
             </template>
           </el-table-column>
+          <el-table-column prop="ptRemark" label="平台余额" sortable>
+            <template slot-scope="scope">
+              <span v-if="scope.row.Alias=='平台在途总额'" style="color: #00C6FF;">{{ scope.row.Remark }}</span>
+              <span v-else>{{ scope.row.Remark }}</span>
+            </template>
+          </el-table-column>
         </el-table>
 
       </div>
@@ -424,6 +431,18 @@
         </div>
       </el-dialog>
 
+      <el-dialog width="410px"  :title="$t('objFill.daoru')" :visible.sync="outerVisible" center>
+        <el-upload ref="ticketUpload" drag class="upload-demo" :action="PlatBalImport()"
+          :on-success="handleAvatarSuccess">
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">
+            {{$t('tips.tuodongwenjian')}}
+            <em>{{$t('tips.dianjishanhcuan')}}</em>
+          </div>
+          <div slot="tip" class="el-upload__tip">{{$t('objFill.zhinengscexwj')}}</div>
+        </el-upload>
+      </el-dialog>
+
   </div>
 
 </template>
@@ -535,7 +554,8 @@ export default {
           Type:'1',
           Remark:'',
           Money:0
-        }
+        },
+        outerVisible: false,
       }
   },
   created(){
@@ -591,6 +611,24 @@ export default {
       var that = this;
   },
   methods:{
+     //导入
+     PlatBalImport() {
+      let url =
+          this.domainManager().UploadFileUrl +
+          "?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&Type=9&EmployeeId=" +
+          this.getLocalStorage().EmployeeId +
+          "&importType=" +
+          this.importType;
+        return url;
+    },
+    //上传文件后清空文件队列
+    handleAvatarSuccess(res, file) {
+      this.$refs.ticketUpload.clearFiles();
+      if (res.resultCode == 1) {
+        this.Success(res.message);
+        this.outerVisible = false;
+      }
+    },
     GetSupperOrderEditAuth() {
         var actionCode = this.$AuthCode.isQueryHistoryData;
         this.CheckUserAuth(actionCode, res => {

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2261,6 +2261,35 @@
                   {{ sItem.Client_Name + "" + sItem.ContractNum }}
                 </span>
               </div>
+              <div v-if="OrderDataList.LeaderInsurance && OrderDataList.LeaderInsurance.length>0">
+                <span>{{$t('objFill.v101.FinancialModule.baoxianmd')}}：</span>
+                <template v-if="InsuranceUpdate==false">                  
+                  <span v-for="(liitem,liindex) in OrderDataList.LeaderInsurance" :key="liindex">
+                    <span v-if="liitem.InsuranceState==1" style="color:blue">{{liitem.Name}}(√)&nbsp;&nbsp;&nbsp;</span> 
+                    <span v-else>{{liitem.Name}}(x)&nbsp;&nbsp;&nbsp;</span> 
+                  </span>
+                  <span v-if="EditBtn"><el-button type="primary" icon="el-icon-edit" circle size="mini" @click="InsuranceUpdate=true"></el-button></span>
+                </template>
+                <template v-if="InsuranceUpdate">
+                  <span v-for="(liitem,liindex) in OrderDataList.LeaderInsurance" :key="liindex">
+                    <span v-if="liitem.InsuranceState==1" style="color:blue;margin-right:40px">
+                      {{liitem.Name}}&nbsp;&nbsp;&nbsp;
+                      <el-button-group>
+                      <el-button type="warning" size="mini" @click="SetLeaderInsuranceState(1,liitem.ID,2)">当团不买</el-button>
+                      <el-button type="danger" size="mini" @click="SetLeaderInsuranceState(2,liitem.ID,2)">标记全团不买</el-button>
+                    </el-button-group>
+                    </span> 
+                    <span v-else style="margin-right:40px;">
+                      {{liitem.Name}}&nbsp;&nbsp;&nbsp;
+                      <el-button-group>
+                      <el-button type="primary" size="mini" @click="SetLeaderInsuranceState(1,liitem.ID,1)">当团购买</el-button>
+                      <el-button type="success" size="mini" @click="SetLeaderInsuranceState(2,liitem.ID,1)">标记全团购买</el-button>
+                    </el-button-group>&nbsp;&nbsp;&nbsp;
+                    </span> 
+                  </span>
+                  <span v-if="EditBtn"><el-button type="primary" icon="el-icon-close" circle size="mini" @click="InsuranceUpdate=false"></el-button></span>
+                </template>
+              </div>
             </td>
           </tr>
           <tr>
@@ -4076,6 +4105,7 @@
         IsSupperOrderEdit: false, //获取总经理副总经理超级修改权限
         IsLookOrder: false, //出纳查看订单权限
         EditBtn: false, //恢复订单
+        InsuranceUpdate: false,
         //修改订单业务员权限
         isEditOrderCreate: 0,
         importFileUrl2: "",
@@ -7284,6 +7314,21 @@
           this.addMsg.LessPrice = this.addMsg.LessAvgPrice * LessNum;
         }
         this.getTotalPrice();
+      },
+      SetLeaderInsuranceState(Status,leaderId,type){
+        this.apipost(
+          "Financial_post_SetLeaderInsuranceState",{Status:Status,BaseFinanceId:this.msg.TCID,RelevanceFrId:leaderId,RelevanceFrId2:type},
+          (res) => {
+            if (res.data.resultCode == 1) {
+              this.Success(res.data.message);
+              this.getList();
+              this.InsuranceUpdate = false;
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          (err) => {}
+        );
       }
     },
     mounted() {