新血制品

App.vue

@@ -83,6 +83,7 @@
 
 <style>
   @import url("./static/font/iconfont.css");
+  @import url("@/static/newIcon/iconfont.css");
   @import url("/node_modules/spinkit/spinkit.css");
 
   /*每个页面公共css */

components/bigScreen/bigScreen.vue

@@ -2,8 +2,8 @@
   <view class="toolbar" @click="Scanning()" hover-class="seimin-btn-hover">
     <text class="toolbar-icon icon_transport transport-saoma"></text>
     <text class="toolbar-sao">扫一扫</text>
-    <!-- 填写交接人账号弹窗 -->
-    <selectAccount @click.stop.native v-if="hosModels.disjunctor" :title="hosModels.title" :disjunctor="hosModels.disjunctor" @ok="hosOk"
+    <!-- 填写交接人工号弹窗 -->
+    <selectAccount @click.stop.native v-if="hosModels.disjunctor" :disjunctor="hosModels.disjunctor" @ok="hosOk"
       @cancel="hosCancel">
     </selectAccount>
   </view>
@@ -17,7 +17,7 @@
   export default {
     data() {
       return {
-        // 填写交接人账号弹窗model
+        // 填写交接人工号弹窗model
         hosModels: {
           disjunctor: false,
         },
@@ -34,7 +34,7 @@
       }
     },
     methods: {
-      // 填写交接人账号-确认
+      // 填写交接人工号-确认
       hosOk(data) {
         console.log(data);
         const {
@@ -46,7 +46,7 @@
           //没有填写交接人
           uni.showModal({
             title: "提示",
-            content: "请填写交接人账号！",
+            content: "请填写交接人工号！",
             showCancel: false,
             success: function(res) {
               if (res.confirm) {
@@ -61,7 +61,7 @@
           //没有填写交接人
           uni.showModal({
             title: "提示",
-            content: "请填写正确的交接人账号！",
+            content: "请填写正确的交接人工号！",
             showCancel: false,
             success: function(res) {
               if (res.confirm) {
@@ -76,15 +76,14 @@
         this.hosModels.disjunctor = false;
         this.orderDeptHandler(false, data);
       },
-      // 填写交接人账号-取消
+      // 填写交接人工号-取消
       hosCancel() {
         this.hosModels.disjunctor = false;
         this.flag = true;
       },
-      // 填写交接人账号弹窗
+      // 填写交接人工号弹窗
       showSelectAccount() {
         this.hosModels = {
-          title: "填写交接人账号",
           disjunctor: true,
         };
       },
@@ -269,7 +268,7 @@
                           uni.navigateTo({
                             url: `../scanning_all/scanning_all?infoDATA=${encodeURIComponent(
                             JSON.stringify(infoDATA)
-                          )}&code=${data.code}&deptName=${res.deptName}`,
+                          )}&code=${data.code}&deptName=${res.deptName}&deptId=${res.deptId}`,
                           });
                         }
                       } else if (res.type == 'drugsBag') {
@@ -335,6 +334,39 @@
                             }
                           },
                         });
+                      } else if (res.type == 'bloodTake') {
+                        if(res.data){
+                          //新血制品-扫科室
+                          uni.navigateTo({
+                            url: `/pages/startOrderSignBlood/startOrderSignBlood?deptId=${res.deptId}&deptName=${res.deptName}&taskTypeId=${res.taskTypeId}`,
+                          });
+                        }else{
+                          // 走type是dept的流程
+                          // 扫描科室码
+                          // code: data.code //二维码
+                          let infoDATA = res.data;
+                          console.log(infoDATA)
+                          // 判断是否是标本配送，并且仅仅只有这一种业务类型，默认全选,并跳转到下一步;
+                          // 判断是否是标本轮巡 ，并且仅仅只有这一种业务类型，并且只有一个工单，默认选中,并跳转到下一步;
+                          if(Object.keys(infoDATA).length === 1 && (infoDATA.specimen || (infoDATA.specimenPlan && infoDATA.specimenPlan.length === 1))){
+                            this.infoDATA = infoDATA;
+                            this.workData = infoDATA.specimen || infoDATA.specimenPlan;
+                            this.tabType = infoDATA.specimen ? 'specimen' : 'specimenPlan';
+                            this.code = data.code;
+                            this.selectArr = [];
+                            for (var i = 0; i < this.workData.length; i++) {
+                              this.selectArr.push(this.workData[i].id);
+                            }
+                            this.userId.ids = this.selectArr;
+                            this.orderDeptHandler(true);
+                          }else{
+                            uni.navigateTo({
+                              url: `../scanning_all/scanning_all?infoDATA=${encodeURIComponent(
+                              JSON.stringify(infoDATA)
+                            )}&code=${data.code}&deptName=${res.deptName}&deptId=${res.deptId}`,
+                            });
+                          }
+                        }
                       }
                     } else {
                       uni.navigateTo({

components/handViewBlood/handViewBlood.vue

@@ -106,7 +106,7 @@
         hosId: null,
         timer: null,
         spe: {}, //标本对象
-        account: '', //交接人账号
+        account: '', //交接人工号
         accountName: '', //交接人姓名
         accountId: '' //交接人ID
       };

components/handViewSpecimen/handViewSpecimen.vue

@@ -106,7 +106,7 @@
         hosId: null,
         timer: null,
         spe: {}, //标本对象
-        account: '', //交接人账号
+        account: '', //交接人工号
         accountName: '', //交接人姓名
         accountId: '' //交接人ID
       };

components/selectAccount/selectAccount.vue

@@ -1,22 +1,47 @@
 <template>
   <view class="changeHospital" v-show="disjunctor">
     <view class="changeHospital__wrap">
-      <view class="changeHospital__header" v-if="title">
-        {{ title }}
+      <view class="changeHospital__header">
+        提示
       </view>
       <view class="changeHospital__article">
+        <view class="uni-list-cell content" v-show="content">
+          {{content}}
+        </view>
         <view class="uni-list-cell">
           <view class="uni-list-cell-left">
-            {{name}}账号：
+            输入工号：
           </view>
           <view class="uni-list-cell-db">
-            <input class="uni-input" auto-focus="true" :placeholder="'请填写'+name+'账号'" v-model="account"
+            <input class="uni-input" auto-focus="true" placeholder="请输入工号" v-model="account"
               @input="bindPickerChange($event)" />
           </view>
         </view>
         <view class="uni-list-cell">
           <view class="uni-list-cell-left">
-            {{name}}姓名：
+            人员工号：
+          </view>
+          <view class="uni-list-cell-db-text">
+            <text v-show="!loading">{{ accountName ? account : "无" }}</text>
+            <view class="sk-circle" v-show="loading">
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+            </view>
+          </view>
+        </view>
+        <view class="uni-list-cell">
+          <view class="uni-list-cell-left">
+            人员姓名：
           </view>
           <view class="uni-list-cell-db-text">
             <text v-show="!loading">{{ accountName || "无" }}</text>
@@ -61,7 +86,7 @@
         userData: null,
         hosId: null,
         timer: null,
-        account: '', //交接人账号
+        account: '', //交接人工号
         accountName: '', //交接人姓名
         accountId: '' //交接人ID
       };
@@ -86,25 +111,21 @@
         type: Boolean,
         default: false,
       },
-      // 标题
-      title: {
+      // 提示内容
+      content: {
         type: String,
-        default: "提示",
+        default: "",
       },
       // 操作按钮文字
       operate: {
         type: Object,
         default: () => {
           return {
-            ok: "确认",
+            ok: "确定",
             cancel: "取消",
           };
         },
       },
-      name: {
-        type: String,
-        default: '交接人'
-      }
     },
     methods: {
       //修改picker的值
@@ -180,6 +201,13 @@
       align-items: center;
       text-align: center;
       margin-top: 32rpx;
+      
+      &.content{
+        justify-content: center;
+        color: #000;
+        margin-top: 0;
+        font-weight: bold;
+      }
 
       .uni-list-cell-left {
         flex: 3;

components/smallScreen/smallScreen.vue

@@ -3,8 +3,8 @@
     <view class="smallScreen_scan" @click="getInspectAndPatientTransform(sData,sType)">
       <slot></slot>
     </view>
-    <!-- 填写交接人账号弹窗 -->
-    <selectAccount v-if="hosModels.disjunctor" :title="hosModels.title" :disjunctor="hosModels.disjunctor" @ok="hosOk"
+    <!-- 填写交接人工号弹窗 -->
+    <selectAccount v-if="hosModels.disjunctor" :disjunctor="hosModels.disjunctor" @ok="hosOk"
       @cancel="hosCancel">
     </selectAccount>
     <!-- 弹窗 -->
@@ -32,7 +32,7 @@
         hosId: uni.getStorageSync("userData").user.currentHospital.id,
         currentCode: '', //当前小扫描的科室二维码
         currentData: {}, //当前小扫描的工单对象
-        // 填写交接人账号弹窗model
+        // 填写交接人工号弹窗model
         hosModels: {
           disjunctor: false,
         },
@@ -388,7 +388,7 @@
           this.SMFlag = true;
         });
       },
-      // 填写交接人账号-确认
+      // 填写交接人工号-确认
       hosOk(data) {
         console.log(data);
         const {
@@ -400,7 +400,7 @@
           //没有填写交接人
           uni.showModal({
             title: '提示',
-            content: "请填写交接人账号！",
+            content: "请填写交接人工号！",
             showCancel: false,
             success: function(res) {
               if (res.confirm) {
@@ -415,7 +415,7 @@
           //没有填写交接人
           uni.showModal({
             title: '提示',
-            content: "请填写正确的交接人账号！",
+            content: "请填写正确的交接人工号！",
             showCancel: false,
             success: function(res) {
               if (res.confirm) {
@@ -446,14 +446,13 @@
           this.isOpenTransportationProcessRemarks(this.currentData, data, 'nextDeptOrder_ss');
         }
       },
-      // 填写交接人账号-取消
+      // 填写交接人工号-取消
       hosCancel() {
         this.hosModels.disjunctor = false;
       },
-      // 填写交接人账号弹窗
+      // 填写交接人工号弹窗
       showSelectAccount() {
         this.hosModels = {
-          title: '填写交接人账号',
           disjunctor: true,
         }
       },

main.js

@@ -44,7 +44,11 @@ Date.prototype.Format = function (fmt) {
 // 日期过滤器
 Vue.filter('formatDate', function(timestamp, format){
   console.log(timestamp, format);
-  return new Date(timestamp).Format(format);
+  if(timestamp){
+    return new Date(timestamp).Format(format);
+  }else{
+    return '';
+  }
 })
 App.mpType = 'app'
 

pages.json

@@ -444,6 +444,30 @@
         }
       }
 
+    }, {
+      "path": "pages/startOrderSignBlood/startOrderSignBlood",
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+    },
+    {
+      "path": "pages/startOrderSignBloodDetail/startOrderSignBloodDetail",
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+
+    }, {
+      "path": "pages/endOrderSignBlood/endOrderSignBlood",
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+
     }
   ],
   "globalStyle": {

pages/checkAfterBigScreen/checkAfterBigScreen.vue

@@ -29,8 +29,8 @@
       <view class="btn1" @click="allStart()">核对完成</view>
       <view class="btn3" @click="goBack">取消</view>
     </view>
-    <!-- 填写交接人账号弹窗 -->
-    <selectAccount v-if="hosModels.disjunctor" :title="hosModels.title" :disjunctor="hosModels.disjunctor" @ok="hosOk"
+    <!-- 填写交接人工号弹窗 -->
+    <selectAccount v-if="hosModels.disjunctor" :disjunctor="hosModels.disjunctor" @ok="hosOk"
       @cancel="hosCancel">
     </selectAccount>
   </view>
@@ -45,7 +45,7 @@
   export default {
     data() {
       return {
-        // 填写交接人账号弹窗model
+        // 填写交接人工号弹窗model
         hosModels: {
           disjunctor: false,
         },
@@ -54,7 +54,7 @@
       };
     },
     methods: {
-      // 填写交接人账号-确认
+      // 填写交接人工号-确认
       hosOk(data) {
         console.log(data);
         const {
@@ -66,7 +66,7 @@
           //没有填写交接人
           uni.showModal({
             title: "提示",
-            content: "请填写交接人账号！",
+            content: "请填写交接人工号！",
             showCancel: false,
             success: function(res) {
               if (res.confirm) {
@@ -81,7 +81,7 @@
           //没有填写交接人
           uni.showModal({
             title: "提示",
-            content: "请填写正确的交接人账号！",
+            content: "请填写正确的交接人工号！",
             showCancel: false,
             success: function(res) {
               if (res.confirm) {
@@ -96,14 +96,13 @@
         this.hosModels.disjunctor = false;
         this.orderDeptHandler(false, data);
       },
-      // 填写交接人账号-取消
+      // 填写交接人工号-取消
       hosCancel() {
         this.hosModels.disjunctor = false;
       },
-      // 填写交接人账号弹窗
+      // 填写交接人工号弹窗
       showSelectAccount() {
         this.hosModels = {
-          title: "填写交接人账号",
           disjunctor: true,
         };
       },

pages/endOrderSignBlood/endOrderSignBlood.vue

@@ -0,0 +1,581 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_top_top">
+      <view class="Scanning_top_icon">
+        <text class="cubeic-ok icon_transport transport-duigou"></text>
+      </view>
+      <view class="Scanning_top_text">
+        <view class="text1"> 签到成功 </view>
+      </view>
+    </view>
+    
+    <view class="Scanning_cont_cont">
+       <view>您已到达{{queryObj.deptName}}，您需要交接血制品数量为 <text class="red fz58">{{dataList.bloodTotalCount}}</text></view>
+    </view>
+    
+    <view class="Scanning_top">
+      <view class="title1">{{queryObj.deptName}}</view>
+      <view>{{dataList.patientTotalCount}}人</view>
+      <view>{{dataList.bloodTotalCount}}袋</view>
+    </view>
+
+    <view class="Scanning_cont">
+      <view class="list" v-for="(v2, i2) of dataList.children" :key="i2">
+        <view class="list_top">
+          <text class="newicon newicon-a-ziyuan7"></text>
+          <view class="title1 ellipsis">
+            <text>{{v2.patientName}}</text><text>{{v2.hosNum}}</text>
+          </view>
+          <view>
+            <text>{{v2.count}}袋</text>
+          </view>
+        </view>
+        <view class="list_bottom_wrap" v-for="(v3, i3) of v2.children" :key="i3" @click="v3.checked = !v3.checked">
+          <view class="list_bottom">
+            <view class="title1 ellipsis">
+              <text class="ellipsis flex1">{{v3.bloodCode}}</text>
+              <text>{{v3.volume}}{{v3.unit}}</text>
+            </view>
+            <view class="title2">
+              <text>{{v3.count}}袋</text>
+              <text class="newicon newicon-a-ziyuan3" :class="{active: v3.checked}"></text>
+            </view>
+          </view>
+          
+          <view class="list_detail" v-if="v3.checked">
+            <view class="list_detail_item" v-for="(v4, i4) of v3.children" :key="i4">
+              <view class="list_detail_item_title">
+                <text>{{v4.bloodCode}}{{v4.productCode ? '+' + v4.productCode : ''}}</text>
+                <text class="blue serialNumber">{{i4 + 1}}</text>
+              </view>
+              <view class="list_detail_item_content">
+                <view>
+                  <text>血型：{{v4.aboType}}</text>
+                  <text class="ml16">RH(D)：{{v4.rhType}}</text>
+                </view>
+                <view>
+                  <text>{{v4.overDate | formatDate('yyyy-MM-dd hh:mm')}}</text>
+                  <!-- <text class="zhi">至</text> -->
+                  <!-- <text></text> -->
+                </view>
+                <view class="list_detail_item_content_status">
+                  <text class="blue">{{v4.state ? v4.state.name : ''}}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="foot_btn_spe">
+      <view class="btn1" @click="complete()" v-if="dataList.bloodTotalCount">核对完成</view>
+      <view class="btn3" @click="goBack()">取消</view>
+    </view>
+    <!-- 填写交接人工号弹窗 -->
+    <selectAccount @click.stop.native v-if="hosModels.disjunctor" :content="hosModels.content" :disjunctor="hosModels.disjunctor" @ok="hosOk"
+      @cancel="hosCancel">
+    </selectAccount>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "../../http/http.js";
+  export default {
+    data() {
+      return {
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        // 填写交接人工号弹窗model
+        hosModels: {
+          disjunctor: false,
+        },
+        dataList: {},
+        queryObj: {}, //路由传递过来的数据
+      };
+    },
+    methods: {
+      // 核对完成
+      complete(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post('/simple/data/fetchDataList/taskTypeConfig', {
+          idx: 0,
+          sum: 1,
+          taskTypeConfig: {
+            "taskTypeDTO": {
+                "hosId": {
+                    "id": this.hosId
+                },
+                "ordinaryField": {
+                    "key": "ordinary_field",
+                    "value": "blood"
+                }
+            }
+          },
+        }).then(res => {
+          uni.hideLoading();
+          if(res.status == 200){
+           let list = res.list || [];
+           if(list.length > 0){
+             let signTypeList = list[0].signTypeList || [];
+             let signType = signTypeList.find( v => v.value == 6 );
+             if(signType){
+               this.showSelectAccount();
+             }else{
+               this.checkComplete();
+             }
+           }else{
+            uni.showToast({
+              icon: "none",
+              title: "请配置血制品任务类型！",
+            }); 
+           }
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        })
+      },
+      // 填写交接人工号-确认
+      hosOk(data) {
+        console.log(data);
+        const {
+          accountName,
+          account,
+          accountId
+        } = data;
+        if (!accountName && !account) {
+          //没有填写交接人
+          uni.showModal({
+            title: "提示",
+            content: "请填写交接人工号！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log("用户点击确定");
+              } else if (res.cancel) {
+                console.log("用户点击取消");
+              }
+            },
+          });
+          return;
+        } else if ((!accountName && account) || (accountName && !account)) {
+          //没有填写交接人
+          uni.showModal({
+            title: "提示",
+            content: "请填写正确的交接人工号！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log("用户点击确定");
+              } else if (res.cancel) {
+                console.log("用户点击取消");
+              }
+            },
+          });
+          return;
+        }
+        this.hosModels.disjunctor = false;
+        this.checkComplete(data);
+      },
+      // 填写交接人工号-取消
+      hosCancel() {
+        this.hosModels.disjunctor = false;
+        this.flag = true;
+      },
+      // 填写交接人工号弹窗
+      showSelectAccount() {
+        this.hosModels = {
+          content: "确定核对完成,请输入交接人员工号",
+          disjunctor: true,
+        };
+      },
+      checkComplete(accountObj){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        let postData = {
+          "type": "blood",
+          "orderId": 0,
+          "orderIds": this.queryObj.orderIds || undefined,
+        };
+        if (accountObj) {
+          postData.handoverUser = accountObj.accountId;
+        }
+        post('/transflow/checkComplete', postData).then(res => {
+          uni.hideLoading();
+          if(res.state == 200){
+             uni.navigateTo({
+               url: `../receiptpage/receiptpage`,
+             });
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        })
+      },
+      // 返回
+      goBack() {
+        uni.navigateBack();
+      },
+      //获取页面信息
+      getInfo(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post('/transflow/scanInfo', {
+          "code": "nb",
+          "id": 0,
+          "type": "blood",
+          "deptOrderDetails": true,
+          "orderIds": this.queryObj.orderIds,
+          "deptId": this.queryObj.deptId,
+        }).then(res => {
+          uni.hideLoading();
+          if(res.state == 200){
+            let dataList = res.data.data || {};
+            // 第一层
+            let dataNewList = {
+              bloodTotalCount: 0,
+              patientTotalCount: 0,
+              children: [],
+            };
+            
+            for (let key2 in dataList) {
+              let value2 = dataList[key2];
+              console.log(value2);
+              // 第三层,第四层
+              let array3 = [];
+              for (let key3 in value2) {
+                let value3 = value2[key3];
+                console.log(dataNewList);
+                array3.push({
+                  checked: false,
+                  bloodCode: key3.split('|')[0],
+                  volume: key3.split('|')[1],
+                  unit: key3.split('|')[2],
+                  count: value3.length,
+                  children: value3,
+                });
+              }
+              // 第二层
+              dataNewList.children.push({
+                patientName: key2.split('|')[0],
+                hosNum: key2.split('|')[1],
+                count: array3.reduce((pre, current) => pre + current.count, 0),
+                children: array3,
+              });
+            }
+            // 计算第一层血袋数量
+            dataNewList.bloodTotalCount = dataNewList.children.reduce((pre, current) => pre + current.count, 0);
+            // 计算第一层患者数量
+            dataNewList.patientTotalCount = Object.keys(dataList).length;
+            console.log(dataNewList)
+            // 赋值
+            this.dataList = dataNewList;
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        })
+      },
+
+    },
+    onLoad(options) {
+      console.log(options, "result");
+      this.queryObj = options;
+      this.getInfo();
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .Scanning_Result {
+    padding: 16rpx;
+    display: flex;
+    flex-direction: column;
+    height: 100vh;
+    background-color: #f5f7fb;
+    
+    .ml16{
+      margin-left: 16rpx;
+    }
+    
+    .blue{
+      color: #49b856!important;
+    }
+    
+    .ellipsis{
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    
+    .flex1{
+      flex: 1;
+    }
+    
+    .Scanning_top_top {
+      .Scanning_top_icon {
+        width: 140rpx;
+        height: 140rpx;
+        margin: 50rpx auto 40rpx;
+        border-radius: 50%;
+        
+        .speNum{
+          text-align: center;
+          font-size: 140rpx;
+        }
+    
+        .cubeic-ok {
+          font-size: 140rpx;
+          color: #35b34a;
+        }
+    
+        .cubeic-close {
+          font-size: 140rpx;
+          color: #ff3b53;
+        }
+      }
+    
+      .Scanning_top_text {
+        .text1 {
+          font-size: 48rpx;
+          text-align: center;
+        }
+    
+        .success_tips {
+          color: red;
+          font-size: 30rpx;
+        }
+      }
+    }
+    
+    .Scanning_cont_cont {
+      padding-bottom: 50rpx;
+      text-align: center;
+      display: flex;
+      flex-direction: column;
+      
+      .fz58{
+        font-size: 58rpx;
+      }
+      
+      .table_bodys{
+        overflow-y: auto;
+        flex: 1;
+      }
+      
+      .table_head{
+        display: flex;
+        margin-top: 50rpx;
+        .ml16{
+          margin-left: 16rpx;
+        }
+        
+        view {
+          height: 110rpx;
+          line-height: 1;
+          flex: 1;
+          font-weight: bold;
+          color: #000;
+          font-size: 38rpx;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+      }
+      
+      .table_body{
+        background: #F3FAF7;
+        border-radius: 8px;
+        border: 1px solid #E9E9E9;
+        display: flex;
+        margin-bottom: 20rpx;
+        padding: 30rpx 20rpx;
+        view {
+          line-height: 1;
+          flex: 1;
+          color: #555;
+          font-size: 38rpx;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          word-break: break-all;
+        }
+      }
+    }
+    
+
+    .Scanning_top {
+      margin-top: 16rpx;
+      background-color: #fff;
+      color: #49b856;
+      font-weight: bold;
+      font-size: 30rpx;
+      display: flex;
+      align-items: center;
+      line-height: 1.1;
+      
+      view{
+        padding: 16rpx 20rpx;
+        flex: 1;
+        &.title1{
+          flex: 4;
+          word-break: break-all;
+        }
+      }
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      overflow-y: auto;
+      
+      .list{
+        background-color: #fff;
+        margin-top: 16rpx;
+        line-height: 1;        
+        .list_top{
+          display: flex;
+          font-weight: bold;
+          color: #000;
+          font-size: 30rpx;
+          position: relative;
+          padding-bottom: 16rpx;
+          
+          .newicon-a-ziyuan7{
+            position: absolute;
+            left: 12rpx;
+            top: 14rpx;
+            font-size: 32rpx;
+            color: #49b856;
+          }
+          view{
+            padding: 16rpx 20rpx 0 0;
+            flex: 1;
+            &.title1{
+              padding: 16rpx 20rpx 0 54rpx;
+              flex: 5;
+              text:first-of-type{
+                margin-right: 16rpx;
+              }
+            }
+          }
+        }
+        .list_bottom{
+          display: flex;
+          font-size: 25rpx;
+          color: #767676;
+          view{
+            padding: 0 20rpx 16rpx 5rpx;
+            flex: 1;
+            &.title1{
+              padding: 0 20rpx 16rpx 54rpx;
+              flex: 5;
+              display: flex;
+            }
+            &.title2{
+              display: flex;
+              align-items: center;
+            }
+            .newicon-a-ziyuan3{
+              color: #cdcdcd;
+              font-size: 12rpx;
+              margin-left: 20rpx;
+              transform: rotate(180deg);
+              transition: all 0.5s;
+              &.active{
+                transform: rotate(0deg);
+              }
+            }
+          }
+        }
+        
+        .list_detail{
+          border: 2rpx solid #C6C6C6;
+          padding: 22rpx 30rpx 0;
+          font-size: 26rpx;
+          .list_detail_item{
+            margin-bottom: 22rpx;
+            padding: 10rpx 0;
+            background-color: #F3FAF7;
+            .list_detail_item_title{
+              padding: 0 17rpx 6rpx;
+              border-bottom: 2rpx solid #C3C3C3;
+              display: flex;
+              align-items: center;
+              justify-content: space-between;
+              
+              .serialNumber{
+                font-size: 38rpx;
+              }
+            }
+            .list_detail_item_content{
+              padding: 0 17rpx;
+              
+              view{
+                line-height: 35rpx;
+                margin-top: 17rpx;
+                &:first-of-type{
+                  margin-top: 9rpx;
+                }
+              }
+              
+              .zhi{
+                margin-left: 60rpx;
+                margin-right: 60rpx;
+              }
+              
+              .list_detail_item_content_status{
+                display: flex;
+                justify-content: flex-end;
+                text{
+                  font-weight: bold;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+    .foot_btn_spe {
+      line-height: 64rpx;
+      height: 64rpx;
+      margin-bottom: 40rpx;
+      text-align: center;
+      display: flex;
+      justify-content: space-between;
+    
+      view {
+        height: 64rpx;
+        flex: 1;
+        margin: 0 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 26rpx;
+      }
+    }
+  }
+</style>

pages/otherCompleteOrder/otherCompleteOrder.vue

@@ -36,8 +36,8 @@
       <view class="btn1" @click="photographToOther(order)">{{tips}}</view>
       <view class="btn3" @click="goBack">返回</view>
     </view>
-    <!-- 填写交接人账号弹窗 -->
-    <selectAccount v-if="hosModels.disjunctor" :title="hosModels.title" :disjunctor="hosModels.disjunctor" @ok="hosOk"
+    <!-- 填写交接人工号弹窗 -->
+    <selectAccount v-if="hosModels.disjunctor" :disjunctor="hosModels.disjunctor" @ok="hosOk"
       @cancel="hosCancel">
     </selectAccount>
   </view>
@@ -62,7 +62,7 @@
       return {
         tips: '',
         currentIndex: undefined,
-        // 填写交接人账号弹窗model
+        // 填写交接人工号弹窗model
         hosModels: {
           disjunctor: false,
         },
@@ -97,7 +97,7 @@
           commonFun[funName](this, data, accountObj);
         }
       },
-      // 填写交接人账号-确认
+      // 填写交接人工号-确认
       hosOk(data) {
         console.log(data);
         const {
@@ -109,7 +109,7 @@
           //没有填写交接人
           uni.showModal({
             title: '提示',
-            content: "请填写交接人账号！",
+            content: "请填写交接人工号！",
             showCancel: false,
             success: function(res) {
               if (res.confirm) {
@@ -124,7 +124,7 @@
           //没有填写交接人
           uni.showModal({
             title: '提示',
-            content: "请填写正确的交接人账号！",
+            content: "请填写正确的交接人工号！",
             showCancel: false,
             success: function(res) {
               if (res.confirm) {
@@ -149,14 +149,13 @@
           this.isOpenTransportationProcessRemarks(this.currentData, data, 'uploadToOther');
         }
       },
-      // 填写交接人账号-取消
+      // 填写交接人工号-取消
       hosCancel() {
         this.hosModels.disjunctor = false;
       },
-      // 填写交接人账号弹窗
+      // 填写交接人工号弹窗
       showSelectAccount() {
         this.hosModels = {
-          title: '填写交接人账号',
           disjunctor: true,
         }
       },

pages/pharmacyDetails/pharmacyDetails.vue

@@ -86,7 +86,7 @@
       </button>
     </view>
     <!-- 护士自取账号弹窗 -->
-    <selectAccount v-if="hosModels.disjunctor" :title="hosModels.title" :disjunctor="hosModels.disjunctor" @ok="hosOk"
+    <selectAccount v-if="hosModels.disjunctor" :disjunctor="hosModels.disjunctor" @ok="hosOk"
       @cancel="hosCancel">
     </selectAccount>
   </view>
@@ -231,7 +231,6 @@
       // 护士自取
       nursetake() {
         this.hosModels = {
-          title: '填写账号',
           disjunctor: true,
         }
       },

pages/receipt_infopage/receipt_infopage.vue

@@ -421,8 +421,8 @@
     <inspectRemoveModel :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor"
       :content="models1.content" @know="know1" :operate="models1.operate" @ok="ok1" @cancel="cancel1" :remove="true">
     </inspectRemoveModel>
-    <!-- 填写交接人账号弹窗 -->
-    <selectAccount v-if="hosModels.disjunctor" :title="hosModels.title" :disjunctor="hosModels.disjunctor" @ok="hosOk"
+    <!-- 填写交接人工号弹窗 -->
+    <selectAccount v-if="hosModels.disjunctor" :disjunctor="hosModels.disjunctor" @ok="hosOk"
       @cancel="hosCancel">
     </selectAccount>
     <!-- 手动查询弹窗 -->
@@ -459,7 +459,7 @@
           disjunctor: false,
         },
         taskTypeConfig: {},
-        // 填写交接人账号弹窗model
+        // 填写交接人工号弹窗model
         hosModels: {
           disjunctor: false,
         },
@@ -684,7 +684,7 @@
           });
         }
       },
-      // 填写交接人账号-确认
+      // 填写交接人工号-确认
       hosOk(data) {
         console.log(data);
         const {
@@ -696,7 +696,7 @@
           //没有填写交接人
           uni.showModal({
             title: '提示',
-            content: "请填写交接人账号！",
+            content: "请填写交接人工号！",
             showCancel: false,
             success: function(res) {
               if (res.confirm) {
@@ -711,7 +711,7 @@
           //没有填写交接人
           uni.showModal({
             title: '提示',
-            content: "请填写正确的交接人账号！",
+            content: "请填写正确的交接人工号！",
             showCancel: false,
             success: function(res) {
               if (res.confirm) {
@@ -728,14 +728,13 @@
         console.log(associationTypeValue)
         this.uploadToOther(this.currentData, data, 'start');
       },
-      // 填写交接人账号-取消
+      // 填写交接人工号-取消
       hosCancel() {
         this.hosModels.disjunctor = false;
       },
-      // 填写交接人账号弹窗
+      // 填写交接人工号弹窗
       showSelectAccount() {
         this.hosModels = {
-          title: '填写交接人账号',
           disjunctor: true,
         }
       },

pages/receiptpage/receiptpage.vue

@@ -314,8 +314,8 @@
     <handViewDrugsBag v-if="drugbagModels.disjunctor" :title="drugbagModels.title"
       :disjunctor="drugbagModels.disjunctor" @ok="drugbagOk" @cancel="drugbagCancel">
     </handViewDrugsBag>
-    <!-- 填写交接人账号弹窗 -->
-    <selectAccount v-if="hosModels.disjunctor" :title="hosModels.title" :disjunctor="hosModels.disjunctor" @ok="hosOk"
+    <!-- 填写交接人工号弹窗 -->
+    <selectAccount v-if="hosModels.disjunctor" :disjunctor="hosModels.disjunctor" @ok="hosOk"
       @cancel="hosCancel">
     </selectAccount>
     <!-- 手动查询弹窗 -->
@@ -395,7 +395,7 @@
         checkboxModels: {
           disjunctor: false,
         },
-        // 填写交接人账号弹窗model
+        // 填写交接人工号弹窗model
         hosModels: {
           disjunctor: false,
         },
@@ -1041,7 +1041,7 @@
         }
       },
 
-      // 填写交接人账号-确认
+      // 填写交接人工号-确认
       hosOk(data) {
         console.log(data);
         const {
@@ -1053,7 +1053,7 @@
           //没有填写交接人
           uni.showModal({
             title: '提示',
-            content: "请填写交接人账号！",
+            content: "请填写交接人工号！",
             showCancel: false,
             success: function(res) {
               if (res.confirm) {
@@ -1068,7 +1068,7 @@
           //没有填写交接人
           uni.showModal({
             title: '提示',
-            content: "请填写正确的交接人账号！",
+            content: "请填写正确的交接人工号！",
             showCancel: false,
             success: function(res) {
               if (res.confirm) {
@@ -1085,14 +1085,13 @@
         console.log(associationTypeValue)
         this.uploadToOther(this.currentData, data, 'start');
       },
-      // 填写交接人账号-取消
+      // 填写交接人工号-取消
       hosCancel() {
         this.hosModels.disjunctor = false;
       },
-      // 填写交接人账号弹窗
+      // 填写交接人工号弹窗
       showSelectAccount() {
         this.hosModels = {
-          title: '填写交接人账号',
           disjunctor: true,
         }
       },

pages/scanning_B/scanning_B.vue

@@ -44,8 +44,8 @@
         v-if="res.data.speState&&(res.data.speState.value == 2||res.data.speState.value == 3||res.data.speState.value == 4||res.data.speState.value == 5)">
         退回</view>
     </view>
-    <!-- 填写交接人账号弹窗 -->
-    <selectAccount v-if="hosModels.disjunctor" :title="hosModels.title" :disjunctor="hosModels.disjunctor" @ok="hosOk"
+    <!-- 填写交接人工号弹窗 -->
+    <selectAccount v-if="hosModels.disjunctor" :disjunctor="hosModels.disjunctor" @ok="hosOk"
       @cancel="hosCancel">
     </selectAccount>
     <!-- 退回弹窗 -->
@@ -75,7 +75,7 @@
         backStatus: '',
         infoDATA: {},
         res: {},
-        // 填写交接人账号弹窗model
+        // 填写交接人工号弹窗model
         hosModels: {
           disjunctor: false,
         },
@@ -305,7 +305,7 @@
           }
         })
       },
-      // 填写交接人账号-确认
+      // 填写交接人工号-确认
       hosOk(data) {
         console.log(data);
         const {
@@ -317,7 +317,7 @@
           //没有填写交接人
           uni.showModal({
             title: "提示",
-            content: "请填写交接人账号！",
+            content: "请填写交接人工号！",
             showCancel: false,
             success: function(res) {
               if (res.confirm) {
@@ -332,7 +332,7 @@
           //没有填写交接人
           uni.showModal({
             title: "提示",
-            content: "请填写正确的交接人账号！",
+            content: "请填写正确的交接人工号！",
             showCancel: false,
             success: function(res) {
               if (res.confirm) {
@@ -356,14 +356,13 @@
           this.nextDeptOrder_s(this.res.workOrder, data);
         }
       },
-      // 填写交接人账号-取消
+      // 填写交接人工号-取消
       hosCancel() {
         this.hosModels.disjunctor = false;
       },
-      // 填写交接人账号弹窗
+      // 填写交接人工号弹窗
       showSelectAccount() {
         this.hosModels = {
-          title: "填写交接人账号",
           disjunctor: true,
         };
       },

pages/scanning_Result/scanning_Result.vue

@@ -85,7 +85,7 @@
       <view v-if="type == 'drugsBag'"> 药包编码 : #{{ infoDATA.packid }} </view>
       <view
         v-if="type == 'drugsBag' && accountObj && (queryObj.type1 === 'drug-ddd-2' || queryObj.type1 === 'drug-dsd-2')">
-        交接人账号 : {{ accountObj.account }} </view>
+        交接人工号 : {{ accountObj.account }} </view>
       <view
         v-if="type == 'drugsBag' && accountObj && (queryObj.type1 === 'drug-ddd-2' || queryObj.type1 === 'drug-dsd-2')">
         交接人姓名 : {{ accountObj.accountName }} </view>

pages/scanning_all/scanning_all.vue

@@ -168,8 +168,8 @@
     <!-- 弹窗 -->
     <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
       @know="know" :operate="models.operate"></showModel>
-    <!-- 填写交接人账号弹窗 -->
-    <selectAccount v-if="hosModels.disjunctor" :title="hosModels.title" :disjunctor="hosModels.disjunctor" @ok="hosOk"
+    <!-- 填写交接人工号弹窗 -->
+    <selectAccount v-if="hosModels.disjunctor" :disjunctor="hosModels.disjunctor" @ok="hosOk"
       @cancel="hosCancel">
     </selectAccount>
   </view>
@@ -187,7 +187,7 @@
         hosId: null,
         currentCode: '', //当前小扫描的科室二维码
         SMFlag: true,
-        // 填写交接人账号弹窗model
+        // 填写交接人工号弹窗model
         hosModels: {
           disjunctor: false,
         },
@@ -204,6 +204,7 @@
         typeData: [],
         types: false,
         code: "",
+        deptId: '',
         deptName: '',
         flag: true, //一键操作，禁止多次
         flagTimer: null,
@@ -212,7 +213,7 @@
       };
     },
     methods: {
-      // 填写交接人账号-确认
+      // 填写交接人工号-确认
       hosOk(data) {
         console.log(data);
         const {
@@ -224,7 +225,7 @@
           //没有填写交接人
           uni.showModal({
             title: "提示",
-            content: "请填写交接人账号！",
+            content: "请填写交接人工号！",
             showCancel: false,
             success: function(res) {
               if (res.confirm) {
@@ -239,7 +240,7 @@
           //没有填写交接人
           uni.showModal({
             title: "提示",
-            content: "请填写正确的交接人账号！",
+            content: "请填写正确的交接人工号！",
             showCancel: false,
             success: function(res) {
               if (res.confirm) {
@@ -254,15 +255,14 @@
         this.hosModels.disjunctor = false;
         this.orderDeptHandler(false, data);
       },
-      // 填写交接人账号-取消
+      // 填写交接人工号-取消
       hosCancel() {
         this.hosModels.disjunctor = false;
         this.flag = true;
       },
-      // 填写交接人账号弹窗
+      // 填写交接人工号弹窗
       showSelectAccount() {
         this.hosModels = {
-          title: "填写交接人账号",
           disjunctor: true,
         };
       },
@@ -391,51 +391,93 @@
           console.log(this.userId)
           if (this.userId.ids.length > 0) {
             if (this.tabType == "blood") {
-              // 万能交接服务的血制品
-              let postData = {
-                  "idx": 0,
-                  "sum": 1,
-                  "taskTypeConfig": {
-                      "taskTypeDTO": {
-                          "hosId": {
-                              "id": this.hosId
-                          },
-                          "ordinaryField": {
-                              "key": "ordinary_field",
-                              "value": "blood"
-                          }
-                      }
-                  }
-              };
               uni.showLoading({
                 title: "加载中",
                 mask: true,
               });
-              post("/simple/data/fetchDataList/taskTypeConfig", postData).then((result) => {
-                uni.hideLoading();
-                if(result.status == 200){
-                  if(result.list && result.list[0] && result.list[0].checkType){
-                    if(result.list[0].checkType.value == 1){
-                      // 起点终点科室按照血制品类型进行核对
-                      uni.navigateTo({
-                        url: `../signIn_blood/signIn_blood?deptName=${this.deptName}&orderId=${this.userId.ids[0]}`,
-                      });
-                    }else if(result.list[0].checkType.value == 2){
-                      // 终点科室无需扫码进行核对
-                      uni.navigateTo({
-                        url: `../check_blood/check_blood?orderId=${this.userId.ids[0]}`,
-                      });
-                    }
-                  }else{
-                    uni.showToast({
-                      icon: "none",
-                      title: "请前往血制品配置页面配置核对方式！",
-                    });
+              // 判断是否签到批量核对
+              post('/simple/data/fetchDataList/taskTypeConfig', {
+                idx: 0,
+                sum: 1,
+                taskTypeConfig: {
+                  "taskTypeDTO": {
+                      "hosId": {
+                          "id": this.hosId
+                      },
+                      "ordinaryField": {
+                          "key": "ordinary_field",
+                          "value": "blood"
+                      }
                   }
+                },
+              }).then(res => {
+                if(res.status == 200){
+                 let list = res.list || [];
+                 if(list.length > 0){
+                   let signTypeList = list[0].signTypeList || [];
+                   let signType = signTypeList.find( v => v.value == 4 );
+                   if(signType){
+                     uni.hideLoading();
+                     uni.navigateTo({
+                       url: `../endOrderSignBlood/endOrderSignBlood?orderIds=${this.userId.ids.toString()}&deptName=${this.deptName}&deptId=${this.deptId}`,
+                     });
+                   }else{
+                     // 万能交接服务的血制品
+                     let postData = {
+                         "idx": 0,
+                         "sum": 1,
+                         "taskTypeConfig": {
+                             "taskTypeDTO": {
+                                 "hosId": {
+                                     "id": this.hosId
+                                 },
+                                 "ordinaryField": {
+                                     "key": "ordinary_field",
+                                     "value": "blood"
+                                 }
+                             }
+                         }
+                     };
+                     post("/simple/data/fetchDataList/taskTypeConfig", postData).then((result) => {
+                       uni.hideLoading();
+                       if(result.status == 200){
+                         if(result.list && result.list[0] && result.list[0].checkType){
+                           if(result.list[0].checkType.value == 1){
+                             // 起点终点科室按照血制品类型进行核对
+                             uni.navigateTo({
+                               url: `../signIn_blood/signIn_blood?deptName=${this.deptName}&orderId=${this.userId.ids[0]}`,
+                             });
+                           }else if(result.list[0].checkType.value == 2){
+                             // 终点科室无需扫码进行核对
+                             uni.navigateTo({
+                               url: `../check_blood/check_blood?orderId=${this.userId.ids[0]}`,
+                             });
+                           }
+                         }else{
+                           uni.showToast({
+                             icon: "none",
+                             title: "请前往血制品配置页面配置核对方式！",
+                           });
+                         }
+                       }else{
+                         uni.showToast({
+                           icon: "none",
+                           title: result.msg || "接口获取数据失败！",
+                         });
+                       }
+                     })
+                   }
+                 }else{
+                  uni.showToast({
+                    icon: "none",
+                    title: "请配置血制品任务类型！",
+                  }); 
+                 }
                 }else{
+                  uni.hideLoading();
                   uni.showToast({
                     icon: "none",
-                    title: result.msg || "接口获取数据失败！",
+                    title: res.msg || "接口获取数据失败！",
                   });
                 }
               })
@@ -695,6 +737,7 @@
       console.log(this.infoDATA);
       this.code = options.code; //扫描科室码返回的二维码信息
       this.deptName = options.deptName; //扫描科室码返回的科室名称
+      this.deptId = options.deptId; //扫描科室码返回的科室ID
       let arr = [];
       for (let key in this.infoDATA) {
         if(key === 'ordinary'){

pages/scanning_code/scanning_code.vue

@@ -122,7 +122,7 @@
       </view>
       <view class="page_item_foot">
         <view class="page_item_foot_text" v-if="accountObj && (infoType === 'drug-ddd-1' || infoType === 'drug-dsd-1')">
-          <text class="text1">交接人账号</text>
+          <text class="text1">交接人工号</text>
           <text class="text2">{{ accountObj.account }}</text>
         </view>
         <view class="page_item_foot_text" v-if="accountObj && (infoType === 'drug-ddd-1' || infoType === 'drug-dsd-1')">

pages/scanning_djEnd/scanning_djEnd.vue

@@ -50,7 +50,7 @@
           type == 'jPBag' &&
           (type1 == 'jp-ddd-1' || type1 == 'jp-dsd-1'))
       ">
-      <view v-if="accountObj"> 交接人账号 : {{ accountObj.account }} </view>
+      <view v-if="accountObj"> 交接人工号 : {{ accountObj.account }} </view>
       <view v-if="accountObj"> 交接人姓名 : {{ accountObj.accountName }} </view>
       <view>已到达目标科室,请取药包或静配包后送达目标科室.</view>
     </view>
@@ -84,7 +84,7 @@
           type == 'specimen' &&
           infoDATA.type == 'spe-ddd-1')
       ">
-      <view v-if="accountObj"> 交接人账号 : {{ accountObj.account }} </view>
+      <view v-if="accountObj"> 交接人工号 : {{ accountObj.account }} </view>
       <view v-if="accountObj"> 交接人姓名 : {{ accountObj.accountName }} </view>
       <view>已到达目标科室,请取标本后送达目标科室.</view>
     </view>
@@ -97,7 +97,7 @@
           type == 'specimen' &&
           infoDATA.type == 'spe-dsd-1')
       ">
-      <view v-if="accountObj"> 交接人账号 : {{ accountObj.account }} </view>
+      <view v-if="accountObj"> 交接人工号 : {{ accountObj.account }} </view>
       <view v-if="accountObj"> 交接人姓名 : {{ accountObj.accountName }} </view>
       <view>已到达目标科室,请放置标本完成该工单.</view>
     </view>

pages/scanning_djInfo/scanning_djInfo.vue

@@ -55,7 +55,7 @@
       <view v-if="
           accountObj && infoType !== 'spe-ddd-1' && infoType !== 'spe-dsd-1'&& infoType !== 'plan-spe-ddd-1' && infoType !== 'plan-spe-dsd-1'
         ">
-        交接人账号 : {{ accountObj.account }}
+        交接人工号 : {{ accountObj.account }}
       </view>
       <view v-if="
           accountObj && infoType !== 'spe-ddd-1' && infoType !== 'spe-dsd-1'&& infoType !== 'plan-spe-ddd-1' && infoType !== 'plan-spe-dsd-1'
@@ -93,7 +93,7 @@
       <view v-if="
           accountObj && (infoType === 'drug-ddd-2' || infoType === 'drug-dsd-2')
         ">
-        交接人账号 : {{ accountObj.account }}
+        交接人工号 : {{ accountObj.account }}
       </view>
       <view v-if="
           accountObj && (infoType === 'drug-ddd-2' || infoType === 'drug-dsd-2')

pages/scanning_drug/scanning_drug.vue

@@ -89,8 +89,8 @@
     <!-- 弹窗 -->
     <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
       @ok="ok" @cancel="cancel" :operate="models.operate"></showModel>
-    <!-- 填写交接人账号弹窗 -->
-    <selectAccount v-if="hosModels.disjunctor" :title="hosModels.title" :disjunctor="hosModels.disjunctor" @ok="hosOk"
+    <!-- 填写交接人工号弹窗 -->
+    <selectAccount v-if="hosModels.disjunctor" :disjunctor="hosModels.disjunctor" @ok="hosOk"
       @cancel="hosCancel">
     </selectAccount>
   </view>
@@ -117,7 +117,7 @@
         workOrder: {}, //药包关联的工单信息
         currentCode: "", //当前小扫描的科室二维码
         currentData: {}, //当前小扫描的工单对象
-        // 填写交接人账号弹窗model
+        // 填写交接人工号弹窗model
         hosModels: {
           disjunctor: false,
         },
@@ -233,7 +233,7 @@
           }
         });
       },
-      // 填写交接人账号-确认
+      // 填写交接人工号-确认
       hosOk(data) {
         console.log(data);
         const {
@@ -245,7 +245,7 @@
           //没有填写交接人
           uni.showModal({
             title: "提示",
-            content: "请填写交接人账号！",
+            content: "请填写交接人工号！",
             showCancel: false,
             success: function(res) {
               if (res.confirm) {
@@ -260,7 +260,7 @@
           //没有填写交接人
           uni.showModal({
             title: "提示",
-            content: "请填写正确的交接人账号！",
+            content: "请填写正确的交接人工号！",
             showCancel: false,
             success: function(res) {
               if (res.confirm) {
@@ -275,15 +275,14 @@
         this.hosModels.disjunctor = false;
         this.commonBuild(data);
       },
-      // 填写交接人账号-取消
+      // 填写交接人工号-取消
       hosCancel() {
         this.hosModels.disjunctor = false;
         this.gotoFlag = true;
       },
-      // 填写交接人账号弹窗
+      // 填写交接人工号弹窗
       showSelectAccount() {
         this.hosModels = {
-          title: "填写交接人账号",
           disjunctor: true,
         };
       },
@@ -316,7 +315,7 @@
             if (data) {
               //有交接人
               info.accountName = data.accountName; //交接人姓名
-              info.account = data.account; //交接人账号
+              info.account = data.account; //交接人工号
             }
             uni.navigateTo({
               url: `../scanning_result_seimin/scanning_result_seimin?info=${encodeURIComponent(

pages/scanning_result_seimin/scanning_result_seimin.vue

@@ -20,7 +20,7 @@
 
     <view class="Scanning_cont" v-if="queryObj.status == 200">
       <view class="Scanning_cont_block"> 药包编码 : #{{ queryObj.packid }} </view>
-      <view class="Scanning_cont_block" v-if="queryObj.account"> 交接人账号 : {{ queryObj.account }} </view>
+      <view class="Scanning_cont_block" v-if="queryObj.account"> 交接人工号 : {{ queryObj.account }} </view>
       <view class="Scanning_cont_block" v-if="queryObj.accountName">
         交接人姓名 : {{ queryObj.accountName }}
       </view>

pages/specimenCheckingDetail/specimenCheckingDetail.vue

@@ -74,8 +74,8 @@
     <!-- 退回弹窗 -->
     <backModel v-if="backModels.disjunctor" :title="backModels.title" :disjunctor="backModels.disjunctor" @ok="backOk"
       @cancel="backCancel"></backModel>
-    <!-- 填写交接人账号弹窗 -->
-    <selectAccount v-if="hosModels.disjunctor" :title="hosModels.title" :disjunctor="hosModels.disjunctor" @ok="hosOk"
+    <!-- 填写交接人工号弹窗 -->
+    <selectAccount v-if="hosModels.disjunctor" :disjunctor="hosModels.disjunctor" @ok="hosOk"
       @cancel="hosCancel">
     </selectAccount>
     <!-- 弹窗 -->
@@ -114,7 +114,7 @@
         backModels: {
           disjunctor: false,
         },
-        // 填写交接人账号弹窗model
+        // 填写交接人工号弹窗model
         hosModels: {
           disjunctor: false,
         },
@@ -184,7 +184,7 @@
           }
         });
       },
-      // 填写交接人账号-确认
+      // 填写交接人工号-确认
       hosOk(data) {
         console.log(data);
         const {
@@ -196,7 +196,7 @@
           //没有填写交接人
           uni.showModal({
             title: "提示",
-            content: "请填写交接人账号！",
+            content: "请填写交接人工号！",
             showCancel: false,
             success: function(res) {
               if (res.confirm) {
@@ -211,7 +211,7 @@
           //没有填写交接人
           uni.showModal({
             title: "提示",
-            content: "请填写正确的交接人账号！",
+            content: "请填写正确的交接人工号！",
             showCancel: false,
             success: function(res) {
               if (res.confirm) {
@@ -234,14 +234,13 @@
           this.backHandler(this.backSpecimen, this.msg.uuid, data);
         }
       },
-      // 填写交接人账号-取消
+      // 填写交接人工号-取消
       hosCancel() {
         this.hosModels.disjunctor = false;
       },
-      // 填写交接人账号弹窗
+      // 填写交接人工号弹窗
       showSelectAccount() {
         this.hosModels = {
-          title: "填写交接人账号",
           disjunctor: true,
         };
       },

pages/startOrderSignBlood/startOrderSignBlood.vue

@@ -0,0 +1,356 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_top">
+      <view class="Scanning_top_icon">
+        <text class="cubeic-ok icon_transport transport-duigou"></text>
+      </view>
+      <view class="Scanning_top_text">
+        <view class="text1"> 签到成功 </view>
+      </view>
+    </view>
+
+    <view class="Scanning_cont">
+      <view>您已到达{{queryObj.deptName}}，请核对以下数量</view>
+      <view class="table_head">
+        <view>科室<text class="red ml16">{{deptTotalCount}}</text></view>
+        <view>患者<text class="red ml16">{{patientTotalCount}}</text></view>
+        <view>血制品<text class="red ml16">{{bloodTotalCount}}</text></view>
+      </view>
+      <view class="table_bodys">
+        <view class="table_body" v-for="(item, index) in dataList" :key="index" @click="toDetail(item)">
+          <view>{{item.dept}}</view>
+          <view>{{item.patientCount}}</view>
+          <view>{{item.bloodCount}}</view>
+        </view>
+      </view>
+    </view>
+
+    <view class="foot_btn_spe">
+      <view class="btn1" @click="complete()" v-if="orderIds">核对完成</view>
+      <view class="btn3" @click="goBack()">取消</view>
+    </view>
+    <!-- 填写交接人工号弹窗 -->
+    <selectAccount @click.stop.native v-if="hosModels.disjunctor" :content="hosModels.content" :disjunctor="hosModels.disjunctor" @ok="hosOk"
+      @cancel="hosCancel">
+    </selectAccount>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "../../http/http.js";
+  export default {
+    data() {
+      return {
+        orderIds: '',
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        // 填写交接人工号弹窗model
+        hosModels: {
+          disjunctor: false,
+        },
+        deptTotalCount: 0,
+        patientTotalCount: 0,
+        bloodTotalCount: 0,
+        dataList: [],
+        queryObj: {}, //路由传递过来的数据
+      };
+    },
+    methods: {
+      // 核对完成
+      complete(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post('/simple/data/fetchDataList/taskTypeConfig', {
+          idx: 0,
+          sum: 1,
+          taskTypeConfig: {
+            "taskTypeDTO": {
+                "hosId": {
+                    "id": this.hosId
+                },
+                "ordinaryField": {
+                    "key": "ordinary_field",
+                    "value": "blood"
+                }
+            }
+          },
+        }).then(res => {
+          uni.hideLoading();
+          if(res.status == 200){
+           let list = res.list || [];
+           if(list.length > 0){
+             let signTypeList = list[0].signTypeList || [];
+             let signType = signTypeList.find( v => v.value == 5 );
+             if(signType){
+               this.showSelectAccount();
+             }else{
+               this.checkComplete();
+             }
+           }else{
+            uni.showToast({
+              icon: "none",
+              title: "请配置血制品任务类型！",
+            }); 
+           }
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        })
+      },
+      // 填写交接人工号-确认
+      hosOk(data) {
+        console.log(data);
+        const {
+          accountName,
+          account,
+          accountId
+        } = data;
+        if (!accountName && !account) {
+          //没有填写交接人
+          uni.showModal({
+            title: "提示",
+            content: "请填写交接人工号！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log("用户点击确定");
+              } else if (res.cancel) {
+                console.log("用户点击取消");
+              }
+            },
+          });
+          return;
+        } else if ((!accountName && account) || (accountName && !account)) {
+          //没有填写交接人
+          uni.showModal({
+            title: "提示",
+            content: "请填写正确的交接人工号！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log("用户点击确定");
+              } else if (res.cancel) {
+                console.log("用户点击取消");
+              }
+            },
+          });
+          return;
+        }
+        this.hosModels.disjunctor = false;
+        this.checkComplete(data);
+      },
+      // 填写交接人工号-取消
+      hosCancel() {
+        this.hosModels.disjunctor = false;
+        this.flag = true;
+      },
+      // 填写交接人工号弹窗
+      showSelectAccount() {
+        this.hosModels = {
+          content: "确定核对完成,请输入交接人员工号",
+          disjunctor: true,
+        };
+      },
+      checkComplete(accountObj){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        let postData = {
+          "type": "blood",
+          "orderId": 0,
+          "orderIds": this.orderIds || undefined,
+        };
+        if (accountObj) {
+          postData.handoverUser = accountObj.accountId;
+        }
+        post('/transflow/checkComplete', postData).then(res => {
+          uni.hideLoading();
+          if(res.state == 200){
+             uni.navigateTo({
+               url: `../receiptpage/receiptpage`,
+             });
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        })
+      },
+      // 返回
+      goBack() {
+        uni.navigateBack();
+      },
+      // 跳转血制品列表
+      toDetail(data){
+        uni.navigateTo({
+          url: `../startOrderSignBloodDetail/startOrderSignBloodDetail?bloodIds=${data.bloodIds}&deptName=${data.dept}`,
+        });
+      },
+      //获取页面信息
+      getInfo(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post('/transflow/scanInfo', {
+          "code": "nb",
+          "id": 0,
+          "type": "blood",
+          "deptOrder": true,
+          "deptId": this.queryObj.deptId,
+          "taskTypeId": this.queryObj.taskTypeId,
+        }).then(res => {
+          uni.hideLoading();
+          if(res.state == 200){
+            this.orderIds = res.data.orderIds;
+            this.dataList = res.data.data || [];
+            this.deptTotalCount = this.dataList.length;
+            this.patientTotalCount = this.dataList.reduce((pre, current) => pre + current.patientCount, 0);
+            this.bloodTotalCount = this.dataList.reduce((pre, current) => pre + current.bloodCount, 0);
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        })
+      },
+
+    },
+    onLoad(options) {
+      console.log(options, "result");
+      this.queryObj = options;
+      this.getInfo();
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .Scanning_Result {
+    padding: 0 20rpx;
+    display: flex;
+    flex-direction: column;
+    height: 100vh;
+
+    .Scanning_top {
+      .Scanning_top_icon {
+        width: 140rpx;
+        height: 140rpx;
+        margin: 50rpx auto 40rpx;
+        border-radius: 50%;
+        
+        .speNum{
+          text-align: center;
+          font-size: 140rpx;
+        }
+
+        .cubeic-ok {
+          font-size: 140rpx;
+          color: #35b34a;
+        }
+
+        .cubeic-close {
+          font-size: 140rpx;
+          color: #ff3b53;
+        }
+      }
+
+      .Scanning_top_text {
+        .text1 {
+          font-size: 48rpx;
+          text-align: center;
+        }
+
+        .success_tips {
+          color: red;
+          font-size: 30rpx;
+        }
+      }
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      text-align: center;
+      display: flex;
+      flex-direction: column;
+      
+      .table_bodys{
+        overflow-y: auto;
+        flex: 1;
+      }
+      
+      .table_head{
+        display: flex;
+        margin-top: 50rpx;
+        .ml16{
+          margin-left: 16rpx;
+        }
+        
+        view {
+          height: 110rpx;
+          line-height: 1;
+          flex: 1;
+          font-weight: bold;
+          color: #000;
+          font-size: 38rpx;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+      }
+      
+      .table_body{
+        background: #F3FAF7;
+        border-radius: 8px;
+        border: 1px solid #E9E9E9;
+        display: flex;
+        margin-bottom: 20rpx;
+        padding: 30rpx 20rpx;
+        view {
+          line-height: 1;
+          flex: 1;
+          color: #555;
+          font-size: 38rpx;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          word-break: break-all;
+        }
+      }
+    }
+
+    .foot_btn_spe {
+      line-height: 64rpx;
+      height: 64rpx;
+      margin-bottom: 40rpx;
+      text-align: center;
+      display: flex;
+      justify-content: space-between;
+    
+      view {
+        height: 64rpx;
+        flex: 1;
+        margin: 0 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 26rpx;
+      }
+    }
+  }
+</style>

pages/startOrderSignBloodDetail/startOrderSignBloodDetail.vue

@@ -0,0 +1,340 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_top">
+      <view class="title1">{{queryObj.deptName}}</view>
+      <view>{{dataList.patientTotalCount}}人</view>
+      <view>{{dataList.bloodTotalCount}}袋</view>
+    </view>
+
+    <view class="Scanning_cont">
+      <view class="list" v-for="(v2, i2) of dataList.children" :key="i2">
+        <view class="list_top">
+          <text class="newicon newicon-a-ziyuan7"></text>
+          <view class="title1 ellipsis">
+            <text>{{v2.patientName}}</text><text>{{v2.hosNum}}</text>
+          </view>
+          <view>
+            <text>{{v2.count}}袋</text>
+          </view>
+        </view>
+        <view class="list_bottom_wrap" v-for="(v3, i3) of v2.children" :key="i3" @click="v3.checked = !v3.checked">
+          <view class="list_bottom">
+            <view class="title1 ellipsis">
+              <text class="ellipsis flex1">{{v3.bloodCode}}</text>
+              <text>{{v3.volume}}{{v3.unit}}</text>
+            </view>
+            <view class="title2">
+              <text>{{v3.count}}袋</text>
+              <text class="newicon newicon-a-ziyuan3" :class="{active: v3.checked}"></text>
+            </view>
+          </view>
+          
+          <view class="list_detail" v-if="v3.checked">
+            <view class="list_detail_item" v-for="(v4, i4) of v3.children" :key="i4">
+              <view class="list_detail_item_title">
+                <text>{{v4.bloodCode}}{{v4.productCode ? '+' + v4.productCode : ''}}</text>
+                <text class="blue serialNumber">{{i4 + 1}}</text>
+              </view>
+              <view class="list_detail_item_content">
+                <view>
+                  <text>血型：{{v4.aboType}}</text>
+                  <text class="ml16">RH(D)：{{v4.rhType}}</text>
+                </view>
+                <view>
+                  <text>{{v4.overDate | formatDate('yyyy-MM-dd hh:mm')}}</text>
+                  <!-- <text class="zhi">至</text> -->
+                  <!-- <text></text> -->
+                </view>
+                <view class="list_detail_item_content_status">
+                  <text class="blue">{{v4.state ? v4.state.name : ''}}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+
+    </view>
+
+    <view class="foot_btn_spe">
+      <view class="btn3" @click="goBack()">返回</view>
+    </view>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "../../http/http.js";
+  export default {
+    data() {
+      return {
+        dataList: {},
+        queryObj: {}, //路由传递过来的数据
+      };
+    },
+    methods: {
+      // 返回
+      goBack() {
+        uni.navigateBack();
+      },
+      //获取页面信息
+      getInfo(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post('/transflow/scanInfo', {
+          "code": "nb",
+          "id": 0,
+          "type": "blood",
+          "deptOrderDetails": true,
+          "bloodIds": this.queryObj.bloodIds,
+        }).then(res => {
+          uni.hideLoading();
+          if(res.state == 200){
+            let dataList = res.data.data || {};
+            // 第一层
+            let dataNewList = {
+              bloodTotalCount: 0,
+              patientTotalCount: 0,
+              children: [],
+            };
+            
+            for (let key2 in dataList) {
+              let value2 = dataList[key2];
+              console.log(value2);
+              // 第三层,第四层
+              let array3 = [];
+              for (let key3 in value2) {
+                let value3 = value2[key3];
+                console.log(dataNewList);
+                array3.push({
+                  checked: false,
+                  bloodCode: key3.split('|')[0],
+                  volume: key3.split('|')[1],
+                  unit: key3.split('|')[2],
+                  count: value3.length,
+                  children: value3,
+                });
+              }
+              // 第二层
+              dataNewList.children.push({
+                patientName: key2.split('|')[0],
+                hosNum: key2.split('|')[1],
+                count: array3.reduce((pre, current) => pre + current.count, 0),
+                children: array3,
+              });
+            }
+            // 计算第一层血袋数量
+            dataNewList.bloodTotalCount = dataNewList.children.reduce((pre, current) => pre + current.count, 0);
+            // 计算第一层患者数量
+            dataNewList.patientTotalCount = Object.keys(dataList).length;
+            console.log(dataNewList)
+            // 赋值
+            this.dataList = dataNewList;
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        })
+      },
+
+    },
+    onLoad(options) {
+      console.log(options, "result");
+      this.queryObj = options;
+      this.getInfo();
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .Scanning_Result {
+    padding: 16rpx;
+    display: flex;
+    flex-direction: column;
+    height: 100vh;
+    background-color: #f5f7fb;
+    
+    .ml16{
+      margin-left: 16rpx;
+    }
+    
+    .blue{
+      color: #49b856!important;
+    }
+    
+    .ellipsis{
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    
+    .flex1{
+      flex: 1;
+    }
+
+    .Scanning_top {
+      margin-top: 16rpx;
+      background-color: #fff;
+      color: #49b856;
+      font-weight: bold;
+      font-size: 30rpx;
+      display: flex;
+      align-items: center;
+      line-height: 1.1;
+      
+      view{
+        padding: 16rpx 20rpx;
+        flex: 1;
+        &.title1{
+          flex: 4;
+          word-break: break-all;
+        }
+      }
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      overflow-y: auto;
+      
+      .list{
+        background-color: #fff;
+        margin-top: 16rpx;
+        line-height: 1;        
+        .list_top{
+          display: flex;
+          font-weight: bold;
+          color: #000;
+          font-size: 30rpx;
+          position: relative;
+          padding-bottom: 16rpx;
+          
+          .newicon-a-ziyuan7{
+            position: absolute;
+            left: 12rpx;
+            top: 14rpx;
+            font-size: 32rpx;
+            color: #49b856;
+          }
+          view{
+            padding: 16rpx 20rpx 0 0;
+            flex: 1;
+            &.title1{
+              padding: 16rpx 20rpx 0 54rpx;
+              flex: 5;
+              text:first-of-type{
+                margin-right: 16rpx;
+              }
+            }
+          }
+        }
+        .list_bottom{
+          display: flex;
+          font-size: 25rpx;
+          color: #767676;
+          view{
+            padding: 0 20rpx 16rpx 5rpx;
+            flex: 1;
+            &.title1{
+              padding: 0 20rpx 16rpx 54rpx;
+              flex: 5;
+              display: flex;
+            }
+            &.title2{
+              display: flex;
+              align-items: center;
+            }
+            .newicon-a-ziyuan3{
+              color: #cdcdcd;
+              font-size: 12rpx;
+              margin-left: 20rpx;
+              transform: rotate(180deg);
+              transition: all 0.5s;
+              &.active{
+                transform: rotate(0deg);
+              }
+            }
+          }
+        }
+        
+        .list_detail{
+          border: 2rpx solid #C6C6C6;
+          padding: 22rpx 30rpx 0;
+          font-size: 26rpx;
+          .list_detail_item{
+            margin-bottom: 22rpx;
+            padding: 10rpx 0;
+            background-color: #F3FAF7;
+            .list_detail_item_title{
+              padding: 0 17rpx 6rpx;
+              border-bottom: 2rpx solid #C3C3C3;
+              display: flex;
+              align-items: center;
+              justify-content: space-between;
+              
+              .serialNumber{
+                font-size: 38rpx;
+              }
+            }
+            .list_detail_item_content{
+              padding: 0 17rpx;
+              
+              view{
+                line-height: 35rpx;
+                margin-top: 17rpx;
+                &:first-of-type{
+                  margin-top: 9rpx;
+                }
+              }
+              
+              .zhi{
+                margin-left: 60rpx;
+                margin-right: 60rpx;
+              }
+              
+              .list_detail_item_content_status{
+                display: flex;
+                justify-content: flex-end;
+                text{
+                  font-weight: bold;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+    .foot_btn_spe {
+      line-height: 64rpx;
+      height: 64rpx;
+      margin-bottom: 40rpx;
+      text-align: center;
+      display: flex;
+      justify-content: space-between;
+    
+      view {
+        height: 64rpx;
+        flex: 1;
+        margin: 0 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 26rpx;
+      }
+    }
+  }
+</style>

static/newIcon/demo.css

@@ -0,0 +1,539 @@
+/* Logo 字体 */
+@font-face {
+  font-family: "iconfont logo";
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
+}
+
+.logo {
+  font-family: "iconfont logo";
+  font-size: 160px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* tabs */
+.nav-tabs {
+  position: relative;
+}
+
+.nav-tabs .nav-more {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  height: 42px;
+  line-height: 42px;
+  color: #666;
+}
+
+#tabs {
+  border-bottom: 1px solid #eee;
+}
+
+#tabs li {
+  cursor: pointer;
+  width: 100px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  font-size: 16px;
+  border-bottom: 2px solid transparent;
+  position: relative;
+  z-index: 1;
+  margin-bottom: -1px;
+  color: #666;
+}
+
+
+#tabs .active {
+  border-bottom-color: #f00;
+  color: #222;
+}
+
+.tab-container .content {
+  display: none;
+}
+
+/* 页面布局 */
+.main {
+  padding: 30px 100px;
+  width: 960px;
+  margin: 0 auto;
+}
+
+.main .logo {
+  color: #333;
+  text-align: left;
+  margin-bottom: 30px;
+  line-height: 1;
+  height: 110px;
+  margin-top: -50px;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.main .logo a {
+  font-size: 160px;
+  color: #333;
+}
+
+.helps {
+  margin-top: 40px;
+}
+
+.helps pre {
+  padding: 20px;
+  margin: 10px 0;
+  border: solid 1px #e7e1cd;
+  background-color: #fffdef;
+  overflow: auto;
+}
+
+.icon_lists {
+  width: 100% !important;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.icon_lists li {
+  width: 100px;
+  margin-bottom: 10px;
+  margin-right: 20px;
+  text-align: center;
+  list-style: none !important;
+  cursor: default;
+}
+
+.icon_lists li .code-name {
+  line-height: 1.2;
+}
+
+.icon_lists .icon {
+  display: block;
+  height: 100px;
+  line-height: 100px;
+  font-size: 42px;
+  margin: 10px auto;
+  color: #333;
+  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
+  -moz-transition: font-size 0.25s linear, width 0.25s linear;
+  transition: font-size 0.25s linear, width 0.25s linear;
+}
+
+.icon_lists .icon:hover {
+  font-size: 100px;
+}
+
+.icon_lists .svg-icon {
+  /* 通过设置 font-size 来改变图标大小 */
+  width: 1em;
+  /* 图标和文字相邻时，垂直对齐 */
+  vertical-align: -0.15em;
+  /* 通过设置 color 来改变 SVG 的颜色/fill */
+  fill: currentColor;
+  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
+      normalize.css 中也包含这行 */
+  overflow: hidden;
+}
+
+.icon_lists li .name,
+.icon_lists li .code-name {
+  color: #666;
+}
+
+/* markdown 样式 */
+.markdown {
+  color: #666;
+  font-size: 14px;
+  line-height: 1.8;
+}
+
+.highlight {
+  line-height: 1.5;
+}
+
+.markdown img {
+  vertical-align: middle;
+  max-width: 100%;
+}
+
+.markdown h1 {
+  color: #404040;
+  font-weight: 500;
+  line-height: 40px;
+  margin-bottom: 24px;
+}
+
+.markdown h2,
+.markdown h3,
+.markdown h4,
+.markdown h5,
+.markdown h6 {
+  color: #404040;
+  margin: 1.6em 0 0.6em 0;
+  font-weight: 500;
+  clear: both;
+}
+
+.markdown h1 {
+  font-size: 28px;
+}
+
+.markdown h2 {
+  font-size: 22px;
+}
+
+.markdown h3 {
+  font-size: 16px;
+}
+
+.markdown h4 {
+  font-size: 14px;
+}
+
+.markdown h5 {
+  font-size: 12px;
+}
+
+.markdown h6 {
+  font-size: 12px;
+}
+
+.markdown hr {
+  height: 1px;
+  border: 0;
+  background: #e9e9e9;
+  margin: 16px 0;
+  clear: both;
+}
+
+.markdown p {
+  margin: 1em 0;
+}
+
+.markdown>p,
+.markdown>blockquote,
+.markdown>.highlight,
+.markdown>ol,
+.markdown>ul {
+  width: 80%;
+}
+
+.markdown ul>li {
+  list-style: circle;
+}
+
+.markdown>ul li,
+.markdown blockquote ul>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown>ul li p,
+.markdown>ol li p {
+  margin: 0.6em 0;
+}
+
+.markdown ol>li {
+  list-style: decimal;
+}
+
+.markdown>ol li,
+.markdown blockquote ol>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown code {
+  margin: 0 3px;
+  padding: 0 5px;
+  background: #eee;
+  border-radius: 3px;
+}
+
+.markdown strong,
+.markdown b {
+  font-weight: 600;
+}
+
+.markdown>table {
+  border-collapse: collapse;
+  border-spacing: 0px;
+  empty-cells: show;
+  border: 1px solid #e9e9e9;
+  width: 95%;
+  margin-bottom: 24px;
+}
+
+.markdown>table th {
+  white-space: nowrap;
+  color: #333;
+  font-weight: 600;
+}
+
+.markdown>table th,
+.markdown>table td {
+  border: 1px solid #e9e9e9;
+  padding: 8px 16px;
+  text-align: left;
+}
+
+.markdown>table th {
+  background: #F7F7F7;
+}
+
+.markdown blockquote {
+  font-size: 90%;
+  color: #999;
+  border-left: 4px solid #e9e9e9;
+  padding-left: 0.8em;
+  margin: 1em 0;
+}
+
+.markdown blockquote p {
+  margin: 0;
+}
+
+.markdown .anchor {
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  margin-left: 8px;
+}
+
+.markdown .waiting {
+  color: #ccc;
+}
+
+.markdown h1:hover .anchor,
+.markdown h2:hover .anchor,
+.markdown h3:hover .anchor,
+.markdown h4:hover .anchor,
+.markdown h5:hover .anchor,
+.markdown h6:hover .anchor {
+  opacity: 1;
+  display: inline-block;
+}
+
+.markdown>br,
+.markdown>p>br {
+  clear: both;
+}
+
+
+.hljs {
+  display: block;
+  background: white;
+  padding: 0.5em;
+  color: #333333;
+  overflow-x: auto;
+}
+
+.hljs-comment,
+.hljs-meta {
+  color: #969896;
+}
+
+.hljs-string,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-strong,
+.hljs-emphasis,
+.hljs-quote {
+  color: #df5000;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-type {
+  color: #a71d5d;
+}
+
+.hljs-literal,
+.hljs-symbol,
+.hljs-bullet,
+.hljs-attribute {
+  color: #0086b3;
+}
+
+.hljs-section,
+.hljs-name {
+  color: #63a35c;
+}
+
+.hljs-tag {
+  color: #333333;
+}
+
+.hljs-title,
+.hljs-attr,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+  color: #795da3;
+}
+
+.hljs-addition {
+  color: #55a532;
+  background-color: #eaffea;
+}
+
+.hljs-deletion {
+  color: #bd2c00;
+  background-color: #ffecec;
+}
+
+.hljs-link {
+  text-decoration: underline;
+}
+
+/* 代码高亮 */
+/* PrismJS 1.15.0
+https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
+/**
+ * prism.js default theme for JavaScript, CSS and HTML
+ * Based on dabblet (http://dabblet.com)
+ * @author Lea Verou
+ */
+code[class*="language-"],
+pre[class*="language-"] {
+  color: black;
+  background: none;
+  text-shadow: 0 1px white;
+  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+  text-align: left;
+  white-space: pre;
+  word-spacing: normal;
+  word-break: normal;
+  word-wrap: normal;
+  line-height: 1.5;
+
+  -moz-tab-size: 4;
+  -o-tab-size: 4;
+  tab-size: 4;
+
+  -webkit-hyphens: none;
+  -moz-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+}
+
+pre[class*="language-"]::-moz-selection,
+pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection,
+code[class*="language-"] ::-moz-selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+pre[class*="language-"]::selection,
+pre[class*="language-"] ::selection,
+code[class*="language-"]::selection,
+code[class*="language-"] ::selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+@media print {
+
+  code[class*="language-"],
+  pre[class*="language-"] {
+    text-shadow: none;
+  }
+}
+
+/* Code blocks */
+pre[class*="language-"] {
+  padding: 1em;
+  margin: .5em 0;
+  overflow: auto;
+}
+
+:not(pre)>code[class*="language-"],
+pre[class*="language-"] {
+  background: #f5f2f0;
+}
+
+/* Inline code */
+:not(pre)>code[class*="language-"] {
+  padding: .1em;
+  border-radius: .3em;
+  white-space: normal;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+  color: slategray;
+}
+
+.token.punctuation {
+  color: #999;
+}
+
+.namespace {
+  opacity: .7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+  color: #905;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+  color: #690;
+}
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+  color: #9a6e3a;
+  background: hsla(0, 0%, 100%, .5);
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+  color: #07a;
+}
+
+.token.function,
+.token.class-name {
+  color: #DD4A68;
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+  color: #e90;
+}
+
+.token.important,
+.token.bold {
+  font-weight: bold;
+}
+
+.token.italic {
+  font-style: italic;
+}
+
+.token.entity {
+  cursor: help;
+}

static/newIcon/demo_index.html

@@ -0,0 +1,257 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <title>iconfont Demo</title>
+  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg" type="image/x-icon"/>
+  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg"/>
+  <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
+  <link rel="stylesheet" href="demo.css">
+  <link rel="stylesheet" href="iconfont.css">
+  <script src="iconfont.js"></script>
+  <!-- jQuery -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>
+  <!-- 代码高亮 -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
+  <style>
+    .main .logo {
+      margin-top: 0;
+      height: auto;
+    }
+
+    .main .logo a {
+      display: flex;
+      align-items: center;
+    }
+
+    .main .logo .sub-title {
+      margin-left: 0.5em;
+      font-size: 22px;
+      color: #fff;
+      background: linear-gradient(-45deg, #3967FF, #B500FE);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+  </style>
+</head>
+<body>
+  <div class="main">
+    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
+      <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
+      
+    </a></h1>
+    <div class="nav-tabs">
+      <ul id="tabs" class="dib-box">
+        <li class="dib active"><span>Unicode</span></li>
+        <li class="dib"><span>Font class</span></li>
+        <li class="dib"><span>Symbol</span></li>
+      </ul>
+      
+      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=4304849" target="_blank" class="nav-more">查看项目</a>
+      
+    </div>
+    <div class="tab-container">
+      <div class="content unicode" style="display: block;">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+              <span class="icon newicon">&#xe605;</span>
+                <div class="name">资源 7</div>
+                <div class="code-name">&amp;#xe605;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon newicon">&#xe604;</span>
+                <div class="name">头像</div>
+                <div class="code-name">&amp;#xe604;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon newicon">&#xe601;</span>
+                <div class="name">箭头上</div>
+                <div class="code-name">&amp;#xe601;</div>
+              </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="unicode-">Unicode 引用</h2>
+          <hr>
+
+          <p>Unicode 是字体在网页端最原始的应用方式，特点是：</p>
+          <ul>
+            <li>支持按字体的方式去动态调整图标大小，颜色等等。</li>
+            <li>默认情况下不支持多色，直接添加多色图标会自动去色。</li>
+          </ul>
+          <blockquote>
+            <p>注意：新版 iconfont 支持两种方式引用多色图标：SVG symbol 引用方式和彩色字体图标模式。（使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。）</p>
+          </blockquote>
+          <p>Unicode 使用步骤如下：</p>
+          <h3 id="-font-face">第一步：拷贝项目下面生成的 <code>@font-face</code></h3>
+<pre><code class="language-css"
+>@font-face {
+  font-family: 'newicon';
+  src: url('iconfont.woff2?t=1698546579618') format('woff2'),
+       url('iconfont.woff?t=1698546579618') format('woff'),
+       url('iconfont.ttf?t=1698546579618') format('truetype');
+}
+</code></pre>
+          <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
+<pre><code class="language-css"
+>.newicon {
+  font-family: "newicon" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+</code></pre>
+          <h3 id="-">第三步：挑选相应图标并获取字体编码，应用于页面</h3>
+<pre>
+<code class="language-html"
+>&lt;span class="newicon"&gt;&amp;#x33;&lt;/span&gt;
+</code></pre>
+          <blockquote>
+            <p>"newicon" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
+          </blockquote>
+          </div>
+      </div>
+      <div class="content font-class">
+        <ul class="icon_lists dib-box">
+          
+          <li class="dib">
+            <span class="icon newicon newicon-a-ziyuan71"></span>
+            <div class="name">
+              资源 7
+            </div>
+            <div class="code-name">.newicon-a-ziyuan71
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon newicon newicon-a-ziyuan7"></span>
+            <div class="name">
+              头像
+            </div>
+            <div class="code-name">.newicon-a-ziyuan7
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon newicon newicon-a-ziyuan3"></span>
+            <div class="name">
+              箭头上
+            </div>
+            <div class="code-name">.newicon-a-ziyuan3
+            </div>
+          </li>
+          
+        </ul>
+        <div class="article markdown">
+        <h2 id="font-class-">font-class 引用</h2>
+        <hr>
+
+        <p>font-class 是 Unicode 使用方式的一种变种，主要是解决 Unicode 书写不直观，语意不明确的问题。</p>
+        <p>与 Unicode 使用方式相比，具有如下特点：</p>
+        <ul>
+          <li>相比于 Unicode 语意明确，书写更直观。可以很容易分辨这个 icon 是什么。</li>
+          <li>因为使用 class 来定义图标，所以当要替换图标时，只需要修改 class 里面的 Unicode 引用。</li>
+        </ul>
+        <p>使用步骤如下：</p>
+        <h3 id="-fontclass-">第一步：引入项目下面生成的 fontclass 代码：</h3>
+<pre><code class="language-html">&lt;link rel="stylesheet" href="./iconfont.css"&gt;
+</code></pre>
+        <h3 id="-">第二步：挑选相应图标并获取类名，应用于页面：</h3>
+<pre><code class="language-html">&lt;span class="newicon newicon-xxx"&gt;&lt;/span&gt;
+</code></pre>
+        <blockquote>
+          <p>"
+            newicon" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
+        </blockquote>
+      </div>
+      </div>
+      <div class="content symbol">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-a-ziyuan71"></use>
+                </svg>
+                <div class="name">资源 7</div>
+                <div class="code-name">#newicon-a-ziyuan71</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-a-ziyuan7"></use>
+                </svg>
+                <div class="name">头像</div>
+                <div class="code-name">#newicon-a-ziyuan7</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-a-ziyuan3"></use>
+                </svg>
+                <div class="name">箭头上</div>
+                <div class="code-name">#newicon-a-ziyuan3</div>
+            </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="symbol-">Symbol 引用</h2>
+          <hr>
+
+          <p>这是一种全新的使用方式，应该说这才是未来的主流，也是平台目前推荐的用法。相关介绍可以参考这篇<a href="">文章</a>
+            这种用法其实是做了一个 SVG 的集合，与另外两种相比具有如下特点：</p>
+          <ul>
+            <li>支持多色图标了，不再受单色限制。</li>
+            <li>通过一些技巧，支持像字体那样，通过 <code>font-size</code>, <code>color</code> 来调整样式。</li>
+            <li>兼容性较差，支持 IE9+，及现代浏览器。</li>
+            <li>浏览器渲染 SVG 的性能一般，还不如 png。</li>
+          </ul>
+          <p>使用步骤如下：</p>
+          <h3 id="-symbol-">第一步：引入项目下面生成的 symbol 代码：</h3>
+<pre><code class="language-html">&lt;script src="./iconfont.js"&gt;&lt;/script&gt;
+</code></pre>
+          <h3 id="-css-">第二步：加入通用 CSS 代码（引入一次就行）：</h3>
+<pre><code class="language-html">&lt;style&gt;
+.icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+&lt;/style&gt;
+</code></pre>
+          <h3 id="-">第三步：挑选相应图标并获取类名，应用于页面：</h3>
+<pre><code class="language-html">&lt;svg class="icon" aria-hidden="true"&gt;
+  &lt;use xlink:href="#icon-xxx"&gt;&lt;/use&gt;
+&lt;/svg&gt;
+</code></pre>
+          </div>
+      </div>
+
+    </div>
+  </div>
+  <script>
+  $(document).ready(function () {
+      $('.tab-container .content:first').show()
+
+      $('#tabs li').click(function (e) {
+        var tabContent = $('.tab-container .content')
+        var index = $(this).index()
+
+        if ($(this).hasClass('active')) {
+          return
+        } else {
+          $('#tabs li').removeClass('active')
+          $(this).addClass('active')
+
+          tabContent.hide().eq(index).fadeIn()
+        }
+      })
+    })
+  </script>
+</body>
+</html>

static/newIcon/iconfont.css

@@ -0,0 +1,27 @@
+@font-face {
+  font-family: "newicon"; /* Project id 4304849 */
+  src: url('~@/static/newIcon/iconfont.woff2?t=1698546579618') format('woff2'),
+       url('~@/static/newIcon/iconfont.woff?t=1698546579618') format('woff'),
+       url('~@/static/newIcon/iconfont.ttf?t=1698546579618') format('truetype');
+}
+
+.newicon {
+  font-family: "newicon" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.newicon-a-ziyuan71:before {
+  content: "\e605";
+}
+
+.newicon-a-ziyuan7:before {
+  content: "\e604";
+}
+
+.newicon-a-ziyuan3:before {
+  content: "\e601";
+}
+

static/newIcon/iconfont.json

@@ -0,0 +1,30 @@
+{
+  "id": "4304849",
+  "name": "新转运图标",
+  "font_family": "newicon",
+  "css_prefix_text": "newicon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "37864835",
+      "name": "资源 7",
+      "font_class": "a-ziyuan71",
+      "unicode": "e605",
+      "unicode_decimal": 58885
+    },
+    {
+      "icon_id": "37864731",
+      "name": "头像",
+      "font_class": "a-ziyuan7",
+      "unicode": "e604",
+      "unicode_decimal": 58884
+    },
+    {
+      "icon_id": "37861550",
+      "name": "箭头上",
+      "font_class": "a-ziyuan3",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    }
+  ]
+}