增加公文审批相关界面

src/assets/iconfont/demo_index.html

@@ -96,6 +96,12 @@
                 <div class="code-name">&amp;#xe61e;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe674;</span>
+                <div class="name">不通过</div>
+                <div class="code-name">&amp;#xe674;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe632;</span>
                 <div class="name">搜索</div>
@@ -840,6 +846,12 @@
                 <div class="code-name">&amp;#xe686;</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">&#xe636;</span>
                 <div class="name">导航</div>
@@ -1001,6 +1013,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-butongguo"></span>
+            <div class="name">
+              不通过
+            </div>
+            <div class="code-name">.icon-butongguo
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-sousuo"></span>
             <div class="name">
@@ -2117,6 +2138,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-tongguo"></span>
+            <div class="name">
+              通过
+            </div>
+            <div class="code-name">.icon-tongguo
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-icon_daohang-copy"></span>
             <div class="name">
@@ -2252,6 +2282,14 @@
                 <div class="code-name">#icon-guanyuwomen</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-butongguo"></use>
+                </svg>
+                <div class="name">不通过</div>
+                <div class="code-name">#icon-butongguo</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-sousuo"></use>
@@ -3244,6 +3282,14 @@
                 <div class="code-name">#icon-biaoqian1</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-tongguo"></use>
+                </svg>
+                <div class="name">通过</div>
+                <div class="code-name">#icon-tongguo</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-icon_daohang-copy"></use>

src/pages/about.vue

@@ -16,7 +16,7 @@
 
     <div class="about_wrap">
       <div class="about_logo">
-        <img src="../assets/longjia.png" class="about-img-responsive "></img>
+        <img src="../assets/lj_about.jpg" 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>
@@ -26,14 +26,26 @@
         <div class="about_lianxi_dept">总部</div>
         <div>地址：佛山市顺德区龙江镇西溪工业区雄塑科技大厦二楼</div>
         <div>电话：0757-23873986；23393986</div>
+
+        <div class="about_lianxi_dept">合资运营</div>
+        <div>深圳世绎文化科技有限公司 </div>
+        <div>联系人：李先生</div>
+        <div>电话：13691905622</div>
+
         <div class="about_lianxi_dept">成都分公司</div>
         <div>地址：成都市新都区龙桥镇</div>
         <div>联系人：唐先生</div>
         <div>电话：15528192207</div>
+
         <div class="about_lianxi_dept">广州番禺办事处</div>
         <div>地址：广州番禺奥园广场1号塔1108室 </div>
         <div>联系人：朱先生</div>
         <div>电话：13925944065</div>
+        
+        <div class="about_lianxi_dept">嘉兴办事处</div>
+        <div>地址：嘉兴优普信息技术有限公司 </div>
+        <div>联系人：顾先生</div>
+        <div>电话：18658818280</div>
       </div>
     </div>
   </div>
@@ -82,18 +94,18 @@
   }
 
   .about_wrap {
-    padding: 50px 0
+    padding: 45px 0
   }
 
   .about_logo {
     text-align: center;
-    margin: 10px
+    /* margin: 10px */
   }
 
   .about-img-responsive {
     display: inline-block;
     height: auto;
-    max-width: 60%;
+    max-width: 100%;
   }
 
   .about_liubai {
@@ -104,15 +116,15 @@
   }
 
   .about_content {
-    font-size: 16px;
+    font-size: 15px;
     color: #636363;
     padding: 10px 20px;
   }
 
   .about_lianxi{
-    font-size: 16px;
+    font-size: 15px;
     color: #636363;
-    padding:10px 20px
+    padding:0 20px 10px 20px
   }
 
   .about_lianxi_title{
@@ -123,7 +135,7 @@
   }
 
   .about_lianxi_dept{
-    font-size: 17px;
+    font-size: 15px;
     font-weight: bold;
     padding: 10px 0 0 0 ;
   }

src/pages/homenew.vue

@@ -17,7 +17,7 @@
           <svg class="icon" aria-hidden="true">
             <use xlink:href="#icon-xiaoxi"></use>
           </svg>
-          7月25日公司经营日报已出炉，欢迎查看！</div>
+          8月12日公司经营日报已出炉，欢迎查看！</div>
       </div>
 
 

