大量调整优化

src/assets/iconfont/demo_index.html

@@ -126,6 +126,12 @@
                 <div class="code-name">&amp;#xe64c;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe648;</span>
+                <div class="name">手机</div>
+                <div class="code-name">&amp;#xe648;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe6c0;</span>
                 <div class="name">问题补充</div>
@@ -150,6 +156,12 @@
                 <div class="code-name">&amp;#xe745;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe647;</span>
+                <div class="name">警告</div>
+                <div class="code-name">&amp;#xe647;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe630;</span>
                 <div class="name">下拉</div>
@@ -168,6 +180,12 @@
                 <div class="code-name">&amp;#xe604;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe646;</span>
+                <div class="name">错误</div>
+                <div class="code-name">&amp;#xe646;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe62f;</span>
                 <div class="name">选择</div>
@@ -450,6 +468,12 @@
                 <div class="code-name">&amp;#xe635;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe678;</span>
+                <div class="name">等待</div>
+                <div class="code-name">&amp;#xe678;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe603;</span>
                 <div class="name">客户</div>
@@ -576,6 +600,18 @@
                 <div class="code-name">&amp;#xe6db;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe658;</span>
+                <div class="name">错误</div>
+                <div class="code-name">&amp;#xe658;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe913;</span>
+                <div class="name">步骤</div>
+                <div class="code-name">&amp;#xe913;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe601;</span>
                 <div class="name">采购</div>
@@ -612,6 +648,12 @@
                 <div class="code-name">&amp;#xe62e;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe645;</span>
+                <div class="name">建站步骤未完</div>
+                <div class="code-name">&amp;#xe645;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe6d6;</span>
                 <div class="name">公文包</div>
@@ -630,6 +672,12 @@
                 <div class="code-name">&amp;#xe67f;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe640;</span>
+                <div class="name">完成</div>
+                <div class="code-name">&amp;#xe640;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe654;</span>
                 <div class="name">管理员小组</div>
@@ -648,6 +696,18 @@
                 <div class="code-name">&amp;#xe62d;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xebf0;</span>
+                <div class="name">控件未选</div>
+                <div class="code-name">&amp;#xebf0;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xebf1;</span>
+                <div class="name">控件已选</div>
+                <div class="code-name">&amp;#xebf1;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe60d;</span>
                 <div class="name">同意</div>
@@ -678,6 +738,12 @@
                 <div class="code-name">&amp;#xe622;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe64a;</span>
+                <div class="name">电脑</div>
+                <div class="code-name">&amp;#xe64a;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe61b;</span>
                 <div class="name">消息推送</div>
@@ -840,24 +906,60 @@
                 <div class="code-name">&amp;#xe62c;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe668;</span>
+                <div class="name">正确</div>
+                <div class="code-name">&amp;#xe668;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe71d;</span>
+                <div class="name">灰色步骤</div>
+                <div class="code-name">&amp;#xe71d;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe686;</span>
                 <div class="name">标签</div>
                 <div class="code-name">&amp;#xe686;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe63e;</span>
+                <div class="name">未完成</div>
+                <div class="code-name">&amp;#xe63e;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe65c;</span>
                 <div class="name">通过</div>
                 <div class="code-name">&amp;#xe65c;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe6a6;</span>
+                <div class="name">未到步骤</div>
+                <div class="code-name">&amp;#xe6a6;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe649;</span>
+                <div class="name">错误</div>
+                <div class="code-name">&amp;#xe649;</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">&#xe63f;</span>
+                <div class="name">正确</div>
+                <div class="code-name">&amp;#xe63f;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe6be;</span>
                 <div class="name">添加图片</div>
@@ -1058,6 +1160,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-tel"></span>
+            <div class="name">
+              手机
+            </div>
+            <div class="code-name">.icon-tel
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-wentibuchong"></span>
             <div class="name">
@@ -1094,6 +1205,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-jinggao"></span>
+            <div class="name">
+              警告
+            </div>
+            <div class="code-name">.icon-jinggao
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-xiala1"></span>
             <div class="name">
@@ -1121,6 +1241,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-cuowu"></span>
+            <div class="name">
+              错误
+            </div>
+            <div class="code-name">.icon-cuowu
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-xuanze1"></span>
             <div class="name">
@@ -1544,6 +1673,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-dengdai1"></span>
+            <div class="name">
+              等待
+            </div>
+            <div class="code-name">.icon-dengdai1
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-kehu"></span>
             <div class="name">
@@ -1733,6 +1871,24 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-cuowu1"></span>
+            <div class="name">
+              错误
+            </div>
+            <div class="code-name">.icon-cuowu1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shoucang-"></span>
+            <div class="name">
+              步骤
+            </div>
+            <div class="code-name">.icon-shoucang-
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-caigou"></span>
             <div class="name">
@@ -1787,6 +1943,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-jianzhanbuzhouweiwan"></span>
+            <div class="name">
+              建站步骤未完
+            </div>
+            <div class="code-name">.icon-jianzhanbuzhouweiwan
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-gongwenbao"></span>
             <div class="name">
@@ -1814,6 +1979,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-wancheng"></span>
+            <div class="name">
+              完成
+            </div>
+            <div class="code-name">.icon-wancheng
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-xiaozu-"></span>
             <div class="name">
@@ -1841,6 +2015,24 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-kongjianweixuan"></span>
+            <div class="name">
+              控件未选
+            </div>
+            <div class="code-name">.icon-kongjianweixuan
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-kongjianyixuan"></span>
+            <div class="name">
+              控件已选
+            </div>
+            <div class="code-name">.icon-kongjianyixuan
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-tongyi"></span>
             <div class="name">
@@ -1886,6 +2078,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-diannao"></span>
+            <div class="name">
+              电脑
+            </div>
+            <div class="code-name">.icon-diannao
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-huaban"></span>
             <div class="name">
@@ -2129,6 +2330,24 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-zhengque"></span>
+            <div class="name">
+              正确
+            </div>
+            <div class="code-name">.icon-zhengque
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-huisebuzhou"></span>
+            <div class="name">
+              灰色步骤
+            </div>
+            <div class="code-name">.icon-huisebuzhou
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-biaoqian1"></span>
             <div class="name">
@@ -2138,6 +2357,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-weiwancheng"></span>
+            <div class="name">
+              未完成
+            </div>
+            <div class="code-name">.icon-weiwancheng
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-tongguo"></span>
             <div class="name">
@@ -2147,6 +2375,24 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-weidaobuzhou"></span>
+            <div class="name">
+              未到步骤
+            </div>
+            <div class="code-name">.icon-weidaobuzhou
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-error"></span>
+            <div class="name">
+              错误
+            </div>
+            <div class="code-name">.icon-error
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-icon_daohang-copy"></span>
             <div class="name">
@@ -2156,6 +2402,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-zhengque1"></span>
+            <div class="name">
+              正确
+            </div>
+            <div class="code-name">.icon-zhengque1
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-tianjiatupian"></span>
             <div class="name">
@@ -2322,6 +2577,14 @@
                 <div class="code-name">#icon-check1</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-tel"></use>
+                </svg>
+                <div class="name">手机</div>
+                <div class="code-name">#icon-tel</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-wentibuchong"></use>
@@ -2354,6 +2617,14 @@
                 <div class="code-name">#icon-erweima</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-jinggao"></use>
+                </svg>
+                <div class="name">警告</div>
+                <div class="code-name">#icon-jinggao</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xiala1"></use>
@@ -2378,6 +2649,14 @@
                 <div class="code-name">#icon-icon-test</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-cuowu"></use>
