Ver código fonte

待出库新需求,以及维多利亚出入库流水页,以及邮箱ui样式调整

cz 1 ano atrás
pai
commit
188e3ff4c0

+ 762 - 3
src/assets/icons/iconfont/demo_index.html

@@ -55,6 +55,204 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe8b2;</span>
+                <div class="name">icon_biaoqian2</div>
+                <div class="code-name">&amp;#xe8b2;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8b3;</span>
+                <div class="name">icon_biaoqian1</div>
+                <div class="code-name">&amp;#xe8b3;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8b1;</span>
+                <div class="name">icon_weixiu</div>
+                <div class="code-name">&amp;#xe8b1;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8a8;</span>
+                <div class="name">icon_qignl</div>
+                <div class="code-name">&amp;#xe8a8;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8a9;</span>
+                <div class="name">icon_zhegnzbx</div>
+                <div class="code-name">&amp;#xe8a9;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8aa;</span>
+                <div class="name">icon_caijian</div>
+                <div class="code-name">&amp;#xe8aa;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8ab;</span>
+                <div class="name">icon_gognpc</div>
+                <div class="code-name">&amp;#xe8ab;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8ac;</span>
+                <div class="name">icon_ljsy</div>
+                <div class="code-name">&amp;#xe8ac;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8ad;</span>
+                <div class="name">icon_fengs</div>
+                <div class="code-name">&amp;#xe8ad;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8ae;</span>
+                <div class="name">icon_tongzhi1</div>
+                <div class="code-name">&amp;#xe8ae;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8af;</span>
+                <div class="name">icon_vip1</div>
+                <div class="code-name">&amp;#xe8af;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8b0;</span>
+                <div class="name">icon_qizi</div>
+                <div class="code-name">&amp;#xe8b0;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe893;</span>
+                <div class="name">icon_dangqsd</div>
+                <div class="code-name">&amp;#xe893;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe894;</span>
+                <div class="name">icon_bpqbj</div>
+                <div class="code-name">&amp;#xe894;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe895;</span>
+                <div class="name">icon_jiak1</div>
+                <div class="code-name">&amp;#xe895;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe896;</span>
+                <div class="name">icon_gygd</div>
+                <div class="code-name">&amp;#xe896;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe897;</span>
+                <div class="name">icon_juanzhou</div>
+                <div class="code-name">&amp;#xe897;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe898;</span>
+                <div class="name">icon_dqms</div>
+                <div class="code-name">&amp;#xe898;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe899;</span>
+                <div class="name">icon_jiak2</div>
+                <div class="code-name">&amp;#xe899;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe89a;</span>
+                <div class="name">icon_midu</div>
+                <div class="code-name">&amp;#xe89a;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe89b;</span>
+                <div class="name">icon_gykd</div>
+                <div class="code-name">&amp;#xe89b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe89c;</span>
+                <div class="name">icon_dqbc</div>
+                <div class="code-name">&amp;#xe89c;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe89d;</span>
+                <div class="name">icon_video</div>
+                <div class="code-name">&amp;#xe89d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe89e;</span>
+                <div class="name">icon_qianla</div>
+                <div class="code-name">&amp;#xe89e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe89f;</span>
+                <div class="name">icon_zongzous</div>
+                <div class="code-name">&amp;#xe89f;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8a0;</span>
+                <div class="name">icon_shebzt</div>
+                <div class="code-name">&amp;#xe8a0;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8a1;</span>
+                <div class="name">icon_q&a</div>
+                <div class="code-name">&amp;#xe8a1;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8a2;</span>
+                <div class="name">icon_sdbc</div>
+                <div class="code-name">&amp;#xe8a2;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8a3;</span>
+                <div class="name">icon-ebc2</div>
+                <div class="code-name">&amp;#xe8a3;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8a4;</span>
+                <div class="name">icon_songjingz</div>
+                <div class="code-name">&amp;#xe8a4;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8a5;</span>
+                <div class="name">icon_weixjl</div>
+                <div class="code-name">&amp;#xe8a5;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8a6;</span>
+                <div class="name">icon-hegnyi</div>
+                <div class="code-name">&amp;#xe8a6;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8a7;</span>
+                <div class="name">icon-ebc1</div>
+                <div class="code-name">&amp;#xe8a7;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe88e;</span>
                 <div class="name">iconm_forwarding</div>
                 <div class="code-name">&amp;#xe88e;</div>