src/pages/l1todolist.vue

@@ -1,133 +1,223 @@
 <template>
   <div>
     <div class="todo_top">
-      <div class="todo_selection">
+      <div class="todo_selection" v-if="todotype==0">
         <div class='todo_selection_check'>任务</div>
         <div style="margin-left:30px">公文</div>
         <div class="todo_top_cnt"></div>
       </div>
+
+      <div class="todo_selection" v-if="todotype==1">
+        <div>任务</div>
+        <div class='todo_selection_check' style="margin-left:30px">公文</div>
+      </div>      
     </div>
 
     <!-- 日历 -->
     <div style="padding:0 0 60px 0 ">
-      <div class="todo_img_wap" v-if="reporttype != 2">
+      <div class="todo_img_wap">
         <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>
         </div>
       </div>
 
-
-      <!-- 选择我的任务或我安排的任务 -->
-      <div class="todo_mid_selection">
-        <div class="todo_mid_selection_check">我的任务</div>
-        <div>我安排的任务</div>
-      </div>
-
-      <!-- 任务列表 -->
-      <div style="display:flex;align-items: center;margin-top:10px">
-        <div class="todo_title">8月6日(今天)</div>
-        <div style="font-size:14px;position:absolute;right:70px;color:#666">只显示待办</div>
-        <div style="margin-left:10px;font-size:40px;position:absolute;right:20px;">
-          <svg class="icon" aria-hidden="true">
-            <use xlink:href="#icon-uni_icon_kaiguan_guan"></use>
-          </svg>
+      <!-- 任务页 -->
+      <div v-if="todotype==0">
+        <!-- 选择我的任务或我安排的任务 -->
+        <div class="todo_mid_selection">
+          <div class="todo_mid_selection_check">我的任务</div>
+          <div>我安排的任务</div>
         </div>
-      </div>
-      <div class="todo_list">
-        <div class="arrow_box ">
-          <div class="task_date_inner">8/6 16:00-18:00</div>
-          <div class="task_conner tip_red">待办</div>
-          <div class="task_dscrp">
-            <div>跟设计公司沟通，定好最新一季宣传画册的设计。</div>
-          </div>
 
-          <div class="task_flex">
-            <div class="task_tip">安排人:张小强</div>
-            <div class="task_tip">临时任务</div>
+        <!-- 任务列表 -->
+        <div style="display:flex;align-items: center;margin-top:10px">
+          <div class="todo_title">8月6日(今天)</div>
+          <div style="font-size:14px;position:absolute;right:70px;color:#666">只显示待办</div>
+          <div style="margin-left:10px;font-size:40px;position:absolute;right:20px;">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-uni_icon_kaiguan_guan"></use>
+            </svg>
           </div>
         </div>
-
-        <div class="arrow_box ">
-          <div class="task_date_inner">8/6 09:00-12:00</div>
-          <div class="task_conner tip_blue">待验收</div>
-          <div class="task_dscrp">
-            <div>拿川建国有限公司的合同给老板签字然后传真过去给客户。</div>
+        <div class="todo_list">
+          <div class="arrow_box ">
+            <div class="task_date_inner">8/6 16:00-18:00</div>
+            <div class="task_conner tip_red">待办</div>
+            <div class="task_dscrp">
+              <div>跟设计公司沟通，定好最新一季宣传画册的设计。</div>
+            </div>
+
+            <div class="task_flex">
+              <div class="task_tip">安排人:张小强</div>
+              <div class="task_tip">临时任务</div>
+            </div>
           </div>
 
-          <div class="task_flex">
-            <div class="task_tip">安排人:张小强</div>
-            <div class="task_tip">临时任务</div>
+          <div class="arrow_box ">
+            <div class="task_date_inner">8/6 09:00-12:00</div>
+            <div class="task_conner tip_blue">待验收</div>
+            <div class="task_dscrp">
+              <div>拿川建国有限公司的合同给老板签字然后传真过去给客户。</div>
+            </div>
+
+            <div class="task_flex">
+              <div class="task_tip">安排人:张小强</div>
+              <div class="task_tip">临时任务</div>
+            </div>
           </div>
         </div>