+                </svg>
+                <div class="name">错误</div>
+                <div class="code-name">#icon-cuowu</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xuanze1"></use>
@@ -2754,6 +3033,14 @@
                 <div class="code-name">#icon-zhongying</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-dengdai1"></use>
+                </svg>
+                <div class="name">等待</div>
+                <div class="code-name">#icon-dengdai1</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-kehu"></use>
@@ -2922,6 +3209,22 @@
                 <div class="code-name">#icon-icon-</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-cuowu1"></use>
+                </svg>
+                <div class="name">错误</div>
+                <div class="code-name">#icon-cuowu1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shoucang-"></use>
+                </svg>
+                <div class="name">步骤</div>
+                <div class="code-name">#icon-shoucang-</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-caigou"></use>
@@ -2970,6 +3273,14 @@
                 <div class="code-name">#icon-youjian</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-jianzhanbuzhouweiwan"></use>
+                </svg>
+                <div class="name">建站步骤未完</div>
+                <div class="code-name">#icon-jianzhanbuzhouweiwan</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-gongwenbao"></use>
@@ -2994,6 +3305,14 @@
                 <div class="code-name">#icon-shouzhiliushui</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-wancheng"></use>
+                </svg>
+                <div class="name">完成</div>
+                <div class="code-name">#icon-wancheng</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xiaozu-"></use>
@@ -3018,6 +3337,22 @@
                 <div class="code-name">#icon-biaoqian</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-kongjianweixuan"></use>
+                </svg>
+                <div class="name">控件未选</div>
+                <div class="code-name">#icon-kongjianweixuan</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-kongjianyixuan"></use>
+                </svg>
+                <div class="name">控件已选</div>
+                <div class="code-name">#icon-kongjianyixuan</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-tongyi"></use>
@@ -3058,6 +3393,14 @@
                 <div class="code-name">#icon-lingliaochuku</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-diannao"></use>
+                </svg>
+                <div class="name">电脑</div>
+                <div class="code-name">#icon-diannao</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-huaban"></use>
@@ -3274,6 +3617,22 @@
                 <div class="code-name">#icon-yanjing_bi</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-zhengque"></use>
+                </svg>
+                <div class="name">正确</div>
+                <div class="code-name">#icon-zhengque</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-huisebuzhou"></use>
+                </svg>
+                <div class="name">灰色步骤</div>
+                <div class="code-name">#icon-huisebuzhou</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-biaoqian1"></use>
@@ -3282,6 +3641,14 @@
                 <div class="code-name">#icon-biaoqian1</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-weiwancheng"></use>
+                </svg>
+                <div class="name">未完成</div>
+                <div class="code-name">#icon-weiwancheng</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-tongguo"></use>
@@ -3290,6 +3657,22 @@
                 <div class="code-name">#icon-tongguo</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-weidaobuzhou"></use>
+                </svg>
+                <div class="name">未到步骤</div>
+                <div class="code-name">#icon-weidaobuzhou</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-error"></use>
+                </svg>
+                <div class="name">错误</div>
+                <div class="code-name">#icon-error</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-icon_daohang-copy"></use>
@@ -3298,6 +3681,14 @@
                 <div class="code-name">#icon-icon_daohang-copy</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-zhengque1"></use>
+                </svg>
+                <div class="name">正确</div>
+                <div class="code-name">#icon-zhengque1</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-tianjiatupian"></use>

src/pages/about.vue

@@ -16,7 +16,7 @@
 
     <div class="about_wrap">
       <div class="about_logo">
-        <img src="../assets/lj_about.jpg" class="about-img-responsive "></img>
+        <img src="../assets/app_about_pic.png" class="about-img-responsive "></img>
       </div>
       <div class="about_content">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;龙嘉软件有限公司成立于2003年，总部位于有“中囯家具制造重镇”、“中囯家具材料之都”及“中囯家具电商之都”称号的广东省佛山市顺德区龙江镇，下设立成都分公司。</div>
       <div class="about_content">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;龙嘉软件以软件技术服务企业管理为原则，专业服务于各类家具、五金等制造企业，提供实用的管理软件及信息化咨询服务，通过应用信息技术推动制造企业的高速供应链、智能生产制造、客户关系、电子商务、智能办公、绩效考核等管理升级。</div>
@@ -34,8 +34,8 @@
 
         <div class="about_lianxi_dept">成都分公司</div>
         <div>地址：成都市新都区龙桥镇</div>
-        <div>联系人：唐先生</div>
-        <div>电话：15528192207</div>
+        <div>联系人：周先生</div>
+        <div>电话：15828538680</div>
 
         <div class="about_lianxi_dept">广州番禺办事处</div>
         <div>地址：广州番禺奥园广场1号塔1108室 </div>

src/pages/buytaskdetail.vue

@@ -114,7 +114,45 @@
         </div>
       </div>
 
+      <div class="liubai_dt"></div>
+
+      <div style="font-size:14px;margin:20px;">
+
+        <div v-if="oaflag_dt=='处理中'">
+          <div style="font-weight:bold">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-dengdai1"></use>
+            </svg>
+            审批流程处理中</div>
+          <div style="color:#888;line-height:30px;margin-left:18px;">正在审批步骤：财务审批</div>
+        </div>
+
+
+        <div v-if="oaflag_dt=='否决'">
+          <div style="font-weight:bold;color:#f00">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-weiwancheng"></use>
+            </svg>
+            审批流程已否决
+          </div>
+          <div style="color:#888;line-height:30px;margin-left:18px;">否决步骤：财务审批</div>
+        </div>
+
 
+        <div v-if="oaflag_dt=='通过'">
+          <div style="font-weight:bold">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-zhengque1"></use>
+            </svg>
+            审批流程已通过
+          </div>
+          <div style="color:#888;line-height:30px;margin-left:18px;">共耗时1天16小时</div>
+        </div>
+
+        <div style="display:flex">
+          <div style="color:#6495ed;margin:10px auto 0 auto ">查看详细审批情况</div>
+        </div>
+      </div>
 
       <div class="liubai_dt"></div>
       <!-- <div class="mxjdinfo">*点击明细可查看明细产品进度</div> -->
@@ -362,28 +400,32 @@
             <div style="flex:0 0 25%;text-align: center;line-height:34px">累计采购量</div>
           </div>
 
-          <div style="display:flex;margin-top:5px;border-bottom: 1px solid #eee;line-height:35px;font-size:13px;align-items: center;">
+          <div
+            style="display:flex;margin-top:5px;border-bottom: 1px solid #eee;line-height:35px;font-size:13px;align-items: center;">
             <div style="flex:0 0 25%;text-align: center;">某某纸箱厂</div>
             <div style="flex:0 0 25%;text-align: center;">8.33元/个</div>
             <div style="flex:0 0 25%;text-align: center;">2019/8/1</div>
             <div style="flex:0 0 25%;text-align: center;">7000个</div>
           </div>
 
-          <div style="display:flex;margin-top:5px;border-bottom: 1px solid #eee;line-height:35px;font-size:13px;align-items: center;">
+          <div
+            style="display:flex;margin-top:5px;border-bottom: 1px solid #eee;line-height:35px;font-size:13px;align-items: center;">
             <div style="flex:0 0 25%;text-align: center;">天天纸箱厂</div>
             <div style="flex:0 0 25%;text-align: center;">9.2元/个</div>
             <div style="flex:0 0 25%;text-align: center;">2019/8/1</div>
             <div style="flex:0 0 25%;text-align: center;">500个</div>
           </div>
 
