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

src/components/IntellectIcon.vue

 <template>
 
+<!-- 
 <c-col :span="24">
         <el-row>
             <el-col :span="spanVal" v-for="(item, idx) in displayIconList" :key="idx" :offset="1">
@@ -34,6 +35,44 @@
             </div>
         </el-dialog>
 </c-col>
+-->
+
+<c-col :span="24">
+        <el-row>
+            <el-col :span="spanVal" v-for="(item, idx) in displayIconList" :key="idx" :offset="1">
+                <el-card :body-style="{ padding: '0px' }" style="height:100%">
+                <!-- <img :src="item.src" class="image"> -->
+                <div style="padding: 5px;">
+                    <span style="text-align:center;font-size:5px">{{item.name}}</span>
+                    <el-button type="text" class="button" icon="el-icon-delete" @click="DeleteIcon(item.id)"></el-button>
+                </div>
+                </el-card>
+            </el-col>
+            <el-col :span="2" :offset="1">
+                <el-card :body-style="{ padding: '5px' }">
+                    <!-- <img :src="require('~/assets/add.png')" class="image" @click="AddIcon"> -->
+                    <!-- <span style="text-align:center;font-size:5px">添加</span> -->
+                    <el-button type="text" class="button" icon="el-icon-plus" @click="AddIcon"></el-button>
+                </el-card>
+            </el-col>
+        </el-row>
+        <el-dialog :visible.sync="IconDialog" :title="'单据列表'">
+            <div style="height:200px">
+                <el-col :span="14">
+                    <el-col :span="spanVal" v-for="(item, idx) in hideIconList" :key="idx" :offset="1">
+                        <el-card :body-style="{ padding: '0px' }" style="height:100%">
+                        <!-- <img :src="item.src" class="image"> -->
+                        <div style="padding: 5px;">
+                            <span style="text-align:center;font-size:5px">{{item.name}}</span>
+                            <el-button type="text" class="button" icon="el-icon-plus" @click="InsertIcon(item.id)"></el-button>
+                        </div>
+                        </el-card>
+                    </el-col>
+                </el-col>
+                
+            </div>
+        </el-dialog>
+</c-col>
 
 </template>
 

src/views/Business/Ditdck/Docpre.vue

 <template>
   <div class="eibs-tab">
     <!-- =================左边====================== -->
-    <c-col :span="11">
+    <c-col :span="12">
       <el-form-item label="不符点">
         <c-col :span="21">
           <c-input
@@ -54,7 +54,7 @@
     </c-col>
 
     <!-- =================右边====================== -->
-    <c-col :span="11" :offset="1">
+    <c-col :span="12">
       <c-col :span="24">
         <el-form-item label="" prop="bddgrp.rec.igndisflg">
           <c-checkbox v-model="model.bddgrp.rec.igndisflg"
@@ -132,6 +132,9 @@
 
     <!-- =================已交单据====================== -->
     <c-col :span="24">
+        <el-button slot="reference" style="float:right" @click="addDocgrdDataStore">添加</el-button>
+    </c-col>
+    <c-col :span="24">
         <!-- :list="model.bdtp.docgrdm.docgrd" -->
       <c-table
         :border="true"
@@ -219,7 +222,7 @@
       <el-dialog :visible.sync="InsertErrorDialogVisibal" center width="500px">
         <c-col :span="24">
           <c-col :span="20">
-            <el-form-item label="错误信息" label-width="100px">
+            <el-form-item label="不符点" label-width="100px">
               <c-input v-model="newInsertError"></c-input>
             </el-form-item>
           </c-col>
@@ -322,22 +325,22 @@ export default {
                             },
                         ]
                     },