-      </div>
-
-      <div class="liubai_dt"></div>
 
-      <div class="todo_title">超期</div>
-      <div class="todo_list">
-        <div class="arrow_box kindred">
-          <div class="task_date_inner">7/25 16:00-18:00</div>
-          <div class="task_conner_sec tip_red">超期</div>
-          <div class="task_conner tip_red">待办</div>
-          <div class="task_dscrp">
-            <div>拿川建国有限公司的合同给老板签字然后传真过去给客户。</div>
+        <div class="liubai_dt"></div>
+
+        <div class="todo_title">超期</div>
+        <div class="todo_list">
+          <div class="arrow_box kindred">
+            <div class="task_date_inner">7/25 16:00-18:00</div>
+            <div class="task_conner_sec tip_red">超期</div>
+            <div class="task_conner tip_red">待办</div>
+            <div class="task_dscrp">
+              <div>拿川建国有限公司的合同给老板签字然后传真过去给客户。</div>
+            </div>
+
+            <div class="task_flex">
+              <div class="task_tip">安排人:张小强</div>
+              <div class="task_tip">临时任务</div>
+            </div>
           </div>
 
-          <div class="task_flex">
-            <div class="task_tip">安排人:张小强</div>
-            <div class="task_tip">临时任务</div>
+          <div class="arrow_box kindred">
+            <div class="task_date_inner">7/25 16:00-18:00</div>
+            <div class="task_conner_sec tip_red">超期</div>
+            <div class="task_conner tip_red">待办</div>
+            <div class="task_dscrp">
+              <div>拿川建国有限公司的合同给老板签字然后传真过去给客户。</div>
+            </div>
+
+            <div class="task_flex">
+              <div class="task_tip">安排人:张小强</div>
+              <div class="task_tip">临时任务</div>
+            </div>
           </div>
         </div>
 
-        <div class="arrow_box kindred">
-          <div class="task_date_inner">7/25 16:00-18:00</div>
-          <div class="task_conner_sec tip_red">超期</div>
-          <div class="task_conner tip_red">待办</div>
-          <div class="task_dscrp">
-            <div>拿川建国有限公司的合同给老板签字然后传真过去给客户。</div>
+        <div class="liubai_dt"></div>
+
+        <div class="todo_title">验收</div>
+        <div class="todo_list">
+          <div class="arrow_box kindgreen">
+            <div class="task_date_inner">7/25 15:32</div>
+            <div class="task_conner_sec">有图片</div>
+            <div class="task_conner tip_red">待验收</div>
+            <div class="task_dscrp">
+              <div>木工车间设备定期保养</div>
+            </div>
+
+            <div class="task_flex">
+              <div class="task_tip">完成人:王大民</div>
+              <div class="task_tip">任务验收</div>
+            </div>
           </div>
 
-          <div class="task_flex">
-            <div class="task_tip">安排人:张小强</div>
-            <div class="task_tip">临时任务</div>
+          <div class="arrow_box kindgreen">
+            <div class="task_date_inner">7/25 16:00</div>
+            <div class="task_conner_sec">有图片</div>
+            <div class="task_conner tip_red">待验收</div>
+            <div class="task_dscrp">
+              <div>按6S标准检查车间清洁是否达标。</div>
+            </div>
+
+            <div class="task_flex">
+              <div class="task_tip">完成人:王大民</div>
+              <div class="task_tip">任务验收</div>
+            </div>
           </div>
         </div>
       </div>
 
-      <div class="liubai_dt"></div>
+      <!-- 公文页 -->
+      <div v-if="todotype==1">
+        <!-- 选择待我审批或我发起的公文 -->
+        <div class="todo_mid_selection">
+          <div class="todo_mid_selection_check">待我审批</div>
+          <div>我发起的公文</div>
+        </div>
 