-          <div style="display:flex;margin-top:5px;border-bottom: 1px solid #eee;line-height:35px;font-size:13px;align-items: center;">
+          <div
+            style="display:flex;margin-top:5px;border-bottom: 1px solid #eee;line-height:35px;font-size:13px;align-items: center;">
             <div style="flex:0 0 25%;text-align: center;">景田纸箱厂</div>
             <div style="flex:0 0 25%;text-align: center;">8.8元/个</div>
             <div style="flex:0 0 25%;text-align: center;">2019/8/1</div>
             <div style="flex:0 0 25%;text-align: center;">600个</div>
           </div>
 
-          <div style="display:flex;margin-top:5px;border-bottom: 1px solid #eee;line-height:35px;font-size:13px;align-items: center;">
+          <div
+            style="display:flex;margin-top:5px;border-bottom: 1px solid #eee;line-height:35px;font-size:13px;align-items: center;">
             <div style="flex:0 0 25%;text-align: center;">东南纸箱厂</div>
             <div style="flex:0 0 25%;text-align: center;">9.6元/个</div>
             <div style="flex:0 0 25%;text-align: center;">2019/7/1</div>
@@ -395,6 +437,316 @@
 
     </div>
 
+
+    <!-- 弹出审批流程进度界面 -->
+    <div v-if="ifoaview==1">
+      <div class="quote_edit_mask"></div>
+      <div style="z-index: 9999;position: fixed;bottom: 0px;height: 95%;width: 100%;font-size:14px;padding: 10px 0">
+        <div
+          style="width:95%;background-color: #fff;margin:0 auto;height: 100%;    border-radius: 15px;overflow:hidden;">
+
+          <!-- 顶部造型图片 -->
+          <!-- <div style="text-align: center;">
+            <img src="../assets/ui_toppic.jpg" style="display: inline-block;height: auto;max-width: 100%;"
+              v-if="oaflag_dt=='处理中'">
+            </img>
+            <img src="../assets/ui_toppic_red.jpg" style="display: inline-block;height: auto;max-width: 100%;"
+              v-if="oaflag_dt=='否决'">
+            </img>
+            <img src="../assets/ui_toppic_green.jpg" style="display: inline-block;height: auto;max-width: 100%;"
+              v-if="oaflag_dt=='通过'">
+            </img>
+          </div> -->
+
+          <div style="width:100%;height:168px;overflow:hidden;" :class="pic_bg_color">
+            <div class="wave_one" :class="wave_color"></div>
+            <div class="wave_two" :class="wave_color"></div>
+            <div class="wave_three" :class="wave_color"></div>
+          </div>
+
+          <!-- 图片 -->
+          <div class="pic_warp">
+            <div style="text-align: center;">
+              <img src="../assets/toppic.png" style="display: inline-block;max-width:200px;"> </img> </div>
+          </div>
+
+          <!-- 关闭按钮 -->
+          <div style="position: absolute;top:15px;right: 6%;color: #f0f0f0;font-size: 12px;line-height:26px;">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-guanbi"></use>
+            </svg>
+          </div>
+
+          <!-- 左边状态角标 -->
+          <div v-if="oaflag_dt=='处理中'"
+            style="position: absolute;top:40px;background-color:#d8ebf9;color:#0679b2;padding:2px 8px;font-weight:bold;font-size:14px;box-shadow: 1px 2px 7px rgba(0, 0, 0, 0.3);">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-dengdai1"></use>
+            </svg>
+            {{oaflag_dt}}
+          </div>
+
+          <div v-if="oaflag_dt=='通过'"
+            style="position: absolute;top:40px;background-color:#ebfbd4;color:#88b04b;padding:2px 8px;font-weight:bold;font-size:14px;box-shadow: 1px 2px 7px rgba(0, 0, 0, 0.3);">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-zhengque1"></use>
+            </svg>
+            {{oaflag_dt}}
+          </div>
+
+          <div v-if="oaflag_dt=='否决'"
+            style="position: absolute;top:40px;background-color:#fee7e5;color:#ff6f61;padding:2px 8px;font-weight:bold;font-size:14px;box-shadow: 1px 2px 7px rgba(0, 0, 0, 0.3);">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-weiwancheng"></use>
+            </svg>
+            {{oaflag_dt}}
+          </div>
+
+          <!-- 审批流程状态 -->
+          <div style="display:flex;margin:10px 0 0 0;align-items: center;">
+            <!-- <div style="background-color:#d8ebf9;color:#0269b8;margin:0 0 0 20px;padding:2px 8px;font-size:12px"
+              v-if="oaflag_dt!='否决'">
+              {{oaflag_dt}}
+            </div>
+
+            <div style="background-color:#fdd1cd;color:#ff6f61;margin:0 0 0 20px;padding:2px 8px;font-size:12px"
+              v-if="oaflag_dt=='否决'">
+              {{oaflag_dt}}
+            </div> -->
+
+            <div style="position: absolute;right:5%;color:#888;font-size:12px" v-if="oaflag_dt=='处理中'">已审批了1天14小时
+            </div>
+            <div style="position: absolute;right:5%;color:#888;font-size:12px" v-if="oaflag_dt!='处理中'">审批耗时1天7小时
+            </div>
+          </div>
+
+          <!-- 审批流程主体内容 -->
+          <div style="margin:15px 0 0 0 ">
+
+            <div class="oaview_emp">
+              <div class="oaview_emp_title">
+                <span class="oaview_emp_list_icon">
+                  <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-zhengque1"></use>
+                  </svg>
+                </span>
+
+                <span>
+                  发起审批
+                </span>
+              </div>
+
+              <div class="oaview_emp_list">
+                <div>
+                  黎小娟
+                </div>
+
+                <div class="oaview_emp_list_time">
+                  8/12 09:23
+                </div>
+
+                <div class="oaview_emp_list_from oaview_emp_list_from_pc">
+                  <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-diannao"></use>
+                  </svg>
+                  PC
+                </div>
+              </div>
+
+              <div class="oaview_emp_title">
+                <span class="oaview_emp_list_icon">
+                  <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-zhengque1"></use>
+                  </svg>
+                </span>
+
+                <span>
+                  主管审批
+                </span>
+              </div>
+
+              <div class="oaview_emp_list">
+                <div>
+                  <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-buzhoutiaowancheng"></use>
+                  </svg>
+                  李子雄
+                </div>
+                <div class="oaview_emp_list_time">
+                  8/12 10:12
+                </div>
+                <div class="oaview_emp_list_from oaview_emp_list_from_app">
+                  <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-tel"></use>
+                  </svg>
+                  移动端
+                </div>
+              </div>
+
+              <div class="oaview_emp_list oaview_emp_list_gray">
+                <div>
+                  <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-buzouweijinxing"></use>
+                  </svg>
+                  杨李玉
+                </div>
+              </div>
+
+              <!-- 当前审批步骤：红字 oaview_emp_list_red -->
+              <div class="oaview_emp_title" :class="ban_red">
+                <span class="oaview_emp_list_icon">
+                  <svg class="icon" aria-hidden="true" v-if="oaflag_dt=='否决'">
+                    <use xlink:href="#icon-weiwancheng"></use>
+                  </svg>
+
+                  <svg class="icon" aria-hidden="true" v-if="oaflag_dt=='处理中'">
+                    <use xlink:href="#icon-dengdai1"></use>
+                  </svg>
+
+                  <svg class="icon" aria-hidden="true" v-if="oaflag_dt=='通过'">
+                    <use xlink:href="#icon-zhengque1"></use>
+                  </svg>
+                </span>
+
+                <span>
+                  财务审批<span v-if="oaflag_dt=='处理中'"> (正在审批)</span>
+                </span>
+
+
+
+
+              </div>
+
+              <div class="oaview_emp_list">
+                <div>
+                  <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-kongjianyixuan"></use>
+                  </svg>
+                  王小千
+                </div>
+                <div class="oaview_emp_list_time">
+                  8/12 10:32
+                </div>
+                <div class="oaview_emp_list_from oaview_emp_list_from_app">
+                  <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-tel"></use>
+                  </svg>
+                  移动端
+                </div>
+
+              </div>
+
+
+              <div class="oaview_emp_list" :class="ban_red">
+                <div>
+                  <svg class="icon" aria-hidden="true" v-if="oaflag_dt=='否决'">
+                    <use xlink:href="#icon-cuowu"></use>
+                  </svg>
+                  <svg class="icon" aria-hidden="true" v-if="oaflag_dt=='处理中'">
+                    <use xlink:href="#icon-kongjianweixuan"></use>
+                  </svg>
+                  <svg class="icon" aria-hidden="true" v-if="oaflag_dt=='通过'">
+                    <use xlink:href="#icon-kongjianyixuan"></use>
+                  </svg>
+                  冯子茹
+                </div>
+                <div class="oaview_emp_list_time" v-if="oaflag_dt=='通过'">
+                  8/12 10:40
+                </div>
+
+                <!-- 当前审批步骤显示为红色，否决状态下，否决那一行的步骤也是红字加粗，否决时间也显示为红色（常规状态下审批时间用的是灰色） -->
+                <div class="oaview_emp_list_time " style="color:#f00" v-if="oaflag_dt=='否决'">
+                  8/13 16:30
+                </div>
+
+                <div class="oaview_emp_list_from oaview_emp_list_from_app" v-if="oaflag_dt!='处理中'">
+                  <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-tel"></use>
+                  </svg>
+                  移动端
+                </div>
+              </div>
+
+              <div style="padding:0 0 5px 43px;color:#ef250f;font-size:12px" v-if="oaflag_dt=='否决'">
+                否决理由：该客户上批货款还未结清。
+              </div>
+
+              <div class="oaview_emp_list" :class="response_band">
+                <div>
+                  <svg class="icon" aria-hidden="true" v-if="oaflag_dt!='通过'">
+                    <use xlink:href="#icon-kongjianweixuan"></use>
+                  </svg>
+                  <svg class="icon" aria-hidden="true" v-if="oaflag_dt=='通过'">
+                    <use xlink:href="#icon-kongjianyixuan"></use>
+                  </svg>
+                  关敏霞
+                </div>
+                <div class="oaview_emp_list_time" v-if="oaflag_dt=='通过'">
+                  8/12 10:39
+                </div>
+                <div class="oaview_emp_list_from oaview_emp_list_from_pc" v-if="oaflag_dt=='通过'">
+                  <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-diannao"></use>
+                  </svg>
+                  PC
+                </div>
+              </div>
+
+
+
+
+              <!-- 如果是否决，则否决步骤之后的全部步骤，样式均处理为 删除线+浅灰色，表示之后的步骤已经没用了  class是oaview_emp_list_gray -->
+              <div class="oaview_emp_title">
+                <span class="oaview_emp_list_icon">
+                  <svg class="icon" aria-hidden="true" v-if="oaflag_dt!='通过'">
+                    <use xlink:href="#icon-jianzhanbuzhouweiwan"></use>
+                  </svg>
+
+                  <svg class="icon" aria-hidden="true" v-if="oaflag_dt=='通过'">
+                    <use xlink:href="#icon-zhengque1"></use>
+                  </svg>
+                </span>
+
+                <span :class="response_band">
+                  经理审批
+                </span>
+              </div>
+
+              <div class="oaview_emp_list" :class="response_band">
+                <div>
+                  <svg class="icon" aria-hidden="true" v-if="oaflag_dt=='通过'">
+                    <use xlink:href="#icon-kongjianyixuan"></use>
+                  </svg>
+                  张建国(马浩文 代理)
+                </div>
+                <div class="oaview_emp_list_time" v-if="oaflag_dt=='通过'">
+                  18/13 16:32
+                </div>
+                <div class="oaview_emp_list_from oaview_emp_list_from_app" v-if="oaflag_dt=='通过'">
+                  <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-tel"></use>
+                  </svg>
+                  移动端
+                </div>
+              </div>
+
+            </div>
+
+          </div>
+
+          <!-- 催办按钮 -->
+          <div
+            style="background-color:#0074d9;position: absolute;bottom:30px;right:30px;text-align: center;padding:10px 40px;color:#fff;font-weight:bold;border-radius: 5px;box-shadow: 0 2px 7px rgba(0, 0, 0, 0.3);"
+            v-if="oaflag_dt=='处理中'">
+            催办
+          </div>
+
+        </div>
+
+
+      </div>
+    </div>
+
   </div>
 </template>
 
