报账合并 流水科目

src/components/FinancialModule/ConsolidationOfAccounts/index.vue

@@ -551,7 +551,7 @@
             </tr>
             <tr v-if="BillType===2">
               <td>{{$t('fnc.jiaoyiriqi')}}</td>
-              <td colspan="6">
+              <td colspan="2">
                 <el-date-picker
                   class="width100b"
                   v-model="addMsg.TradeDate"
@@ -560,14 +560,27 @@
                   :placeholder="$t('admin.admin_choDate')">
                 </el-date-picker>
               </td>
+              <td>{{$t('objFill.v103.liushukemu')}}</td>
+              <td colspan="3">
+                <el-select class="width100b" v-model="addMsg.BankSubjectId" 
+                  filterable
+                  :placeholder="$t('objFill.v103.qingxuanzlskm')">
+                  <el-option
+                    v-for="item in SubjectTypeList"
+                    :key="item.Id"
+                    :label="item.Name"
+                    :value="item.Id"
+                  />
+                </el-select>
+              </td>
             </tr>
             <tr v-if="BillType===1">
               <td>{{$t('fnc.huikuanren')}}</td>
-              <td colspan="2">
+              <td colspan="1">
                 <el-input v-model="addMsg.RemitterName" type="text" class=" _border_b_1"></el-input>
               </td>
               <td>{{$t('fnc.jiaoyiriqi')}}</td>
-              <td colspan="3">
+              <td colspan="1">
                 <el-date-picker
                   class="width100b"
                   v-model="addMsg.TradeDate"
@@ -576,6 +589,19 @@
                   :placeholder="$t('admin.admin_choDate')">
                 </el-date-picker>
               </td>
+              <td>{{$t('objFill.v103.liushukemu')}}</td>
+              <td colspan="2">
+                <el-select class="width100b" v-model="addMsg.BankSubjectId" 
+                  filterable
+                  :placeholder="$t('objFill.v103.qingxuanzlskm')">
+                  <el-option
+                    v-for="item in SubjectTypeList"
+                    :key="item.Id"
+                    :label="item.Name"
+                    :value="item.Id"
+                  />
+                </el-select>
+              </td>
             </tr>
           </table>
           <el-form label-width="110px">
@@ -703,7 +729,8 @@
               RemitterName:'',
               TradeDate:'',
               BankList:[],
-              vorcherInos:[]
+              vorcherInos:[],
+              BankSubjectId: '',
             },
             AccListT:[],
             accountListT:[],
@@ -724,6 +751,7 @@
             saveMsg:[],
             TradeDate:'',
             initialIndex: 0,
+            SubjectTypeList: [],
         }
     },
     created(){
@@ -743,7 +771,7 @@
         }
     },
     mounted(){
-
+        this.getSubjectList()
 
         let userInfo=this.getLocalStorage();
         this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id;    //集团ID
@@ -754,6 +782,13 @@
         this.AccountType_post_GetList();
     },
     methods:{
+      getSubjectList(){
+        this.apipost("Financial_post_GetBankSubjectList", {}, res => {
+        if (res.data.resultCode === 1) {
+            this.SubjectTypeList = res.data.data;
+        }
+        }, null)
+    },
       showUpLoadFile(i) { // 预览上传文件
           if (i.Content.substring(i.Content.lastIndexOf('.') + 1, i.Content.length).toUpperCase() == 'PDF') {
             this.previewPDF(i.Content)
@@ -1046,6 +1081,7 @@
             RemitterName:'',
             TradeDate:'',
             BankList:[],
+            BankSubjectId: '',
           }
         },
         clearAccBank(){  // 选择账户类型清空数据

src/components/FinancialModule/accDetail/CompanyAccDetail.vue

@@ -414,11 +414,11 @@
             </tr>
             <tr v-if="BillType===1">
               <td>{{$t('fnc.huikuanren')}}</td>
-              <td colspan="2">
+              <td colspan="1">
                 <el-input v-model="addMsg.RemitterName" type="text" class=" _border_b_1"></el-input>
               </td>
               <td>{{$t('fnc.jiaoyiriqi')}}</td>
-              <td colspan="3">
+              <td colspan="1">
                 <el-date-picker
                   class="width100b"
                   v-model="addMsg.TradeDate"
@@ -427,6 +427,19 @@
                   :placeholder="$t('admin.admin_choDate')">
                 </el-date-picker>
               </td>
+              <td>{{$t('objFill.v103.liushukemu')}}</td>
+              <td colspan="2">
+                <el-select class="width100b" v-model="addMsg.BankSubjectId" 
+                  filterable
+                  :placeholder="$t('objFill.v103.qingxuanzlskm')">
+                  <el-option
+                    v-for="item in SubjectTypeList"
+                    :key="item.Id"
+                    :label="item.Name"
+                    :value="item.Id"
+                  />
+                </el-select>
+              </td>
             </tr>
           </table>
           <el-form label-width="110px">