Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/assets/icon/demo_index.html

@@ -54,6 +54,84 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe607;</span>
+                <div class="name">客户资料</div>
+                <div class="code-name">&amp;#xe607;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe659;</span>
+                <div class="name">签证</div>
+                <div class="code-name">&amp;#xe659;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe665;</span>
+                <div class="name">机票</div>
+                <div class="code-name">&amp;#xe665;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe687;</span>
+                <div class="name">酒店</div>
+                <div class="code-name">&amp;#xe687;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xebc4;</span>
+                <div class="name">经理人_o</div>
+                <div class="code-name">&amp;#xebc4;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe61d;</span>
+                <div class="name">公共</div>
+                <div class="code-name">&amp;#xe61d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe60c;</span>
+                <div class="name">权限</div>
+                <div class="code-name">&amp;#xe60c;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe64d;</span>
+                <div class="name">统计</div>
+                <div class="code-name">&amp;#xe64d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe660;</span>
+                <div class="name">供货商邀请</div>
+                <div class="code-name">&amp;#xe660;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe68b;</span>
+                <div class="name">gpt</div>
+                <div class="code-name">&amp;#xe68b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe62c;</span>
+                <div class="name">人事管理</div>
+                <div class="code-name">&amp;#xe62c;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe636;</span>
+                <div class="name">地接</div>
+                <div class="code-name">&amp;#xe636;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe601;</span>
+                <div class="name">设置</div>
+                <div class="code-name">&amp;#xe601;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe616;</span>
                 <div class="name">现场管控</div>
@@ -168,9 +246,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1679044803754') format('woff2'),
-       url('iconfont.woff?t=1679044803754') format('woff'),
-       url('iconfont.ttf?t=1679044803754') format('truetype');
+  src: url('iconfont.woff2?t=1710382466980') format('woff2'),
+       url('iconfont.woff?t=1710382466980') format('woff'),
+       url('iconfont.ttf?t=1710382466980') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -196,6 +274,123 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-kehuziliao"></span>
+            <div class="name">
+              客户资料
+            </div>
+            <div class="code-name">.icon-kehuziliao
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-qianzheng"></span>
+            <div class="name">
+              签证
+            </div>
+            <div class="code-name">.icon-qianzheng
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-jipiao"></span>
+            <div class="name">
+              机票
+            </div>
+            <div class="code-name">.icon-jipiao
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-jiudian"></span>
+            <div class="name">
+              酒店
+            </div>
+            <div class="code-name">.icon-jiudian
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-jingliren_o"></span>
+            <div class="name">
+              经理人_o
+            </div>
+            <div class="code-name">.icon-jingliren_o
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-gonggong"></span>
+            <div class="name">
+              公共
+            </div>
+            <div class="code-name">.icon-gonggong
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-quanxian"></span>
+            <div class="name">
+              权限
+            </div>
+            <div class="code-name">.icon-quanxian
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-tongji"></span>
+            <div class="name">
+              统计
+            </div>
+            <div class="code-name">.icon-tongji
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-gonghuoshangyaoqing"></span>
+            <div class="name">
+              供货商邀请
+            </div>
+            <div class="code-name">.icon-gonghuoshangyaoqing
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-gpt"></span>
+            <div class="name">
+              gpt
+            </div>
+            <div class="code-name">.icon-gpt
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-renshiguanli"></span>
+            <div class="name">
+              人事管理
+            </div>
+            <div class="code-name">.icon-renshiguanli
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-dijie1"></span>
+            <div class="name">
+              地接
+            </div>
+            <div class="code-name">.icon-dijie1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shezhi"></span>
+            <div class="name">
+              设置
+            </div>
+            <div class="code-name">.icon-shezhi
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-xianchangguankong"></span>
             <div class="name">
