Browse Source

常规更新

LongjoeDyy 5 years ago
parent
commit
e9a0c84a4c
5 changed files with 958 additions and 4 deletions
  1. 3 3
      src/pages/l1todolist.vue
  2. 316 0
      src/pages/orderzl.vue
  3. 620 0
      src/pages/orderzlmx.vue
  4. 1 1
      src/pages/quoteedit.vue
  5. 18 0
      src/router/index.js

+ 3 - 3
src/pages/l1todolist.vue

@@ -553,12 +553,12 @@
   }
 
   .kindgreen {
-    border-left: 3px solid #88b04b;
+    border-left: 3px solid #8dc026;
 
   }
 
   .kindgreen::after {
-    border-right-color: #88b04b;
+    border-right-color: #8dc026;
   }
 
   .kindred {
@@ -578,7 +578,7 @@
   }
 
   .icongreen {
-    background: #88b04b;
+    background: #8dc026;
     box-shadow: 0 0 0 3px #d1f3a1;
   }
 

+ 316 - 0
src/pages/orderzl.vue

@@ -0,0 +1,316 @@
+<template>
+  <div>
+    <div class="topbar">
+      <div class="topbar_left">
+        <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="order_scan_area">
+        <div class="order_scan">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-sousuo"></use>
+          </svg>
+          输入或扫描单号
+        </div>
+        <div class="order_scan_btn">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-iconfontscan"></use>
+          </svg>
+        </div>
+      </div>
+
+      <!-- 日期 -->
+      <div style="font-size: 17px;font-weight: bold;padding: 10px 0 0 10px;">9月10日</div>
+      <!-- 内容主体 -->
+      <div style="padding: 10px 10px 0 10px;font-size:14px;line-height:19px;">
+
+        <!-- 以下div封装为组件,v-for中调用 -->
+        <div class="arrow_box kindgreen">
+          <div style="font-size:16px;font-weight:bold">SC190907001</div>
+          <div class="order_conner_sec tip_red">待排程审</div>
+          <div class="order_conner tip_green">在进行</div>
+
+          <div>W-168黑色 FHZY4202</div>
+          <div>数量:100
+            <span style="margin-left:5px;color:#888">
+              (已完成80,已终止5,未完成15)
+            </span>
+          </div>
+          <div>
+            <span>日期:9月10日~9月20日</span>
+<!-- 如果当前时间晚于指令单的要求完成时间,则显示已超期标记 -->
+
+            <!-- <span style="color: #fa5a5a;font-size:13px;margin-left:5px">
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-jinggao"></use>
+              </svg>
+              已超期
+            </span> -->
+          </div>
+          <div>生产批号:FHLWL8603-02</div>
+        </div>
+
+        <div class="arrow_box kindblue">
+          <div style="font-size:16px;font-weight:bold">SC190829001</div>
+          <div class="order_conner_sec tip_blue">已排程审</div>
+          <div class="order_conner tip_blue">已完成</div>
+
+          <div>FS19-1 FHLWL8603</div>
+          <div>数量:100
+            <span style="margin-left:5px;color:#888">
+              (已完成100)
+            </span>
+          </div>
+          <div>
+            <span>日期:9月10日~10月20日</span>
+          </div>
+          <div>生产批号:FHD6605-17</div>
+        </div>
+
+        <div class="arrow_box kindred">
+          <div style="font-size:16px;font-weight:bold">SC190910001</div>
+          <div class="order_conner_sec tip_red">待排程审</div>
+          <div class="order_conner tip_red">待审核</div>
+
+          <div>X-16B升级版电镀架 FHD59301</div>
+          <div>数量:100
+            <span style="margin-left:5px;color:#888">
+              (已完成0,未完成100)
+            </span>
+          </div>
+          <div>
+            <span>日期:9月10日~10月20日</span>
+          </div>
+          <div>生产批号:FHD59301-132</div>
+        </div>
+
+      </div>
+
+<!-- 以下内容跟上面重复,只作效果展示用 -->
+      <!-- 日期 -->
+      <div style="font-size: 17px;font-weight: bold;padding: 10px 0 0 10px;">9月9日</div>
+      <!-- 内容主体 -->
+      <div style="padding: 10px 10px 0 10px;font-size:14px;line-height:19px">
+
+        <!-- 以下div封装为组件,v-for中调用 -->
+        <div class="arrow_box kindgreen">
+          <div style="font-size:16px;font-weight:bold">SC190907001</div>
+          <div class="order_conner_sec tip_red">待排程审</div>
+          <div class="order_conner tip_green">在进行</div>
+
+          <div>W-168黑色 FHZY4202</div>
+          <div>数量:100
+            <span style="margin-left:5px;color:#888">
+              (已完成80,已终止5,未完成15)
+            </span>
+          </div>
+          <div>
+            <span>日期:9月9日~9月12日</span>
+            <span style="color: #fa5a5a;font-size:13px;margin-left:5px">
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-jinggao"></use>
+              </svg>
+              已超期
+            </span>
+          </div>
+          <div>生产批号:FHLWL8603-02</div>
+        </div>
+
+        <div class="arrow_box kindblue">
+          <div style="font-size:16px;font-weight:bold">SC190829001</div>
+          <div class="order_conner_sec tip_blue">已排程审</div>
+          <div class="order_conner tip_blue">已完成</div>
+
+          <div>FS19-1 FHLWL8603</div>
+          <div>数量:100
+            <span style="margin-left:5px;color:#888">
+              (已完成100)
+            </span>
+          </div>
+          <div>
+            <span>日期:9月10日~10月20日</span>
+          </div>
+          <div>生产批号:FHD6605-17</div>
+        </div>
+
+        <div class="arrow_box kindred">
+          <div style="font-size:16px;font-weight:bold">SC190910001</div>
+          <div class="order_conner_sec tip_red">待排程审</div>
+          <div class="order_conner tip_red">待审核</div>
+
+          <div>X-16B升级版电镀架 FHD59301</div>
+          <div>数量:100
+            <span style="margin-left:5px;color:#888">
+              (已完成0,未完成100)
+            </span>
+          </div>
+          <div>
+            <span>日期:9月10日~10月20日</span>
+          </div>
+          <div>生产批号:FHD59301-132</div>
+        </div>
+
+      </div>
+
+
+    </div>
+  </div>
+
+</template>
+
+<script>
+  export default {
+
+  }
+
+</script>
+
+<style>
+  body {
+    margin: 0;
+    padding: 0;
+    /* background-color: #fff; */
+    font-family: "微软雅黑";
+    font-size: 15px;
+  }
+
+  .topbar {
+    min-height: 44px;
+    border-bottom: 1px solid #e5e5e5;
+    background: #fff;
+    position: fixed;
+    width: 100%;
+    z-index: 9993;
+    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;
+  }
+
+  #content {
+    position: absolute;
+    top: 44px;
+    background-color: #fff;
+    width: 100%;
+    padding-bottom: 60px;
+  }
+
+  .order_scan_area {
+    display: flex;
+    align-items: center;
+  }
+
+  .order_scan {
+    margin: 10px 10px;
+    padding: 8px 10px;
+    /* border: 1px solid #c7c7c7; */
+    background-color: #f7f7f7;
+    color: #bbb;
+    border-radius: 20px;
+    flex: 0 0 78%
+  }
+
+  .order_scan_btn {
+    color: #999;
+    font-size: 28px;
+  }
+
+  .arrow_box {
+    position: relative;
+    padding: 5px 5px 5px 10px;
+    /* border-radius: 5px; */
+
+    box-shadow: 0 2px 7px rgba(0, 0, 0, 0.1);
+    background: #fff;
+    margin-bottom: 8px;
+    /* border-bottom: 1px solid #f5f5f5;
+    border-top: 1px solid #f5f5f5;
+    border-right: 1px solid #f5f5f5; */
+  }
+
+  .kindgreen {
+    border-left: 5px solid #8dc026;
+
+  }
+
+
+  .kindblue {
+    border-left: 5px solid #46a4da;
+
+  }
+
+  .kindred {
+    border-left: 5px solid #ff6f61;
+  }
+
+
+  .tip_red {
+    color: #fff;
+    background-color: #fa5a5a
+  }
+
+  .tip_blue {
+    color: #fff;
+    background-color: #46a4da
+  }
+
+  .tip_green {
+    color: #fff;
+    background-color: #8dc026
+  }
+
+  .order_conner {
+    position: absolute;
+    right: 0px;
+    top: 0px;
+    /* color: #888; */
+    font-size: 12px;
+    padding: 4px 10px;
+    /* background-color: #ececec; */
+    line-height: 12px;
+    width: 36px;
+    text-align: center;
+    font-weight: bold;
+  }
+
+  .order_conner_sec {
+    position: absolute;
+    right: 60px;
+    top: 0px;
+    /* color: #888; */
+    font-size: 12px;
+    padding: 4px 10px;
+    /* background-color: #ececec; */
+    line-height: 12px;
+    /* width: 36px; */
+    text-align: center;
+    font-weight: bold;
+  }
+
+</style>

