2022.03.10 wujia switsk

src/views/Business/Switsk/Tskmgr.vue

@@ -388,14 +388,8 @@
   </div>
 </template>
 <script>
-<<<<<<< HEAD
-import 
-i from "~/service/Api";
-import CommonProcess from "~/mixin/CommonProcess";
-=======
 import Api from "~/service/Api";
 import commonProcess from "~/mixin/commonProcess";
->>>>>>> cc48b60ed4385932a67d853ae70016ee6b67705e
 import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Switsk/Event";
 import moment from 'moment'

src/views/Layout/SideMenu.vue

@@ -120,21 +120,16 @@ export default {
         { inifrm: "detopn", ininam: "信用证开立", pntmiu: "11" },
         { inifrm: "detame", ininam: "信用证修改", pntmiu: "11" },
         { inifrm: "detsel", ininam: "信用证查询", pntmiu: "11" },
-<<<<<<< HEAD
-        { inifrm: "12",ininam: "Switsk", pntmiu: "" },
-        { inifrm: "switsk", ininam: "Switsk", pntmiu: "12" },
-        { inifrm: "13",ininam: "智能审单", pntmiu: "" },
-        { inifrm: "examRule", ininam: "智能审单规则配置", pntmiu: "13" },
-=======
+        
         { inifrm: "12",ininam: "智能审单", pntmiu: "" },
         { inifrm: "examRule", ininam: "智能审单规则配置", pntmiu: "12" },
         //进口保函
         {inifrm: "13",ininam:"进口保函",pntmiu:""},
         {inifrm:"gitsel",ininam:"进口保函查询",pntmiu:"13"},
         {inifrm:"gitset",ininam:"进口保函赔付",pntmiu:"13"},
-        {inifrm:"gitcrq",ininam:"进口保函索赔登记",pntmiu:"13"}
-
->>>>>>> cc48b60ed4385932a67d853ae70016ee6b67705e
+        {inifrm:"gitcrq",ininam:"进口保函索赔登记",pntmiu:"13"},
+        { inifrm: "14",ininam: "Switsk", pntmiu: "" },
+        { inifrm: "switsk", ininam: "Switsk", pntmiu: "14" },
       ],
       menus: [],
       menusHeight: 0