工组完工，工组进度列表

src/assets/iconfont/demo_index.html

@@ -36,6 +36,12 @@
                 <div class="code-name">&amp;#xe607;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe618;</span>
+                <div class="name">扫码</div>
+                <div class="code-name">&amp;#xe618;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe7bd;</span>
                 <div class="name">排行榜</div>
@@ -168,6 +174,12 @@
                 <div class="code-name">&amp;#xe610;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe669;</span>
+                <div class="name">发现-小组</div>
+                <div class="code-name">&amp;#xe669;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe60e;</span>
                 <div class="name">等待</div>
@@ -258,6 +270,12 @@
                 <div class="code-name">&amp;#xeb96;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe654;</span>
+                <div class="name">管理员小组</div>
+                <div class="code-name">&amp;#xe654;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe60d;</span>
                 <div class="name">同意</div>
@@ -288,6 +306,12 @@
                 <div class="code-name">&amp;#xe620;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe617;</span>
+                <div class="name">下 拉</div>
+                <div class="code-name">&amp;#xe617;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe656;</span>
                 <div class="name">订单号</div>
@@ -443,6 +467,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-iconfontscan"></span>
+            <div class="name">
+              扫码
+            </div>
+            <div class="code-name">.icon-iconfontscan
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-paixingbang"></span>
             <div class="name">
@@ -641,6 +674,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-faxian-xiaozu"></span>
+            <div class="name">
+              发现-小组
+            </div>
+            <div class="code-name">.icon-faxian-xiaozu
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-dengdai"></span>
             <div class="name">
@@ -776,6 +818,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-xiaozu-"></span>
+            <div class="name">
+              管理员小组
+            </div>
+            <div class="code-name">.icon-xiaozu-
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-tongyi"></span>
             <div class="name">
@@ -821,6 +872,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-xiala"></span>
+            <div class="name">
+              下 拉
+            </div>
+            <div class="code-name">.icon-xiala
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-dingdanhao"></span>
             <div class="name">
@@ -1002,6 +1062,14 @@
                 <div class="code-name">#icon-xitongtuisong</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconfontscan"></use>
+                </svg>
+                <div class="name">扫码</div>
+                <div class="code-name">#icon-iconfontscan</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-paixingbang"></use>
@@ -1178,6 +1246,14 @@
                 <div class="code-name">#icon-weikaishi</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-faxian-xiaozu"></use>
+                </svg>
+                <div class="name">发现-小组</div>
+                <div class="code-name">#icon-faxian-xiaozu</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-dengdai"></use>
@@ -1298,6 +1374,14 @@
                 <div class="code-name">#icon-tubiao-zhuzhuangtu</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-xiaozu-"></use>
+                </svg>
+                <div class="name">管理员小组</div>
+                <div class="code-name">#icon-xiaozu-</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-tongyi"></use>
@@ -1338,6 +1422,14 @@
                 <div class="code-name">#icon-kucun</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-xiala"></use>
+                </svg>
+                <div class="name">下 拉</div>
+                <div class="code-name">#icon-xiala</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-dingdanhao"></use>

src/pages/components/orderwkplist.vue

@@ -0,0 +1,111 @@
+<template>
+  <div class="wkplist">
+    <div class="wkplist_maininfo">
+      <div class="orderwkp_ordercode">
+        SC190427001
+      </div>
+
+      <div>
+        <svg class="icon" aria-hidden="true">
+          <use xlink:href="#icon-yingyongguanli"></use>
+        </svg>
+        餐桌 #18202FFED，50张
+      </div>
+
+      <div class="orderwkp_flex">
+        <div class="orderwkp_name">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-xiaozu-"></use>
+          </svg>
+          喷漆
+        </div>
+        <div class="orderwkp_wkpjd">(0/50)</div>
+      </div>
+
+      <div class="orderwkp_flex">
+        <div class="orderwkp_wrkname">油漆组 要求4月27日完成</div>
+
+        <div class="orderwkp_finish" @click="gotofinish">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-icon-test"></use>
+          </svg>
+          报告完工
+        </div>
+
+      </div>
+    </div>
+
+    <div class="orderwkp_status bgcolorred">超期</div>
+  </div>
+</template>
+<script>
+  export default {
+    name: "orderwkplist",
+    methods: {
+      gotofinish(){
+        this.$router.push({
+          path: "/wkpfinish"
+        });
+      }
+    }
+
+  }
+
+</script>
+
+<style>
+  .wkplist {
+    display: flex;
+    font-size: 15px;
+    margin: 10px 10px 10px 20px;
+    padding: 0 0 10px 0;
+    border-bottom: 1px solid #f0f0f0;
+  }
+
+  .wkplist_maininfo {
+    flex: 0 0 80%
+  }
+
+  .orderwkp_ordercode {
+    font-size: 18px;
+    font-weight: bold;
+  }
+
+  .orderwkp_wkpjd {
+    padding: 0 0 0 10px;
+  }
+
+  .orderwkp_wrkname {
+    font-size: 14px;
+    color: #666666;
+    flex: 0 0 70%
+  }
+
+  .orderwkp_finish {
+    font-size: 14px;
+    color: #666666;
+    position: absolute;
+    right: 25px;
+  }
+
+  .orderwkp_status {
+    font-size: 12px;
+    position: absolute;
+    right: 30px;
+    width: 55px;
+    line-height: 20px;
+    font-weight: bold;
+    color: #fff;
+    border-radius: 15px;
+    text-align: center;
+  }
+
+  .bgcolorred {
+    background-color: #ff0000;
+  }
+
+  .orderwkp_flex {
+    display: flex
+  }
+
+</style>