-      <div class="todo_title">验收</div>
-      <div class="todo_list">
-        <div class="arrow_box kindgreen">
-          <div class="task_date_inner">7/25 15:32</div>
-          <div class="task_conner_sec">有图片</div>
-          <div class="task_conner tip_red">待验收</div>
-          <div class="task_dscrp">
-            <div>木工车间设备定期保养</div>
+        <!-- 公文列表 -->
+        <div style="display:flex;align-items: center;margin-top:10px">
+          <div class="todo_title">8月6日(今天)</div>
+          <!-- <div style="font-size:14px;position:absolute;right:70px;color:#666">只显示待审批</div>
+          <div style="margin-left:10px;font-size:40px;position:absolute;right:20px;">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-uni_icon_kaiguan_guan"></use>
+            </svg>
+          </div> -->
+        </div>
+        <div class="todo_list">
+          <div class="arrow_box ">
+            <div class="task_date_inner">8/6 16:24</div>
+            <div class="task_conner tip_red">待审批</div>
+            <div class="task_dscrp">
+              <div>年假申请，2019年9月1日至2019年9月7日共7天，望批准。</div>
+            </div>
+
+            <div class="task_flex">
+              <div class="task_tip">发起人:黎小娟</div>
+              <div class="task_tip">公文审批</div>
+            </div>
           </div>
 
-          <div class="task_flex">
-            <div class="task_tip">完成人:王大民</div>
-            <div class="task_tip">任务验收</div>
+          <div class="arrow_box ">
+            <div class="task_date_inner">8/6 09:00-12:00</div>
+            <div class="task_conner tip_blue">已审批</div>
+            <div class="task_dscrp">
+              <div>销售订单审核。SG190725003，美利坚不合群有限公司</div>
+            </div>
+
+            <div class="task_flex">
+              <div class="task_tip">发起人:张小强</div>
+              <div class="task_tip">单据审批</div>
+            </div>
           </div>
         </div>
 
-        <div class="arrow_box kindgreen">
-          <div class="task_date_inner">7/25 16:00</div>
-          <div class="task_conner_sec">有图片</div>
-          <div class="task_conner tip_red">待验收</div>
-          <div class="task_dscrp">
-            <div>按6S标准检查车间清洁是否达标。</div>
+        <div class="liubai_dt"></div>
+
+        <div class="todo_title">待审批</div>
+        <div class="todo_list">
+          <div class="arrow_box kindred">
+            <div class="task_date_inner">7/25 16:11</div>
+            <div class="task_conner tip_red">待审批</div>
+            <div class="task_dscrp">
+              <div>明天（7月26日）请假一天。</div>
+            </div>
+
+            <div class="task_flex">
+              <div class="task_tip">发起人:张小强</div>
+              <div class="task_tip">公文审批</div>
+            </div>
           </div>
 
-          <div class="task_flex">
-            <div class="task_tip">完成人:王大民</div>
-            <div class="task_tip">任务验收</div>
+          <div class="arrow_box kindred">
+            <div class="task_date_inner">7/25 09:15</div>
+            <div class="task_conner tip_red">待审批</div>
+            <div class="task_dscrp">
+              <div>明天（7月26日）请假一天。</div>
+            </div>
+
+            <div class="task_flex">
+              <div class="task_tip">发起人:王小千</div>
+              <div class="task_tip">公文审批</div>
+            </div>
           </div>
         </div>
+
       </div>
+
+
     </div>
+
+
     <!-- 悬浮的新建任务按钮 -->
     <div class="todo_add">
       <svg class="icon" aria-hidden="true">
@@ -199,6 +289,7 @@
     data() {
       return {
         datetype: 1, //0-完整日历 1-只显示本周的日历
+        todotype:1,//0-任务 1-公文
       }
     }
 

src/pages/oaview.vue

@@ -19,7 +19,7 @@
     <div class="oaview_toparea" :class="colortop">
       <div class="oaview_top_type" v-if="tasktype==0">单据审批</div>
       <div class="oaview_top_type" v-if="tasktype==1">公文审批</div>
-      <div class="oaview_top_flag">{{taskflag_dt}}</div>
+      <div class="oaview_top_flag">{{oaflag_dt}}</div>
     </div>
     <div class="oaview_toparea_sec" :class="colortop_sec"></div>
     <div class="oaview_toparea_thr" :class="colortop_thr"></div>
@@ -28,11 +28,17 @@
 
       <div class="oaview_main">
         <div class="oaview_info" v-if="tasktype==1">