@@ -404,9 +756,11 @@
     name: 'buytaskDetail',
     data() {
       return {
-        taskflag_dt: '在进行',
+        taskflag_dt: '在进行', //在进行,待审核
         ifnew: 1,
-        ifmx: 0 //0-不弹出明细相关信息 1-数量相关信息 2-价格相关信息
+        oaflag_dt: "处理中", //处理中,通过,否决
+        ifmx: 0, //0-不弹出明细相关信息 1-数量相关信息 2-价格相关信息
+        ifoaview: 1 //0-不弹出审批流程界面 1-弹出
       };
     },
     methods: {
@@ -429,6 +783,30 @@
           bgcolorblue: this.taskflag_dt == "已完成"
         };
       },
+      response_band: function () {
+        return {
+          oaview_emp_list_gray: this.oaflag_dt == "否决"
+        };
+      },
+      ban_red: function () {
+        return {
+          oaview_emp_list_red: this.oaflag_dt == "否决"
+        };
+      },
+      wave_color: function () {
+        return {
+          wave_red: this.oaflag_dt == "否决",
+          wave_blue: this.oaflag_dt == "处理中",
+          wave_green: this.oaflag_dt == "通过"
+        };
+      },
+      pic_bg_color: function () {
+        return {
+          pic_bg_red: this.oaflag_dt == "否决",
+          pic_bg_blue: this.oaflag_dt == "处理中",
+          pic_bg_green: this.oaflag_dt == "通过"
+        };
+      }
     }
   }
 
@@ -695,4 +1073,129 @@
     z-index: 9998;
   }
 