+ 620 - 0
src/pages/orderzlmx.vue

@@ -0,0 +1,620 @@
+<template>
+  <div>
+    <div class="topbar":class="colortop">
+      <div class="topbar_left">
+        <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">
+          SC190907001
+        </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-shouhuo"></use>
+          </svg>
+          W-168黑色 FHZY4202
+        </div>
+      </div>
+
+      <div class="ordermx_pz_dt">背面料:LFSD-22黑色|座面料:LFSS-26黑色|腰面料:LFSS-26黑色|扶手面料:LFSS-26黑色|座主棉:座内棉/D35灰泡|铁架:银白色喷漆|</div>
+
+      <div class="liubai_dt"></div>
+
+
+      <div class="middlearea">
+        <div class='taskinfo_dtflex'>
+          <div class="taskinfo_dttitle_dt">
+            <div class="title_dt ">生产批号:</div>
+            <div class="taskinfo_dtitem leftsize">FHLWL8603-02</div>
+          </div>
+          <div class="taskinfo_dttitle_dt">
+            <div class="title_dt rightside">订单序号:</div>
+            <div class="taskinfo_dtitem requiredate">1</div>
+          </div>
+        </div>
+        <div class='taskinfo_dtflex'>
+          <div class="taskinfo_dttitle_dt">
+            <div class="title_dt ">开始日期:</div>
+            <div class="taskinfo_dtitem leftsize">2018-09-10</div>
+          </div>
+          <div class="taskinfo_dttitle_dt">
+            <div class="title_dt rightside">交货日期:</div>
+            <div class="taskinfo_dtitem requiredate">2018-09-30</div>
+          </div>
+        </div>
+        <div class="taskinfo_dtamt">
+          <div class="taskinfo_dttitle_dt">
+            <div class="title_dt">计划数量:</div>
+            <div class="taskinfo_dtitem  leftsize">100</div>
+          </div>
+          <div class="taskinfo_dttitle_dt dingjin">
+            <div class="title_dt rightside">已进仓数:</div>
+            <div class="taskinfo_dtitem ">80</div>
+          </div>
+        </div>
+        <div class="taskinfo_dtamt">
+          <div class="taskinfo_dttitle_dt">
+            <div class="title_dt">已终止数:</div>
+            <div class="taskinfo_dtitem  leftsize">5</div>
+          </div>
+          <div class="taskinfo_dttitle_dt dingjin">
+            <div class="title_dt rightside">未完成数:</div>
+            <div class="taskinfo_dtitem ">15</div>
+          </div>
+        </div>
+
+        <div class="dscrp">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-wentibuchong"></use>
+          </svg>备注
+          <!-- white-space: pre-wrap;用于正常显示回车换行 -->
+          <div style="white-space: pre-wrap;margin-top:5px">1.所有产品的汽杆质量一定要好,上票投诉很多升降有问题
+2.靠背网布的颜色和座垫网布的颜色要保持一致
+3.客户投诉W-42A喷塑不良,这次要注意,不要再出现此类问题</div>
+        </div>
+
+        <div class="ordermx_fj">
+          <div style="font-size:30px">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-excel"></use>
+            </svg>
+          </div>
+
+          <div style="margin:0 0 0 5px">
+            <div>FHLWL8603-02唛头信息.xlsx</div>
+            <div style="color:#888;font-size:12px">
+              <span>1.2M</span>
+            </div>
+          </div>
+        </div>
+
+        <div class="ordermx_fj">
+          <div style="font-size:30px">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-yasuobao"></use>
+            </svg>
+          </div>
+
+          <div style="margin:0 0 0 5px">
+            <div>FHLWL8603-02唛头信息.rar</div>
+            <div style="color:#888;font-size:12px">
+              <span>3.2M</span>
+            </div>
+          </div>
+        </div>
+
+      </div>
+
+      <div class="liubai_dt"></div>
+
+      <div class="subtitle_dt">工组进度</div>
+      <div class="jindu">
+        <div class="jindumx">
+          <div>
+            <div style="display:flex">
+              <div>
+                <span style="font-size:15px;font-weight:bold">木工组</span>
+                <span style="color:#666;margin-left:5px">0/100</span>
+              </div>
+              <div style="position:absolute;right:105px">
+                领完料<svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-error"></use>
+                </svg>
+              </div>
+              <div style="position:absolute;right:40px">
+                排程审<svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-wancheng"></use>
+                </svg>
+              </div>
+            </div>
+            <div style="color:#666">9/10 08:00~18:00</div>
+          </div>
+          <div class="jindumx_pzbtn" style="color:#ccc">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-iconfontjiantou2"></use>
+            </svg>
+          </div>
+        </div>
+
+        <div class="jindumx">
+          <div>
+            <div style="display:flex">
+              <div>
+                <span style="font-size:15px;font-weight:bold">裁棉组</span>
+                <span style="color:#666;margin-left:5px">100/100</span>
+              </div>
+              <div style="position:absolute;right:105px">
+                领完料<svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-wancheng"></use>
+                </svg>
+              </div>
+              <div style="position:absolute;right:40px">
+                排程审<svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-wancheng"></use>
+                </svg>
+              </div>
+            </div>
+            <div style="color:#666">9/10 08:00~18:00</div>
+          </div>
+          <div class="jindumx_pzbtn" style="color:#ccc">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-iconfontjiantou2"></use>
+            </svg>
+          </div>
+        </div>
+
+        <div class="jindumx">
+          <div>
+            <div style="display:flex">
+              <div>
+                <span style="font-size:15px;font-weight:bold">裁面料组</span>
+                <span style="color:#666;margin-left:5px">40/100</span>
+              </div>
+              <div style="position:absolute;right:105px">
+                领完料<svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-wancheng"></use>
+                </svg>
+              </div>
+              <div style="position:absolute;right:40px">
+                排程审<svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-wancheng"></use>
+                </svg>
+              </div>
+            </div>
+            <div style="color:#666">9/10 08:00~18:00</div>
+          </div>
+          <div class="jindumx_pzbtn" style="color:#ccc">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-iconfontjiantou2"></use>
+            </svg>
+          </div>
+        </div>
+
+
+        <div class="jindumx">
+          <div>
+            <div style="display:flex">
+              <div>
+                <span style="font-size:15px;font-weight:bold">配件组</span>
+                <span style="color:#666;margin-left:5px">0/100</span>
+              </div>
+              <div style="position:absolute;right:105px">
+                领完料<svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-error"></use>
+                </svg>
+              </div>
+              <div style="position:absolute;right:40px">
+                排程审<svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-wancheng"></use>
+                </svg>
+              </div>
+            </div>
+            <div style="color:#666">9/11 08:00~18:00</div>
+          </div>
+          <div class="jindumx_pzbtn" style="color:#ccc">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-iconfontjiantou2"></use>
+            </svg>
+          </div>
+        </div>
+
+        <div class="jindumx">
+          <div>
+            <div style="display:flex">
+              <div>
+                <span style="font-size:15px;font-weight:bold">装配组</span>
+                <span style="color:#666;margin-left:5px">0/100</span>
+              </div>
+              <div style="position:absolute;right:105px">
+                领完料<svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-error"></use>
+                </svg>
+              </div>
+              <div style="position:absolute;right:40px">
+                排程审<svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-wancheng"></use>
+                </svg>
+              </div>
+            </div>
+            <div style="color:#666">9/11 08:00~18:00</div>
+          </div>
+          <div class="jindumx_pzbtn" style="color:#ccc">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-iconfontjiantou2"></use>
+            </svg>
+          </div>
+        </div>
+
+        <div class="jindumx">
+          <div>
+            <div style="display:flex">
+              <div>
+                <span style="font-size:15px;font-weight:bold">缝纫组</span>
+                <span style="color:#666;margin-left:5px">0/100</span>
+              </div>
+              <div style="position:absolute;right:105px">
+                领完料<svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-error"></use>
+                </svg>
+              </div>
+              <div style="position:absolute;right:40px">
+                排程审<svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-wancheng"></use>
+                </svg>
+              </div>
+            </div>
+            <div style="color:#666">9/11 08:00~18:00</div>
+          </div>
+          <div class="jindumx_pzbtn" style="color:#ccc">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-iconfontjiantou2"></use>
+            </svg>
+          </div>
+        </div>
+
+
+        <div class="jindumx">
+          <div>
+            <div style="display:flex">
+              <div>
+                <span style="font-size:15px;font-weight:bold">普通网椅线</span>
+                <span style="color:#666;margin-left:5px">0/100</span>
+              </div>
+              <div style="position:absolute;right:105px">
+                领完料<svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-error"></use>
+                </svg>
+              </div>
+              <div style="position:absolute;right:40px">
+                排程审<svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-wancheng"></use>
+                </svg>
+              </div>
+            </div>
+            <div style="color:#666">9/11 08:00~18:00</div>
+          </div>
+          <div class="jindumx_pzbtn" style="color:#ccc">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-iconfontjiantou2"></use>
+            </svg>
+          </div>
+        </div>
+      </div>
+
+
+      <div class="liubai_dt" v-if="ifqty==1"></div>
+
+      <div class="subtitle_dt" v-if="ifqty==1">缺料明细</div>
+      <div class="jindu" v-if="ifqty==1">
+        <div class="order_mxmtrl_dt">
+          <span
+            style="font-size:12px;background-color:#fc4e2c;color:#fff;padding: 2px 6px;border-radius: 15px;">木工组</span>
+          <span>W-119G-1扶手加强铁片 30*30*1.8MM内放孔10*10MM</span>
+          <span style="color:#888;margin-left:5px">×100块</span>
+          <span style="color:#888;margin-left:5px">未领数:100,库存可用:80,缺20</span>
+        </div>
+
+        <div class="order_mxmtrl_dt">
+          <span
+            style="font-size:12px;background-color:#fc4e2c;color:#fff;padding: 2px 6px;border-radius: 15px;">装配组</span>
+          <span>大扁头内六角螺丝(高等发黑) M6*20MM</span>
+          <span style="color:#888;margin-left:5px">×100块</span>
+          <span style="color:#888;margin-left:5px">未领数:20,库存可用:0,缺20</span>
+        </div>
+
+        <div class="order_mxmtrl_dt">
+          <span
+            style="font-size:12px;background-color:#fc4e2c;color:#fff;padding: 2px 6px;border-radius: 15px;">配件组</span>
+          <span>自封袋 9*13cm</span>
+          <span style="color:#888;margin-left:5px">×100只</span>
+          <span style="color:#888;margin-left:5px">未领数:100,库存可用:80,缺20</span>
+        </div>
+
+      </div>
+
+    </div>
+
+  </div>
+
+</template>
+
+<script>
+  export default {
+    name: 'orderzlmx',
+    data() {
+      return {
+        taskflag_dt: '在进行',
+        ifqty:1 //0-不缺料 1-缺料
+      };
+    },
+    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: "微软雅黑";
+    font-size: 15px;
+  }
+
+  .topbar {
+    min-height: 44px;
+    /* border-bottom: 1px solid #e5e5e5; */
+    background: #fff;
+    position: fixed;
+    width: 100%;
+    z-index: 9993;
+    display: flex;
+    font-size: 18px;
+    align-items: center;
+    color:#fff
+  }
+
+  .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;
+  }
+
+  #content {
+    position: absolute;
+    top: 44px;
+    background-color: #fff;
+    width: 100%;
+    padding-bottom: 30px;
+  }
+
+  .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;
+  }
+
+  .ordermx_pz_dt {
+    font-size: 13px;
+    margin: 10px 20px 10px 30px;
+    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: flex-start;
+    line-height: 20px;
+  }
+
+  .taskinfo_dttitle_dt {
+    font-weight: bold;
+    margin-bottom: 5px;
+    display: flex;
+    flex-wrap: wrap;
+    line-height: 18px;
+  }
+
+  .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: #f7f7f7;
+    padding: 10px 20px;
+    margin: 10px 0 0 0;
+    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;
+  }
+
+  .ordermx_fj {
+    margin: 20px 0;
+    padding: 0px 0 0 10px;
+    align-items: center;
+    display: flex;
+    font-size: 14px;
+    height: 25px;
+    /* line-height: 25px; */
+  }
+
+  .subtitle_dt {
+    font-size: 17px;
+    font-weight: 700;
+    text-align: center;
+    margin: 0 20px;
+    height: 42px;
+    line-height: 43px;
+    color: #666
+  }
+
+
+  .jindu {
+    border-top: 1px solid #f0f0f0;
+    margin: 0 20px;
+    font-size: 14px;
+    line-height: 20px;
+    padding: 10px 0;
+  }
+
+  .jindumx {
+    padding: 5px 0;
+    margin-top: 5px;
+    border-bottom: 1px solid #f0f0f0;
+    display: flex;
+    align-items: center;
+  }
+
+  .jindumx_pzbtn {
+    position: absolute;
+    right: 20px;
+    color: #ccc;
+    font-size: 12px;
+  }
+
+  .order_mxmtrl_dt {
+    border-bottom: 1px solid #f0f0f0;
+    padding: 8px 0;
+    line-height: 22px
+  }
+
+</style>