-          <span>年假申请，2019年9月1日至2019年9月7日，望审批。</span>
+          <span>年假申请，2019年9月1日至2019年9月7日共7天，望批准。</span>
+
+          <div style="color:#888;font-size:14px;margin:5px 0 0 20px;position: absolute;right: 20px;">
+            黎小娟
+          </div>
         </div>
 
+
+
         <!-- 客户订单信息 -->
-        <div v-if="tasktype==0" style="margin:10px 0 0 0 ">
+        <div v-if="tasktype==0" style="padding:10px 0 20px 0 ">
 
           <!-- <div class="liubai_dt"></div> -->
           <div class="oaview_flex">
@@ -52,7 +58,7 @@
 
           <div class="oaview_flex">
             <div class="oaview_title">业务员</div>
-            <div class="oaview_item">章北海</div>
+            <div class="oaview_item">黎小娟</div>
           </div>
 
 
@@ -68,7 +74,7 @@
           </div>
 
 
-          <div style="color:#666;margin:10px 0 0 20px">
+          <div style="color:#888;font-size:12px;margin:5px 0 0 20px;position: absolute;right: 20px;">
             <svg class="icon" aria-hidden="true">
               <use xlink:href="#icon-chakan"></use>
             </svg>
@@ -84,12 +90,12 @@
           <div class="oaview_emp_list">
             <div class="oaview_emp_list_icon">
               <svg class="icon" aria-hidden="true">
-                <use xlink:href="#icon-CombinedShape"></use>
+                <use xlink:href="#icon-tongguo"></use>
               </svg>
             </div>
 
             <div>
-              发起：黎小娟
+              发起审批：黎小娟
             </div>
 
             <div class="oaview_emp_list_time">
@@ -100,31 +106,73 @@
           <div class="oaview_emp_list">
             <div class="oaview_emp_list_icon">
               <svg class="icon" aria-hidden="true">
-                <use xlink:href="#icon-CombinedShape"></use>
+                <use xlink:href="#icon-tongguo"></use>
               </svg>
             </div>
 
             <div>
-              主管审：黎小娟
+              主管审批：李子雄
             </div>
             <div class="oaview_emp_list_time">
               2019-08-12 10:12
             </div>
           </div>
 
-
-          <div class="oaview_emp_list">
+          <!-- 当前审批步骤：红字加粗 oaview_emp_list_red -->
+          <div class="oaview_emp_list oaview_emp_list_red">
             <div class="oaview_emp_list_icon">
-              <svg class="icon" aria-hidden="true">
+              <svg class="icon" aria-hidden="true" v-if="oaflag_dt=='否决'">
+                <use xlink:href="#icon-butongguo"></use>
+              </svg>
+
+              <svg class="icon" aria-hidden="true" v-if="oaflag_dt=='处理中'">
                 <use xlink:href="#icon-buzouweijinxing"></use>
               </svg>
+
+              <svg class="icon" aria-hidden="true" v-if="oaflag_dt=='通过'">
+                <use xlink:href="#icon-tongguo"></use>
+              </svg>
             </div>
 
             <div>
-              财务审：王小千
+              财务审批：王小千<span v-if="oaflag_dt=='处理中'"> (正在审批)</span>
             </div>
+
+            <div class="oaview_emp_list_time" v-if="oaflag_dt=='通过'">
+              2019-08-12 10:32
+            </div>
+
+            <!-- 当前审批步骤显示为红色并加粗，否决状态下，否决那一行的步骤也是红字加粗，否决时间也显示为红色（常规状态下审批时间用的是灰色） -->
+            <div class="oaview_emp_list_time " style="color:#f00" v-if="oaflag_dt=='否决'">
+              2019-08-12 11:12
+            </div>
+          </div>
+
+          <div style="padding:0 0 0 25px;color:#ef250f;font-size:12px" v-if="oaflag_dt=='否决'">
+            否决理由：该客户上批货款还未结清。
           </div>
 