@@ -2556,9 +2754,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1685410028889') format('woff2'),
-       url('iconfont.woff?t=1685410028889') format('woff'),
-       url('iconfont.ttf?t=1685410028889') format('truetype');
+  src: url('iconfont.woff2?t=1685685956827') format('woff2'),
+       url('iconfont.woff?t=1685685956827') format('woff'),
+       url('iconfont.ttf?t=1685685956827') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
@@ -2585,6 +2783,303 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-icon_biaoqian2"></span>
+            <div class="name">
+              icon_biaoqian2
+            </div>
+            <div class="code-name">.icon-icon_biaoqian2
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_biaoqian1"></span>
+            <div class="name">
+              icon_biaoqian1
+            </div>
+            <div class="code-name">.icon-icon_biaoqian1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_weixiu"></span>
+            <div class="name">
+              icon_weixiu
+            </div>
+            <div class="code-name">.icon-icon_weixiu
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_qignl"></span>
+            <div class="name">
+              icon_qignl
+            </div>
+            <div class="code-name">.icon-icon_qignl
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_zhegnzbx"></span>
+            <div class="name">
+              icon_zhegnzbx
+            </div>
+            <div class="code-name">.icon-icon_zhegnzbx
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_caijian"></span>
+            <div class="name">
+              icon_caijian
+            </div>
+            <div class="code-name">.icon-icon_caijian
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_gognpc"></span>
+            <div class="name">
+              icon_gognpc
+            </div>
+            <div class="code-name">.icon-icon_gognpc
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_ljsy"></span>
+            <div class="name">
+              icon_ljsy
+            </div>
+            <div class="code-name">.icon-icon_ljsy
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_fengs"></span>
+            <div class="name">
+              icon_fengs
+            </div>
+            <div class="code-name">.icon-icon_fengs
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_tongzhi1"></span>
+            <div class="name">
+              icon_tongzhi1
+            </div>
+            <div class="code-name">.icon-icon_tongzhi1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_vip1"></span>
+            <div class="name">
+              icon_vip1
+            </div>
+            <div class="code-name">.icon-icon_vip1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_qizi"></span>
+            <div class="name">
+              icon_qizi
+            </div>
+            <div class="code-name">.icon-icon_qizi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_dangqsd"></span>
+            <div class="name">
+              icon_dangqsd
+            </div>
+            <div class="code-name">.icon-icon_dangqsd
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_bpqbj"></span>
+            <div class="name">
+              icon_bpqbj
+            </div>
+            <div class="code-name">.icon-icon_bpqbj
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_jiak1"></span>
+            <div class="name">
+              icon_jiak1
+            </div>
+            <div class="code-name">.icon-icon_jiak1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_gygd"></span>
+            <div class="name">
+              icon_gygd
+            </div>
+            <div class="code-name">.icon-icon_gygd
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_juanzhou"></span>
+            <div class="name">
+              icon_juanzhou
+            </div>
+            <div class="code-name">.icon-icon_juanzhou
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_dqms"></span>
+            <div class="name">
+              icon_dqms
+            </div>
+            <div class="code-name">.icon-icon_dqms
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_jiak2"></span>
+            <div class="name">
+              icon_jiak2
+            </div>
+            <div class="code-name">.icon-icon_jiak2
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_midu"></span>
+            <div class="name">
+              icon_midu
+            </div>
+            <div class="code-name">.icon-icon_midu
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_gykd"></span>
+            <div class="name">
+              icon_gykd
+            </div>
+            <div class="code-name">.icon-icon_gykd
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_dqbc"></span>
+            <div class="name">
+              icon_dqbc
+            </div>
+            <div class="code-name">.icon-icon_dqbc
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_video"></span>
+            <div class="name">
+              icon_video
+            </div>
+            <div class="code-name">.icon-icon_video
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_qianla"></span>
+            <div class="name">
+              icon_qianla
+            </div>
+            <div class="code-name">.icon-icon_qianla
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_zongzous"></span>
+            <div class="name">
+              icon_zongzous
+            </div>
+            <div class="code-name">.icon-icon_zongzous
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_shebzt"></span>
+            <div class="name">
+              icon_shebzt
+            </div>
+            <div class="code-name">.icon-icon_shebzt
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-a-icon_qa"></span>
+            <div class="name">
+              icon_q&a
+            </div>
+            <div class="code-name">.icon-a-icon_qa
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_sdbc"></span>
+            <div class="name">
+              icon_sdbc
+            </div>
+            <div class="code-name">.icon-icon_sdbc
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon-ebc2"></span>
+            <div class="name">
+              icon-ebc2
+            </div>
+            <div class="code-name">.icon-icon-ebc2
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_songjingz"></span>
+            <div class="name">
+              icon_songjingz
+            </div>
+            <div class="code-name">.icon-icon_songjingz
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_weixjl"></span>
+            <div class="name">
+              icon_weixjl
+            </div>
+            <div class="code-name">.icon-icon_weixjl
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon-hegnyi"></span>
+            <div class="name">
+              icon-hegnyi
+            </div>
+            <div class="code-name">.icon-icon-hegnyi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon-ebc1"></span>
+            <div class="name">
+              icon-ebc1
+            </div>
+            <div class="code-name">.icon-icon-ebc1
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-iconm_forwarding"></span>
             <div class="name">
               iconm_forwarding
