no message

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

@@ -8169,6 +8169,13 @@ export const obj = {
   },
   seeMySelfCompany:'只查看自己填写的公司信息',
   duizhnagkm: '对账科目',
+  v103:{
+    qichuyue: '期初余额',
+    xinzenliushuiu: '新增流水',
+    yinhangshouru: '银行收入',
+    yinhangzhichu: '银行支出',
+    liushui: '流水',
+  }
   //#endregion
 }
 export default obj;

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

@@ -47,13 +47,7 @@
     watch: {
         obj: {
             handler(newValue,onldValue) {
-                this.queryObj = newValue
-                if(this.queryObj.tradeObj){
-                   this.tradeObj = JSON.parse(this.queryObj.tradeObj)
-                }
-                if(this.queryObj.orderObj){
-                   this.tradeObj = JSON.parse(this.queryObj.orderObj)
-                }
+                
             },
             deep:true,
         },

src/components/FinancialModule/BankStatementReconciliation/index.vue

@@ -128,8 +128,9 @@
 			<ul>
 				<li>
                     <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
-                    <input type="button" class="normalBtn" :value="$t('objFill.duizhnagkm')+$t('ground.liebiao')" @click="isShow=true"/>
+                    <input v-if="SubjectList&&SubjectList.length>0" type="button" class="normalBtn" :value="$t('objFill.v103.xinzenliushuiu')" @click="addBankStatement"/>
                     <input type="button" class="hollowFixedBtn" :value="$t('objFill.v101.FinancialModule.xinzengkem')" @click="isShowAdd=true"/>
+                    <input type="button" class="normalBtn" :value="$t('objFill.duizhnagkm')+$t('ground.liebiao')" @click="isShow=true"/>
                 </li>
 			</ul>
 		</div>
@@ -150,7 +151,10 @@
                 <template v-if="DateList&&DateList.length>0">
                     <el-table-column v-for="(item,index) in DateList" 
                     :key="index"
-                    :label="String(item.StartDate)" align="center">
+                     align="center">
+                    <template #header>
+                        <div style="cursor: pointer;" @click="getTimeObj(item)">{{ String(item.StartDate) }} <i style="color: #33B3FF" class="el-icon-edit"></i> </div>
+                    </template>
                         <el-table-column :label="String(item.StartBalance)" align="center">
                                 <el-table-column prop="Income" label="银行收入" width="120"  align="center">
                                     <template slot-scope="scope">
@@ -196,14 +200,16 @@
         </div>
         <SubjectList v-if="isShow" @changeData="changeData" @change="close"></SubjectList>
         <addSubject v-if="isShowAdd" :obj="addMsg" @changeData="changeData" @change="close"></addSubject>
+        <BankStatement v-if="isShowBankSta" :obj="BankStaObj" @changeData="changeDataBan" @change="isShowBankSta=false"></BankStatement>
     </div>
 </template>
 <script>
 import moment from "moment"
 import SubjectList from './comm/SubjectList.vue';
 import addSubject from './comm/addSubject.vue';
+import BankStatement from './comm/BankStatement.vue';
 export default {
-    components: {SubjectList,addSubject},
+    components: {SubjectList,addSubject,BankStatement},
     data(){
         return{
             msg:{
@@ -228,14 +234,29 @@ export default {
                 Status: 0,
                 Name: '',
                 Sort: 0,
+            },
+            isShowBankSta: false,
+            BankStaObj:{
+                BankId: 0,//银行ID
+                Date: '',//	日期
+                StartBalance: '',//	期初余额
+                Image: '',
+                SubjectList:[],
+            },
+            BanObj:{
+                Id: 0,
+                SubjectId:0,//科目ID
+                SubjectName: '',
+                Income:0,//	银行收入
+                Expenses:0,//银行支出
             }
         }
     },
     created(){
         // let mon1= this.getBeforeDate(1, new Date().Format("yyyy-MM-dd"));
         // let mon2= this.getBeforeDate(7, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
-        let mon1= this.getBeforeDate(11, new Date().Format("yyyy-MM-dd"));
-        let mon2= this.getBeforeDate(15, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
+        let mon1= this.getBeforeDate(12, new Date().Format("yyyy-MM-dd"));
+        let mon2= this.getBeforeDate(16, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
         this.titleStart = mon2.slice(5,7)>9?mon2.slice(5,7):mon2.slice(6,7)
         this.titleEnd = mon1.slice(5,7)>9?mon1.slice(5,7):mon1.slice(6,7)
         this.productionDate=[mon2,mon1];
@@ -244,6 +265,70 @@ export default {
         this.getList();
   },
   methods:{
+    changeDataBan(){
+        this.isShowBankSta = false
+        this.getList();
+    },
+    addBankStatement(){
+        this.BankStaObj = {
+            Id: 0,
+            BankId: this.msg.BankId,
+            Date: '',
+            StartBalance: 0,
+            Image: '',
+            SubjectList: [],
+        }
+        this.SubjectList.forEach((x,index)=>{
+            if(x.SubjectId!=-4&&x.SubjectId!=-5&&x.SubjectId!=-6){
+                x.BalanceList.forEach((y,indexs)=>{
+                    if(indexs==0){
+                        let BanObj =  JSON.parse(JSON.stringify(this.BanObj))
+                        BanObj = {
+                            SubjectId: x.SubjectId,//科目ID
+                            SubjectName: x.Name,
+                            Income: 0,//	银行收入
+                            Expenses: 0,//银行支出
+                        }
+                        this.BankStaObj.SubjectList.push(BanObj)
+                    }
+                })
+            }
+            
+        })
+        this.isShowBankSta = true
+    },
+    getTimeObj(item){
+        this.BankStaObj = {
+            Id: 1,
+            BankId: this.msg.BankId,
+            Date: item.StartDate,
+            StartBalance: item.StartBalance,
+            Image: '',
+            SubjectList: [],
+        }
+        this.SubjectList.forEach(x=>{
+            x.BalanceList.forEach(y=>{
+                if(y.StartDate==item.StartDate){
+                    console.log(y.Image,'-----------')
+                    if(x.SubjectId!=-4&&x.SubjectId!=-5&&x.SubjectId!=-6){
+                        let BanObj =  JSON.parse(JSON.stringify(this.BanObj))
+                        BanObj = {
+                            SubjectId: x.SubjectId,//科目ID
+                            SubjectName: x.Name,
+                            Income: y.Income,//	银行收入
+                            Expenses: y.Expenses,//银行支出
+                        }
+                        this.BankStaObj.SubjectList.push(BanObj)
+                    }
+                    if(x.SubjectId==-6) {
+                        this.BankStaObj.Image = y.Image
+                    }
+                }
+            })
+        })
+        console.log(this.BankStaObj,'----------')
+        this.isShowBankSta = true
+    },
     changeData(){
         this.isShowAdd = false
         this.getList();