+
+          <!-- 如果是否决，则否决步骤之后的全部步骤，样式均处理为 删除线+浅灰色，表示之后的步骤已经没用了  class是oaview_emp_list_gray -->
+          <div class="oaview_emp_list" :class="response_band">
+            <div class="oaview_emp_list_icon">
+              <svg class="icon" aria-hidden="true" v-if="oaflag_dt!='通过'">
+                <use xlink:href="#icon-buzouweijinxing"></use>
+              </svg>
+
+              <svg class="icon" aria-hidden="true" v-if="oaflag_dt=='通过'">
+                <use xlink:href="#icon-tongguo"></use>
+              </svg>
+            </div>
+
+            <div>
+              经理审批：张建国
+            </div>
+
+            <div class="oaview_emp_list_time" v-if="oaflag_dt=='通过'">
+              2019-08-12 11:32
+            </div>
+          </div>
         </div>
 
 
@@ -132,9 +180,11 @@
 
     </div>
 
-    <div class="quote_edit_btn_wrap">
-      <div class="quote_edit_btn">
+    <div class="quote_edit_btn_wrap" v-if="oaflag_dt=='处理中'">
+      <div class="quote_edit_btn" style="background-color: #ffb732">
         <span>同意</span>
+      </div>
+      <div class="quote_edit_btn">
         <span>否决</span>
       </div>
     </div>
@@ -143,11 +193,10 @@
     <div v-if="ifresponse>0">
       <div class="oaview_mask"></div>
 
-      <div :class="response_height" class="oaview_response">
+      <div class="oaview_response">
         <div style="display:flex;align-items: center;">
           <div style="font-size:15px;padding:0 20px;color:#888">
-            <span v-if="ifresponse==2">任务验收</span>
-            <span v-if="ifresponse==1">完成任务</span>
+            <span>审批</span>
           </div>
           <div style="position: absolute;right: 20px;color: #ccc;font-size: 12px;">
             <svg class="icon" aria-hidden="true">
@@ -156,75 +205,28 @@
           </div>
         </div>
 
-        <!-- 评价星级 -->
-        <div class="oaview_flex" style="margin-top:15px;" v-if="ifresponse==2">
-          <div class="oaview_title">评分</div>
-          <div class="oaview_item" style="font-size:22px;">
-            <svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-xing1"></use>
-            </svg>
-            <svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-xing1"></use>
-            </svg>
-            <svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-xing1"></use>
-            </svg>
-            <svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-xing"></use>
-            </svg>
-            <svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-xing"></use>
-            </svg>
-          </div>
-
-
-        </div>
 
-        <!-- 评语 或 汇报 录入 -->
+        <!-- 审批意见 -->
         <div style="width: 100%;text-align: center;">
-          <textarea name="banreason" rows="5" placeholder="请填写评语" style="width: 90%;font-size: 15px;margin: 10px;"
-            v-if="ifresponse==2">
-            </textarea>
 
-          <textarea name="banreason" rows="5" placeholder="请填写任务汇报" style="width: 90%;font-size: 15px;margin: 10px;"
+          <textarea name="banreason" rows="5" placeholder="可填写审批意见" style="width: 90%;font-size: 15px;margin: 10px;"
             v-if="ifresponse==1">
             </textarea>
 
+          <textarea name="banreason" rows="5" placeholder="请填写否决原因" style="width: 90%;font-size: 15px;margin: 10px;"
+            v-if="ifresponse==2">
+            </textarea>
         </div>
 
-        <!-- 添加图片 -->
-        <div style="display:flex" v-if="ifresponse==1">
-          <div class="oaview_addpic">
-            <svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-tianjiatupian"></use>
-            </svg>
-          </div>
-        </div>
-
-        <!-- 完成任务时添加附件 -->
-        <div v-if="ifresponse==1" class="taskedit_fjarea" style="padding:0 0 0 20px;color:#666">
-          <svg class="icon" aria-hidden="true">
-            <use xlink:href="#icon-fujian"></use>
-          </svg>
-          添加附件
-        </div>
-
-        <!-- 验收任务时选择是否需要返工 -->
-        <div v-if="ifresponse==2"
-          style="display:flex;line-height: 45px;align-items: flex-start;margin:0 0 0 20px;color:#888">
-          <div class="taskedit_title">需要返工</div>
-          <div style="margin-left:10px;font-size:40px">
-            <svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-uni_icon_kaiguan_guan"></use>
-            </svg>
-          </div>
-        </div>
 
         <!-- 提交按钮 -->
         <div class="quote_edit_btn_wrap">
