Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

src/views/Business/Bopsel/Errp.vue

@@ -5,80 +5,82 @@
       @form-search="errpHandleSearch"
     >
       <template v-slot="searchSlot"> -->
-        <div style="border-bottom: 10px solid rgb(232, 232, 232);">
-        <el-form
-          class="m-table-search-form"
-          ref="paramsForm"
-          :inline="true"
-          label-position="right"
-          label-width="110px"
-          size="small"
-        >
-        
-        <el-row>
-          <c-col :span="23" style="margin-left: 9px;">
-          <c-col :span="8">
-            <el-form-item label="申报编号" prop="errsel.rptno"  style="width: 100%">
-              <c-input
-                v-model="model.errsel.rptno"
-                maxlength="22"
-                placeholder="请输入申报编号"
-              ></c-input>
-            </el-form-item>
-          </c-col>
+      <el-form
+        class="m-table-search-form"
+        ref="paramsForm"
+        :inline="true"
+        label-position="right"
+        label-width="110px"
+        size="small"
+      >
+      
+      <el-row>
+        <c-col :span="23" style="margin-left: 9px;">
+        <c-col :span="8">
+          <el-form-item label="申报编号" prop="errsel.rptno"  style="width: 100%">
+            <c-input
+              v-model="model.errsel.rptno"
+              maxlength="22"
+              placeholder="请输入申报编号"
+            ></c-input>
+          </el-form-item>
+        </c-col>
 
-          <c-col :span="8">
-                <el-form-item label="起止日期" style="width: 100%">
-                  <c-col :span="11">
-                    <c-date-picker
-                      type="date"
-                      v-model="model.bopquep.frmdat"
-                      value-format="yyyy-MM-dd"
-                      style="width: 100%"
-                      placeholder="请选择From"
-                    ></c-date-picker>
-                  </c-col>
-                  <c-col :span="2" style="text-align: center">
-                    <label style="display: inline-block; width: 100%">-</label>
-                  </c-col>
-                  <c-col :span="11">
-                    <c-date-picker
-                      type="date"
-                      v-model="model.bopquep.tildat"
-                      value-format="yyyy-MM-dd"
-                      style="width: 100%"
-                      placeholder="请选择Until"
-                    ></c-date-picker>
-                  </c-col>
-                </el-form-item>
-              </c-col>
+        <c-col :span="8">
+              <el-form-item label="起止日期" style="width: 100%">
+                <c-col :span="11">
+                  <c-date-picker
+                    type="date"
+                    v-model="model.bopquep.frmdat"
+                    value-format="yyyy-MM-dd"
+                    style="width: 100%"
+                    placeholder="请选择From"
+                  ></c-date-picker>
+                </c-col>
+                <c-col :span="2" style="text-align: center">
+                  <label style="display: inline-block; width: 100%">-</label>
+                </c-col>
+                <c-col :span="11">
+                  <c-date-picker
+                    type="date"
+                    v-model="model.bopquep.tildat"
+                    value-format="yyyy-MM-dd"
+                    style="width: 100%"
+                    placeholder="请选择Until"
+                  ></c-date-picker>
+                </c-col>
+              </el-form-item>
+            </c-col>
 
-          <c-col :span="8">
-            <el-form-item label="业务所属行" prop="bopquep.ownextkey"  style="width: 100%">
-              <c-select
-                v-model="model.bopquep.ownextkey"
-                style="width: 100%"
-                placeholder="请选择业务所属行"
-              >
-              </c-select>
-            </el-form-item>
-          </c-col>
-              </c-col>
-          <c-col :span="23" style="margin-left: 9px;text-align: right;height:36.8px">
-            <el-button size="small" @click="errpHandleReset">重置</el-button>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="small"
-              @click="errpHandleSearch"
-              >查询</el-button
+        <c-col :span="8">
+          <el-form-item label="业务所属行" prop="bopquep.ownextkey"  style="width: 100%">
+            <c-select
+              v-model="model.bopquep.ownextkey"
+              style="width: 100%"
+              placeholder="请选择业务所属行"
             >
