Merge branch 'development-202206' into 'development-202206'

Development 202206

See merge request !12

src/views/Statics/Dbiact/ActInfo.vue

@@ -24,32 +24,32 @@
       </c-col>
       <c-col :span="24">
         <el-form-item label="账号优先级" prop="pri">
-          <c-input v-model="model.pri" placeholder="请输入pri" > </c-input>
+          <c-input v-model="model.pri" placeholder="请输入账号优先级" > </c-input>
         </el-form-item>
       </c-col>
       <c-col :span="24">
         <el-form-item label="账号币种" prop="cur">
-          <c-select v-model="model.cur" placeholder="请输入cur" :code="getCodesByKey('curtxt')"> </c-select>
+          <c-select v-model="model.cur" placeholder="请选择账号币种" :code="getCodesByKey('curtxt')"> </c-select>
         </el-form-item>
       </c-col>
       <c-col :span="24">
         <el-form-item label="账号" prop="extkey">
-          <c-input v-model="model.extkey" placeholder="请输入extkey" > </c-input>
+          <c-input v-model="model.extkey" placeholder="请输入账号" > </c-input>
         </el-form-item>
       </c-col>
       <c-col :span="24">
         <el-form-item label="账号提供机构的账号" prop="seracc">
-          <c-input v-model="model.seracc" placeholder="请输入seracc" > </c-input>
+          <c-input v-model="model.seracc" placeholder="请输入账号提供机构的账号" > </c-input>
         </el-form-item>
       </c-col>
       <c-col :span="24">
         <el-form-item label="账号提供机构名称" prop="sernam">
-          <c-input v-model="model.sernam" placeholder="请输入sernam" > </c-input>
+          <c-input v-model="model.sernam" placeholder="请输入账号提供机构名称" > </c-input>
         </el-form-item>
       </c-col>
       <c-col :span="24">
         <el-form-item label="账号提供机构种类" prop="serptytyp">
-          <c-select v-model="model.serptytyp" placeholder="请输入serptytyp" :code="getCodesByKey('ptytyp')">
+          <c-select v-model="model.serptytyp" placeholder="请选择账号提供机构种类" :code="getCodesByKey('ptytyp')">
           </c-select>
         </el-form-item>
       </c-col>
@@ -61,17 +61,17 @@
       </c-col>
       <c-col :span="24">
         <el-form-item label="账号开户机构的账号" prop="holacc">
-          <c-input v-model="model.holacc" placeholder="请输入holacc" > </c-input>
+          <c-input v-model="model.holacc" placeholder="请输入账号开户机构的账号" > </c-input>
         </el-form-item>
       </c-col>
       <c-col :span="24">
         <el-form-item label="账号开户机构名称" prop="holnam">
-          <c-input v-model="model.holnam" placeholder="请输入holnam" > </c-input>
+          <c-input v-model="model.holnam" placeholder="请输入账号开户机构名称" > </c-input>
         </el-form-item>
       </c-col>
       <c-col :span="24">
         <el-form-item label="账号开户机构类型" prop="holptytyp">
-          <c-select v-model="model.holptytyp" placeholder="请输入holptytyp" :code="getCodesByKey('ptytyp')">
+          <c-select v-model="model.holptytyp" placeholder="请选择账号开户机构类型" :code="getCodesByKey('ptytyp')">
           </c-select>
         </el-form-item>
       </c-col>
@@ -83,17 +83,12 @@
       </c-col>
       <c-col :span="24">
         <el-form-item label="头寸账户标志" prop="cvrflg">
-          <c-input v-model="model.cvrflg" placeholder="请输入cvrflg" > </c-input>
+          <c-input v-model="model.cvrflg" placeholder="请输入头寸账户标志" > </c-input>
         </el-form-item>
       </c-col>
       <c-col :span="24">
         <el-form-item label="偿付账户标志" prop="rmbflg">
-          <c-input v-model="model.rmbflg" placeholder="请输入rmbflg" > </c-input>
-        </el-form-item>
-      </c-col>
-      <c-col :span="24">
-        <el-form-item label="已删账户标志" prop="delflg">
-          <c-input v-model="model.delflg" placeholder="请输入delflg" > </c-input>
+          <c-input v-model="model.rmbflg" placeholder="请输入偿付账户标志" > </c-input>
         </el-form-item>
       </c-col>
       <!-- <c-col :span="24">
@@ -106,7 +101,7 @@
     <c-col :span="12" class="col-right">
       <c-col :span="24">
         <el-form-item label="借贷标志" prop="dirflg">
-          <c-select v-model="model.dirflg" placeholder="请输入dirflg" >
+          <c-select v-model="model.dirflg" placeholder="请输入借贷标志" >
             <el-option
               v-for="item in dirflg"
               :key="item.value"
@@ -125,7 +120,7 @@
       </c-col>
       <c-col :span="24">
         <el-form-item label="账户行名称" prop="othptynam">
-          <c-input v-model="model.othptynam" placeholder="请输入othptynam" >
+          <c-input v-model="model.othptynam" placeholder="请输入账户行名称" >
           </c-input>
         </el-form-item>
       </c-col>
@@ -137,51 +132,51 @@
       </c-col>
       <c-col :span="24">
         <el-form-item label="账户行的6位BIC" prop="othbic6">
-          <c-input v-model="model.othbic6" placeholder="请输入othbic6" >
+          <c-input v-model="model.othbic6" placeholder="请输入账户行的6位BIC" >
           </c-input>
         </el-form-item>
       </c-col>
       <c-col :span="24">
         <el-form-item label="国际银行账户号" prop="iban">
