From f054d6f31e98af9086dec32d1562c9540ace95f4 Mon Sep 17 00:00:00 2001
From: lsk <1099331017@qq.com>
Date: Fri, 17 Dec 2021 17:34:14 +0800
Subject: [PATCH] 布局优化

---
 src/assets/icons/sideMenu/进口信用证.svg |  1 +
 src/views/Business/Sptsel/Menu.vue            | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------
 src/views/Layout/SideMenu.vue                 | 16 ++++++++--------
 src/views/Public/Ptap.vue                     |  6 ++++--
 4 files changed, 71 insertions(+), 26 deletions(-)
 create mode 100644 src/assets/icons/sideMenu/进口信用证.svg

diff --git "a/src/assets/icons/sideMenu/\350\277\233\345\217\243\344\277\241\347\224\250\350\257\201.svg" "b/src/assets/icons/sideMenu/\350\277\233\345\217\243\344\277\241\347\224\250\350\257\201.svg"
new file mode 100644
index 0000000..f88e300
--- /dev/null
+++ "b/src/assets/icons/sideMenu/\350\277\233\345\217\243\344\277\241\347\224\250\350\257\201.svg"
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1639731186565" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12314" width="26" height="26" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css"></style></defs><path d="M855.620267 239.2064H169.949867c-17.749333-0.238933-32.324267 13.243733-32.631467 30.173867v451.6864c0.341333 16.930133 14.916267 30.378667 32.631467 30.139733h685.6704c17.7152 0.238933 32.324267-13.243733 32.631466-30.173867V269.380267c-0.341333-16.964267-14.9504-30.4128-32.631466-30.173867zM188.416 699.392v-306.517333h648.533333v306.517333h-648.533333z m0-357.751467V290.474667h648.533333v51.2l-648.533333-0.034134z m104.072533 234.018134c-17.92 0-32.597333 11.229867-32.597333 24.917333 0 13.7216 14.677333 24.951467 32.597333 24.951467h65.1264c17.92 0 32.5632-11.229867 32.5632-24.917334 0-13.7216-14.6432-24.917333-32.5632-24.917333H292.488533z" p-id="12315" fill="#909399"></path><path d="M760.6272 569.344h-172.578133l30.549333-29.2864-26.897067-28.0576L512 588.561067l79.4624 78.9504 27.374933-27.5456-31.914666-31.744h173.704533z" p-id="12316" fill="#909399"></path></svg>
\ No newline at end of file
diff --git a/src/views/Business/Sptsel/Menu.vue b/src/views/Business/Sptsel/Menu.vue
index d9de16d..9177ab5 100644
--- a/src/views/Business/Sptsel/Menu.vue
+++ b/src/views/Business/Sptsel/Menu.vue
@@ -79,8 +79,13 @@
               </el-form-item>
             </c-col>
             <c-col :span="8" v-show="searchSlot.searchToggle">
-              <el-form-item label="来源" style="width:100%">
-                <c-select v-model="sourceModel" style="width: 70%" placeholder="请选择来源" multiple>
+              <el-form-item label="来源" style="width: 100%">
+                <c-select
+                  v-model="sourceModel"
+                  style="width: 70%"
+                  placeholder="请选择来源"
+                  multiple
+                >
                   <el-option
                     v-for="item in sourceData"
                     :key="item.value"
@@ -130,7 +135,7 @@
               </c-col>
 
               <c-col :span="8">
-                <el-form-item label="Between" style="width:100%">
+                <el-form-item label="Between" style="width: 100%">
                   <c-col :span="11">
                     <el-date-picker
                       type="date"
@@ -212,35 +217,72 @@
             </c-button>
         </div> -->
     <el-row>
-        <c-col :span="24" style="text-align: right; margin-top: 7px">
-        <c-button style="margin-left:0" size="small" type="primary" @click="onTake">
+      <!-- <c-col :span="24" style="text-align: right; margin-top: 7px">
+        <c-button
+          style="margin-left: 0"
+          size="small"
+          type="primary"
+          @click="onTake"
+        >
           处理
         </c-button>
-        <c-button style="margin-left:0" size="small" type="primary" @click="onDelete">
+        <c-button
+          style="margin-left: 0"
+          size="small"
+          type="primary"
+          @click="onDelete"
+        >
           删除
         </c-button>
-        <c-button style="margin-left:0" size="small" type="primary" @click="onRouting">
+        <c-button
+          style="margin-left: 0"
+          size="small"
+          type="primary"
+          @click="onRouting"
+        >
           分派
         </c-button>
-        <c-button style="margin-left:0" size="small" type="primary" @click="onShowInc">
+        <c-button
+          style="margin-left: 0"
+          size="small"
+          type="primary"
+          @click="onShowInc"
+        >
           显示报文
         </c-button>
-        <c-button style="margin-left:0" size="small" type="primary" @click="onDetails">
+        <c-button
+          style="margin-left: 0"
+          size="small"
+          type="primary"
+          @click="onDetails"
+        >
           详情
         </c-button>
-      </c-col>
+      </c-col> -->
       <c-col :span="24">
         <c-istream-table :list="stmData.data" :columns="stmData.columns">
-          <el-table-column fixed="right" prop="op" label="OP" width="80px">
-            <template slot-scope="scope">
-              <a href="javascript:void(0)" @click="continueEdit(scope.row)"
-                >继续编辑</a
+          <el-table-column fixed="right" prop="op" label="OP" width="200px">
+            <template>
+              <c-button
+                style="margin-left: 0"
+                size="small"
+                type="primary"
+                @click="onTake"
+              >
+                处理
+              </c-button>
+              <c-button
+                style="margin-left: 0"
+                size="small"
+                type="primary"
+                @click="onDetails"
               >