-          </c-col>
-        </el-row>
-        </el-form>
-        </div>
+            </c-select>
+          </el-form-item>
+        </c-col>
+            </c-col>
+        <c-col :span="23" style="margin-left: 9px;text-align: right;height:36.8px">
+          <el-button size="small" @click="errpHandleReset">重置</el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="small"
+            @click="errpHandleSearch"
+            >查询</el-button
+          >
+        </c-col>
+      </el-row>
+      </el-form>
       <!-- </template>
     </c-list-search> -->
+    <c-col :span="23" style="margin-left: 9px;">
+      <div style="border-bottom: 10px solid rgb(232, 232, 232)">
+      </div>
+    </c-col>
 
     <el-row>
       <c-col :span="23" style="margin-left: 9px;">

src/views/Business/Bopsel/Selp.vue

@@ -192,7 +192,12 @@
       </template>
     </c-list-search>
 
-    <c-row style="margin-top: 10px">
+    <c-col :span="23" style="margin-left: 9px;">
+      <div style="border-bottom: 10px solid rgb(232, 232, 232)">
+      </div>
+    </c-col>
+
+    <c-row style="margin-top: 20px">
       <c-col style="margin-left: 9px;">
         <c-button size="small" type="primary" style="margin-left:0">导出Excel</c-button>
         <c-button size="small" type="primary" style="margin-left:0">应急导出</c-button>
@@ -392,5 +397,11 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
+.eibs-tab >>> .m-table-search{
+  border-bottom: 0;
+}
+.eibs-tab >>> .m-table-search-operation-top {
+  width: calc(95.833333% + 9px);
+}
 </style>

src/views/Business/Diasel/Diaselp.vue

@@ -2,7 +2,7 @@
   <div class="eibs-tab">
     <!-- <c-list-search @form-reset="handleReset" @form-search="handleSearch">
       <template  v-slot="searchSlot"> -->
-    <div style="border-bottom: 10px solid rgb(232, 232, 232);">
+
     <el-form
       class="m-table-search-form"
       ref="paramsForm"
@@ -190,7 +190,12 @@
       </el-row>
       
     </el-form>
-    </div>
+
+    <c-col :span="23" style="margin-left: 9px;">
+      <div style="border-bottom: 10px solid rgb(232, 232, 232)">
+      </div>
+    </c-col>
+
     <!-- </template>
     </c-list-search> -->
 

src/views/Business/Sptsel/Sptbrk/Menu.vue

@@ -2,7 +2,7 @@
   <div class="eibs-tab">
     <!-- <c-list-search @form-reset="sptfndHandleReset" @form-search="sptfndHandleSearch"> -->
     <!-- <template v-slot="searchSlot"> -->
-      <div style="border-bottom: 10px solid rgb(232, 232, 232);">
+      
     <el-form
       class="m-table-search-form"
       ref="paramsForm"
@@ -218,7 +218,11 @@
         </c-col>
       </el-row>
     </el-form>
+
+    <c-col :span="23" style="margin-left: 9px;">
+      <div style="border-bottom: 10px solid rgb(232, 232, 232)">
       </div>
+    </c-col>
     <!-- </template> -->
     <!-- </c-list-search> -->
 

src/views/Business/Trnrel/Trnfnd/Inftrnps.vue

@@ -2,7 +2,7 @@
   <div class="eibs-tab">
     <!-- <c-list-search @form-reset="handleReset" @form-search="handleSearch"> -->
     <!-- <template v-slot="searchSlot"> -->
-      <div style="border-bottom: 10px solid rgb(232, 232, 232);">
+
     <el-form
       class="m-table-search-form"
       ref="paramsForm"
@@ -196,7 +196,11 @@
         </c-col>
       </el-row>
     </el-form>
+
+    <c-col :span="23" style="margin-left: 9px;">
+      <div style="border-bottom: 10px solid rgb(232, 232, 232)">
       </div>
+    </c-col>
     <!-- </template> -->
     <!-- </c-list-search> -->