-          <c-input v-model="model.iban" placeholder="请输入iban" > </c-input>
+          <c-input v-model="model.iban" placeholder="请输入国际银行账户号" > </c-input>
         </el-form-item>
       </c-col>
       <c-col :span="24">
         <el-form-item label="实体组" prop="etgextkey">
-          <c-input v-model="model.etgextkey" placeholder="请输入etgextkey" >
+          <c-input v-model="model.etgextkey" placeholder="请输入实体组" >
           </c-input>
         </el-form-item>
       </c-col>
       <c-col :span="24">
         <el-form-item label="账号名称" prop="nam">
-          <c-input v-model="model.nam" placeholder="请输入nam" > </c-input>
+          <c-input v-model="model.nam" placeholder="请输入账号名称" > </c-input>
         </el-form-item>
       </c-col>
       <c-col :span="24">
         <el-form-item label="外部账号类型" prop="exttyp">
-          <c-input v-model="model.exttyp" placeholder="请输入exttyp" > </c-input>
+          <c-input v-model="model.exttyp" placeholder="请输入外部账号类型" > </c-input>
         </el-form-item>
       </c-col>
       <c-col :span="24">
         <el-form-item label="账号类型" prop="typ">
-          <c-input v-model="model.typ" placeholder="请输入typ" > </c-input>
+          <c-input v-model="model.typ" placeholder="请输入账号类型" > </c-input>
         </el-form-item>
       </c-col>
       <c-col :span="24">
         <el-form-item label="外部账号" prop="extact">
-          <c-input v-model="model.extact" placeholder="请输入extact" > </c-input>
+          <c-input v-model="model.extact" placeholder="请输入外部账号" > </c-input>
         </el-form-item>
       </c-col>
       <c-col :span="24">
         <el-form-item label="科目代码" prop="trmtyp">
-          <c-input v-model="model.trmtyp" placeholder="请输入trmtyp" > 
+          <c-input v-model="model.trmtyp" placeholder="请输入科目代码" > 
           </c-input>
           <!-- :code="getCodesByKey('trmmix')" td上看码表-->
         </el-form-item>
       </c-col>
       <c-col :span="24">
         <el-form-item label="账户类型" prop="acctyp">
-          <c-select v-model="model.acctyp" placeholder="请输入acctyp" > 
+          <c-select v-model="model.acctyp" placeholder="请选择账户类型" > 
             <el-option
               v-for="item in acctyp"
               :key="item.value"
@@ -218,7 +213,7 @@ export default {
         { label: "内部分户账", value: "O" },
       ],
       dirflg: [
-        { label: "可以借记或贷记", value: "NULL" },
+        { label: "可以借记或贷记", value: " " },
         { label: "只能贷记", value: "C" },
         { label: "只能借记", value: "D" },
       ],

src/views/Statics/Infact/Infsea.vue

@@ -8,7 +8,7 @@
         <el-form-item label="资金账号" prop="extkey">
             <c-input
                 v-model="model.extkey"
-                placeholder="请输入extkey"
+                placeholder="请输入资金账号"
             >
             </c-input>
         </el-form-item>
@@ -18,7 +18,7 @@
         <el-form-item label="客户账户" prop="ptyExtkey">
             <c-input
                 v-model="model.ptyExtkey"
-                placeholder=""
+                placeholder="请输入客户账户"
             >
             </c-input>
         </el-form-item>
@@ -27,7 +27,7 @@
         <el-form-item label="账号类型" prop="typ">
           <c-select
             v-model="model.typ"
-            placeholder=""
+            placeholder="请选择账号类型"
             style="width: 100%"
             :code="getCodesByKey('recgrptyp')"
           ></c-select>
@@ -40,7 +40,7 @@
         <el-form-item label="账号名称" prop="nam">
           <c-input
             v-model="model.nam"
-            placeholder=""
+            placeholder="请输入账号名称"
           ></c-input>
         </el-form-item>
       </c-col>
@@ -50,7 +50,7 @@
           <c-input
             v-model="model.iban"
             maxlength="34"
-            placeholder="请输入IBAN"
+            placeholder="请输入国际银行账户号"
           ></c-input>
         </el-form-item>
       </c-col>
@@ -60,7 +60,7 @@
           <c-select
             v-model="model.cur"
             style="width: 100%"
-            placeholder=""
+            placeholder="请选择账号币种"
             :code="getCodesByKey('infled_Cur')"
           >
           </c-select>
@@ -153,11 +153,14 @@ export default {
       actColumns: [
         { label: 'HolPtyExtkey', prop: 'holPtyExtkey', width: '200' },
 				{ label: 'SerPtyExtkey', prop: 'serPtyExtkey', width: '200' },
+        { label: '账号名称', prop: 'nam', width: '200' },
 				{ label: '账号类型', prop: 'typ', width: '100' },
 				{ label: '账号币种', prop: 'cur', width: '100' },
 				{ label: '资金账号', prop: 'extkey', width: '200' },
 				{ label: '账号开户机构的账号', prop: 'holacc', width: '200' },
 				{ label: '账号提供机构的账号', prop: 'seracc', width: '200' },
+        { label: '客户账户', prop: 'serPtyExtkey', width: '200' },
+        { label: '国际银行账户号', prop: 'iban', width: '200' },
 			],
     };
   },