+                详情
+              </c-button>
             </template>
           </el-table-column>
         </c-istream-table>
       </c-col>
-      
     </el-row>
     <el-row style="margin-top: 2rem">
       <el-card class="box-card">
@@ -294,7 +336,7 @@ export default {
   mixins: [CommonProcess],
   data() {
     return {
-      sourceModel:'',
+      sourceModel: "",
       sourceData: [
         { label: "Incoming", value: "chkinc" },
         { label: "E-Trade", value: "chkdzt" },
diff --git a/src/views/Layout/SideMenu.vue b/src/views/Layout/SideMenu.vue
index 0f776c9..08e05c8 100644
--- a/src/views/Layout/SideMenu.vue
+++ b/src/views/Layout/SideMenu.vue
@@ -59,12 +59,12 @@ export default {
         { inifrm: "infbdd", ininam: "买方信用证单据查询", pntmiu: "2" },
         { inifrm: "bdtudp", ininam: "国内证承兑", pntmiu: "2" },
         { inifrm: "3", ininam: "出口信用证", pntmiu: "", icon: require("~/assets/icons/sideMenu/出口信用证.svg") },
-        { inifrm: "3", ininam: "出口信用证", pntmiu: "" },
+        //{ inifrm: "3", ininam: "出口信用证", pntmiu: "" },
         { inifrm: "letsel", ininam: "出口信用证查询", pntmiu: "3" },
         { inifrm: "letopn", ininam: "出口信用证通知", pntmiu: "3" },
         { inifrm: "letame", ininam: "出口信用证修改", pntmiu: "3" },
         { inifrm: "letrsv", ininam: "出口信用证补通知", pntmiu: "3" },
-        { inifrm: "4", ininam: "进口信用证", pntmiu: "" },
+        { inifrm: "4", ininam: "进口信用证", pntmiu: "", icon: require("~/assets/icons/sideMenu/进口信用证.svg")},
         { inifrm: "inflid", ininam: "进口信用证查询", pntmiu: "4" },
         { inifrm: "litopn", ininam: "进口信用证开立", pntmiu: "4" },
         { inifrm: "litdav", ininam: "进口信用证通知到单", pntmiu: "4" },
@@ -73,14 +73,14 @@ export default {
         { inifrm: "litcan", ininam: "进口信用证注销", pntmiu: "4" },
         { inifrm: "inftrd", ininam: "进口押汇查询", pntmiu: "4" },
         { inifrm: "trtame", ininam: "进口融资修改", pntmiu: "4" },
-        { inifrm: "5", ininam: "进口代收", pntmiu: "" },
+        // { inifrm: "5", ininam: "进口代收", pntmiu: "" },
+        // { inifrm: "bctacc", ininam: "进口代收承兑", pntmiu: "5" },
+        // { inifrm: "6", ininam: "静态参数管理", pntmiu: "" },
+        // { inifrm: "infusr", ininam: "用户信息", pntmiu: "6" },
+        { inifrm: "5", ininam: "进口代收", pntmiu: "", icon: require("~/assets/icons/sideMenu/进口代收.svg") },
         { inifrm: "bctacc", ininam: "进口代收承兑", pntmiu: "5" },
-        { inifrm: "6", ininam: "静态参数管理", pntmiu: "" },
+        { inifrm: "6", ininam: "静态参数管理", pntmiu: "", icon: require("~/assets/icons/sideMenu/静态参数.svg") },
         { inifrm: "infusr", ininam: "用户信息", pntmiu: "6" },
-        { inifrm: "4", ininam: "进口代收", pntmiu: "", icon: require("~/assets/icons/sideMenu/进口代收.svg") },
-        { inifrm: "bctacc", ininam: "进口代收承兑", pntmiu: "4" },
-        { inifrm: "5", ininam: "静态参数管理", pntmiu: "", icon: require("~/assets/icons/sideMenu/静态参数.svg") },
-        { inifrm: "infusr", ininam: "用户信息", pntmiu: "5" },
       ],
       menusOrigin: [],
       menus: [],
diff --git a/src/views/Public/Ptap.vue b/src/views/Public/Ptap.vue
index b222276..3c98b27 100644
--- a/src/views/Public/Ptap.vue
+++ b/src/views/Public/Ptap.vue
@@ -12,7 +12,7 @@
       </el-form-item>
     </c-col>
 
-    <c-col :span="18">
+    <c-col :span="20">
       <el-form-item
         :label="`${argadr.title}ID`"
         :prop="`${argadr.grp}.${argadr.rol}.pts.extkey`"
@@ -33,6 +33,7 @@
     <c-col :span="1">
       <!-- <el-form-item label="" label-width="5px"> -->
       <c-button
+        style="margin:0 10px 0 0;padding: 0 10px;"
         class="searchButton"
         size="small"
         type="primary"
@@ -40,8 +41,9 @@
         @click="onSeainf(`${argadr.grp}.${argadr.rol}.pts.extkey`)"
       ></c-button>
     </c-col>
-    <c-col :span="3" :offset="1" style="text-align: right">
+    <c-col :span="3" style="text-align: right">
       <c-button
+        style="margin:0 0"
         class="detailsButton"
         size="small"
         type="primary"
--
libgit2 0.26.0