@@ -6339,6 +6834,270 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_biaoqian2"></use>
+                </svg>
+                <div class="name">icon_biaoqian2</div>
+                <div class="code-name">#icon-icon_biaoqian2</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_biaoqian1"></use>
+                </svg>
+                <div class="name">icon_biaoqian1</div>
+                <div class="code-name">#icon-icon_biaoqian1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_weixiu"></use>
+                </svg>
+                <div class="name">icon_weixiu</div>
+                <div class="code-name">#icon-icon_weixiu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_qignl"></use>
+                </svg>
+                <div class="name">icon_qignl</div>
+                <div class="code-name">#icon-icon_qignl</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_zhegnzbx"></use>
+                </svg>
+                <div class="name">icon_zhegnzbx</div>
+                <div class="code-name">#icon-icon_zhegnzbx</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_caijian"></use>
+                </svg>
+                <div class="name">icon_caijian</div>
+                <div class="code-name">#icon-icon_caijian</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_gognpc"></use>
+                </svg>
+                <div class="name">icon_gognpc</div>
+                <div class="code-name">#icon-icon_gognpc</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_ljsy"></use>
+                </svg>
+                <div class="name">icon_ljsy</div>
+                <div class="code-name">#icon-icon_ljsy</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_fengs"></use>
+                </svg>
+                <div class="name">icon_fengs</div>
+                <div class="code-name">#icon-icon_fengs</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_tongzhi1"></use>
+                </svg>
+                <div class="name">icon_tongzhi1</div>
+                <div class="code-name">#icon-icon_tongzhi1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_vip1"></use>
+                </svg>
+                <div class="name">icon_vip1</div>
+                <div class="code-name">#icon-icon_vip1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_qizi"></use>
+                </svg>
+                <div class="name">icon_qizi</div>
+                <div class="code-name">#icon-icon_qizi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_dangqsd"></use>
+                </svg>
+                <div class="name">icon_dangqsd</div>
+                <div class="code-name">#icon-icon_dangqsd</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_bpqbj"></use>
+                </svg>
+                <div class="name">icon_bpqbj</div>
+                <div class="code-name">#icon-icon_bpqbj</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_jiak1"></use>
+                </svg>
+                <div class="name">icon_jiak1</div>
+                <div class="code-name">#icon-icon_jiak1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_gygd"></use>
+                </svg>
+                <div class="name">icon_gygd</div>
+                <div class="code-name">#icon-icon_gygd</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_juanzhou"></use>
+                </svg>
+                <div class="name">icon_juanzhou</div>
+                <div class="code-name">#icon-icon_juanzhou</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_dqms"></use>
+                </svg>
+                <div class="name">icon_dqms</div>
+                <div class="code-name">#icon-icon_dqms</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_jiak2"></use>
+                </svg>
+                <div class="name">icon_jiak2</div>
+                <div class="code-name">#icon-icon_jiak2</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_midu"></use>
+                </svg>
+                <div class="name">icon_midu</div>
+                <div class="code-name">#icon-icon_midu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_gykd"></use>
+                </svg>
+                <div class="name">icon_gykd</div>
+                <div class="code-name">#icon-icon_gykd</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_dqbc"></use>
+                </svg>
+                <div class="name">icon_dqbc</div>
+                <div class="code-name">#icon-icon_dqbc</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_video"></use>
+                </svg>
+                <div class="name">icon_video</div>
+                <div class="code-name">#icon-icon_video</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_qianla"></use>
+                </svg>
+                <div class="name">icon_qianla</div>
+                <div class="code-name">#icon-icon_qianla</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_zongzous"></use>
+                </svg>
+                <div class="name">icon_zongzous</div>
+                <div class="code-name">#icon-icon_zongzous</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_shebzt"></use>
+                </svg>
+                <div class="name">icon_shebzt</div>
+                <div class="code-name">#icon-icon_shebzt</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-a-icon_qa"></use>
+                </svg>
+                <div class="name">icon_q&a</div>
+                <div class="code-name">#icon-a-icon_qa</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_sdbc"></use>
+                </svg>
+                <div class="name">icon_sdbc</div>
+                <div class="code-name">#icon-icon_sdbc</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon-ebc2"></use>
+                </svg>
+                <div class="name">icon-ebc2</div>
+                <div class="code-name">#icon-icon-ebc2</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_songjingz"></use>
+                </svg>
+                <div class="name">icon_songjingz</div>
+                <div class="code-name">#icon-icon_songjingz</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_weixjl"></use>
+                </svg>
+                <div class="name">icon_weixjl</div>
+                <div class="code-name">#icon-icon_weixjl</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon-hegnyi"></use>
+                </svg>
+                <div class="name">icon-hegnyi</div>
+                <div class="code-name">#icon-icon-hegnyi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon-ebc1"></use>
+                </svg>
+                <div class="name">icon-ebc1</div>
+                <div class="code-name">#icon-icon-ebc1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-iconm_forwarding"></use>
                 </svg>
                 <div class="name">iconm_forwarding</div>

+ 135 - 3
src/assets/icons/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3933484 */
-  src: url('iconfont.woff2?t=1685410028889') format('woff2'),
-       url('iconfont.woff?t=1685410028889') format('woff'),
-       url('iconfont.ttf?t=1685410028889') format('truetype');
+  src: url('iconfont.woff2?t=1685685956827') format('woff2'),
+       url('iconfont.woff?t=1685685956827') format('woff'),
+       url('iconfont.ttf?t=1685685956827') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,138 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-icon_biaoqian2:before {
+  content: "\e8b2";
+}
+
+.icon-icon_biaoqian1:before {
+  content: "\e8b3";
+}
+
+.icon-icon_weixiu:before {
+  content: "\e8b1";
+}
+
+.icon-icon_qignl:before {
+  content: "\e8a8";
+}
+
+.icon-icon_zhegnzbx:before {
+  content: "\e8a9";
+}
+
+.icon-icon_caijian:before {
+  content: "\e8aa";
+}
+
+.icon-icon_gognpc:before {
+  content: "\e8ab";
+}
+
+.icon-icon_ljsy:before {
+  content: "\e8ac";
+}
+
+.icon-icon_fengs:before {
+  content: "\e8ad";
+}
+
+.icon-icon_tongzhi1:before {
+  content: "\e8ae";
+}
+
+.icon-icon_vip1:before {
+  content: "\e8af";
+}
+
+.icon-icon_qizi:before {
+  content: "\e8b0";
+}
+
+.icon-icon_dangqsd:before {
+  content: "\e893";
+}
+
+.icon-icon_bpqbj:before {
+  content: "\e894";
+}
+
+.icon-icon_jiak1:before {
+  content: "\e895";
+}
+
+.icon-icon_gygd:before {
+  content: "\e896";
+}
+
+.icon-icon_juanzhou:before {
+  content: "\e897";
+}
+
+.icon-icon_dqms:before {
+  content: "\e898";
+}
+
+.icon-icon_jiak2:before {
+  content: "\e899";
+}
+
+.icon-icon_midu:before {
+  content: "\e89a";
+}
+
+.icon-icon_gykd:before {
+  content: "\e89b";
+}
+
+.icon-icon_dqbc:before {
+  content: "\e89c";
+}
+
+.icon-icon_video:before {
+  content: "\e89d";
+}
+
+.icon-icon_qianla:before {
+  content: "\e89e";
+}
+
+.icon-icon_zongzous:before {
+  content: "\e89f";
+}
+
+.icon-icon_shebzt:before {
+  content: "\e8a0";
+}
+
+.icon-a-icon_qa:before {
+  content: "\e8a1";
+}
+
+.icon-icon_sdbc:before {
+  content: "\e8a2";
+}
+
+.icon-icon-ebc2:before {
+  content: "\e8a3";
+}
+
+.icon-icon_songjingz:before {
+  content: "\e8a4";
+}
+
+.icon-icon_weixjl:before {
+  content: "\e8a5";
+}
+
+.icon-icon-hegnyi:before {
+  content: "\e8a6";
+}
+
+.icon-icon-ebc1:before {
+  content: "\e8a7";
+}
+
 .icon-iconm_forwarding:before {
   content: "\e88e";
 }

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
src/assets/icons/iconfont/iconfont.js