+
+  /* 审核流程查看界面相关css */
+  .oaview_emp {
+    padding: 0 0 0 15px;
+  }
+
+  .oaview_emp_title {
+    margin: 5px 0;
+    font-weight: bold;
+  }
+
+  .oaview_emp_list {
+    display: flex;
+    line-height: 25px;
+    margin: 0 0 0 25px;
+  }
+
+  .oaview_emp_name {
+    flex: 0 0 80px;
+  }
+
+  .oaview_emp_list_from {
+    margin: 0 0 0 8px;
+    font-size: 12px;
+  }
+
+  .oaview_emp_list_from_pc {
+    color: #0281ed;
+  }
+
+  .oaview_emp_list_from_app {
+    color: #7ba62c;
+  }
+
+  .oaview_emp_list_red {
+    color: #F00;
+    /* font-weight: bold; */
+  }
+
+  .oaview_emp_list_gray {
+    color: #aaa;
+    text-decoration: line-through
+  }
+
+  .oaview_emp_list_icon {
+    margin: 0 5px 0 0;
+    font-size: 17px;
+  }
+
+  .oaview_emp_list_time {
+    color: #888;
+    font-weight: 400;
+    margin: 0 0 0 8px;
+  }
+
+
+  /* 顶部造型css */
+  .wave_one {
+    width: 180%;
+    height: 180%;
+    background-color: #fec1c1;
+    opacity: 0.3;
+    border-radius: 50%;
+    position: relative;
+    top: 98px;
+    left: -40%;
+    z-index: 9990;
+  }
+
+  .wave_two {
+    width: 180%;
+    height: 180%;
+    background-color: #fec1c1;
+    opacity: 0.4;
+    border-radius: 50%;
+    position: relative;
+    top: -183px;
+    left: -40%;
+    z-index: 9991;
+  }
+
+  .wave_three {
+    width: 160%;
+    height: 160%;
+    background-color: #fec1c1;
+    opacity: 0.5;
+    border-radius: 50%;
+    position: relative;
+    top: -468px;
+    left: -30%;
+    z-index: 9991;
+  }
+
+  .pic_warp {
+    position: absolute;
+    top: 38px;
+    width: 95%;
+    z-index: 9998;
+  }
+
+  .wave_green {
+    background-color: #d2f3a2;
+  }
+
+  .pic_bg_green {
+    background-color: #88b14b;
+  }
+
+  .wave_blue {
+    background-color: #82bcd8;
+  }
+
+  .pic_bg_blue {
+    background-color: #0679b2;
+  }
+
+
+  .wave_red {
+    background-color: #fec1c1;
+  }
+
+  .pic_bg_red {
+    background-color: #fa5a5a;
+  }
+
 </style>

src/pages/components/tasklist.vue

@@ -83,6 +83,7 @@
     <div class="arrow_box ">
       <div class="task_date_inner">8/6 16:00-18:00</div>
       <div class="task_conner tip_blue">已完成</div>
+      <!-- <div class="task_conner tip_red">待办</div> -->
       <div class="task_dscrp">
         <div>跟设计公司沟通，定最新一季宣传画册的最终设计。</div>
       </div>
@@ -131,23 +132,23 @@
     right: 0px;
     top: 0px;
     color: #888;
-    font-size: 8px;
-    padding: 5px;
+    font-size: 12px;
+    padding: 4px 10px;
     background-color: #ececec;
-    line-height: 8px;
+    line-height: 12px;
     width: 36px;
-    text-align: center
+    text-align: center;
   }
 
   .task_conner_sec {
     position: absolute;
-    right: 50px;
+    right: 60px;
     top: 0px;
     color: #888;
-    font-size: 8px;
-    padding: 5px;
+    font-size: 12px;
+    padding: 4px 10px;
     background-color: #ececec;
-    line-height: 8px;
+    line-height: 12px;
     width: 36px;
     text-align: center
   }

src/pages/l1todolist.vue

@@ -15,7 +15,7 @@
 
     <!-- 日历 -->
     <div style="padding:0 0 60px 0 ">
-      <div class="todo_img_wap">
+      <div class="todo_img_wap" v-if="todotype==0">
         <div style="flex:0 0 100%;margin: 0 auto;">
           <img src="../assets/task_date_2.jpg" class="todo_img" v-if="datetype==0"></img>
           <img src="../assets/task_date_1.jpg" class="todo_img" v-if="datetype==1"></img>
@@ -157,6 +157,7 @@
           <div class="arrow_box ">
             <div class="task_date_inner">8/6 16:24</div>
             <div class="task_conner tip_red">待审批</div>
+            <div class="task_conner_sec tip_red">催办</div>
             <div class="task_dscrp">
               <div>年假申请，2019年9月1日至2019年9月7日共7天，望批准。</div>
             </div>
@@ -316,7 +317,7 @@
 
   .todo_top_cnt {
     position: absolute;
-    left: 230px;
+    left: 63%;
     height: 2px;
     width: 2px;
     font-weight: bold;
@@ -378,6 +379,7 @@
   .todo_mid_selection {
     display: flex;
     color: #888;
+    margin:10px 0;
     box-shadow: 0 2px 3px rgba(0, 0, 0, 0.102);
   }
 
@@ -419,23 +421,23 @@
     right: 0px;
     top: 0px;
     color: #888;
-    font-size: 8px;
-    padding: 5px;
+    font-size: 12px;
+    padding: 4px 10px;
     background-color: #ececec;
-    line-height: 8px;
+    line-height: 12px;
     width: 36px;
-    text-align: center
+    text-align: center;
   }
 
   .task_conner_sec {
     position: absolute;
-    right: 50px;
+    right: 60px;
     top: 0px;
     color: #888;
-    font-size: 8px;
-    padding: 5px;
+    font-size: 12px;
+    padding: 4px 10px;
     background-color: #ececec;
-    line-height: 8px;
+    line-height: 12px;
     width: 36px;
     text-align: center
   }

src/pages/oaview.vue

@@ -82,98 +82,219 @@
             <div style="font-size:14px;color:#6495ed;margin: 10px auto 0 auto">查看单据详细信息</div>
           </div>
 
+          <div style="font-size:14px;margin:20px 0 0 20px;color:#fc4f4f">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-jinggao"></use>
+            </svg>
+            黎小娟于8月13日16:38发起催办，请抓紧处理。</div>
+
         </div>
 
 
         <div class="liubai_dt"></div>
 
         <div class="oaview_emp">
-          <div class="oaview_emp_list">
-            <div class="oaview_emp_list_icon">
+          <div class="oaview_emp_title">
+            <span class="oaview_emp_list_icon">
               <svg class="icon" aria-hidden="true">
-                <use xlink:href="#icon-tongguo"></use>
+                <use xlink:href="#icon-zhengque1"></use>
               </svg>
-            </div>
+            </span>
+
+            <span>
+              发起审批
+            </span>
+          </div>
 
+          <div class="oaview_emp_list">
             <div>
-              发起审批：黎小娟
+              黎小娟
             </div>
 
             <div class="oaview_emp_list_time">
-              2019-08-12 09:23
+              8/12 09:23
+            </div>
+            <div class="oaview_emp_list_from oaview_emp_list_from_pc">
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-diannao"></use>
+              </svg>
+              PC
             </div>
           </div>
 
-          <div class="oaview_emp_list">
-            <div class="oaview_emp_list_icon">
+          <div class="oaview_emp_title">
+            <span class="oaview_emp_list_icon">
               <svg class="icon" aria-hidden="true">
-                <use xlink:href="#icon-tongguo"></use>
+                <use xlink:href="#icon-zhengque1"></use>
               </svg>
-            </div>
+            </span>
 
+            <span>
+              主管审批
+            </span>
+          </div>
+
+          <div class="oaview_emp_list">
             <div>
-              主管审批：李子雄
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-buzhoutiaowancheng"></use>
+              </svg>
+              李子雄
             </div>
             <div class="oaview_emp_list_time">
-              2019-08-12 10:12
+              8/12 10:12
+            </div>
+            <div class="oaview_emp_list_from oaview_emp_list_from_app">
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-tel"></use>
+              </svg>
+              移动端
             </div>
           </div>
 
