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/views/Business/Gitopn/Ovwp1.vue

@@ -660,7 +660,7 @@
               <c-select
                 v-model="model.gidgrp.gidcxm.cxmflg"
                 style="width: 100%"
-                placeholder="请选择是否显示查询码"
+                placeholder="请选择是否生成查询码"
               >
                 <el-option
                   v-for="item in codes.cxmflg"
@@ -1193,8 +1193,7 @@
               disabled
               size="small"
               type="primary"
-              style="margin: 5px 0 0 10px;float: left;
-              text-align: center;"
+              style="margin: 5px 0 0 10px;float: left;text-align: center;"
               @click="onGitpButdifexptxt"
             >
               查看系统文本
@@ -1326,8 +1325,7 @@
               disabled
               size="small"
               type="primary"
-              style="margin: 5px 0 0 10px;float: left;
-              text-align: center;"
+              style="margin: 5px 0 0 10px;float: left;text-align: center;"
               @click="onGitpButdifliatxtc"
             >
               查看系统文本

src/views/Business/Gitopn/Voup.vue

@@ -242,10 +242,9 @@
                   <c-button
                     size="small"
                     type="primary"
-                    icon="el-icon-search"
                     @click="onVoucty1Selbut1"
                   >
-                    ?
+                  ?
                   </c-button>
                 </template>
               </c-fullbox>
@@ -277,7 +276,6 @@
                   <c-button
                     size="small"
                     type="primary"
-                    icon="el-icon-search"
                     @click="onVoucty2Selbut1"
                   >
                     ?
@@ -302,7 +300,6 @@
                   <c-button
                     size="small"
                     type="primary"
-                    icon="el-icon-search"
                     @click="onVoucty3Selbut1"
                   >
                     ?
@@ -337,7 +334,6 @@
                   <c-button
                     size="small"
                     type="primary"
-                    icon="el-icon-search"
                     @click="onVoucty4Selbut1"
                   >
                     ?