@@ -367,6 +562,110 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-kehuziliao"></use>
+                </svg>
+                <div class="name">客户资料</div>
+                <div class="code-name">#icon-kehuziliao</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-qianzheng"></use>
+                </svg>
+                <div class="name">签证</div>
+                <div class="code-name">#icon-qianzheng</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-jipiao"></use>
+                </svg>
+                <div class="name">机票</div>
+                <div class="code-name">#icon-jipiao</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-jiudian"></use>
+                </svg>
+                <div class="name">酒店</div>
+                <div class="code-name">#icon-jiudian</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-jingliren_o"></use>
+                </svg>
+                <div class="name">经理人_o</div>
+                <div class="code-name">#icon-jingliren_o</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-gonggong"></use>
+                </svg>
+                <div class="name">公共</div>
+                <div class="code-name">#icon-gonggong</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-quanxian"></use>
+                </svg>
+                <div class="name">权限</div>
+                <div class="code-name">#icon-quanxian</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-tongji"></use>
+                </svg>
+                <div class="name">统计</div>
+                <div class="code-name">#icon-tongji</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-gonghuoshangyaoqing"></use>
+                </svg>
+                <div class="name">供货商邀请</div>
+                <div class="code-name">#icon-gonghuoshangyaoqing</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-gpt"></use>
+                </svg>
+                <div class="name">gpt</div>
+                <div class="code-name">#icon-gpt</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-renshiguanli"></use>
+                </svg>
+                <div class="name">人事管理</div>
+                <div class="code-name">#icon-renshiguanli</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-dijie1"></use>
+                </svg>
+                <div class="name">地接</div>
+                <div class="code-name">#icon-dijie1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shezhi"></use>
+                </svg>
+                <div class="name">设置</div>
+                <div class="code-name">#icon-shezhi</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xianchangguankong"></use>

src/assets/icon/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3950759 */
-  src: url('iconfont.woff2?t=1679044803754') format('woff2'),
-       url('iconfont.woff?t=1679044803754') format('woff'),
-       url('iconfont.ttf?t=1679044803754') format('truetype');
+  src: url('iconfont.woff2?t=1710382466980') format('woff2'),
+       url('iconfont.woff?t=1710382466980') format('woff'),
+       url('iconfont.ttf?t=1710382466980') format('truetype');
 }
 