-          <div class="quote_edit_btn">
-            <span v-if="ifresponse==2">验收</span>
-            <span v-if="ifresponse==1">完成</span>
+          <div class="quote_edit_btn" style="background-color: #ffb732" v-if="ifresponse==1">
+            <span>同意</span>
+          </div>
+
+          <div class="quote_edit_btn" v-if="ifresponse==2">
+            <span>否决</span>
           </div>
         </div>
 
@@ -241,34 +243,33 @@
     data() {
       return {
         tasktype: 0, //0-单据审批 1-公文审批
-        taskflag_dt: "处理中", //处理中,通过,否决
-        ifresponse: 0, //弹窗 0：不弹  1：完成任务界面 2：验收任务界面
+        oaflag_dt: "处理中", //处理中,通过,否决
+        ifresponse: 0, //弹窗 0-不弹  1-同意 2-否决
         iffg: 0 //0-不是返工 1-返工
       }
     },
     computed: {
       colortop: function () {
         return {
-          oaview_toparea_green: this.taskflag_dt == "处理中",
-          oaview_toparea_blue: this.taskflag_dt == "通过"
+          oaview_toparea_green: this.oaflag_dt == "处理中",
+          oaview_toparea_blue: this.oaflag_dt == "通过"
         };
       },
       colortop_sec: function () {
         return {
-          oaview_toparea_green_sec: this.taskflag_dt == "处理中",
-          oaview_toparea_blue_sec: this.taskflag_dt == "通过"
+          oaview_toparea_green_sec: this.oaflag_dt == "处理中",
+          oaview_toparea_blue_sec: this.oaflag_dt == "通过"
         };
       },
       colortop_thr: function () {
         return {
-          oaview_toparea_green_thr: this.taskflag_dt == "处理中",
-          oaview_toparea_blue_thr: this.taskflag_dt == "通过"
+          oaview_toparea_green_thr: this.oaflag_dt == "处理中",
+          oaview_toparea_blue_thr: this.oaflag_dt == "通过"
         };
       },
-      response_height: function () {
+      response_band: function () {
         return {
-          response_height_1: this.ifresponse == 1,
-          response_height_2: this.ifresponse == 2
+          oaview_emp_list_gray: this.oaflag_dt == "否决"
         };
       }
     }
@@ -291,16 +292,26 @@
 
   .oaview_emp_list {
     display: flex;
-    line-height: 30px;
+    line-height: 40px;
+  }
+
+  .oaview_emp_list_red {
+    color: #F00;
+    font-weight: bold;
+  }
+
+  .oaview_emp_list_gray {
+    color: #aaa;
+    text-decoration: line-through
   }
 
   .oaview_emp_list_icon {
-    color: #000;
     margin: 0 10px 0 0;
   }
 
   .oaview_emp_list_time {
     color: #888;
+    font-weight: 400;
     margin: 0 0 0 10px;
   }
 
@@ -337,7 +348,7 @@
     background-color: #ffffff;
     position: fixed;
     bottom: 0px;
-    /* height: 330px; */
+    height: 180px;
     width: 100%;
     border-top-left-radius: 15px;
     border-top-right-radius: 15px;
@@ -375,7 +386,7 @@
 
   .oaview_info {
     font-size: 16px;
-    padding: 5px 20px;
+    padding: 5px 20px 25px 20px;
   }
 
   .oaview_toparea {

src/pages/quoteedit.vue

@@ -569,7 +569,7 @@
     name: 'quoteedit',
     data() {
       return {
-        ifch: 1, //选择配置 0-没有显示  1-显示 
+        ifch: 0, //选择配置 0-没有显示  1-显示 
         ifusd: 0, //0-人民币 1-美元
         ifcust: 1, //0-只显示客户编码 1-显示客户名称地址
         ifshow: 0 //0-不显示数量优惠条件 1-显示

src/pages/setting.vue

@@ -11,7 +11,7 @@
     <div class="setting_liubai"></div>
 
     <div class="setting_list">
-      <div class="setting_list_item setting_list_item_border">
+      <!-- <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-youjian"></use>
@@ -24,7 +24,7 @@
             <use xlink:href="#icon-iconfontjiantou2"></use>
           </svg>
         </div>
-      </div>
+      </div> -->
 
       <div class="setting_list_item setting_list_item_border">
         <div class="setting_list_item_icon">
@@ -151,13 +151,14 @@
   }
 
   .setting_userinfo_name_name {
-    font-size: 22px;
-    font-weight: bold
+    font-size: 20px;
+    font-weight: bold;
+    line-height: 40px;
   }
 
   .setting_userinfo_name_id {
     color: #838383;
-    font-size: 18px;
+    font-size: 16px;
   }
 
   .setting_list {
@@ -168,7 +169,7 @@
   .setting_list_item {
     display: flex;
     color: #606060;
-    font-size: 16px;
+    font-size: 15px;
     font-weight: bold;
     line-height: 60px;
   }

src/pages/taskview.vue

@@ -47,11 +47,11 @@
         <!-- 附件图片，直接显示缩略图 -->
         <div style="display:flex;margin:10px 0 0 20px;" v-if="tasktype==2">
           <div>
-            <img src="../assets/taskview_01.jpeg" style="height: 80px"></img>
+            <img src="../assets/taskview_01.jpeg" style="height: 60px;box-shadow: 0 2px 3px rgba(0, 0, 0, 0.302);"></img>
           </div>
 
           <div style="margin-left:10px">
-            <img src="../assets/taskview_02.jpg" style="height: 80px"></img>
+            <img src="../assets/taskview_02.jpg" style="height: 60px;box-shadow: 0 2px 3px rgba(0, 0, 0, 0.302);"></img>
           </div>
         </div>
 
@@ -101,7 +101,7 @@
         </div>
 
         <!-- 返工信息，根据此任务是否返工类型决定显示与否 -->
-        <div style="color:#666;margin:10px 0 0 20px" v-if="iffg==1">
+        <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>
@@ -197,15 +197,15 @@
         <!-- 附件图片，直接显示缩略图 -->
         <div style="display:flex;margin:10px 0 0 20px;" v-if="taskflag_dt!='未完成'">
           <div v-if="tasktype==2">
-            <img src="../assets/taskview_03.jpg" style="height: 80px"></img>
+            <img src="../assets/taskview_03.jpg" style="height: 60px;box-shadow: 0 2px 3px rgba(0, 0, 0, 0.302);"></img>
           </div>
 
           <div v-if="tasktype==1">
-            <img src="../assets/taskview_04.jpg" style="height: 180px"></img>
+            <img src="../assets/taskview_04.jpg" style="height: 140px;box-shadow: 0 2px 3px rgba(0, 0, 0, 0.302);"></img>
           </div>
 
           <div v-if="tasktype==0">
-            <img src="../assets/taskview_05.jpg" style="height: 80px"></img>
+            <img src="../assets/taskview_05.jpg" style="height: 45px;box-shadow: 0 2px 3px rgba(0, 0, 0, 0.302);"></img>
           </div>
         </div>
 
@@ -268,7 +268,7 @@
 
         <div class="taskview_flex" v-if="taskflag_dt=='已验收'">
           <div class="taskview_title">评语</div>
-          <div class="taskview_item">人在做，天在看，下次记得准时完成任务。</div>
+          <div class="taskview_item">下次争取准时完成任务。</div>
         </div>
 
       </div>
@@ -383,8 +383,8 @@
     name: 'taskview',
     data() {
       return {
-        tasktype: 2, //0-临时任务 1-客户走访 2-稽核检查
-        taskflag_dt: "已验收", //未完成,待验收,已验收
+        tasktype: 0, //0-临时任务 1-客户走访 2-稽核检查
+        taskflag_dt: "待验收", //未完成,待验收,已验收
         ifresponse: 0, //弹窗 0：不弹  1：完成任务界面 2：验收任务界面
         iffg: 0//0-不是返工 1-返工
       }

src/router/index.js

@@ -7,7 +7,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'