Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/model/Botdav/index.js

@@ -115,7 +115,7 @@ export default class Botdav {
 					},
 				},
 				docgrdm: {
-					docgrd: "",
+					docgrd: [],
 					docdsclab: "",			//  Label of document description		.botp.docgrdm.docdsclab
 				},
 				drrp: {

src/model/Cltdav/Event.js

@@ -33,6 +33,9 @@ export default {
             //TODO 列表显示数据
             this.model.bptbck.bptbckg = rtnmsg.data.ccdbatg;
         }
+        else {
+            this.$notify.error({ title: '错误', message: '服务请求失败！' });
+        }
     },
     async onCltpButgetref() {
         let rtnmsg = await this.executeRule("cltp.butgetref")

src/views/Statics/Dbiatp/AtpInfo.vue

 <template>
   <div class="eibs-tab">
     <c-col :span="12" class="col-left">
-	<c-col :span="24">
-        <el-form-item label="编号" prop="inr">
-            <c-input
-                v-model="model.inr"
-                placeholder="请输入inr"
-            >
-            </c-input>
-        </el-form-item>
-    </c-col>
-	<c-col :span="24">
-        <el-form-item label="代码" prop="cod">
+<!--	<c-col :span="24">-->
+<!--        <el-form-item label="编号" prop="inr">-->
+<!--            <c-input-->
+<!--                v-model="model.inr"-->
+<!--                placeholder="请输入编号"-->
+<!--            >-->
+<!--            </c-input>-->
+<!--        </el-form-item>-->
+<!--    </c-col>-->
+	<c-col :span="24">
+        <el-form-item label="交易配置信息代码" prop="cod">
             <c-input
                 v-model="model.cod"
-                placeholder="请输入代码"
+                placeholder="请输入交易配置信息代码"
             >
             </c-input>
         </el-form-item>
@@ -23,7 +23,7 @@
         <el-form-item label="控制标志" prop="rouflg">
             <c-input
                 v-model="model.rouflg"
-                placeholder="请输入rouflg"
+                placeholder="请输入控制标志"
             >
             </c-input>
         </el-form-item>
@@ -32,7 +32,7 @@
         <el-form-item label="业务品种" prop="bus">
             <c-input
                 v-model="model.bus"
-                placeholder="请输入bus"
+                placeholder="请输入业务品种"
             >
             </c-input>
         </el-form-item>
@@ -41,7 +41,7 @@
         <el-form-item label="创建新进程标志" prop="concreflg">
             <c-input
                 v-model="model.concreflg"
-                placeholder="请输入concreflg"
+                placeholder="请输入创建新进程标志"
             >
             </c-input>
         </el-form-item>
@@ -50,7 +50,7 @@
         <el-form-item label="处理数据标志" prop="dtaflg">
             <c-input
                 v-model="model.dtaflg"
-                placeholder="请输入dtaflg"
+                placeholder="请输入处理数据标志"
             >
             </c-input>
         </el-form-item>
@@ -59,7 +59,7 @@
         <el-form-item label="处理临时结算标志" prop="sepflg">
             <c-input
                 v-model="model.sepflg"
-                placeholder="请输入sepflg"
+                placeholder="请输入处理临时结算标志"
             >
             </c-input>
         </el-form-item>
@@ -68,7 +68,7 @@
         <el-form-item label="后台进程标志" prop="jobflg">
             <c-input
                 v-model="model.jobflg"
-                placeholder="请输入jobflg"
+                placeholder="请输入后台进程标志"
             >
             </c-input>
         </el-form-item>
@@ -77,7 +77,7 @@
         <el-form-item label="创建子合同进程" prop="subflg">
             <c-input
                 v-model="model.subflg"
-                placeholder="请输入subflg"
+                placeholder="请输入创建子合同进程"
             >
             </c-input>
         </el-form-item>
@@ -88,7 +88,7 @@
         <el-form-item label="关联表名" prop="lnkobj">
             <c-input
                 v-model="model.lnkobj"
-                placeholder="请输入lnkobj"
+                placeholder="请输入关联表名"
             >
             </c-input>
         </el-form-item>
@@ -97,43 +97,43 @@
         <el-form-item label="比较类型" prop="ccstyp">
             <c-input
                 v-model="model.ccstyp"
-                placeholder="请输入ccstyp"
-            >
-            </c-input>
-        </el-form-item>
-    </c-col>
-	<c-col :span="24">
-        <el-form-item label="版本号" prop="ver">
-            <c-input
-                v-model="model.ver"
-                placeholder="请输入ver"
+                placeholder="请输入比较类型"
             >
             </c-input>
         </el-form-item>
     </c-col>
+<!--	<c-col :span="24">-->
+<!--        <el-form-item label="版本号" prop="ver">-->
+<!--            <c-input-->
+<!--                v-model="model.ver"-->
+<!--                placeholder="请输入版本号"-->
+<!--            >-->
+<!--            </c-input>-->
+<!--        </el-form-item>-->
+<!--    </c-col>-->
 	<c-col :span="24">
         <el-form-item label="交易处理标志" prop="bustrnflg">
             <c-input
                 v-model="model.bustrnflg"
-                placeholder="请输入bustrnflg"
+                placeholder="请输入交易处理标志"
             >
             </c-input>
         </el-form-item>
     </c-col>
 	<c-col :span="24">
-        <el-form-item label="用于release的金额" prop="relamt">
+        <el-form-item label="用于释放的金额" prop="relamt">
             <c-input
                 v-model="model.relamt"
-                placeholder="请输入relamt"
+                placeholder="请输入用于释放的金额"
             >
             </c-input>
         </el-form-item>
     </c-col>
 	<c-col :span="24">
-        <el-form-item label="release规则类型" prop="reltyp">
+        <el-form-item label="释放规则类型" prop="reltyp">
             <c-input
                 v-model="model.reltyp"
-                placeholder="请输入reltyp"
+                placeholder="请输入释放规则类型"
             >
             </c-input>
         </el-form-item>
@@ -142,7 +142,7 @@
         <el-form-item label="押汇中心处理标志" prop="negflg">
             <c-input
                 v-model="model.negflg"
-                placeholder="请输入negflg"
+                placeholder="请输入押汇中心处理标志"
             >
             </c-input>
         </el-form-item>
@@ -151,7 +151,7 @@
         <el-form-item label="交易处理时间" prop="dealtim">
             <c-input
                 v-model="model.dealtim"
-                placeholder="请输入dealtim"
+                placeholder="请输入交易处理时间"
             >
             </c-input>
         </el-form-item>

src/views/Statics/Dbiatx/AtxInfo.vue

@@ -14,7 +14,7 @@
         <el-form-item label="保函文本用途" prop="atxcod">
             <c-input
                 v-model="model.atxcod"
-                placeholder="请输入atxcod"
+                placeholder="请输入保函文本用途"
             >
             </c-input>
         </el-form-item>
@@ -23,7 +23,7 @@
         <el-form-item label="保函文本类型" prop="atxtyp">
             <c-input
                 v-model="model.atxtyp"
-                placeholder="请输入atxtyp"
+                placeholder="请输入保函文本类型"
             >
             </c-input>
         </el-form-item>
@@ -32,7 +32,7 @@
         <el-form-item label="上级文本所属实体组织" prop="etgextkey">
             <c-input
                 v-model="model.etgextkey"
-                placeholder="请输入etgextkey"
+                placeholder="请输入上级文本所属实体组织"
             >
             </c-input>
         </el-form-item>
@@ -50,7 +50,7 @@
         <el-form-item label="语言" prop="uil">
             <c-input
                 v-model="model.uil"
-                placeholder="请输入uil"
+                placeholder="请输入语言"
             >
             </c-input>
         </el-form-item>
@@ -59,7 +59,7 @@
         <el-form-item label="出具目的" prop="gtxpurpos">
             <c-input
                 v-model="model.gtxpurpos"
-                placeholder="请输入gtxpurpos"
+                placeholder="请输入出具目的"
             >
             </c-input>
         </el-form-item>
@@ -68,7 +68,7 @@
         <el-form-item label="保函包含类型" prop="gtxgartyp">
             <c-input
                 v-model="model.gtxgartyp"
-                placeholder="请输入gtxgartyp"
+                placeholder="请输入保函包含类型"
             >
             </c-input>
         </el-form-item>
@@ -77,7 +77,7 @@
         <el-form-item label="保函格式" prop="gtxlegfrm">
             <c-input
                 v-model="model.gtxlegfrm"
-                placeholder="请输入gtxlegfrm"
+                placeholder="请输入保函格式"
             >
             </c-input>
         </el-form-item>
@@ -86,7 +86,7 @@
         <el-form-item label="上一级文本" prop="atxtxt">
             <c-input
                 v-model="model.atxtxt"
-                placeholder="请输入atxtxt"
+                placeholder="请输入上一级文本"
             >
             </c-input>
         </el-form-item>
@@ -99,7 +99,7 @@
         <el-form-item label="保函文本名" prop="nam">
             <c-input
                 v-model="model.nam"
-                placeholder="请输入nam"
+                placeholder="请输入保函文本名"
             >
             </c-input>
         </el-form-item>
@@ -108,7 +108,7 @@
         <el-form-item label="优先级" prop="gtxpri">
             <c-input
                 v-model="model.gtxpri"
-                placeholder="请输入gtxpri"
+                placeholder="请输入优先级"
             >
             </c-input>
         </el-form-item>
@@ -117,7 +117,7 @@
         <el-form-item label="保函无责任担保标志" prop="gtxexpflg">
             <c-input
                 v-model="model.gtxexpflg"
-                placeholder="请输入gtxexpflg"
+                placeholder="请输入保函无责任担保标志"
             >
             </c-input>
         </el-form-item>
@@ -126,7 +126,7 @@
         <el-form-item label="保函文本中的交易日期" prop="laborcdat">
             <c-input
                 v-model="model.laborcdat"
-                placeholder="请输入laborcdat"
+                placeholder="请输入保函文本中的交易日期"
             >
             </c-input>
         </el-form-item>
@@ -135,7 +135,7 @@
         <el-form-item label="包含文本中的附加信息" prop="labaddinf">
             <c-input
                 v-model="model.labaddinf"
-                placeholder="请输入labaddinf"
+                placeholder="请输入包含文本中的附加信息"
             >
             </c-input>
         </el-form-item>

src/views/Statics/Dbiatx/index.vue

@@ -136,7 +136,7 @@ export default {
           edit(this.model)
             .then((res) => {
               this.$message.success("保存成功！");
-              this.goBack()
+              this.goBack(true)
             })
             .catch((err) => {
               this.$message.error("保存失败！");

src/views/Statics/Infatp/Infsea.vue

@@ -29,7 +29,7 @@
           type="primary"
           icon="el-icon-search"
           size="small"
-          @click="onInfatpSearch()"
+          @click="onSearch()"
           >查询
         </el-button>
       </c-col>
@@ -120,6 +120,11 @@ export default {
     handleReset() {
       this.root.$refs.modelForm.resetFields();
     },
+    onSearch() {
+      this.model.pageSize = 5;
+      this.model.pageNum = 1;
+      this.onInfatpSearch();
+    },
     onInfatpSearch() {
 			queryByPage(this.model).then(res => {
         /**

src/views/Statics/Infatx/Infsea.vue

@@ -7,7 +7,7 @@
         <el-form-item label="保函文本用途" prop="atxcod">
             <c-select
                 v-model="model.atxcod"
-               placeholder="请选择atxcod"
+               placeholder="请选择保函文本用途"
                 :code="getCodesByKey('atxcod')"
             >
             </c-select>
@@ -19,7 +19,7 @@
         <el-form-item label="保函文本名" prop="nam">
             <c-input
                 v-model="model.nam"
-                placeholder="请输入nam"
+                placeholder="请输入保函文本名"
             >
             </c-input>
         </el-form-item>
@@ -33,7 +33,7 @@
         <el-form-item label="出具目的" prop="gtxpurpos">
             <c-select
                 v-model="model.gtxpurpos"
-               placeholder="请选择gtxpurpos"
+               placeholder="请选择出具目的"
                 :code="getCodesByKey('gtxpurpos')"
             >
             </c-select>
@@ -44,7 +44,7 @@
         <el-form-item label="保函包含类型" prop="gtxgartyp">
             <c-select
                 v-model="model.gtxgartyp"
-               placeholder="请选择gtxgartyp"
+               placeholder="请选择保函包含类型"
                 :code="getCodesByKey('gtxgartyp')"
             >
             </c-select>
@@ -52,10 +52,10 @@
     </c-col>
 	
 	<c-col :span="24">
-        <el-form-item label="保函格式" prop="gtxlegfrm">.
+        <el-form-item label="保函格式" prop="gtxlegfrm">
              <c-select
                 v-model="model.sealegfrm"
-               placeholder="请选择gtxlegfrm"
+               placeholder="请选择保函格式"
                 :code="getCodesByKey('gtxlegfrm')"
             >
             </c-select>
@@ -69,7 +69,7 @@
         <el-form-item label="语言" prop="gtxuil">
             <c-select
                 v-model="model.gtxuil"
-               placeholder="请选择gtxuil"
+               placeholder="请选择语言"
                 :code="getCodesByKey('gtxuil')"
             >
             </c-select>
@@ -80,7 +80,7 @@
         <el-form-item label="保函无责任担保标志" prop="gtxexpflg">
             <c-select
                 v-model="model.gtxexpflg"
-               placeholder="请选择gtxexpflg"
+               placeholder="请选择保函无责任担保标志"
                 :code="getCodesByKey('gtxexpflg')"
             >
             </c-select>
@@ -109,7 +109,7 @@
           type="primary"
           icon="el-icon-search"
           size="small"
-          @click="onInfatxSearch()"
+          @click="onSearch()"
           >查询
         </el-button>
       </c-col>
@@ -207,6 +207,11 @@ export default {
     handleReset() {
       this.root.$refs.modelForm.resetFields();
     },
+    onSearch() {
+      this.model.pageSize = 5;
+      this.model.pageNum = 1;
+      this.onInfatxSearch();
+    },
     onInfatxSearch() {
 			queryByPage(this.model).then(res => {
         /**

src/views/Statics/Infatx/index.vue

@@ -53,6 +53,7 @@ export default {
 		    gtxgartyp: "",
         //出具目的
 		    gtxpurpos: "",
+        sealegfrm: "",
         // paging
         pageNum: 1,
         pageSize: 5,