+ 1 - 1
src/pages/quoteedit.vue

@@ -580,7 +580,7 @@
         ifch: 0, //选择配置 0-没有显示  1-显示 
         ifusd: 1, //0-人民币 1-美元
         ifcust: 1, //0-只显示客户编码 1-显示客户名称地址
-        ifshow: 1 //0-不显示数量优惠条件 1-显示
+        ifshow: 0 //0-不显示数量优惠条件 1-显示
       }
     },
     methods: {

+ 18 - 0
src/router/index.js

@@ -40,6 +40,8 @@ import Testcss from '@/pages/testcss'
 import Funclist from '@/pages/funclist'
 import DmHome from '@/pages/dmweb/dmhome'
 import HomeRp from '@/pages/homerp'
+import OrderZl from '@/pages/orderzl'
+import OrderZLMX from '@/pages/orderzlmx'
 
 Vue.use(Router)
 
@@ -58,6 +60,22 @@ export default new Router({
         title: '工作任务'
       }
     },
+    {
+      path: '/orderzlmx',
+      name: 'OrderZLMX',
+      component: OrderZLMX,
+      meta: {
+        title: '指令单详情'
+      }
+    },
+    {
+      path: '/orderzl',
+      name: 'OrderZl',
+      component: OrderZl,
+      meta: {
+        title: '指令单'
+      }
+    },
     {
       path: '/homerp',
       name: 'HomeRp',