-.iconfont,[class^="icon-"],[class*=" icon-"] {
+.iconfont {
   font-family: "iconfont" !important;
   font-size: 16px;
   font-style: normal;
@@ -13,6 +13,151 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-kehuziliao:before {
+  content: "\e607";
+  margin-right: 5px;
+  width: 24px;
+  text-align: center;
+  font-size: 20px;
+  vertical-align: middle;
+  display: inline-block;
+  font-weight: 600;
+}
+
+.icon-qianzheng:before {
+  content: "\e659";
+  margin-right: 5px;
+  width: 24px;
+  text-align: center;
+  font-size: 16px;
+  vertical-align: middle;
+  display: inline-block;
+  font-weight: 600;
+}
+
+.icon-jipiao:before {
+  content: "\e665";
+  margin-right: 5px;
+  width: 24px;
+  text-align: center;
+  font-size: 22px;
+  vertical-align: middle;
+  display: inline-block;
+  font-weight: 600;
+}
+
+.icon-jiudian:before {
+  content: "\e687";
+  margin-right: 5px;
+  width: 24px;
+  text-align: center;
+  font-size: 16px;
+  vertical-align: middle;
+  display: inline-block;
+  font-weight: 600;
+}
+
+.icon-jingliren_o:before {
+  content: "\ebc4";
+  margin-right: 7px;
+  margin-left: -2px;
+  width: 24px;
+  text-align: center;
+  font-size: 26px;
+  vertical-align: middle;
+  display: inline-block;
+  font-weight: 600;
+}
+
+.icon-gonggong:before {
+  content: "\e61d";
+  margin-right: 5px;
+  width: 24px;
+  text-align: center;
+  font-size: 20px;
+  vertical-align: middle;
+  display: inline-block;
+  font-weight: 600;
+}
+
+.icon-quanxian:before {
+  content: "\e60c";
+  margin-right: 5px;
+  width: 24px;
+  text-align: center;
+  font-size: 16px;
+  vertical-align: middle;
+  display: inline-block;
+  font-weight: 600;
+}
+
+.icon-tongji:before {
+  content: "\e64d";
+  margin-right: 5px;
+  width: 24px;
+  text-align: center;
+  font-size: 18px;
+  vertical-align: middle;
+  display: inline-block;
+  font-weight: 600;
+}
+
+.icon-gonghuoshangyaoqing:before {
+  content: "\e660";
+  margin-right: 5px;
+  width: 24px;
+  text-align: center;
+  font-size: 16px;
+  vertical-align: middle;
+  display: inline-block;
+  font-weight: 600;
+}
+
+.icon-gpt:before {
+  content: "\e68b";
+  margin-right: 5px;
+  width: 24px;
+  text-align: center;
+  font-size: 16px;
+  vertical-align: middle;
+  display: inline-block;
+  font-weight: 600;
+}
+
+.icon-renshiguanli:before {
+  content: "\e62c";
+  margin-right: 7px;
+  margin-left: -2px;
+  width: 24px;
+  text-align: center;
+  font-size: 28px;
+  vertical-align: middle;
+  display: inline-block;
+  font-weight: 600;
+}
+
+.icon-dijie1:before {
+  content: "\e636";
+  margin-right: 5px;
+  width: 24px;
+  text-align: center;
+  font-size: 20px;
+  vertical-align: middle;
+  display: inline-block;
+  font-weight: 600;
+}
+
+.icon-shezhi:before {
+  content: "\e601";
+  margin-right: 5px;
+  width: 24px;
+  text-align: center;
+  font-size: 20px;
+  vertical-align: middle;
+  display: inline-block;
+  font-weight: 600;
+}
+
 .icon-xianchangguankong:before {
   content: "\e616";
 }

src/assets/icon/iconfont.json

@@ -5,6 +5,97 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "714274",
+      "name": "客户资料",
+      "font_class": "kehuziliao",
+      "unicode": "e607",
+      "unicode_decimal": 58887
+    },
+    {
+      "icon_id": "867030",
+      "name": "签证",
+      "font_class": "qianzheng",
+      "unicode": "e659",
+      "unicode_decimal": 58969
+    },
+    {
+      "icon_id": "3854352",
+      "name": "机票",
+      "font_class": "jipiao",
+      "unicode": "e665",
+      "unicode_decimal": 58981
+    },
+    {
+      "icon_id": "5318209",
+      "name": "酒店",
+      "font_class": "jiudian",
+      "unicode": "e687",
+      "unicode_decimal": 59015
+    },
+    {
+      "icon_id": "5388051",
+      "name": "经理人_o",
+      "font_class": "jingliren_o",
+      "unicode": "ebc4",
+      "unicode_decimal": 60356
+    },
+    {
+      "icon_id": "6844400",
+      "name": "公共",
+      "font_class": "gonggong",
+      "unicode": "e61d",
+      "unicode_decimal": 58909
+    },
+    {
+      "icon_id": "12515461",
+      "name": "权限",
+      "font_class": "quanxian",
+      "unicode": "e60c",
+      "unicode_decimal": 58892
+    },
+    {
+      "icon_id": "16328041",
+      "name": "统计",
+      "font_class": "tongji",
+      "unicode": "e64d",
+      "unicode_decimal": 58957
+    },
+    {
+      "icon_id": "21015847",
+      "name": "供货商邀请",
+      "font_class": "gonghuoshangyaoqing",
+      "unicode": "e660",
+      "unicode_decimal": 58976
+    },
+    {
+      "icon_id": "36370538",
+      "name": "gpt",
+      "font_class": "gpt",
+      "unicode": "e68b",
+      "unicode_decimal": 59019
+    },
+    {
+      "icon_id": "37543643",
+      "name": "人事管理",
+      "font_class": "renshiguanli",
+      "unicode": "e62c",
+      "unicode_decimal": 58924
+    },
+    {
+      "icon_id": "38709612",
+      "name": "地接",
+      "font_class": "dijie1",
+      "unicode": "e636",
+      "unicode_decimal": 58934
+    },
+    {
+      "icon_id": "162882",
+      "name": "设置",
+      "font_class": "shezhi",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
     {
       "icon_id": "31307121",
       "name": "现场管控",

src/components/Finance/ExpenseReview.vue

@@ -4,7 +4,7 @@
             <div class="group-title">
                 <div>团组列表</div>
                 <div class="group-box">
-                    <el-select v-model="value" clearable placeholder="请选择" @change="filterStatus(value)">
+                    <el-select style="width:120px" v-model="value" clearable placeholder="请选择" @change="filterStatus(value)">
                         <el-option
                         v-for="item in options"
                         :key="item.value"
@@ -13,8 +13,7 @@
                         </el-option>
                     </el-select>
                     <el-input
-                    style="width:200px;"
-
+                    style="width:300px;"
                     placeholder="请输入查询内容"
                     v-model="input"
                     clearable>

src/components/child/Generalindex.vue

@@ -80,7 +80,7 @@
                             <el-table-column width="80" label="管控">
                                 <template slot-scope="scope">
                                     <el-button type="primary" size="mini" @click="handleEdit(scope.$index, scope.row)">
-                                        <i class="icon-xianchangguankong"></i>
+                                        <i class="iconfont icon-xianchangguankong"></i>
                                     </el-button>
                                 </template>
                             </el-table-column>
@@ -104,7 +104,7 @@
                             <p>市场客户资源</p>
                         </div>
                         <div class="sources-icon">
-                            <i class="icon-shichangbu"></i>
+                            <i class="iconfont icon-shichangbu"></i>
                         </div>
                     </div>
                     <div class="sources-li">
@@ -112,7 +112,7 @@
                             <p>车导地接资源</p>
                         </div>
                         <div class="sources-icon">
-                            <i class="icon-dijie"></i>
+                            <i class="iconfont icon-dijie"></i>
                         </div>
                     </div>
                     <div class="sources-li">
@@ -120,7 +120,7 @@
                             <p>策划活动资源</p>
                         </div>
                         <div class="sources-icon">
-                            <i class="icon-xiangmucehua"></i>
+                            <i class="iconfont icon-xiangmucehua"></i>
                         </div>
                     </div>
                 </div>

src/components/home.vue

@@ -122,42 +122,42 @@
       </el-dialog>
     </div>
     <el-container class="all">
-      <el-aside class="delwh">
-        <el-menu :default-active="indexs" class="el-menu-vertical-demo menubar" @open="handleOpen" @close="handleClose"
-          :collapse="isCollapse">
-          <div class="user">
-            <div class="user-box">
-              <div class="user-img">
-                <img src="../assets/logo2.png" />
-              </div>
-              <div v-if="panduan" class="user-text">
-                泛美国际 - AI智能办公系统
-              </div>
+      <el-aside class="delwh menubar">
+        <div class="user">
+          <div class="user-box">
+            <div class="user-img">
+              <img src="../assets/logo2.png" />
+            </div>
+            <div v-if="panduan" class="user-text">
+              泛美国际 - AI智能办公系统
             </div>
           </div>
-          <div class="avatar-box">
-            <div class="nei-avatar">
-              <div class="avatar">
-                <div class="avatar-img">
-                  <img src="../assets/avatar.jpg" alt="" />
-                </div>
-                <div v-if="panduan" class="avatar-text">
-                  <div class="avatar-name">员工: {{ userinif.userInfo.cnName }}</div>
-                  <div class="avatar-division">职位: {{ userinif.userInfo.jobName }}</div>
-                  <div>部门: {{ userinif.userInfo.depName }}</div>
-                </div>
+        </div>
+        <div class="avatar-box">
+          <div class="nei-avatar">
+            <div class="avatar">
+              <div class="avatar-img">
+                <img src="../assets/avatar.jpg" alt="" />
+              </div>
+              <div v-if="panduan" class="avatar-text">
+                <div class="avatar-name">员工: {{ userinif.userInfo.cnName }}</div>
+                <div class="avatar-division">职位: {{ userinif.userInfo.jobName }}</div>
+                <div>部门: {{ userinif.userInfo.depName }}</div>
               </div>
             </div>
           </div>
+        </div>
+        <el-menu :default-active="indexs" class="el-menu-vertical-demo" @open="handleOpen" @close="handleClose"
+          :collapse="isCollapse">
           <el-menu-item v-for="(item, filindex) in filmenuList" :key="filindex + '/'"
             :index="item.modulid + '-' + item.pageList[0].pageid" @click="toURLs($event.index, item)">
-            <i class="iconfont icon-shouye"></i>
+            <i :class="iconfont+item.remark"></i>
             <span slot="title">{{ item.pageList[0].pageName }}</span>
           </el-menu-item>
           <el-submenu v-for="(item, index) in filmenuLists" :key="index" :index='item.modulid + ""'
             @click="toURL($event.index)">
             <template slot="title">
-              <i class="iconfont icon-shouye"></i>
+              <i :class="iconfont+item.remark"></i>
               <span>{{ item.modulName }}</span>
             </template>
             <el-menu-item-group>
@@ -196,11 +196,11 @@
           </div>
           <div class="name-box">
             <div class="instrument" @click="instrumentclick('.instrument-box', $event)">
-              <i class="icon-shiyonggongju"></i>
+              <i class="iconfont icon-shiyonggongju"></i>
             </div>
             <div class="message">
               <el-badge :value="unReadCount" class="item">
-                <i class="icon-tongzhi" @click="dialogVisible= true"></i>
+                <i class="iconfont icon-tongzhi" @click="dialogVisible= true"></i>
               </el-badge>
             </div>
             <div class="user-inif" @click="instrumentclick('.user-operate', $event)">
@@ -354,7 +354,8 @@ export default {
       readStatus:2,//状态
       msglist:[],//list
       count:0,//list数量
-      panduans:false
+      panduans:false,
+      iconfont:'iconfont '
     };
   },
   // components: {