-          <!-- 当前审批步骤：红字加粗 oaview_emp_list_red -->
-          <div class="oaview_emp_list oaview_emp_list_red">
-            <div class="oaview_emp_list_icon">
+          <div class="oaview_emp_list oaview_emp_list_gray">
+            <div>
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-buzouweijinxing"></use>
+              </svg>
+              杨李玉
+            </div>
+          </div>
+
+          <!-- 当前审批步骤：红字 oaview_emp_list_red -->
+          <div class="oaview_emp_title" :class="ban_red">
+            <span class="oaview_emp_list_icon">
               <svg class="icon" aria-hidden="true" v-if="oaflag_dt=='否决'">
-                <use xlink:href="#icon-butongguo"></use>
+                <use xlink:href="#icon-weiwancheng"></use>
               </svg>
 
               <svg class="icon" aria-hidden="true" v-if="oaflag_dt=='处理中'">
-                <use xlink:href="#icon-buzouweijinxing"></use>
+                <use xlink:href="#icon-dengdai1"></use>
               </svg>
 
               <svg class="icon" aria-hidden="true" v-if="oaflag_dt=='通过'">
-                <use xlink:href="#icon-tongguo"></use>
+                <use xlink:href="#icon-zhengque1"></use>
               </svg>
-            </div>
+            </span>
+
+            <span>
+              财务审批<span v-if="oaflag_dt=='处理中'"> (正在审批)</span>
+            </span>
+
+
 
+
+          </div>
+
+          <div class="oaview_emp_list">
             <div>
-              财务审批：王小千<span v-if="oaflag_dt=='处理中'"> (正在审批)</span>
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-kongjianyixuan"></use>
+              </svg>
+              王小千
             </div>
+            <div class="oaview_emp_list_time">
+              8/12 10:32
+            </div>
+            <div class="oaview_emp_list_from oaview_emp_list_from_app">
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-tel"></use>
+              </svg>
+              移动端
+            </div>
+          </div>
 
+
+          <div class="oaview_emp_list" :class="ban_red">
+            <div>
+              <svg class="icon" aria-hidden="true" v-if="oaflag_dt=='否决'">
+                <use xlink:href="#icon-cuowu"></use>
+              </svg>
+              <svg class="icon" aria-hidden="true" v-if="oaflag_dt=='处理中'">
+                <use xlink:href="#icon-kongjianweixuan"></use>
+              </svg>
+              <svg class="icon" aria-hidden="true" v-if="oaflag_dt=='通过'">
+                <use xlink:href="#icon-kongjianyixuan"></use>
+              </svg>
+              冯子茹
+            </div>
             <div class="oaview_emp_list_time" v-if="oaflag_dt=='通过'">
-              2019-08-12 10:32
+              8/12 10:40
             </div>
 
-            <!-- 当前审批步骤显示为红色并加粗，否决状态下，否决那一行的步骤也是红字加粗，否决时间也显示为红色（常规状态下审批时间用的是灰色） -->
+            <!-- 当前审批步骤显示为红色，否决状态下，否决那一行的步骤也是红字加粗，否决时间也显示为红色（常规状态下审批时间用的是灰色） -->
             <div class="oaview_emp_list_time " style="color:#f00" v-if="oaflag_dt=='否决'">
-              2019-08-12 11:12
+              8/12 11:12
+            </div>
+
+            <div class="oaview_emp_list_from oaview_emp_list_from_app" v-if="oaflag_dt!='处理中'">
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-tel"></use>
+              </svg>
+              移动端
             </div>
           </div>
 
-          <div style="padding:0 0 0 25px;color:#ef250f;font-size:12px" v-if="oaflag_dt=='否决'">
+          <div style="padding:0 0 5px 48px;color:#ef250f;font-size:12px" v-if="oaflag_dt=='否决'">
             否决理由：该客户上批货款还未结清。
           </div>
 
+          <div class="oaview_emp_list" :class="response_band">
+            <div>
+              <svg class="icon" aria-hidden="true" v-if="oaflag_dt!='通过'">
+                <use xlink:href="#icon-kongjianweixuan"></use>
+              </svg>
+              <svg class="icon" aria-hidden="true" v-if="oaflag_dt=='通过'">
+                <use xlink:href="#icon-kongjianyixuan"></use>
+              </svg>
+              关敏霞
+            </div>
+            <div class="oaview_emp_list_time" v-if="oaflag_dt=='通过'">
+              8/12 10:39
+            </div>
+            <div class="oaview_emp_list_from oaview_emp_list_from_pc" v-if="oaflag_dt=='通过'">
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-diannao"></use>
+              </svg>
+              PC
+            </div>
+          </div>
+
+
+
 
           <!-- 如果是否决，则否决步骤之后的全部步骤，样式均处理为 删除线+浅灰色，表示之后的步骤已经没用了  class是oaview_emp_list_gray -->
-          <div class="oaview_emp_list" :class="response_band">
-            <div class="oaview_emp_list_icon">
+          <div class="oaview_emp_title">
+            <span class="oaview_emp_list_icon">
               <svg class="icon" aria-hidden="true" v-if="oaflag_dt!='通过'">
-                <use xlink:href="#icon-buzouweijinxing"></use>
+                <use xlink:href="#icon-jianzhanbuzhouweiwan"></use>
               </svg>
 
               <svg class="icon" aria-hidden="true" v-if="oaflag_dt=='通过'">
-                <use xlink:href="#icon-tongguo"></use>
+                <use xlink:href="#icon-zhengque1"></use>
               </svg>
-            </div>
+            </span>
 
+            <span :class="response_band">
+              经理审批
+            </span>
+          </div>
+
+          <div class="oaview_emp_list" :class="response_band">
             <div>
-              经理审批：张建国
+              张建国(马浩文 代理)
             </div>
-
             <div class="oaview_emp_list_time" v-if="oaflag_dt=='通过'">
-              2019-08-12 11:32
+              8/12 11:32
+            </div>
+            <div class="oaview_emp_list_from oaview_emp_list_from_app" v-if="oaflag_dt=='通过'">
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-tel"></use>
+              </svg>
+              移动端
             </div>
           </div>
+
         </div>
 
 
@@ -244,7 +365,7 @@
     data() {
       return {
         tasktype: 0, //0-单据审批 1-公文审批
-        oaflag_dt: "处理中", //处理中,通过,否决
+        oaflag_dt: "否决", //处理中,通过,否决
         ifresponse: 0, //弹窗 0-不弹  1-同意 2-否决
         iffg: 0 //0-不是返工 1-返工
       }
@@ -272,6 +393,11 @@
         return {
           oaview_emp_list_gray: this.oaflag_dt == "否决"
         };
+      },
+      ban_red: function () {
+        return {
+          oaview_emp_list_red: this.oaflag_dt == "否决"
+        };
       }
     }
 
@@ -291,14 +417,20 @@
     padding: 0px 20px;
   }
 
+  .oaview_emp_title {
+    margin: 5px 0;
+    font-weight: bold;
+  }
+
   .oaview_emp_list {
     display: flex;
-    line-height: 40px;
+    line-height: 25px;
+    margin: 0 0 0 30px;
   }
 
   .oaview_emp_list_red {
     color: #F00;
-    font-weight: bold;
+    /* font-weight: bold; */
   }
 
   .oaview_emp_list_gray {
@@ -308,6 +440,7 @@
 
   .oaview_emp_list_icon {
     margin: 0 10px 0 0;
+    font-size: 17px;
   }
 
   .oaview_emp_list_time {
@@ -316,6 +449,20 @@
     margin: 0 0 0 10px;
   }
 
+
+  .oaview_emp_list_from {
+    margin: 0 0 0 8px;
+    font-size: 12px;
+  }
+
+  .oaview_emp_list_from_pc {
+    color: #0281ed;
+  }
+
+  .oaview_emp_list_from_app {
+    color: #7ba62c;
+  }
+
   .oaview_iffg {
     background-color: #fdd1cd;
     color: #ff6f61;
@@ -571,7 +718,7 @@
     font-size: 16px;
     font-weight: bold;
     text-align: center;
-    padding: 8px;
+    padding: 10px;
     width: 100%;
   }
 

src/pages/quote_edit_pad.vue

@@ -388,7 +388,7 @@
     font-size: 16px;
     font-weight: bold;
     text-align: center;
-    padding: 8px;
+    padding: 10px;
   }
 
 </style>