-                    {
-                        name:"KZ3500220597AA-003.pdf",
-                        errorData:[
-                            {
-                                discribe:"货物数量有误",
-                                state:true
-                            },
-                        ]
-                    },
+                    // {
+                    //     name:"KZ3500220597AA-003.pdf",
+                    //     errorData:[
+                    //         {
+                    //             discribe:"货物数量有误",
+                    //             state:true
+                    //         },
+                    //     ]
+                    // },
                   ],
           },
           {
               id:"oceanShipping",
               data:[
                     {
-                        name:"KZ3500220597AA-004.pdf",
+                        name:"KZ3500220597AA-003.pdf",
                         errorData:[
                         ]
                     },
@@ -460,13 +463,13 @@ export default {
         if(this.selectPDFData.length > 0){
             const arr = []
             for(let i = 0; i < this.gridData.length; i++){
-                if(this.gridData[i].id == this.selectPDFData){
+                // if(this.gridData[i].id == this.selectPDFData){
                     // arr.push({"id" : this.gridData[i].id});
                     for(let j = 0; j < this.gridData[i].data.length; j++){
                         arr.push({"name" : this.gridData[i].data[j].name});
                     }
-                    break;
-                }
+                //     break;
+                // }
             }
             this.gridPDFData = arr;
         }   

src/views/Business/Ditopn/Tk.vue

@@ -8,31 +8,31 @@
     <c-col :span="16">
         <c-col :span="24">
         <el-form-item label="货物描述" prop="didgrp.blk.lcrgod">
-            <c-input type="textarea" :autosize="{ minRows: 6, maxRows: 8}"  v-model="model.didgrp.blk.lcrgod" style="width:70%;margin-right:20px;" maxlength="1430" show-word-limit placeholder="请输入Description of Goods" ></c-input>
+            <c-input type="textarea" :autosize="{ minRows: 6, maxRows: 8}"  v-model="model.didgrp.blk.lcrgod" style="margin-right:20px;" maxlength="1430" show-word-limit placeholder="请输入Description of Goods" ></c-input>
        </el-form-item>
        </c-col>
                   
        <c-col :span="24">
         <el-form-item label="单据要求" prop="didgrp.blk.lcrdoc">
-            <c-input type="textarea" :autosize="{ minRows: 6, maxRows: 8}"  v-model="model.didgrp.blk.lcrdoc" maxlength="1950" style="width:70%;margin-right:20px;" show-word-limit placeholder="请输入单据要求" ></c-input>
+            <c-input type="textarea" :autosize="{ minRows: 6, maxRows: 8}"  v-model="model.didgrp.blk.lcrdoc" maxlength="1950" style="margin-right:20px;" show-word-limit placeholder="请输入单据要求" ></c-input>
        </el-form-item>
        </c-col>
                                                     
        <c-col :span="24">
         <el-form-item label="附加条款" prop="didgrp.blk.adlcnd">
-            <c-input type="textarea" :autosize="{ minRows: 6, maxRows: 8}" v-model="model.didgrp.blk.adlcnd" style="width:70%;margin-right:20px;" maxlength="1430" show-word-limit placeholder="请输入附加条款" ></c-input>
+            <c-input type="textarea" :autosize="{ minRows: 6, maxRows: 8}" v-model="model.didgrp.blk.adlcnd" style="margin-right:20px;" maxlength="1430" show-word-limit placeholder="请输入附加条款" ></c-input>
        </el-form-item>
        </c-col>
                                                     
        <c-col :span="24">
         <el-form-item label="给付款、承兑、议付行的指示" prop="didgrp.blk.insbnk">
-            <c-input type="textarea" :autosize="{ minRows: 6, maxRows: 8}" v-model="model.didgrp.blk.insbnk" style="width:70%;margin-right:20px;" maxlength="325" show-word-limit placeholder="请输入付行的指示" ></c-input>
+            <c-input type="textarea" :autosize="{ minRows: 6, maxRows: 8}" v-model="model.didgrp.blk.insbnk" style="margin-right:20px;" maxlength="325" show-word-limit placeholder="请输入付行的指示" ></c-input>
        </el-form-item>
        </c-col>
     </c-col>          
 
-    <c-col :span="8">
-        <IntellectIcon :IconList="IconList" :span="spanVal" v-on:deleteIcon="deleteIcon" v-on:insertIcon="insertIcon"></IntellectIcon>
+    <c-col :span="7" :offset="1">
+        <IntellectIcon :IconList="IconList" :spanVal="spanVal" v-on:deleteIcon="deleteIcon" v-on:insertIcon="insertIcon"></IntellectIcon>
     </c-col>
     <!-- <c-col :span="8">
         <el-row>
@@ -116,7 +116,7 @@ export default {
             IconList:[
                 "invoice","receipt",
             ],
-            spanVal:4,
+            spanVal:5,
         }
     },
     methods:{
@@ -141,7 +141,10 @@ export default {
         }
     },
     created:function(){
-        sessionStorage.setItem('IconList', JSON.stringify(this.IconList));
+        var IconList = JSON.parse(sessionStorage.getItem("IconList"));
+        if(IconList == null){
+            sessionStorage.setItem('IconList', JSON.stringify(this.IconList));
+        }
     }
 }
 </script>

src/views/Layout/SideMenu.vue

@@ -128,8 +128,9 @@ export default {
         {inifrm:"gitsel",ininam:"进口保函查询",pntmiu:"13"},
         {inifrm:"gitset",ininam:"进口保函赔付",pntmiu:"13"},
         {inifrm:"gitcrq",ininam:"进口保函索赔登记",pntmiu:"13"},
-        { inifrm: "14",ininam: "Switsk", pntmiu: "" },
+        { inifrm: "14",ininam: "服务管理", pntmiu: "" },
         { inifrm: "switsk", ininam: "Switsk", pntmiu: "14" },
+        { inifrm: "mgrtsk", ininam: "Mgrtsk", pntmiu: "14" },
       ],
       menus: [],
       menusHeight: 0