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

Development 202206

See merge request !11

src/views/Statics/Dbigtx/GtxInfo.vue

@@ -11,10 +11,10 @@
             </el-form-item>
         </c-col> -->
       <c-col :span="24">
-            <el-form-item label="extkey" prop="extkey">
+            <el-form-item label="编号" prop="extkey">
                 <c-input
                     v-model="model.extkey"
-                    placeholder="请输入extkey"
+                    placeholder="请输入编号"
                 >
                 </c-input>
             </el-form-item>
@@ -39,11 +39,17 @@
         </c-col> -->
       <c-col :span="24">
             <el-form-item label="保函文本" prop="gidtxt">
-                <c-input
-                    v-model="model.gidtxt"
-                    placeholder="请输入保函文本"
-                >
-                </c-input>
+              <c-input
+                v-model="model.gidtxt"
+                placeholder="请输入保函文本">
+              </c-input>
+<!--              <c-mul-row-input-->
+<!--                  v-model="model.gidtxt"-->
+<!--                  :rows="4"-->
+<!--                  :cols="35"-->
+<!--                  placeholder="请输入保函文本"-->
+<!--              >-->
+<!--              </c-mul-row-input>-->
             </el-form-item>
         </c-col>
       <c-col :span="24">
@@ -74,10 +80,10 @@
             </el-form-item>
         </c-col>
       <c-col :span="24">
-            <el-form-item label="objinr" prop="objinr">
+            <el-form-item label="对象编号" prop="objinr">
                 <c-input
                     v-model="model.objinr"
-                    placeholder="请输入objinr"
+                    placeholder="请输入对象编号"
                 >
                 </c-input>
             </el-form-item>
@@ -113,11 +119,11 @@
         </c-col>
       <c-col :span="24">
             <el-form-item label="保函文本中的交易日期" prop="laborcdat">
-                <c-input
+                <c-date-picker
                     v-model="model.laborcdat"
                     placeholder="请输入日期"
                 >
-                </c-input>
+                </c-date-picker>
             </el-form-item>
         </c-col>
       <c-col :span="24">
@@ -148,10 +154,10 @@
             </el-form-item>
         </c-col>
       <c-col :span="24">
-            <el-form-item label="etgextkey" prop="etgextkey">
+            <el-form-item label="实体组" prop="etgextkey">
                 <c-input
                     v-model="model.etgextkey"
-                    placeholder="请输入etgextkey"
+                    placeholder="请输入实体组"
                 >
                 </c-input>
             </el-form-item>

src/views/Statics/Dbigtx/index.vue

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

src/views/Statics/Infgtx/Infsea.vue

@@ -12,10 +12,10 @@
             </el-form-item>
         </c-col> -->
       <c-col :span="24">
-            <el-form-item label="extkey" prop="extkey">
+            <el-form-item label="编号" prop="extkey">
                 <c-input
                     v-model="model.extkey"
-                    placeholder="请输入extkey"
+                    placeholder="请输入名称"
                 >
                 </c-input>
             </el-form-item>
@@ -172,7 +172,7 @@
           type="primary"
           icon="el-icon-search"
           size="small"
-          @click="onInfgtxSearch()"
+          @click="onSearch()"
           >查询
         </el-button>
       </c-col>
@@ -208,23 +208,23 @@
               @click="gtxDelete(scope.$index, scope.row)"
               >删除</c-button
             >
-            <el-popover placement="top-start" width="50" trigger="click">
-              <ul class="table-button-item-list">
-                <li>
-                  <c-button size="small" style="margin-left: 0">指派</c-button>
-                </li>
-                <li>
-                  <c-button size="small" style="margin-left: 0">删除</c-button>
-                </li>
-              </ul>
-              <a
-                slot="reference"
-                href="javascript:void(0)"
-                style="margin-left: 5px"
-              >
-                <i class="el-icon-more"></i>
-              </a>
-            </el-popover>
+<!--            <el-popover placement="top-start" width="50" trigger="click">-->
+<!--              <ul class="table-button-item-list">-->
+<!--                <li>-->
+<!--                  <c-button size="small" style="margin-left: 0">指派</c-button>-->
+<!--                </li>-->
+<!--                <li>-->
+<!--                  <c-button size="small" style="margin-left: 0">删除</c-button>-->
+<!--                </li>-->
+<!--              </ul>-->
+<!--              <a-->
+<!--                slot="reference"-->
+<!--                href="javascript:void(0)"-->
+<!--                style="margin-left: 5px"-->
+<!--              >-->
+<!--                <i class="el-icon-more"></i>-->
+<!--              </a>-->
+<!--            </el-popover>-->
           </template>
         </c-table-column>
       </c-paging-table>
@@ -261,7 +261,7 @@ export default {
       // { label: 'labaddinf', prop: 'labaddinf', width: 'auto' },
       // { label: 'legfrm', prop: 'legfrm', width: 'auto' },
       // { label: 'covgodsrvdft', prop: 'covgodsrvdft', width: 'auto' },
-      { label: 'etgextkey', prop: 'etgextkey', width: 'auto' },
+      { label: '实体组', prop: 'etgextkey', width: 'auto' },
 			],
     };
   },
@@ -277,6 +277,11 @@ export default {
     handleReset() {
       this.root.$refs.modelForm.resetFields();
     },
+    onSearch() {
+      this.model.pageSize = 5;
+      this.model.pageNum = 1;
+      this.onInfgtxSearch();
+    },
     onInfgtxSearch() {
 			queryByPage(this.model).then(res => {
         /**

src/views/Statics/Infgtx/index.vue

@@ -23,7 +23,6 @@
 
 <script>
 import Infsea from "./Infsea";
-
 export default {
   name: "StaticsInfgtx",
   components: {
@@ -38,6 +37,9 @@ export default {
     return {
       tabVal: "infsea",
       model: {
+        // queryConditionInfo
+        extkey: "",
+        nam: "",
         pageNum: 1,
         pageSize: 5,
         total: 0