src/pages/quoteedit_bak0516.vue

@@ -496,7 +496,7 @@
     font-size: 16px;
     font-weight: bold;
     text-align: center;
-    padding: 8px;
+    padding: 10px;
   }
 
 </style>

src/pages/setting.vue

@@ -1,14 +1,20 @@
 <template>
   <div class="setting">
+    <div style="text-align: center;">
+      <img src="../assets/setting_toppic.jpg" style="display: inline-block;max-width:100%;"> </img>
+    </div>
+
+
     <div class="setting_userinfo">
+
       <div class="setting_userinfo_avatar">耀</div>
       <div class="setting_userinfo_name">
-        <div class="setting_userinfo_name_name">邓永耀</div>
         <div class="setting_userinfo_name_id">longjoedyy</div>
+        <div class="setting_userinfo_name_name">邓永耀</div>
       </div>
     </div>
 
-    <div class="setting_liubai"></div>
+    <!-- <div class="setting_liubai"></div> -->
 
     <div class="setting_list">
       <!-- <div class="setting_list_item setting_list_item_border">
@@ -26,6 +32,20 @@
         </div>
       </div> -->
 
+      <div class="setting_list_item setting_list_item_border">
+        <div class="setting_list_item_icon">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-faxian-xiaozu"></use>
+          </svg>
+        </div>
+        <div class="setting_list_item_name">审批代理</div>
+        <div class="setting_list_item_right">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-iconfontjiantou2"></use>
+          </svg>
+        </div>
+      </div>
+
       <div class="setting_list_item setting_list_item_border">
         <div class="setting_list_item_icon">
           <svg class="icon" aria-hidden="true">
@@ -55,7 +75,7 @@
         </div>
       </div>
 
-      <div class="setting_list_item">
+      <div class="setting_list_item setting_list_item_border">
         <div class="setting_list_item_icon">
           <svg class="icon" aria-hidden="true">
             <use xlink:href="#icon-guanyuwomen"></use>
@@ -68,46 +88,60 @@
           </svg>
         </div>
       </div>
+
+      <div class="setting_relogin">退出当前帐号</div>
     </div>
-    <div class="setting_liubai"></div>
-    <div class="setting_relogin">退出当前帐号</div>
 
-    <!-- <div class="todo-tab">
-      <div class="todo-tab-btn">
-        <div class="todo-tab-icon">
+    <!-- 底部按钮 -->
+    <div class="todolist-tab">
+      <div class="todolist-tab-btn">
+        <div class="todolist-tab-icon">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-home"></use>
+          </svg>
+        </div>
+        首页
+      </div>
+      <div class="todolist-tab-btn  ">
+        <div class="todolist-tab-icon">
           <svg class="icon" aria-hidden="true">
-            <use xlink:href="#icon-jindu"></use>
+            <use xlink:href="#icon-format-list-bulleted"></use>
           </svg>
         </div>
-        <div class="todo-tab-count">12</div>
-        待接收
+        <div class="todolist-tab-count">9</div>
+        待办
       </div>
-       <div class="todo-tab-btn">
-        <div class="todo-tab-icon">
+
+
+      <div class="todolist-tab-btn">
+        <div class="todolist-tab-icon">
           <svg class="icon" aria-hidden="true">
-            <use xlink:href="#icon-dengdai"></use>
+            <use xlink:href="#icon-google-drive"></use>
           </svg>
         </div>
-        <div class="todo-tab-count">9</div>
-        待回复
-      </div>     
-      <div class="todo-tab-btn">
-        <div class="todo-tab-icon">
+        功能
+      </div>
+
+      <div class="todolist-tab-btn">
+        <div class="todolist-tab-icon">
           <svg class="icon" aria-hidden="true">
-            <use xlink:href="#icon-yingyongguanli"></use>
+            <use xlink:href="#icon-email-outline"></use>
           </svg>
         </div>
-        全部
+        <div class="todolist-tab-count">5</div>
+        消息
       </div>
-      <div class="todo-tab-btn   todo-tab-btn-on">
-        <div class="todo-tab-icon">
+
+      <div class="todolist-tab-btn todolist-tab-btn-on">
+        <div class="todolist-tab-icon">
           <svg class="icon" aria-hidden="true">
-            <use xlink:href="#icon-kehu"></use>
+            <use xlink:href="#icon-account"></use>
           </svg>
         </div>
-        我
+        我的
       </div>
-    </div> -->
+    </div>
+
   </div>
 </template>
 <script>
@@ -122,48 +156,55 @@
   body {
     margin: 0;
     padding: 0;
-    background-color: rgb(246, 246, 246);
+    background-color: #fff;
     font-family: "微软雅黑";
   }
 
   .setting_userinfo {
-    background-color: #ffffff;
     display: flex;
-    padding: 20px
+    position: relative;
+    top: -40px;
+    /* left:10px; */
   }
 
   .setting_userinfo_avatar {
-    width: 70px;
-    height: 70px;
+    width: 60px;
+    height: 60px;
     border-radius: 50%;
     text-align: center;
-    line-height: 70px;
-    background-color: #ccc;
-    font-size: 35px;
+    line-height: 60px;
+    background-color: #c2c2c2;
+    font-size: 30px;
     font-weight: bold;
     color: #fff;
     margin-left: 10px;
     overflow: hidden;
+    border: 4px solid rgb(255, 255, 255, 0.8);
+    box-shadow: 0 0px 7px rgba(0, 0, 0, 0.3);
   }
 
   .setting_userinfo_name {
-    padding: 5px 20px;
+    padding: 15px 10px;
   }
 
   .setting_userinfo_name_name {
-    font-size: 20px;
+    font-size: 18px;
     font-weight: bold;
-    line-height: 40px;
+    line-height: 45px;
+    color: #666;
   }
 
   .setting_userinfo_name_id {
-    color: #838383;
-    font-size: 16px;
+    color: #fff;
+    font-size: 14px;
+    line-height: 14px;
   }
 
   .setting_list {
     background-color: #ffffff;
-    padding: 0 20px;
+    width: 100%;
+    position: relative;
+    top: -55px;
   }
 
   .setting_list_item {
@@ -171,7 +212,12 @@
     color: #606060;
     font-size: 15px;
     font-weight: bold;
-    line-height: 60px;
+    line-height: 55px;
+    padding: 0 0 0 20px;
+  }
+
+  .setting_list_item_icon {
+    font-size: 20px;
   }
 
   .setting_list_item_border {
@@ -200,8 +246,9 @@
     font-size: 18px;
     font-weight: bold;
     color: #e14123;
-    padding: 18px;
-    text-align: center
+    /* padding: 18px; */
+    text-align: center;
+    margin: 50px 0;
   }
 
 
@@ -255,4 +302,48 @@
     text-align: center;
   }
 