+ 231 - 0
src/assets/icons/iconfont/iconfont.json

@@ -6,6 +6,237 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "35800526",
+      "name": "icon_biaoqian2",
+      "font_class": "icon_biaoqian2",
+      "unicode": "e8b2",
+      "unicode_decimal": 59570
+    },
+    {
+      "icon_id": "35800527",
+      "name": "icon_biaoqian1",
+      "font_class": "icon_biaoqian1",
+      "unicode": "e8b3",
+      "unicode_decimal": 59571
+    },
+    {
+      "icon_id": "35798580",
+      "name": "icon_weixiu",
+      "font_class": "icon_weixiu",
+      "unicode": "e8b1",
+      "unicode_decimal": 59569
+    },
+    {
+      "icon_id": "35798517",
+      "name": "icon_qignl",
+      "font_class": "icon_qignl",
+      "unicode": "e8a8",
+      "unicode_decimal": 59560
+    },
+    {
+      "icon_id": "35798518",
+      "name": "icon_zhegnzbx",
+      "font_class": "icon_zhegnzbx",
+      "unicode": "e8a9",
+      "unicode_decimal": 59561
+    },
+    {
+      "icon_id": "35798519",
+      "name": "icon_caijian",
+      "font_class": "icon_caijian",
+      "unicode": "e8aa",
+      "unicode_decimal": 59562
+    },
+    {
+      "icon_id": "35798520",
+      "name": "icon_gognpc",
+      "font_class": "icon_gognpc",
+      "unicode": "e8ab",
+      "unicode_decimal": 59563
+    },
+    {
+      "icon_id": "35798521",
+      "name": "icon_ljsy",
+      "font_class": "icon_ljsy",
+      "unicode": "e8ac",
+      "unicode_decimal": 59564
+    },
+    {
+      "icon_id": "35798522",
+      "name": "icon_fengs",
+      "font_class": "icon_fengs",
+      "unicode": "e8ad",
+      "unicode_decimal": 59565
+    },
+    {
+      "icon_id": "35798523",
+      "name": "icon_tongzhi1",
+      "font_class": "icon_tongzhi1",
+      "unicode": "e8ae",
+      "unicode_decimal": 59566
+    },
+    {
+      "icon_id": "35798524",
+      "name": "icon_vip1",
+      "font_class": "icon_vip1",
+      "unicode": "e8af",
+      "unicode_decimal": 59567
+    },
+    {
+      "icon_id": "35798525",
+      "name": "icon_qizi",
+      "font_class": "icon_qizi",
+      "unicode": "e8b0",
+      "unicode_decimal": 59568
+    },
+    {
+      "icon_id": "35783069",
+      "name": "icon_dangqsd",
+      "font_class": "icon_dangqsd",
+      "unicode": "e893",
+      "unicode_decimal": 59539
+    },
+    {
+      "icon_id": "35783070",
+      "name": "icon_bpqbj",
+      "font_class": "icon_bpqbj",
+      "unicode": "e894",
+      "unicode_decimal": 59540
+    },
+    {
+      "icon_id": "35783071",
+      "name": "icon_jiak1",
+      "font_class": "icon_jiak1",
+      "unicode": "e895",
+      "unicode_decimal": 59541
+    },
+    {
+      "icon_id": "35783072",
+      "name": "icon_gygd",
+      "font_class": "icon_gygd",
+      "unicode": "e896",
+      "unicode_decimal": 59542
+    },
+    {
+      "icon_id": "35783073",
+      "name": "icon_juanzhou",
+      "font_class": "icon_juanzhou",
+      "unicode": "e897",
+      "unicode_decimal": 59543
+    },
+    {
+      "icon_id": "35783074",
+      "name": "icon_dqms",
+      "font_class": "icon_dqms",
+      "unicode": "e898",
+      "unicode_decimal": 59544
+    },
+    {
+      "icon_id": "35783075",
+      "name": "icon_jiak2",
+      "font_class": "icon_jiak2",
+      "unicode": "e899",
+      "unicode_decimal": 59545
+    },
+    {
+      "icon_id": "35783076",
+      "name": "icon_midu",
+      "font_class": "icon_midu",
+      "unicode": "e89a",
+      "unicode_decimal": 59546
+    },
+    {
+      "icon_id": "35783077",
+      "name": "icon_gykd",
+      "font_class": "icon_gykd",
+      "unicode": "e89b",
+      "unicode_decimal": 59547
+    },
+    {
+      "icon_id": "35783078",
+      "name": "icon_dqbc",
+      "font_class": "icon_dqbc",
+      "unicode": "e89c",
+      "unicode_decimal": 59548
+    },
+    {
+      "icon_id": "35783079",
+      "name": "icon_video",
+      "font_class": "icon_video",
+      "unicode": "e89d",
+      "unicode_decimal": 59549
+    },
+    {
+      "icon_id": "35783080",
+      "name": "icon_qianla",
+      "font_class": "icon_qianla",
+      "unicode": "e89e",
+      "unicode_decimal": 59550
+    },
+    {
+      "icon_id": "35783081",
+      "name": "icon_zongzous",
+      "font_class": "icon_zongzous",
+      "unicode": "e89f",
+      "unicode_decimal": 59551
+    },
+    {
+      "icon_id": "35783082",
+      "name": "icon_shebzt",
+      "font_class": "icon_shebzt",
+      "unicode": "e8a0",
+      "unicode_decimal": 59552
+    },
+    {
+      "icon_id": "35783083",
+      "name": "icon_q&a",
+      "font_class": "a-icon_qa",
+      "unicode": "e8a1",
+      "unicode_decimal": 59553
+    },
+    {
+      "icon_id": "35783084",
+      "name": "icon_sdbc",
+      "font_class": "icon_sdbc",
+      "unicode": "e8a2",
+      "unicode_decimal": 59554
+    },
+    {
+      "icon_id": "35783085",
+      "name": "icon-ebc2",
+      "font_class": "icon-ebc2",
+      "unicode": "e8a3",
+      "unicode_decimal": 59555
+    },
+    {
+      "icon_id": "35783086",
+      "name": "icon_songjingz",
+      "font_class": "icon_songjingz",
+      "unicode": "e8a4",
+      "unicode_decimal": 59556
+    },
+    {
+      "icon_id": "35783087",
+      "name": "icon_weixjl",
+      "font_class": "icon_weixjl",
+      "unicode": "e8a5",
+      "unicode_decimal": 59557
+    },
+    {
+      "icon_id": "35783088",
+      "name": "icon-hegnyi",
+      "font_class": "icon-hegnyi",
+      "unicode": "e8a6",
+      "unicode_decimal": 59558
+    },
+    {
+      "icon_id": "35783089",
+      "name": "icon-ebc1",
+      "font_class": "icon-ebc1",
+      "unicode": "e8a7",
+      "unicode_decimal": 59559
+    },
+    {
       "icon_id": "35729214",
       "name": "iconm_forwarding",
       "font_class": "iconm_forwarding",

BIN
src/assets/icons/iconfont/iconfont.ttf


BIN
src/assets/icons/iconfont/iconfont.woff


BIN
src/assets/icons/iconfont/iconfont.woff2


+ 4 - 0
src/views/WDLY/outInBound/logistics/index.vue

@@ -233,6 +233,10 @@ const businessType = ref([
     dictValue: "京东退货",
     dictKey: "4",
   },
+  {
+    dictValue: "采购退货",
+    dictKey: "5",
+  },
 ]);
 const selectConfig = reactive([
   {

+ 274 - 0
src/views/WDLY/outInBound/record/index.vue

@@ -0,0 +1,274 @@
+<template>
+  <div class="tenant">
+    <div class="content">
+      <byTable
+        :source="sourceList.data"
+        :pagination="sourceList.pagination"
+        :config="config"
+        :loading="loading"
+        :selectConfig="selectConfig"
+        highlight-current-row
+        :action-list="[
+          {
+            text: '导出Excel',
+            action: () => deriveExcel(),
+          },
+        ]"
+        @get-list="getList"
+      >
+        <template #warehouseName="{ item }">
+          <div>
+            <!-- <span v-if="item.opType == 1">{{ item.toWarehouseName }}</span>
+            <span v-else>{{ item.warehouseName }}</span> -->
+            <span>{{ item.warehouseName }}</span>
+          </div>
+        </template>
+      </byTable>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { computed, ref } from "vue";
+import byTable from "@/components/byTable/index";
+
+const { proxy } = getCurrentInstance();
+const route = useRoute();
+const opTypeList = ref([
+  {
+    label: "入库",
+    value: "1",
+  },
+  {
+    label: "出库",
+    value: "2",
+  },
+]);
+const typeList = ref([
+  {
+    label: "手动入库",
+    value: "1",
+  },
+  {
+    label: "手动出库",
+    value: "2",
+  },
+  {
+    label: "调仓入库",
+    value: "3",
+  },
+  {
+    label: "待入库入库",
+    value: "4",
+  },
+  {
+    label: "待出库出库",
+    value: "5",
+  },
+  {
+    label: "组合入库",
+    value: "6",
+  },
+  {
+    label: "组合出库",
+    value: "7",
+  },
+  {
+    label: "组合拆分入库",
+    value: "8",
+  },
+  {
+    label: "组合拆分出库",
+    value: "9",
+  },
+  {
+    label: "京东销售出库",
+    value: "10",
+  },
+  {
+    label: "调仓出库",
+    value: "11",
+  },
+  {
+    label: "销售订单出库",
+    value: "12",
+  },
+  {
+    label: "退货出库",
+    value: "13",
+  },
+  {
+    label: "到货入库",
+    value: "14",
+  },
+  {
+    label: "京东退货入库",
+    value: "15",
+  },
+  {
+    label: "生产任务出库",
+    value: "20",
+  },
+]);
+const warehouseList = ref([]);
+const productUnit = ref([]);
+const sourceList = ref({
+  data: [],
+  pagination: {
+    total: 0,
+    pageNum: 1,
+    pageSize: 10,
+    keyword: "",
+    opType: "",
+    productId: "",
+  },
+});
+const loading = ref(false);
+const selectConfig = computed(() => {
+  return [
+    {
+      label: "操作类型",
+      prop: "opType",
+      data: opTypeList.value,
+    },
+    {
+      label: "出入库类型",
+      prop: "type",
+      data: typeList.value,
+    },
+  ];
+});
+const config = computed(() => {
+  return [
+    {
+      attrs: {
+        label: "操作类型",
+        prop: "opType",
+        width: 140,
+      },
+      render(type) {
+        return proxy.dictValueLabel(type, opTypeList.value);
+      },
+    },
+    {
+      attrs: {
+        label: "关联单号",
+        prop: "linkCode",
+      },
+    },
+    {
+      attrs: {
+        label: "出入库类型",
+        prop: "type",
+        width: 140,
+      },
+      render(type) {
+        return proxy.dictValueLabel(type, typeList.value);
+      },
+    },
+    {
+      attrs: {
+        label: "仓库名称",
+        slot: "warehouseName",
+      },
+    },
+    {
+      attrs: {
+        label: "物品编码",
+        prop: "productCustomCode",
+      },
+    },
+    {
+      attrs: {
+        label: "物品名称",
+        prop: "productName",
+      },
+    },
+    {
+      attrs: {
+        label: "规格型号",
+        prop: "productSpec",
+      },
+    },
+    {
+      attrs: {
+        label: "单位",
+        prop: "productUnit",
+      },
+      render(unit) {
+        return proxy.dictValueLabel(unit, productUnit.value);
+      },
+    },
+    {
+      attrs: {
+        label: "操作数量",
+        prop: "quantity",
+      },
+    },
+    {
+      attrs: {
+        label: "操作人",
+        prop: "opUserName",
+      },
+    },
+    {
+      attrs: {
+        label: "操作时间",
+        prop: "createTime",
+        width: 155,
+      },
+    },
+  ];
+});
+const getDict = () => {
+  proxy.post("/warehouse/page", { pageNum: 1, pageSize: 999 }).then((res) => {
+    if (res.rows && res.rows.length > 0) {
+      warehouseList.value = res.rows.map((item) => {
+        return {
+          label: item.name,
+          value: item.id,
+        };
+      });
+    }
+  });
+  proxy.getDictOne(["unit"]).then((res) => {
+    productUnit.value = res["unit"].map((x) => ({
+      label: x.dictValue,
+      value: x.dictKey,
+    }));
+  });
+};
+const getList = async (req) => {
+  sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
+  loading.value = true;
+  proxy
+    .post("/stockJournalDetails/pageByWdly", sourceList.value.pagination)
+    .then((res) => {
+      sourceList.value.data = res.rows;
+      sourceList.value.pagination.total = res.total;
+      setTimeout(() => {
+        loading.value = false;
+      }, 200);
+    });
+};
+getDict();
+
+onMounted(() => {
+  if (route.query.productId) {
+    sourceList.value.pagination.productId = route.query.productId;
+  }
+  getList();
+});
+const deriveExcel = () => {
+  console.log("deriveExcel");
+};
+</script>
+
+<style lang="scss" scoped>
+.tenant {
+  padding: 20px;
+}
+::v-deep(.el-input-number .el-input__inner) {
+  text-align: left;
+}
+</style>

+ 120 - 1
src/views/WDLY/outInBound/waitOutBound/index.vue

@@ -35,6 +35,50 @@
         :rules="submitType == 5 ? rulesOne : rules"
         ref="byform"
       >
+        <template #countryId>
+          <div>
+            <el-select
+              v-model="formData.data.countryId"
+              placeholder="国家"
+              @change="(val) => getCityData(val, '20', true)"
+            >
+              <el-option
+                v-for="item in countryData"
+                :label="item.chineseName"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </div>
+        </template>
+
+        <template #provinceId>
+          <div>
+            <selectCity
+              placeholder="省/洲"
+              @change="(val) => getCityData(val, '30', true)"
+              addressId="provinceId"
+              addressName="provinceName"
+              v-model="formData.data"
+              :data="provinceData"
+            >
+            </selectCity>
+          </div>
+        </template>
+
+        <template #cityId>
+          <div>
+            <selectCity
+              placeholder="城市"
+              addressId="cityId"
+              addressName="cityName"
+              v-model="formData.data"
+              :data="cityData"
+            >
+            </selectCity>
+          </div>
+        </template>
+
         <template #products>
           <div style="width: 100%">
             <el-table :data="formData.data.jdOrderDetailsList">
@@ -140,6 +184,7 @@ import byTable from "@/components/byTable/index";
 import byForm from "@/components/byForm/index";
 import InventoryInquiry from "@/views/purchaseSales/outAndInWarehouse/inventoryInquiry/index";
 import { computed } from "vue";
+import selectCity from "@/components/selectCity/index.vue";
 
 const loading = ref(false);
 const submitLoading = ref(false);
@@ -178,6 +223,7 @@ let rules = ref({
   logisticsCode: [
     { required: true, message: "请输入物流/快递单号", trigger: "blur" },
   ],
+  countryId: [{ required: true, message: "请选择国家", trigger: "change" }],
 });
 let rulesOne = ref({
   type: [
@@ -357,7 +403,35 @@ const configData = computed(() => [
       prop: "logisticsCode",
       label: " ",
       placeholder: "物流/快递单号",
-      itemWidth: 30,
+      itemWidth: 60,
+      style: {
+        width: "46%",
+      },
+    },
+    {
+      type: "slot",
+      slotName: "countryId",
+      prop: "countryId",
+      label: "收货信息",
+      itemWidth: 33.33,
+    },
+    {
+      type: "slot",
+      slotName: "provinceId",
+      label: " ",
+      itemWidth: 33.33,
+    },
+    {
+      type: "slot",
+      slotName: "cityId",
+      prop: "cityId",
+      label: " ",
+      itemWidth: 33.33,
+    },
+    {
+      type: "input",
+      itemType: "textarea",
+      prop: "areaDetail",
     },
     {
       type: "title",
@@ -466,6 +540,12 @@ const submitForm = () => {
           id: formData.data.id,
           businessType: formData.data.businessType,
           warehouseId: formData.data.warehouseId,
+          logisticsCompanyCode: formData.data.logisticsCompanyCode,
+          logisticsCode: formData.data.logisticsCode,
+          countryId: formData.data.countryId,
+          provinceId: formData.data.provinceId,
+          cityId: formData.data.cityId,
+          areaDetail: formData.data.areaDetail,
           stockWaitDetailsList: list.map((x) => ({
             id: x.id,
             quantity: x.quantity,
@@ -536,6 +616,12 @@ const submitForm = () => {
           businessId: formData.data.businessId,
           businessType: formData.data.businessType,
           warehouseId: formData.data.warehouseId,
+          logisticsCompanyCode: formData.data.logisticsCompanyCode,
+          logisticsCode: formData.data.logisticsCode,
+          countryId: formData.data.countryId,
+          provinceId: formData.data.provinceId,
+          cityId: formData.data.cityId,
+          areaDetail: formData.data.areaDetail,
           type: "2", //2是出库
           stockWaitDetailsList: list.map((x) => ({
             id: x.id,
@@ -579,6 +665,8 @@ const outBound = (row) => {
       }));
       res.businessType = res.businessType + "";
       formData.data = res;
+      formData.data.countryId = "44";
+      getCityData(formData.data.countryId, "20");
       dialogVisible.value = true;
     });
   } else if (row.businessType == 5) {
@@ -613,6 +701,8 @@ const outBound = (row) => {
       }));
       res.businessType = res.businessType + "";
       formData.data = res;
+      formData.data.countryId = "44";
+      getCityData(formData.data.countryId, "20");
       dialogVisible.value = true;
     });
   }
@@ -650,6 +740,35 @@ const getDict = () => {
   });
 };
 getDict();
+
+const countryData = ref([]);
+const provinceData = ref([]);
+const cityData = ref([]);
+
+const getCityData = (id, type, flag) => {
+  proxy.post("/customizeArea/list", { parentId: id }).then((res) => {
+    if (type === "20") {
+      provinceData.value = res;
+      if (flag) {
+        formData.data.provinceId = "";
+        formData.data.provinceName = "";
+        formData.data.cityId = "";
+        formData.data.cityName = "";
+      }
+    } else if (type === "30") {
+      cityData.value = res;
+      if (flag) {
+        formData.data.cityId = "";
+        formData.data.cityName = "";
+      }
+    } else {
+      countryData.value = res;
+    }
+  });
+};
+
+getCityData("0");
+
 onMounted(() => {
   selectConfig[0].data = businessType;
   selectConfig[1].data = outboundType.value;

+ 63 - 12
src/views/connect/E-mail/mail/com/mailDetail.vue

@@ -24,26 +24,48 @@
       <el-button @click="handleReply('40')">再次编辑</el-button>
       <el-button @click="handleMove">移动</el-button>
       <el-button @click="handleRemove">删除</el-button>
-      <el-tag
-        style="margin-left: 8px"
-        type="success"
-        closable
-        v-for="(tag, index) in mailTagList"
-        :key="index"
-        @close="tagClose(tag)"
+      <div
+        style="
+          background-color: #eff6ff;
+          padding: 6px;
+          margin-left: 10px;
+          cursor: pointer;
+          border-radius: 2px 2px 2px 2px;
+        "
+        @click="handleAddTag"
       >
-        {{ tag.name }}
-      </el-tag>
-      <el-tag
+        <span
+          class="iconfont icon-icon_biaoqian2"
+          style="color: #0084ff; font-size: 20px"
+        ></span>
+      </div>
+      <!-- <el-tag
         style="margin-left: 8px; cursor: pointer"
         type="success"
         @click="handleAddTag"
       >
         +
-      </el-tag>
+      </el-tag> -->
     </div>
     <div class="top">
       <div class="top-row">
+        <div class="subject">
+          {{ subject }}
+        </div>
+      </div>
+      <div class="top-row" v-if="mailTagList && mailTagList.length > 0">
+        <el-tag
+          style="margin-left: 8px"
+          type="success"
+          closable
+          v-for="(tag, index) in mailTagList"
+          :key="index"
+          @close="tagClose(tag)"
+        >
+          {{ tag.name }}
+        </el-tag>
+      </div>
+      <div class="top-row">
         <div class="label">发 件 人:</div>
         <div class="value">
           <span
@@ -203,6 +225,8 @@ const replyTo = ref([]);
 const fileList = ref([]);
 const requestData = ref({});
 const time = ref("");
+const subject = ref("");
+
 // 移动文件夹
 const formOption = reactive({
   inline: true,
@@ -396,6 +420,10 @@ const getDetails = (messageId) => {
       if (mailStore.currentMenu.time) {
         time.value = mailStore.currentMenu.time;
       }
+      if (mailStore.currentMenu.subject) {
+        subject.value = mailStore.currentMenu.subject;
+      }
+
       detailsData.data = res;
       to.value = res.messageAddressList.filter((x) => x.type === 1);
       cc.value = res.messageAddressList.filter((x) => x.type === 2);
@@ -544,10 +572,14 @@ defineExpose({
   font-size: 12px;
   .top {
     padding: 10px;
-    background: #f1f1f1;
+    background: #eeeeee;
     .top-row {
       display: flex;
       margin-bottom: 10px;
+      .subject {
+        font-size: 14px;
+        font-weight: bold;
+      }
       .label {
         min-width: 60px;
         color: #999999;
@@ -563,4 +595,23 @@ defineExpose({
     }
   }
 }
+.el-tag {
+  background: #ffffff;
+  color: #0084ff;
+}
+
+.el-tag.el-tag--success {
+  color: #0084ff;
+}
+</style>
+<style lang="scss">
+.top-row {
+  .el-tag .el-tag__close {
+    color: #0084ff !important;
+  }
+  .el-tag .el-tag__close:hover {
+    color: #fff !important;
+    background: #0084ff !important ;
+  }
+}
 </style>

+ 10 - 3
src/views/connect/E-mail/mail/com/mailList.vue

@@ -64,21 +64,21 @@
         </el-table-column>
         <el-table-column prop="fromPersonalName" label="发件人" width="150">
           <template #default="{ row, $index }">
-            <div style="cursor: pointer" @click="handleRowClick(row, $index)">
+            <div class="contentClass" @click="handleRowClick(row, $index)">
               {{ row.fromPersonalName }}
             </div>
           </template>
         </el-table-column>
         <el-table-column prop="fromEmail" label="发件人地址" width="210">
           <template #default="{ row, $index }">
-            <div style="cursor: pointer" @click="handleRowClick(row, $index)">
+            <div class="contentClass" @click="handleRowClick(row, $index)">
               {{ row.fromEmail }}
             </div>
           </template>
         </el-table-column>
         <el-table-column prop="subject" label="主题">
           <template #default="{ row, $index }">
-            <div style="cursor: pointer" @click="handleRowClick(row, $index)">
+            <div class="contentClass" @click="handleRowClick(row, $index)">
               {{ row.subject }}
             </div>
           </template>
@@ -220,6 +220,7 @@ const handleRowClick = (row, index) => {
     messageId: row.id,
     id: "detail" + "," + row.id,
     time: row.sendDate,
+    subject: row.subject,
     row: { ...row },
   };
   const menuItem = mailStore.mailMenuList.find((x) => x.id === menu.id);
@@ -258,4 +259,10 @@ defineExpose({
 .el-pagination {
   padding-left: 30vw;
 }
+.contentClass {
+  cursor: pointer;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
 </style>

+ 25 - 5
src/views/connect/E-mail/mail/com/right/netdisk/enterprise.vue

@@ -14,7 +14,7 @@
       </div>
     </div>
     <el-row>
-      <el-col :span="6" style="border-right: 1px solid #d7d7d7">
+      <el-col :span="11" style="border-right: 1px solid #d7d7d7">
         <div class="mulu">
           <el-tree
             :data="treeListData"
@@ -27,15 +27,35 @@
           ></el-tree>
         </div>
       </el-col>
-      <el-col :span="18" style="padding: 0 5px">
+      <el-col :span="13" style="padding: 0 5px">
         <el-table
           :data="sourceList.data"
           style="width: 100%"
           v-loading="loading"
           :height="tableHeight"
         >
-          <el-table-column prop="name" label="文件名" width="115" />
-          <el-table-column prop="createTime" label="上传时间" width="140" />
+          <el-table-column prop="name" label="文件名" />
+          <el-table-column
+            prop="createTime"
+            label="上传时间"
+            width="80"
+            align="center"
+          >
+            <template #default="{ row }">
+              <el-tooltip
+                class="box-item"
+                effect="dark"
+                :content="row.createTime"
+                placement="top"
+              >
+                <!-- <span
+                  class="iconfont icon-iconx_kehd"
+                  style="cursor: pointer; font-size: 18px"
+                ></span> -->
+                <el-icon :size="20" style="cursor: pointer"><Timer /></el-icon>
+              </el-tooltip>
+            </template>
+          </el-table-column>
           <!-- <el-table-column
             label="操作"
             width="60"
@@ -174,7 +194,7 @@ const handleClickRow = (row) => {
 <style lang="scss">
 .mulu {
   width: 100%;
-  padding: 0 5px;
+  // padding: 0 5px;
   height: calc(100vh - 50px - 50px - 10px - 30px - 28px - 46px - 35px - 24px);
   overflow-y: auto;
   overflow-x: auto;

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff