南方报价页面优化

src/pages/amerce.vue

@@ -0,0 +1,593 @@
+<template>
+  <div id="taskdetail">
+    <div class="topbar">
+      <div class="topbar_left" @click="goback">
+        <svg class="icon" aria-hidden="true">
+          <use xlink:href="#icon-fanhui"></use>
+        </svg>
+      </div>
+      <div class="topbar_middle">
+        供应商罚款单详情
+      </div>
+      <div class="topbar_right">
+        <svg class="icon" aria-hidden="true">
+          <use xlink:href="#icon-caidan"></use>
+        </svg>
+      </div>
+    </div>
+    <div id="content">
+      <div class="toparea_dt" :class="colortop">
+        <div class="taskcode_dt">
+          KK190815001
+          <svg class="icon" aria-hidden="true" v-if="ifnew==1">
+            <use xlink:href="#icon-ziyuan"></use>
+          </svg>
+        </div>
+        <div class="taskflag_dt">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-weikaishi" v-if="taskflag_dt=='待审核'"></use>
+            <use xlink:href="#icon-jindu" v-if="taskflag_dt=='在进行'"></use>
+            <use xlink:href="#icon-CombinedShape" v-if="taskflag_dt=='已完成'"></use>
+          </svg>
+          {{taskflag_dt}}
+        </div>
+      </div>
+      <div class="taskinfo_dt">
+        <div class="cust_dt">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-kehu"></use>
+          </svg>
+          广东省佛山市顺德区某某供应商
+        </div>
+      </div>
+      <div class="reptel_dt">
+        <svg class="icon" aria-hidden="true">
+          <use xlink:href="#icon-address"></use>
+        </svg>
+        <span>王利云</span>
+        <span style="margin-left:10px;">13800138000</span>
+      </div>
+      <div class="address_dt">地址：广东省顺德市芙蓉中路二段115号</div>
+
+      <div class="liubai_dt"></div>
+
+      <div class="middlearea">
+        <div class="taskinfo_dtamt">
+          <div class="taskinfo_dttitle_dt">
+            <div class="title_dt">罚款类型：</div>
+            <div class="taskinfo_dtitem ">质量问题</div>
+          </div>
+        </div>
+
+        <div class="taskinfo_dtamt">
+          <div class="taskinfo_dttitle_dt">
+            <div class="title_dt">经手人：</div>
+            <div class="taskinfo_dtitem leftsize ">张大三</div>
+          </div>
+
+          <div class="taskinfo_dttitle_dt ">
+            <div class="title_dt">日期：</div>
+            <div class="taskinfo_dtitem">2019-08-15</div>
+          </div>
+        </div>
+
+
+        <div class="taskinfo_dtamt">
+          <div class="taskinfo_dttitle_dt">
+            <div class="title_dt">罚款金额：</div>
+            <div class="taskinfo_dtitem taskamt leftsize">¥120</div>
+          </div>
+          <div class="taskinfo_dttitle_dt rightside">
+            <div class="title_dt">结算方式：</div>
+            <div class="taskinfo_dtitem">记帐</div>
+          </div>
+        </div>
+
+
+
+        <div class='taskinfo_dtflex'>
+          <div class="taskinfo_dttitle_dt">
+            <div class="title_dt ">原因：</div>
+            <div class="taskinfo_dtitem" style="flex:0 0 75%">电镀扶手A893 抽检合格率为 80%，特采 10 个。</div>
+          </div>
+        </div>
+
+
+        <div class='taskinfo_dtflex'>
+          <div class="taskinfo_dttitle_dt">
+            <div class="title_dt ">相关单号：</div>
+            <div class="taskinfo_dtitem ">QD190815002</div>
+            <div style="font-size:14px;font-weight:400;color:#888;margin:0 0 0 10px">
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-chakan"></use>
+              </svg>
+              查看详细
+            </div>
+          </div>
+        </div>
+
+
+
+      </div>
+
+      <div class="liubai_dt"></div>
+      <div class="middlearea">
+        <div class="taskinfo_dtamt">
+          <div class="taskinfo_dttitle_dt">
+            <div class="title_dt">审核人：</div>
+            <div class="taskinfo_dtitem leftsize ">张大三</div>
+          </div>
+
+          <div class="taskinfo_dttitle_dt ">
+            <div class="title_dt">审核时间：</div>
+            <div class="taskinfo_dtitem">2019-08-15 10:30</div>
+          </div>
+        </div>
+
+            <div class="taskinfo_dtamt">
+          <div class="taskinfo_dttitle_dt">
+            <div class="title_dt">财审人：</div>
+            <div class="taskinfo_dtitem leftsize ">张大三</div>
+          </div>
+
+          <div class="taskinfo_dttitle_dt ">
+            <div class="title_dt">财审时间：</div>
+            <div class="taskinfo_dtitem">2019-08-15 14:30</div>
+          </div>
+        </div>    
+      </div>
+
+
+      <!-- 
+      <div class="dscrp">
+        <svg class="icon" aria-hidden="true">
+          <use xlink:href="#icon-wentibuchong"></use>
+        </svg>
+        备注：客户要求先发样板进行确认再排产。
+      </div> -->
+
+      <!-- <div class="liubai_dt"></div>
+
+      <div class="subtitle_dt">订单进度跟踪</div>
+      <div class="jindu">
+        <div>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-buzhoutiaowancheng"></use>
+          </svg>
+          下单日期：2018-12-09
+        </div>
+        <div>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-buzhoutiaowancheng"></use>
+          </svg>
+          审核时间：2018-12-11 09:30
+        </div>
+        <div>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-buzhoutiaowancheng"></use>
+          </svg>
+          物料清单审核：2018-12-11 15:32
+        </div>
+        <div>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-buzhoutiaowancheng"></use>
+          </svg>
+          主生产计划MRP：2018-12-12 14:29
+        </div>
+        <div>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-buzouweijinxing"></use>
+          </svg>
+          物料采购下单：
+        </div>
+        <div>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-buzouweijinxing"></use>
+          </svg>
+          唛头采购下单：
+        </div>
+        <div>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-baifenbi"></use>
+          </svg>
+          材料入库：33%
+          <span class="jindubtn">欠料情况</span>
+        </div>
+        <div>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-baifenbi"></use>
+          </svg>
+          发料完成：10%
+        </div>
+        <div>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-baifenbi"></use>
+          </svg>
+          木工：90%
+        </div>
+        <div>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-baifenbi"></use>
+          </svg>
+          裁剪：10%
+        </div>
+        <div>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-baifenbi"></use>
+          </svg>
+          入库：2%&nbsp&nbsp(20/1000)
+        </div>
+        <div> <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-buzouweijinxing"></use>
+          </svg>
+          订船日期：
+        </div>
+        <div>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-buzouweijinxing"></use>
+          </svg>
+          装柜日期：
+        </div>
+        <div>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-buzouweijinxing"></use>
+          </svg>
+          发货开单日期：
+        </div>
+        <div>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-buzouweijinxing"></use>
+          </svg>
+          发货完成日期：
+        </div>
+
+      </div> -->
+
+      <!-- <div class="liubai_dt"></div>
+      <div class="subtitle_dt">订单明细</div>
+      <div class="taskmx_dt">
+
+        <div id="rowmx_dt">
+          <div class="mxmtrl_dt">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-dian"></use>
+            </svg>
+            218B两人位沙发，拉扣:布扣|座包:型号标配|配置:皮加布|
+          </div>
+          <div class="mx_bottomarea">
+            <div class="mxqty_dt">数量：100，¥50000</div>
+            <div class="mx_btndetail" @click="gotomxjd">
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-chakan"></use>
+              </svg>
+              查看进度
+            </div>
+          </div>
+        </div>
+
+        <div id="rowmx_dt">
+          <div class="mxmtrl_dt">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-dian"></use>
+            </svg>
+            6528茶几，型号：P069（72913）
+          </div>
+          <div class="mx_bottomarea">
+            <div class="mxqty_dt">数量：100，¥30000</div>
+            <div class="mx_btndetail" @click="gotomxjd">
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-chakan"></use>
+              </svg>
+              查看进度
+            </div>
+          </div>
+        </div>
+
+
+        <div id="rowmx_dt">
+          <div class="mxmtrl_dt">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-dian"></use>
+            </svg>
+            电视柜，型号：T9999
+          </div>
+          <div class="mx_bottomarea">
+            <div class="mxqty_dt">数量：100，¥20000</div>
+            <div class="mx_btndetail" @click="gotomxjd">
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-chakan"></use>
+              </svg>
+              查看进度
+            </div>
+          </div>
+        </div>
+      </div> -->
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+
+    name: 'saletaskDetail',
+    data() {
+      return {
+        taskflag_dt: '已审核',
+        ifnew: 0
+      };
+    },
+    methods: {
+      goback() {
+        {
+          history.back();
+        }
+      },
+      gotomxjd() {
+        this.$router.push({
+          path: "/salemxjd"
+        });
+      }
+    },
+    computed: {
+      colortop: function () {
+        return {
+          bgcolorred: this.taskflag_dt == "待审核",
+          bgcolorgreen: this.taskflag_dt == "待财审",
+          bgcolorblue: this.taskflag_dt == "已审核"
+        };
+      },
+    }
+  }
+
+</script>
+
+<style>
+  body {
+    margin: 0;
+    padding: 0;
+    /* background-color: #fff; */
+    font-family: "微软雅黑";
+  }
+
+  .topbar {
+    min-height: 44px;
+    border-bottom: 1px solid #e5e5e5;
+    background: #fff;
+    position: fixed;
+    width: 100%;
+    z-index: 9999;
+    display: flex;
+    font-size: 18px;
+    align-items: center;
+  }
+
+  .topbar_left {
+    /* flex: 0 0 %; */
+    margin-left: 10px;
+  }
+
+  .topbar_middle {
+    text-align: center;
+    flex: 0 0 85%;
+  }
+
+  .topbar_right {
+    /* flex: 0 0 10%; */
+    position: absolute;
+    right: 10px;
+  }
+
+  #taskdetail {
+    background-color: #fff;
+  }
+
+  #content {
+    position: absolute;
+    top: 44px;
+    background-color: #fff;
+    width: 100%
+  }
+
+  .toparea_dt {
+    color: white;
+    background-color: rgb(252, 78, 44);
+    height: 80px;
+    display: flex;
+  }
+
+  .bgcolorred {
+    background-color: #fc4e2c
+  }
+
+  .bgcolorgreen {
+    background-color: #8dc026;
+  }
+
+  .bgcolorblue {
+    background-color: #1e90ff;
+  }
+
+  .taskcode_dt {
+    font-size: 20px;
+    font-weight: bold;
+    padding: 10px 0 10px 20px;
+    line-height: 30px;
+  }
+
+  .taskflag_dt {
+    font-size: 16px;
+    font-weight: bold;
+    padding: 10px;
+    line-height: 30px;
+    position: absolute;
+    right: 20px;
+  }
+
+  .taskinfo_dt {
+    background-color: #fff;
+    width: 100%;
+    height: 35px;
+    border-top-left-radius: 20px;
+    border-top-right-radius: 20px;
+    border-bottom-right-radius: 0px;
+    border-bottom-left-radius: 0px;
+    position: absolute;
+    top: 50px;
+  }
+
+  .cust_dt {
+    font-size: 16px;
+    font-weight: bold;
+    padding: 10px
+  }
+
+  .reptel_dt {
+    font-size: 14px;
+    font-weight: bold;
+    margin: 10px 0 2px 10px;
+  }
+
+  .address_dt {
+    font-size: 13px;
+    margin-left: 30px;
+    margin-right: 20px;
+    margin-bottom: 10px;
+    color: #666;
+  }
+
+  .hyaddress_dt {
+    font-size: 13px;
+    margin-left: 10px;
+    margin-right: 10px;
+    margin-bottom: 10px;
+    color: #666;
+  }
+
+  .liubai_dt {
+    width: 100%;
+    height: 10px;
+    background-color: #f6f6f6;
+  }
+
+  .middlearea {
+    margin: 10px;
+    font-size: 14px;
+  }
+
+  .taskinfo_dtflex {
+    display: flex;
+    /* height: 60px; */
+    align-items: center;
+    line-height: 20px;
+  }
+
+  .taskinfo_dttitle_dt {
+    font-weight: bold;
+    margin-bottom: 5px;
+    display: flex;
+    flex-wrap: wrap;
+  }
+
+  .title_dt {
+    width: 80px;
+    text-align: right;
+  }
+
+  .taskinfo_dtitem {
+    font-weight: normal;
+    color: #333;
+
+  }
+
+  .taskinfo_dtamt {
+    display: flex;
+    line-height: 20px;
+  }
+
+  .taskamt {
+    font-weight: bold;
+    color: red;
+  }
+
+  .leftsize {
+    width: 50px;
+  }
+
+  .dscrp {
+    border-radius: 10px;
+    background: rgb(240, 237, 237);
+    padding: 10px 20px;
+    margin: 0 20px 10px 20px;
+    font-size: 14px;
+    color: #555;
+    line-height: 18px;
+  }
+
+  .subtitle_dt {
+    font-size: 17px;
+    font-weight: 700;
+    text-align: center;
+    margin: 0 20px;
+    height: 42px;
+    line-height: 43px;
+  }
+
+  .jindu {
+    border-top: 1px solid #f0f0f0;
+    margin: 0 20px;
+    font-size: 14px;
+    line-height: 30px;
+    padding: 10px 0;
+  }
+
+  .jindubtn {
+    margin-left: 20px;
+    border: 1px solid #bbb;
+    padding: 0 10px;
+    border-radius: 15px;
+    font-size: 13px;
+  }
+
+  .taskmx_dt {
+    border-top: 1px solid #f0f0f0;
+
+  }
+
+  #rowmx_dt {
+
+    margin-bottom: 10px;
+  }
+
+  .mxmtrl_dt {
+    margin: 5px;
+    font-size: 14px;
+  }
+
+  .mxqty_dt {
+    font-size: 14px;
+    color: #888;
+    margin-bottom: 3px;
+    margin-left: 25px;
+  }
+
+  .mxjdinfo {
+    background-color: #f6f6f6;
+    font-size: 12px;
+    color: #888;
+    padding: 5px 0 5px 5px;
+  }
+
+  .mx_bottomarea {
+    display: flex;
+  }
+
+  .mx_btndetail {
+    position: absolute;
+    right: 20px;
+    color: #888;
+    font-size: 13px;
+    margin-right: 0px;
+    border-radius: 5px;
+  }
+
+</style>

src/pages/buytaskdetail.vue

@@ -0,0 +1,698 @@
+<template>
+  <div id="taskdetail">
+    <div class="topbar">
+      <div class="topbar_left" @click="goback">
+        <svg class="icon" aria-hidden="true">
+          <use xlink:href="#icon-fanhui"></use>
+        </svg>
+      </div>
+      <div class="topbar_middle">
+        采购订单详情
+      </div>
+      <div class="topbar_right">
+        <svg class="icon" aria-hidden="true">
+          <use xlink:href="#icon-caidan"></use>
+        </svg>
+      </div>
+    </div>
+    <div id="content">
+      <div class="toparea_dt" :class="colortop">
+        <div class="taskcode_dt">
+          BG190816001
+          <svg class="icon" aria-hidden="true" v-if="ifnew==1">
+            <use xlink:href="#icon-ziyuan"></use>
+          </svg>
+        </div>
+        <div class="taskflag_dt">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-weikaishi" v-if="taskflag_dt=='待审核'"></use>
+            <use xlink:href="#icon-jindu" v-if="taskflag_dt=='在进行'"></use>
+            <use xlink:href="#icon-CombinedShape" v-if="taskflag_dt=='已完成'"></use>
+          </svg>
+          {{taskflag_dt}}
+        </div>
+      </div>
+      <div class="taskinfo_dt">
+        <div class="cust_dt">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-kehu"></use>
+          </svg>
+          广东省佛山市顺德区某某纸箱商
+        </div>
+      </div>
+      <div class="reptel_dt">
+        <svg class="icon" aria-hidden="true">
+          <use xlink:href="#icon-address"></use>
+        </svg>
+        <span>王利云</span>
+        <span style="margin-left:10px;">13800138000</span>
+      </div>
+      <div class="address_dt">地址：广东省顺德市芙蓉中路二段115号</div>
+
+      <div class="liubai_dt"></div>
+
+      <div class="middlearea">
+        <div class="taskinfo_dttitle_dt">
+          <div class="title_dt">负责人：</div>
+          <div class="taskinfo_dtitem">张大三</div>
+        </div>
+        <div class='taskinfo_dtflex'>
+          <div class="taskinfo_dttitle_dt">
+            <div class="title_dt ">订货日期：</div>
+            <div class="taskinfo_dtitem leftsize">2019-8-16</div>
+          </div>
+          <div class="taskinfo_dttitle_dt">
+            <div class="title_dt rightside">相关号码：</div>
+            <div class="taskinfo_dtitem requiredate">K1823103</div>
+          </div>
+        </div>
+        <div class="taskinfo_dtamt">
+          <div class="taskinfo_dttitle_dt">
+            <div class="title_dt">金额：</div>
+            <div class="taskinfo_dtitem taskamt leftsize">¥10000</div>
+          </div>
+          <div class="taskinfo_dttitle_dt dingjin">
+            <div class="title_dt rightside">已付金额：</div>
+            <div class="taskinfo_dtitem taskamt">¥0</div>
+          </div>
+        </div>
+
+        <div class="taskinfo_dtamt">
+          <div class="taskinfo_dttitle_dt">
+            <div class="title_dt">未付金额：</div>
+            <div class="taskinfo_dtitem taskamt leftsize">¥10000</div>
+          </div>
+          <div class="taskinfo_dttitle_dt rightside">
+            <div class="title_dt">结算方式：</div>
+            <div class="taskinfo_dtitem">记帐</div>
+          </div>
+        </div>
+
+      </div>
+
+      <div class="dscrp">
+        <svg class="icon" aria-hidden="true">
+          <use xlink:href="#icon-wentibuchong"></use>
+        </svg>
+        备注：出口单，请准时交货。
+      </div>
+
+      <div style="font-size:14px;margin:20px 20px 10px 20px">
+        <div style="line-height:30px">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-yasuobao"></use>
+          </svg>
+          唛头资料_1.rar
+          <span style="font-size:12px;color:#888;margin-left:10px">9.4 MB</span>
+        </div>
+        <div style="line-height:30px">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-yasuobao"></use>
+          </svg>
+          唛头资料_2.rar
+          <span style="font-size:12px;color:#888;margin-left:10px">6.4 MB</span>
+        </div>
+      </div>
+
+
+
+      <div class="liubai_dt"></div>
+      <!-- <div class="mxjdinfo">*点击明细可查看明细产品进度</div> -->
+      <div class="subtitle_dt">订单明细</div>
+      <div class="taskmx_dt">
+
+        <div id="rowmx_dt">
+          <div class="mxmtrl_dt">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-dian"></use>
+            </svg>
+            天地合纸箱 100*80*60cm
+          </div>
+          <div class="mxqty_dt">交期：2019-08-20</div>
+          <div class="mxqty_dt">数量：600个，单价：8.33元，合计：5000元</div>
+
+        </div>
+
+        <div id="rowmx_dt">
+          <div class="mxmtrl_dt">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-dian"></use>
+            </svg>
+            躺椅纸箱 50*10*10
+          </div>
+          <div class="mxqty_dt">交期：2019-08-20</div>
+          <div class="mxqty_dt">数量：400个，单价：7.5元，合计：3000元</div>
+        </div>
+
+
+        <div id="rowmx_dt">
+          <div class="mxmtrl_dt">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-dian"></use>
+            </svg>
+            1017G纸箱 74*23*10
+          </div>
+          <div class="mxqty_dt">交期：2019-08-20</div>
+          <div class="mxqty_dt">数量：200个，单价：10元，合计：2000元</div>
+          <div class="mxqty_dt">已收货数：200个，完成收货：2019-08-20</div>
+
+        </div>
+      </div>
+      <div style="font-size:12px;color:#888;padding: 0px 0 10px 20px">*点击可查看明细相关信息</div>
+
+      <div class="liubai_dt"></div>
+      <div class="subtitle_dt">订单进度跟踪</div>
+      <div class="jindu">
+        <div>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-buzhoutiaowancheng"></use>
+          </svg>
+          下单：2019-08-16 09:08 张大三
+        </div>
+        <div>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-buzhoutiaowancheng"></use>
+          </svg>
+          初审：2018-12-11 09:30 李大四
+        </div>
+        <div>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-buzhoutiaowancheng"></use>
+          </svg>
+          终审：2018-12-11 09:30 王小五
+        </div>
+        <div>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-baifenbi"></use>
+          </svg>
+          入库：20%&nbsp&nbsp(200/1000)
+        </div>
+        <div>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-buzhoutiaowancheng"></use>
+          </svg>
+          收货开单：2019-08-20 10:30 李小兵
+        </div>
+        <div>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-buzouweijinxing"></use>
+          </svg>
+          收货完成：
+        </div>
+
+      </div>
+
+
+    </div>
+
+    <!-- 弹出详细信息 -->
+    <div v-show="ifmx!=0">
+      <div class="quote_edit_mask"></div>
+
+      <div style="z-index: 9999;
+    background-color: #ffffff;
+    position: fixed;
+    bottom: 0px;
+    height: 90%;
+    width: 100%;
+    border-top-left-radius: 15px;
+    border-top-right-radius: 15px;
+    padding: 10px 0;">
+        <div style="display:flex">
+          <div style="margin:0 auto;font-size:16px;font-weight:bold;color:#666;padding:0 0 5px 0">明细相关信息</div>
+          <div style="position: absolute;
+            right: 20px;
+            color: #ccc;
+            font-size: 12px;
+            line-height:26px;">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-guanbi"></use>
+            </svg>
+          </div>
+        </div>
+
+        <div style="font-size:14px;margin:5px 0 ;padding:0 15px">
+          <div>供应商：广东省佛山市顺德区某某纸箱商</div>
+          <div>物料编号：ZX1001</div>
+          <div>物料名称：天地合纸箱 74*23*10</div>
+          <div style="display:flex">
+            <div style="flex:0 0 70%">采购数量：600个</div>
+            <div style="position: absolute;right:20px">交货日期：2019-08-20</div>
+          </div>
+
+          <div style="display:flex">
+            <div style="flex:0 0 70%">采购单价：8.33元</div>
+            <div style="position: absolute;right:20px">金额：5000元</div>
+          </div>
+        </div>
+        <div class="liubai_dt"></div>
+
+        <div style="width: 100%;">
+          <div style="display: flex;
+    width: 105px;
+    margin: 10px auto 5px auto;
+    font-size: 15px;
+    font-weight: bold;">
+
+            <div style="color: #fd7526;border-bottom: 2px solid #fd7526;" v-if="ifmx==1">数量</div>
+            <div style="color:#888;margin-left:30px" v-if="ifmx==1">价格</div>
+
+            <div v-if="ifmx==2" style="color:#888;">数量</div>
+            <div style="margin-left:30px;color: #fd7526;border-bottom: 2px solid #fd7526;" v-if="ifmx==2">价格</div>
+          </div>
+        </div>
+
+        <div style="font-size:15px;padding:0 20px;font-weight:bold;color:#666" v-if="ifmx==1">
+
+          <div style="border-bottom: 1px solid #eee;padding:0 0 10px 0 ;line-height:20px">
+            <div style="display:flex;padding:10px 0 ">
+              <div style="width:100px">需求数 <svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-down"></use>
+                </svg></div>
+              <div style="position: absolute;right:30px;color:#888">1000</div>
+            </div>
+
+            <div style="font-size:14px;color:#999;margin-left:30px;font-weight:400">
+              <div style="display:flex;">
+                <div>生产需求数</div>
+                <div style="position: absolute;right:30px;">1000</div>
+              </div>
+
+              <div style="display:flex;">
+                <div>订单需求数</div>
+                <div style="position: absolute;right:30px;">0</div>
+              </div>
+
+              <div style="display:flex;">
+                <div>外协需求数</div>
+                <div style="position: absolute;right:30px;">0</div>
+              </div>
+
+            </div>
+          </div>
+
+          <div style="border-bottom: 1px solid #eee;padding:0 0 10px 0;line-height:20px ">
+            <div style="display:flex;padding:10px 0 ">
+              <div style="width:100px">库存数 <svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-down"></use>
+                </svg></div>
+              <div style="position: absolute;right:30px;color:#888">400</div>
+            </div>
+
+            <div style="font-size:14px;color:#999;margin-left:30px;font-weight:400">
+              <div style="display:flex;">
+                <div>材料仓</div>
+                <div style="position: absolute;right:30px;">300</div>
+              </div>
+
+              <div style="display:flex;">
+                <div>车间仓</div>
+                <div style="position: absolute;right:30px;">100</div>
+              </div>
+
+            </div>
+          </div>
+          <div style="display:flex;border-bottom: 1px solid #eee;padding:10px 0;line-height:20px ">
+            <div style="width:100px">可装数</div>
+            <div style="position: absolute;right:30px;color:#888">0</div>
+          </div>
+
+          <div style="display:flex;border-bottom: 1px solid #eee;padding:10px 0;line-height:20px ">
+            <div style="width:100px">外协商库存数</div>
+            <div style="position: absolute;right:30px;color:#888">0</div>
+          </div>
+
+          <div style="border-bottom: 1px solid #eee;padding:0 0 10px 0 ">
+            <div style="display:flex;padding:10px 0 ">
+              <div style="width:100px">在途数 <svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-down"></use>
+                </svg></div>
+              <div style="position: absolute;right:30px;color:#888">0</div>
+            </div>
+
+            <div style="font-size:14px;color:#999;margin-left:30px;font-weight:400">
+              <div style="display:flex;">
+                <div>采购未到货数</div>
+                <div style="position: absolute;right:30px;">0</div>
+              </div>
+
+              <div style="display:flex;">
+                <div>生产未完成数</div>
+                <div style="position: absolute;right:30px;">0</div>
+              </div>
+              <div style="display:flex;">
+                <div>外协未完成数</div>
+                <div style="position: absolute;right:30px;">0</div>
+              </div>
+            </div>
+          </div>
+
+          <div style="display:flex;padding:20px 0 0 0;color:#f00;line-height:20px ">
+            <div style="width:100px">缺料数</div>
+            <div style="position: absolute;right:30px;color:#f00">600</div>
+          </div>
+        </div>
+
+        <div style="padding:5px 10px" v-if="ifmx==2">
+          <div
+            style="display:flex;font-size:13px;margin-top:5px;border-bottom: 1px solid #eee;padding:0 0 5px 0;color:#666">
+            <div style="flex:0 0 25%;text-align: center;line-height:34px">供应商</div>
+            <div style="flex:0 0 25%;text-align: center;line-height:34px">最新报价</div>
+            <div style="flex:0 0 25%;text-align: center;line-height:34px">报价时间</div>
+            <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="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="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="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="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>
+            <div style="flex:0 0 25%;text-align: center;">40个</div>
+          </div>
+        </div>
+
+      </div>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  export default {
+
+    name: 'buytaskDetail',
+    data() {
+      return {
+        taskflag_dt: '在进行',
+        ifnew: 1,
+        ifmx: 0 //0-不弹出明细相关信息 1-数量相关信息 2-价格相关信息
+      };
+    },
+    methods: {
+      goback() {
+        {
+          history.back();
+        }
+      },
+      gotomxjd() {
+        this.$router.push({
+          path: "/salemxjd"
+        });
+      }
+    },
+    computed: {
+      colortop: function () {
+        return {
+          bgcolorred: this.taskflag_dt == "待审核",
+          bgcolorgreen: this.taskflag_dt == "在进行",
+          bgcolorblue: this.taskflag_dt == "已完成"
+        };
+      },
+    }
+  }
+
+</script>
+
+<style>
+  body {
+    margin: 0;
+    padding: 0;
+    /* background-color: #fff; */
+    font-family: "微软雅黑";
+  }
+
+  .topbar {
+    min-height: 44px;
+    border-bottom: 1px solid #e5e5e5;
+    background: #fff;
+    position: fixed;
+    width: 100%;
+    z-index: 9990;
+    display: flex;
+    font-size: 18px;
+    align-items: center;
+  }
+
+  .topbar_left {
+    /* flex: 0 0 %; */
+    margin-left: 10px;
+  }
+
+  .topbar_middle {
+    text-align: center;
+    flex: 0 0 85%;
+  }
+
+  .topbar_right {
+    /* flex: 0 0 10%; */
+    position: absolute;
+    right: 10px;
+  }
+
+  #taskdetail {
+    background-color: #fff;
+  }
+
+  #content {
+    position: absolute;
+    top: 44px;
+    background-color: #fff;
+    width: 100%
+  }
+
+  .toparea_dt {
+    color: white;
+    background-color: rgb(252, 78, 44);
+    height: 80px;
+    display: flex;
+  }
+
+  .bgcolorred {
+    background-color: #fc4e2c
+  }
+
+  .bgcolorgreen {
+    background-color: #8dc026;
+  }
+
+  .bgcolorblue {
+    background-color: #1e90ff;
+  }
+
+  .taskcode_dt {
+    font-size: 20px;
+    font-weight: bold;
+    padding: 10px 0 10px 20px;
+    line-height: 30px;
+  }
+
+  .taskflag_dt {
+    font-size: 16px;
+    font-weight: bold;
+    padding: 10px;
+    line-height: 30px;
+    position: absolute;
+    right: 20px;
+  }
+
+  .taskinfo_dt {
+    background-color: #fff;
+    width: 100%;
+    height: 35px;
+    border-top-left-radius: 20px;
+    border-top-right-radius: 20px;
+    border-bottom-right-radius: 0px;
+    border-bottom-left-radius: 0px;
+    position: absolute;
+    top: 50px;
+  }
+
+  .cust_dt {
+    font-size: 16px;
+    font-weight: bold;
+    padding: 10px
+  }
+
+  .reptel_dt {
+    font-size: 14px;
+    font-weight: bold;
+    margin: 10px 0 2px 10px;
+  }
+
+  .address_dt {
+    font-size: 13px;
+    margin-left: 30px;
+    margin-right: 20px;
+    margin-bottom: 10px;
+    color: #666;
+  }
+
+  .hyaddress_dt {
+    font-size: 13px;
+    margin-left: 10px;
+    margin-right: 10px;
+    margin-bottom: 10px;
+    color: #666;
+  }
+
+  .liubai_dt {
+    width: 100%;
+    height: 10px;
+    background-color: #f6f6f6;
+  }
+
+  .middlearea {
+    margin: 10px;
+    font-size: 14px;
+  }
+
+  .taskinfo_dtflex {
+    display: flex;
+    /* height: 60px; */
+    align-items: center;
+    line-height: 20px;
+  }
+
+  .taskinfo_dttitle_dt {
+    font-weight: bold;
+    margin-bottom: 5px;
+    display: flex;
+    flex-wrap: wrap;
+  }
+
+  .title_dt {
+    width: 80px;
+    text-align: right
+  }
+
+  .taskinfo_dtitem {
+    font-weight: normal;
+    color: #333;
+
+  }
+
+  .taskinfo_dtamt {
+    display: flex;
+    line-height: 20px;
+  }
+
+  .taskamt {
+    font-weight: bold;
+    color: red;
+  }
+
+  .leftsize {
+    width: 100px;
+  }
+
+  .dscrp {
+    border-radius: 10px;
+    background: #f5f5f5;
+    padding: 10px 20px;
+    margin: 0 20px 10px 20px;
+    font-size: 14px;
+    color: #555;
+    line-height: 18px;
+  }
+
+  .subtitle_dt {
+    font-size: 15px;
+    font-weight: 700;
+    text-align: center;
+    margin: 0 20px;
+    line-height: 43px;
+  }
+
+  .jindu {
+    border-top: 1px solid #f0f0f0;
+    margin: 0 20px;
+    font-size: 14px;
+    line-height: 30px;
+    padding: 10px 0;
+  }
+
+  .jindubtn {
+    margin-left: 20px;
+    border: 1px solid #bbb;
+    padding: 0 10px;
+    border-radius: 15px;
+    font-size: 13px;
+  }
+
+  .taskmx_dt {
+    border-top: 1px solid #f0f0f0;
+    margin: 0 20px 0 10px;
+    padding: 0 0 20px 0;
+  }
+
+  #rowmx_dt {
+
+    /* margin-bottom: 10px; */
+    padding: 5px 0;
+    border-bottom: 1px solid #f0f0f0;
+  }
+
+  .mxmtrl_dt {
+    margin: 5px;
+    font-size: 14px;
+  }
+
+  .mxqty_dt {
+    font-size: 14px;
+    color: #888;
+    margin-bottom: 3px;
+    margin-left: 25px;
+  }
+
+  .mxjdinfo {
+    background-color: #f6f6f6;
+    font-size: 12px;
+    color: #888;
+    padding: 5px 0 5px 5px;
+  }
+
+  /* .mx_bottomarea {
+    display: flex;
+  } */
+
+  .mx_btndetail {
+    position: absolute;
+    right: 20px;
+    color: #888;
+    font-size: 13px;
+    margin-right: 0px;
+    border-radius: 5px;
+  }
+
+  .quote_edit_mask {
+    height: 100%;
+    width: 100%;
+    background-color: #1d1d1d;
+    opacity: 0.8;
+    position: fixed;
+    top: 0px;
+    z-index: 9998;
+  }
+
+</style>

src/pages/cses_spt/cses_spt_detail.vue

@@ -386,7 +386,7 @@
       return {
         taskflag_dt: "待接收",
         ifnew: 0,
-        ifban: 1, //控制是否弹出填写拒绝原因div的开关
+        ifban: 0, //控制是否弹出填写拒绝原因div的开关
         ifaccept: 0 //1-全部明细同意，整单接收  0-有明细不能接收，整单退回
       };
     },

src/pages/homenew.vue

@@ -6,7 +6,7 @@
     <div class="home_maininfo">
       <div class="task_selection_warp">
         <div class="task_selection">
-          <div>时间线</div>
+          <div>时刻</div>
           <div class='task_selection_check' style="margin-left:30px" >决策</div>
           <div class="task_top_cnt"></div>
         </div>
@@ -484,7 +484,7 @@
 
   .task_selection {
     display: flex;
-    width: 105px;
+    width: 90px;
     margin: 10px auto 5px auto;
     font-size: 15px;
     font-weight: bold;

src/pages/l1todolist.vue

@@ -3,13 +3,13 @@
     <div class="todo_top">
       <div class="todo_selection" v-if="todotype==0">
         <div class='todo_selection_check'>任务</div>
-        <div style="margin-left:30px">公文</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 class='todo_selection_check' style="margin-left:30px">审批</div>
       </div>      
     </div>
 

src/pages/oaview.vue

@@ -38,7 +38,7 @@
 
 
         <!-- 客户订单信息 -->
-        <div v-if="tasktype==0" style="padding:10px 0 20px 0 ">
+        <div v-if="tasktype==0" style="padding:10px 0 0px 0 ">
 
           <!-- <div class="liubai_dt"></div> -->
           <div class="oaview_flex">
@@ -73,12 +73,13 @@
             <div class="oaview_item">2019年8月30日</div>
           </div>
 
+          <div class="oaview_flex">
+            <div class="oaview_title">摘要</div>
+            <div class="oaview_item">共300件商品,其中包括：218B两人位沙发 100张，100,000元；6528茶几 50张，50,000元...</div>
+          </div>
 
-          <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>
-            查看单据详细信息
+          <div style="display:flex">
+            <div style="font-size:14px;color:#6495ed;margin: 10px auto 0 auto">查看单据详细信息</div>
           </div>
 
         </div>

src/pages/quoteedit.vue

@@ -162,14 +162,14 @@
 
       <div class="liubai"></div>
 
-      <div class="quote_edit_main quote_edit_flex">
+      <div class="quote_edit_main quote_edit_flex" style="border-bottom: 1px solid #f5f5f5;line-height:30px">
         <div class="quote_edit_main_qty">数量</div>
         <!-- <div>
           <svg class="icon" aria-hidden="true">
             <use xlink:href="#icon-shuliangjian1"></use>
           </svg>
         </div> -->
-        <div class="quote_edit_main_qtyvalue">
+        <div class="quote_edit_main_pzvalue">
           432
         </div>
         <!-- <div>
@@ -177,59 +177,67 @@
             <use xlink:href="#icon-shuliangjia1"></use>
           </svg>
         </div> -->
-        <div class="quote_edit_subinfo" style="margin-left:10px;">400~500 优惠5%
+        <div class="quote_edit_subinfo" style="margin-left:20px;color:#888">400~500 优惠5%
           <svg class="icon" aria-hidden="true">
             <use xlink:href="#icon-wenhao"></use>
           </svg>
         </div>
+        <div class="quote_edit_main_pzbtn" style="color:#ccc">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-iconfontjiantou2"></use>
+          </svg>
+        </div>
       </div>
 
-      <div class="quote_edit_main">
-        <div class="quote_edit_flex">
-          <div class="quote_edit_main_qty">贸易方式</div>
-          <div class="quote_edit_main_pzvalue">FOB</div>
-          <div class="quote_edit_main_pzbtn" style="color:#333">
-            <svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-xuanxiang"></use>
-            </svg>
-          </div>
+      <!-- <div class="quote_edit_main"> -->
+      <div class="quote_edit_flex quote_edit_main" style="border-bottom: 1px solid #f5f5f5;line-height:30px">
+        <div class="quote_edit_main_qty">贸易方式</div>
+        <div class="quote_edit_main_pzvalue">FOB</div>
+        <div class="quote_edit_main_pzbtn" style="color:#ccc">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-iconfontjiantou2"></use>
+          </svg>
         </div>
+      </div>
 
-        <div class="quote_edit_flex" style="margin-top:5px;">
-          <div class="quote_edit_main_qty">港口</div>
-          <div class="quote_edit_main_pzvalue">XXXXXX港</div>
-          <div class="quote_edit_main_pzbtn" style="color:#333">
-            <svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-xuanxiang"></use>
-            </svg>
-          </div>
-        </div>
-                <div class="quote_edit_flex" style="margin-top:5px;">
-          <div class="quote_edit_main_qty">柜型</div>
-          <div class="quote_edit_main_pzvalue">40Q"</div>
-          <div class="quote_edit_main_pzbtn" style="color:#333">
-            <svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-xuanxiang"></use>
-            </svg>
-          </div>
+      <div class="quote_edit_flex quote_edit_main"
+        style="margin-top:5px;border-bottom: 1px solid #f5f5f5;line-height:30px">
+        <div class="quote_edit_main_qty">港口</div>
+        <div class="quote_edit_main_pzvalue">XXXXXX港</div>
+        <div class="quote_edit_main_pzbtn" style="color:#ccc">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-iconfontjiantou2"></use>
+          </svg>
         </div>
-        <div class="quote_edit_flex" style="margin-top:5px;">
-          <div class="quote_edit_main_qty">总运费</div>
-          <div class="quote_edit_main_pzvalue"><span v-if="ifusd==1">人民币 </span>5500</div>
-          <div class="quote_edit_main_pzvalue" style="margin-left:10px;" v-if="ifusd==1">折合美元 846.15</div>
+      </div>
+      <div class="quote_edit_flex quote_edit_main"
+        style="margin-top:5px;border-bottom: 1px solid #f5f5f5;line-height:30px">
+        <div class="quote_edit_main_qty">柜型</div>
+        <div class="quote_edit_main_pzvalue">40Q"</div>
+        <div class="quote_edit_main_pzbtn" style="color:#ccc">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-iconfontjiantou2"></use>
+          </svg>
         </div>
       </div>
+      <div class="quote_edit_flex quote_edit_main" style="margin-top:5px;line-height:30px">
+        <div class="quote_edit_main_qty">总运费</div>
+        <div class="quote_edit_main_pzvalue"><span v-if="ifusd==1">人民币 </span>5500</div>
+        <div class="quote_edit_main_pzvalue" style="margin-left:10px;" v-if="ifusd==1">折合美元 846.15</div>
+
+      </div>
+      <!-- </div> -->
 
 
       <div class="liubai"></div>
 
       <div class="quote_edit_main">
         <div class="quote_edit_main_title">调整费用</div>
-        <div style="display:flex;align-items: center;margin-bottom:5px;">
+        <div style="display:flex;align-items: center;margin:10px 5px 0 0 ;">
           <div class="quote_edit_main_pzname">优惠比例</div>
           <div class="quote_edit_main_qtyvalue" style="width:20px;text-align: center;">5%</div>
         </div>
-        <div style="display:flex;align-items: center;margin-bottom:5px;">
+        <div style="display:flex;align-items: center;margin:20px 0 5px 0;">
           <div class="quote_edit_main_pzname">其它费用</div>
           <div class="quote_edit_main_qtyvalue" style="width:20px;text-align: center;">20</div>
         </div>
@@ -494,7 +502,7 @@
 
     <div v-show="ifshow==1">
       <div class="quote_edit_mask"></div>
-      <div class="quote_edit_pzch" style="height:300px">
+      <div class="quote_edit_pzch" style="height:340px">
 
         <div class="quote_edit_flex quote_edit_main_title">
           <div style="margin-left:20px">优惠信息</div>
@@ -539,17 +547,17 @@
           </div>
         </div>
 
-        <div style="display:flex;align-items: center;position: fixed;bottom: 50px;margin-left:20px;width:100%">
+        <div style="display:flex;align-items: center;position: fixed;bottom: 80px;margin-left:20px;width:100%">
           <div class="quote_edit_main_qty">数量</div>
           <div>
             <svg class="icon" aria-hidden="true">
               <use xlink:href="#icon-shuliangjian1"></use>
             </svg>
           </div>
-          <div class="quote_edit_main_qtyvalue">
+          <div class="quote_edit_main_qtyvalue" style="margin:0 0 0 10px">
             432
           </div>
-          <div>
+          <div style="margin:0 0 0 10px">
             <svg class="icon" aria-hidden="true">
               <use xlink:href="#icon-shuliangjia1"></use>
             </svg>
@@ -570,9 +578,9 @@
     data() {
       return {
         ifch: 0, //选择配置 0-没有显示  1-显示 
-        ifusd: 0, //0-人民币 1-美元
+        ifusd: 1, //0-人民币 1-美元
         ifcust: 1, //0-只显示客户编码 1-显示客户名称地址
-        ifshow: 0 //0-不显示数量优惠条件 1-显示
+        ifshow: 1 //0-不显示数量优惠条件 1-显示
       }
     },
     methods: {
@@ -617,6 +625,8 @@
     padding: 0 0 0 10px;
     border-bottom: 1px solid #f5f5f5;
     line-height: 30px;
+    color: #888;
+    font-size: 14px;
   }
 
   .quote_edit_pzch_value_row div {
@@ -733,6 +743,7 @@
     font-size: 14px;
     display: flex;
     line-height: 28px;
+    padding:5px 0 ;
   }
 
   .quote_edit_main_pzname {
@@ -744,9 +755,9 @@
   .quote_edit_main_pzvalue {
     color: #666;
   }
-  
-  .quote_flex{
-    
+
+  .quote_flex {
+
     flex: 0 0 55%;
   }
 
@@ -764,7 +775,7 @@
   }
 
   .quote_edit_main_qty {
-    font-size: 16px;
+    font-size: 14px;
     font-weight: bold;
     flex: 0 0 70px;
   }
@@ -800,7 +811,7 @@
     font-size: 16px;
     font-weight: bold;
     text-align: center;
-    padding: 8px;
+    padding: 10px 0;
   }
 
   .quote_edit_ifusd_0 {
@@ -819,8 +830,8 @@
     width: 100%;
   }
 
-  .quote_edit_main_pzvalue_diff{
-    color:#f00
+  .quote_edit_main_pzvalue_diff {
+    color: #f00
   }
 
 </style>

src/pages/saletaskdetail.vue

@@ -7,7 +7,7 @@
         </svg>
       </div>
       <div class="topbar_middle">
-        订单详情
+        销售订单详情
       </div>
       <div class="topbar_right">
         <svg class="icon" aria-hidden="true">
@@ -383,14 +383,14 @@
   }
 
   .taskcode_dt {
-    font-size: 22px;
+    font-size: 20px;
     font-weight: bold;
     padding: 10px 0 10px 20px;
     line-height: 30px;
   }
 
   .taskflag_dt {
-    font-size: 18px;
+    font-size: 16px;
     font-weight: bold;
     padding: 10px;
     line-height: 30px;
@@ -453,6 +453,7 @@
     display: flex;
     /* height: 60px; */
     align-items: center;
+    line-height: 20px;
   }
 
   .taskinfo_dttitle_dt {
@@ -475,6 +476,7 @@
 
   .taskinfo_dtamt {
     display: flex;
+    line-height: 20px;
   }
 
   .taskamt {
@@ -491,7 +493,7 @@
     background: rgb(240, 237, 237);
     padding: 10px 20px;
     margin: 0 20px 10px 20px;
-    font-size: 15px;
+    font-size: 14px;
     color: #555;
     line-height: 18px;
   }
@@ -508,7 +510,7 @@
   .jindu {
     border-top: 1px solid #f0f0f0;
     margin: 0 20px;
-    font-size: 15px;
+    font-size: 14px;
     line-height: 30px;
     padding: 10px 0;
   }
@@ -533,7 +535,7 @@
 
   .mxmtrl_dt {
     margin: 5px;
-    font-size: 16px;
+    font-size: 14px;
   }
 
   .mxqty_dt {

src/pages/saletaskmxjd.vue

@@ -197,7 +197,7 @@
     padding: 10px;
     line-height: 30px; */
     margin: 0 20px;
-    font-size: 15px;
+    font-size: 14px;
     line-height: 30px;
     padding: 10px 0;
   }

src/pages/task.vue

@@ -24,7 +24,7 @@
         <div class="task_selection_warp">
           <div class="task_selection">
             
-            <div class='task_selection_check'>时间线</div>
+            <div class='task_selection_check'>时刻</div>
             <div style="margin-left:30px">决策</div>
             <div class="task_top_cnt"></div>
           </div>
@@ -130,7 +130,7 @@
 
   .task_selection {
     display: flex;
-    width: 105px;
+    width: 90px;
     margin: 10px auto 5px auto;
     font-size: 15px;
     font-weight: bold;

src/pages/taskedit.vue

@@ -34,6 +34,33 @@
           </div>
         </div>
 
+        <div class="taskedit_flex" v-if="tasktype==2">
+          <div class="taskedit_title">稽核类目</div>
+          <div class="taskedit_item">车间检查-卫生检查</div>
+          <div class="taskedit_pzbtn">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-iconfontjiantou2"></use>
+            </svg>
+          </div>
+        </div>
+
+        <div class="taskedit_flex" v-if="tasktype==2">
+          <div class="taskedit_title">及格标准</div>
+          <div class="taskedit_dscrp">
+            <span>地面清洁无灰尘、无垃圾、无油污、无积水、无死角。墙壁(角)清洁无污染、无蛛网、无死角。门窗明亮干净、无积灰、无污迹、无蛛网。</span>
+          </div>
+        </div>
+
+        <div class="taskedit_flex" v-if="tasktype==2">
+          <div class="taskedit_title">责任人</div>
+          <div class="taskedit_item">待定</div>
+          <div class="taskedit_pzbtn">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-iconfontjiantou2"></use>
+            </svg>
+          </div>
+        </div>
+
         <div class="taskedit_flex">
           <div class="taskedit_title">任务人</div>
           <div class="taskedit_item">张小千</div>
@@ -96,7 +123,7 @@
           </div>
         </div>
 
-        <div class="taskedit_flex">
+        <div class="taskedit_flex" v-if="tasktype!=2">
           <div class="taskedit_title">任务</div>
           <div class="taskedit_dscrp">
             <span v-if="tasktype==0">跟设计公司沟通，定好最新一季宣传画册的设计。</span>
@@ -105,12 +132,7 @@
           </div>
         </div>
 
-        <div class="taskedit_flex" v-if="tasktype==2">
-          <div class="taskedit_title">及格标准</div>
-          <div class="taskedit_dscrp">
-            <span>地面清洁无灰尘、无垃圾、无油污、无积水、无死角。墙壁(角)清洁无污染、无蛛网、无死角。门窗明亮干净、无积灰、无污迹、无蛛网。</span>
-          </div>
-        </div>
+
 
         <div class="taskedit_flex">
           <div class="taskedit_title">时间</div>
@@ -233,8 +255,8 @@
     name: 'taskedit',
     data() {
       return {
-        tasktype: 1 ,//0-临时任务 1-客户走访 2-稽核检查
-        ifcheck:0 //1-需要验收 0-不用验收
+        tasktype: 2, //0-临时任务 1-客户走访 2-稽核检查
+        ifcheck: 1 //1-需要验收 0-不用验收
       }
     }
 

src/pages/taskview.vue

@@ -30,15 +30,25 @@
 
       <div class="taskview_main">
         <div class="taskview_info">
-          <span class="taskview_iffg" v-if="iffg==1">返工</span><span
-            v-if="tasktype==0">跟设计公司沟通，定好最新一季宣传画册的设计。</span>
+          <span class="taskview_iffg" v-if="iffg==1">返工</span><span v-if="tasktype==0">跟设计公司沟通，定好最新一季宣传画册的设计。</span>
           <span v-if="tasktype==1">了解客户上一批货的销售情况及质量反馈，并介绍本季最新产品。</span>
-          <span v-if="tasktype==2">按6S标准检查车间清洁是否达标。</span>
         </div>
 
+        <div class="taskview_flex">
+          <div class="taskview_title">稽核类目</div>
+          <div class="taskview_item">车间检查-卫生检查</div>
+        </div>
+
+        <div class="taskview_flex">
+          <div class="taskview_title">责任人</div>
+          <div class="taskview_item">王磊磊</div>
+        </div>
 
         <div v-if="tasktype==2">
-          <div class="taskview_check_title">及格标准</div>
+          <div class="taskview_flex" style="margin:10px 0 0 0 ;color:#777">
+            <div class="taskview_title">及格标准</div>
+          </div>
+
           <div class="taskview_check_dscrp">
             <span>地面清洁无灰尘、无垃圾、无油污、无积水、无死角。墙壁(角)清洁无污染、无蛛网、无死角。门窗明亮干净、无积灰、无污迹、无蛛网。</span>
           </div>
@@ -47,7 +57,8 @@
         <!-- 附件图片，直接显示缩略图 -->
         <div style="display:flex;margin:10px 0 0 20px;" v-if="tasktype==2">
           <div>
-            <img src="../assets/taskview_01.jpeg" style="height: 60px;box-shadow: 0 2px 3px rgba(0, 0, 0, 0.302);"></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">
@@ -201,7 +212,8 @@
           </div>
 
           <div v-if="tasktype==1">
-            <img src="../assets/taskview_04.jpg" style="height: 140px;box-shadow: 0 2px 3px rgba(0, 0, 0, 0.302);"></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">
@@ -292,6 +304,7 @@
             <span v-if="ifresponse==2">任务验收</span>
             <span v-if="ifresponse==1">完成任务</span>
           </div>
+
           <div style="position: absolute;right: 20px;color: #ccc;font-size: 12px;">
             <svg class="icon" aria-hidden="true">
               <use xlink:href="#icon-guanbi"></use>
@@ -319,8 +332,20 @@
               <use xlink:href="#icon-xing"></use>
             </svg>
           </div>
+        </div>
 
 
+        <div style="margin:10px 20px 0px 20px;font-size:15px" v-if="tasktype==2&ifresponse!=2">
+          <span style="color:#666">检查结果</span>
+          <span style="margin:0 0 0 5px;">合格</span><svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-xiala"></use>
+          </svg>
+
+          <span style="color:#666;margin:0 0 0 20px;position:absolute;right:90px">责任人</span>
+          <span style="position:absolute;right:20px">王磊磊<svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-xiala"></use>
+            </svg>
+          </span>
         </div>
 
         <!-- 评语 或 汇报 录入 -->
@@ -383,10 +408,10 @@
     name: 'taskview',
     data() {
       return {
-        tasktype: 0, //0-临时任务 1-客户走访 2-稽核检查
-        taskflag_dt: "待验收", //未完成,待验收,已验收
-        ifresponse: 0, //弹窗 0：不弹  1：完成任务界面 2：验收任务界面
-        iffg: 0//0-不是返工 1-返工
+        tasktype: 2, //0-临时任务 1-客户走访 2-稽核检查
+        taskflag_dt: "已验收", //未完成,待验收,已验收
+        ifresponse: 1, //弹窗 0：不弹  1：完成任务界面 2：验收任务界面
+        iffg: 0 //0-不是返工 1-返工
       }
     },
     computed: {
@@ -439,7 +464,7 @@
   }
 
   .response_height_1 {
-    height: 330px;
+    height: 370px;
   }
 
   .response_height_2 {

src/router/index.js

@@ -2,12 +2,13 @@ import Vue from 'vue'
 import Router from 'vue-router'
 import SaleTask from '@/pages/saletask'
 import SaleTaskDetail from '@/pages/saletaskdetail'
+import BuyTaskDetail from '@/pages/buytaskdetail'
 import SaleTaskmxjd from '@/pages/saletaskmxjd'
 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'
+import About from '@/pages/about_nanfang'
 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'
@@ -34,6 +35,7 @@ import TaskEdit from '@/pages/taskedit'
 import TaskView from '@/pages/taskview'
 import TodoList from '@/pages/l1todolist'
 import OaView from '@/pages/oaview'
+import Amerce from '@/pages/amerce'
 
 Vue.use(Router)
 
@@ -52,6 +54,22 @@ export default new Router({
         title: '工作任务'
       }
     },
+    {
+      path: '/buytaskdetail',
+      name: 'BuyTaskDetail',
+      component: BuyTaskDetail,
+      meta: {
+        title: '采购订单详情'
+      }
+    },
+    {
+      path: '/amerce',
+      name: 'Amerce',
+      component: Amerce,
+      meta: {
+        title: '供应商罚款单'
+      }
+    },
     {
       path: '/oaview',
       name: 'OaView',