+/* 底部栏 */
+  .todolist-tab {
+    color: #666;
+    display: flex;
+    position: fixed;
+    bottom: 0;
+    background-color: #ffffff;
+    width: 100%;
+    z-index: 9999;
+    align-items: center;
+    justify-content: center;
+    padding: 5px 0 2px 0;
+    box-shadow: 0 -1px 3px #f1f1f1
+  }
+
+  .todolist-tab-btn {
+    font-size: 13px;
+    width: 25%;
+    text-align: center
+  }
+
+  .todolist-tab-btn-on {
+    color: #46a4da
+  }
+
+  .todolist-tab-icon {
+    font-size: 23px;
+  }
+
+  .todolist-tab-count {
+    position: absolute;
+    margin-left: 14%;
+    bottom: 30px;
+    font-size: 12px;
+    line-height: 12px;
+    width: 12px;
+    font-weight: bold;
+    color: #fff;
+    border-radius: 50%;
+    padding: 3px;
+    text-align: center;
+    background-color: #fc4f4f
+  }
+
 </style>

src/pages/task.vue

@@ -38,6 +38,8 @@
         </div>
       </div>
 
+
+
       <div class="task_title" style="margin-top:80px">当天</div>
       <div class="tasklist">
         <task-list></task-list>

src/pages/taskedit.vue

@@ -384,7 +384,7 @@
     font-size: 16px;
     font-weight: bold;
     text-align: center;
-    padding: 8px;
+    padding: 10px;
     width: 100%;
   }
 

src/pages/taskview.vue

@@ -30,7 +30,7 @@
 
       <div class="taskview_main">
         <div class="taskview_info">
-          <span class="taskview_iffg" v-if="iffg==1">返工</span><span v-if="tasktype==0">跟设计公司沟通，定好最新一季宣传画册的设计。</span>
+          <span v-if="tasktype==0">跟设计公司沟通，定好最新一季宣传画册的设计。</span>
           <span v-if="tasktype==1">了解客户上一批货的销售情况及质量反馈，并介绍本季最新产品。</span>
         </div>
 
@@ -112,11 +112,16 @@
         </div>
 
         <!-- 返工信息，根据此任务是否返工类型决定显示与否 -->
-        <div style="color:#888;font-size:12px;margin:10px 0 0 20px" v-if="iffg==1">
-          <svg class="icon" aria-hidden="true">
-            <use xlink:href="#icon-chakan"></use>
-          </svg>
-          查看原任务详细信息
+        <div v-if="iffg==1">
+          <div style="color:#fc4f4f;font-size:14px;margin:20px 0 0 20px;font-weight:bold">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-jinggao"></use>
+            </svg>
+            本任务为返工任务，请认真对待。
+          </div>
+          <div style="display:flex">
+            <div style="font-size:14px;color:#6495ed;margin: 10px auto 0 auto">查看原任务详细信息</div>
+          </div>
         </div>
 
         <!-- 客户信息 -->
@@ -408,10 +413,10 @@
     name: 'taskview',
     data() {
       return {
-        tasktype: 2, //0-临时任务 1-客户走访 2-稽核检查
-        taskflag_dt: "已验收", //未完成,待验收,已验收
-        ifresponse: 1, //弹窗 0：不弹  1：完成任务界面 2：验收任务界面
-        iffg: 0 //0-不是返工 1-返工
+        tasktype: 0, //0-临时任务 1-客户走访 2-稽核检查
+        taskflag_dt: "未完成", //未完成,待验收,已验收
+        ifresponse: 0, //弹窗 0：不弹  1：完成任务界面 2：验收任务界面
+        iffg: 1 //0-不是返工 1-返工
       }
     },
     computed: {
@@ -708,7 +713,7 @@
     font-size: 16px;
     font-weight: bold;
     text-align: center;
-    padding: 8px;
+    padding: 10px;
     width: 100%;
   }
 

src/pages/testcss.vue

@@ -0,0 +1,104 @@
+<template>
+  <div style="z-index: 9999;height: 95%;width: 100%;font-size:14px;padding: 10px 0">
+    <div style="width:95%;border-radius: 15px;overflow:hidden;margin:0 auto;">
+      <div style="width:100%;height:168px;overflow:hidden;background-color:#fa5a5a;">
+        <div class="wave_one"></div>
+        <div class="wave_two"></div>
+        <div class="wave_three"></div>
+        <!-- <div class="wave_four"></div>
+        <div class="wave_five"></div> -->
+      </div>
+
+      <!-- 图片 -->
+      <div class="pic_warp">
+        <div style="text-align: center;">
+          <img src="../assets/toppic.png" style="display: inline-block;max-width:200px;"> </img> </div>
+      </div>
+      <!-- 内容区域 -->
+      <div style="height:1400px;background-color:#fff">
+
+      </div>
+    </div>
+
+  </div>
+</template>
+<script>
+  export default {
+
+  }
+
+</script>
+<style>
+  body {
+    margin: 0;
+    padding: 0;
+    background-color: #ffffff;
+    font-family: "微软雅黑";
+  }
+
+  .wave_one {
+    width: 180%;
+    height: 180%;
+    background-color: rgb(254, 193, 193, 0.3);
+    border-radius: 50%;
+    position: relative;
+    top: 98px;
+    left: -40%;
+    z-index: 9990;
+  }
+
+  .wave_two {
+    width: 180%;
+    height: 180%;
+    background-color: rgb(254, 193, 193, 0.4);
+    border-radius: 50%;
+    position: relative;
+    top: -183px;
+    left: -40%;
+    z-index: 9991;
+  }
+
+  .wave_three {
+    width: 160%;
+    height: 160%;
+    background-color: rgb(254, 193, 193, 0.5);
+    border-radius: 50%;
+    position: relative;
+    top: -468px;
+    left: -30%;
+    z-index: 9991;
+  }
+
+
+  .wave_four {
+    width: 160%;
+    height: 160%;
+    background-color: rgb(254, 193, 193, 0.6);
+    border-radius: 50%;
+    position: relative;
+    top: -736px;
+    left: -30%;
+    z-index: 9991;
+  }
+
+
+  .wave_five {
+    width: 160%;
+    height: 160%;
+    background-color: rgb(254, 193, 193);
+    border-radius: 50%;
+    position: relative;
+    top: -990px;
+    left: -30%;
+    z-index: 9991;
+  }
+
+
+  .pic_warp {
+    position: absolute;
+    top: 30px;
+    width: 95%;
+    z-index: 9998;
+  }
+
+</style>

src/router/index.js

@@ -8,7 +8,7 @@ import Home from '@/pages/homenew'
 import Setting from '@/pages/setting'
 import Daily from '@/pages/daily'
 import Pushlist from '@/pages/pushlist'
-import About from '@/pages/about_nanfang'
+import About from '@/pages/about'
 import CsesSptTodo from '@/pages/cses_spt/todo'
 import CsesSptDetail from '@/pages/cses_spt/cses_spt_detail'
 import CsesSptFeedback from '@/pages/cses_spt/cses_spt_feedback'
@@ -36,6 +36,7 @@ import TaskView from '@/pages/taskview'
 import TodoList from '@/pages/l1todolist'
 import OaView from '@/pages/oaview'
 import Amerce from '@/pages/amerce'
+import Testcss from '@/pages/testcss'
 
 Vue.use(Router)
 
@@ -54,6 +55,14 @@ export default new Router({
         title: '工作任务'
       }
     },
+    {
+      path: '/testcss',
+      name: 'Testcss',
+      component: Testcss,
+      meta: {
+        title: '测试CSS'
+      }
+    },
     {
       path: '/buytaskdetail',
       name: 'BuyTaskDetail',