src/pages/cses_spt/cses_spt_detail.vue

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

src/pages/orderwkp.vue

@@ -0,0 +1,89 @@
+<template>
+  <div>
+    <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">
+      <orderwkp-list v-for="(item,index) in wkplist" :key="index"></orderwkp-list>
+    </div>
+
+  </div>
+
+</template>
+<script>
+  import OrderwkpList from "./components/orderwkplist";
+  export default {
+    components: {
+      OrderwkpList
+    },
+    data() {
+      return {
+        wkplist: [1, 2, 3, 4, 5, 6, 7, 8, 9]
+      }
+    },
+    methods: {
+      goback() {
+        {
+          history.back();
+        }
+      }
+    }
+  }
+
+</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;
+  }
+
+</style>

src/pages/saletaskdetail.vue

@@ -371,7 +371,7 @@
   }
 
   .bgcolorred {
-    background-color: rgb(252, 78, 44)
+    background-color: #fc4e2c
   }
 
   .bgcolorgreen {
@@ -379,7 +379,7 @@
   }
 
   .bgcolorblue {
-    background-color: dodgerblue;
+    background-color: #1e90ff;
   }
 
   .taskcode_dt {

src/pages/wkpfinish.vue

@@ -0,0 +1,332 @@
+<template>
+  <div>
+    <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="wkp_scan_area">
+        <div class="wkp_scan">
+          输入或扫一扫单号
+        </div>
+        <div class="wkp_scan_btn">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-iconfontscan"></use>
+          </svg>
+        </div>
+      </div>
+
+      <div v-if="ifscan==1">
+        <div class="wkp_order_mtrl">
+          <div class="wkp_order_mtrl_ordercode">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-erweima"></use>
+            </svg>
+            SC190427001</div>
+          <div class="wkp_order_mtrl_mtrl">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-yingyongguanli"></use>
+            </svg>
+            餐桌 #18202FFED，50张
+          </div>
+        </div>
+
+        <div class="liubai_wkp"></div>
+
+        <div class="wkp_order_wkp">
+
+          <div class="wkp_order_wkp_title">工组流程</div>
+
+          <div class="wkp_order_wkp_item">
+            <div class="wkp_order_wkp_item_flex">
+              <div class="wkp_order_wkp_item_name">
+                <svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-xiaozu-"></use>
+                </svg>
+                打磨</div>
+              <div class="wkp_order_wkp_item_wkpjd">(50/50)</div>
+              <div class="wkp_order_wkp_item_status bgcolorblue">已完成</div>
+            </div>
+
+            <div class="wkp_order_wkp_item_flex">
+              <div class="wkp_order_wkp_item_wrkname">抛光组 已于4月25日完成</div>
+            </div>
+          </div>
+
+          <div class="wkp_order_wkp_item">
+            <div class="wkp_order_wkp_item_flex">
+              <div class="wkp_order_wkp_item_name">
+                <svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-xiaozu-"></use>
+                </svg>
+                喷漆</div>
+              <div class="wkp_order_wkp_item_wkpjd">(0/50)</div>
+              <div class="wkp_order_wkp_item_status bgcolorred">超期</div>
+            </div>
+
+            <div class="wkp_order_wkp_item_flex">
+              <div class="wkp_order_wkp_item_wrkname">油漆组 要求4月27日完成</div>
+            </div>
+          </div>
+
+          <div class="wkp_order_wkp_item">
+            <div class="wkp_order_wkp_item_flex">
+              <div class="wkp_order_wkp_item_name">
+                <svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-xiaozu-"></use>
+                </svg>
+                组装</div>
+              <div class="wkp_order_wkp_item_wkpjd">(0/50)</div>
+              <div class="wkp_order_wkp_item_status"></div>
+            </div>
+
+            <div class="wkp_order_wkp_item_flex">
+              <div class="wkp_order_wkp_item_wrkname">安装组 要求4月30日完成</div>
+            </div>
+          </div>
+
+        </div>
+        <div class="liubai_wkp"></div>
+      </div>
+
+
+      <div class="wkp_order_wkp_title">本次完工</div>
+
+      <div class="wkp_input">
+        <div>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-xiaozu-"></use>
+          </svg>
+          完工工组：
+          <span>油漆组<svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-xiala"></use>
+            </svg></span>
+        </div>
+        <div v-if="ifscan==1">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-icon-test"></use>
+          </svg>
+          完工数量：<span class="wkp_input_qty">50</span>
+        </div>
+      </div>
+
+      <div class="wkp_none_msg" v-if="ifscan==0">
+        <div>暂无数据</div>
+        <div>选择好工组后，点击右上角的扫码按钮</div>
+      </div>
+
+      <div class="wkp_input_btn_wrap" v-if="ifscan==1">
+        <div class="wkp_input_btn">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-tongyi"></use>
+          </svg>
+          提交
+        </div>
+      </div>
+
+    </div>
+
+  </div>
+
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        ifscan: 1 //0-未扫描 1-已扫描
+      }
+    },
+    methods: {
+      goback() {
+        {
+          history.back();
+        }
+      }
+    }
+  }
+
+</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;
+  }
+  .bgcolorblue {
+    background-color: #1e90ff;
+  }
+
+  .bgcolorred {
+    background-color: #ff0000;
+  }
+
+  .wkp_scan_area {
+    display: flex;
+    align-items: center;
+  }
+
+  .wkp_none_msg {
+    margin-top: 50px;
+    color: #bbbbbb;
+    text-align: center;
+  }
+
+  .wkp_scan {
+    margin: 10px 20px;
+    padding: 5px 10px;
+    border: 1px solid #c7c7c7;
+    color: #bbb;
+    border-radius: 10px;
+    flex: 0 0 70%
+  }
+
+  .wkp_scan_btn {
+    color: #000000;
+    font-size: 30px;
+  }
+
+  .wkp_order_wkp_title {
+    padding: 10px 0 0 20px;
+    font-size: 15px;
+    font-weight: bold
+  }
+
+  .wkp_order_mtrl {
+    padding: 20px 0 10px 20px;
+  }
+
+  .wkp_order_mtrl_ordercode {
+    font-size: 18px;
+    font-weight: bold;
+  }
+
+  .wkp_order_mtrl_mtrl {
+    color: #666666
+  }
+
+  .wkp_order_wkp_item {
+    padding: 5px 20px 0 20px;
+    border-bottom: 1px solid #f0f0f0;
+  }
+
+  .wkp_order_wkp_item_flex {
+    display: flex;
+    line-height: 30px;
+    align-items: center;
+  }
+
+  .wkp_order_wkp_item_wkpjd {
+    padding: 0 0 0 10px;
+  }
+
+  .wkp_order_wkp_item_status {
+    font-size: 12px;
+    position: absolute;
+    right: 30px;
+    width: 55px;
+    line-height: 20px;
+    font-weight: bold;
+    color: #fff;
+    border-radius: 15px;
+    text-align: center;
+  }
+
+  .wkp_order_wkp_item_wrkname {
+    font-size: 14px;
+    color: #666666
+  }
+
+  .liubai_wkp {
+    width: 100%;
+    height: 10px;
+    background-color: #f6f6f6;
+  }
+
+  .wkp_input {
+    padding: 5px 0 10px 20px;
+    line-height: 40px;
+  }
+
+  .wkp_input_qty {
+    font-size: 15px;
+    line-height: 20px;
+    font-weight: bold;
+    color: #000000;
+    border-radius: 10px;
+    text-align: center;
+    padding: 2px 20px;
+    background-color: #e0e0e0;
+  }
+
+  .wkp_input_btn_wrap {
+    display: flex;
+    position: fixed;
+    bottom: 0;
+    background-color: #fc4e2c;
+    width: 100%;
+    z-index: 9990;
+    align-items: center;
+    justify-content: center;
+    padding: 5px 0 2px 0;
+    box-shadow: 0 -1px 3px #f1f1f1;
+  }
+
+
+  .wkp_input_btn {
+    color: #ffffff;
+    font-size: 16px;
+    font-weight: bold;
+    width: 45%;
+    text-align: center;
+    padding: 8px;
+  }
+
+</style>

src/router/index.js

@@ -11,6 +11,8 @@ 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'
+import WkpFinish from '@/pages/wkpfinish'
+import Orderwkp from '@/pages/orderwkp'
 
 Vue.use(Router)
 
@@ -100,6 +102,22 @@ export default new Router({
       meta: {
         title: '待回复'
       }
+    },
+    {
+      path: '/wkpfinish',
+      name: 'WkpFinish',
+      component: WkpFinish,
+      meta: {
+        title: '工组完工'
+      }
+    },
+    {
+      path: '/orderwkp',
+      name: 'Orderwkp',
+      component: Orderwkp,
+      meta: {
+        title: '工组进度'
+      }
     }
   ]
 })