Merge branch 'master' of http://git.dashitech.com/seimin/zy-wechat

pages/newDrug/checkPage/checkPage.vue

@@ -14,7 +14,7 @@
       </view>
       <scroll-view scroll-y class="scrollContent">
         <view class="column" v-for="item in drugsBagList" :key="item.id" @click="toDetail(item.id)">
-          <view class="value1">{{item.batchNo}}</view>
+          <view class="value1">{{item.packid}}</view>
           <view class="value2">{{item.drugsTypeCount}}</view>
           <view class="value3">{{item.drugsCount}}</view>
         </view>
@@ -25,16 +25,19 @@
       <view class="column">
         <view class="btn" @click="scanCode()">扫一扫交接</view>
         <view class="btn" @click="fillInManually(config.drugsStartManual.value)" v-if="workOrder.gdState && workOrder.gdState.value == 4 && config.drugsStartManual">{{config.drugsStartManual.name}}</view>
-        <view class="btn" @click="fillInManually(config.drugsStartManual.value)" v-if="workOrder.gdState && workOrder.gdState.value == 5 && config.drugsEndManual">{{config.drugsEndManual.name}}</view>
+        <view class="btn" @click="fillInManually(config.drugsEndManual.value)" v-if="workOrder.gdState && workOrder.gdState.value == 5 && config.drugsEndManual">{{config.drugsEndManual.name}}</view>
       </view>
     </view>
     <!-- 填写交接人工号弹窗 -->
     <selectAccount @click.stop.native v-if="hosModels.disjunctor" :disjunctor="hosModels.disjunctor" @ok="hosOk"
       @cancel="hosCancel">
     </selectAccount>
+    <!-- 动态密钥 -->
+    <numberKeyModel v-if="showKey" :keyArr="keyArr" @cancel="showKey = false" @confirm="confirmKey($event)"></numberKeyModel>
   </view>
 </template>
 <script>
+  import numberKeyModel from "@/components/numberKeyModel/numberKeyModel.vue";
   import {
     get,
     post,
@@ -54,17 +57,74 @@
         hosModels: {
           disjunctor: false,
         },
+        showKey:false,
+        keyNum:4, //密钥位数
+        isNumberKey:false, //是否开启动态密钥
+        keyArr: [],
       };
     },
+    components: {
+    	numberKeyModel,
+    },
     onShow() {
       this.SMFlag = true;
     },
     methods: {
+      // 获取配置
+      getConfig() {
+        let postData = {
+          idx: 0,
+          sum: 9999,
+      		hospitalConfig:{
+      			hosId:this.hosId,
+      			model:"all"
+      		}
+        };
+
+        post("/simple/data/fetchDataList/hospitalConfig",postData).then((result) => {
+            if (result.status == 200) {
+      				this.keyArr = []
+      				for(let i of result.list){
+      					if(i.key=='digitalSecretKey'){
+      						if(i.value==1){
+      							this.isNumberKey = true
+      						}else{
+      							this.isNumberKey = false
+      						}
+      					}else if(i.key=='numberDigitalSecretKey'){
+      						this.keyNum = Number(i.value)
+      					}
+      				}
+      				for(let i = 0; i < this.keyNum; i++){
+      					this.keyArr.push({
+      						value:null
+      					})
+      				}
+      				console.log(444,this.keyArr)
+            }
+          });
+      },
+      confirmKey(data){
+      	this.padChange(data)
+      	this.showKey = false
+      },
+      isShowKey(){
+      	this.showKey = true
+      },
+      padChange(scannerCode){
+        if(!this.isNumberKey){
+        	scannerCode = scannerCode.replace('\n','')
+        }
+        this.bigScan(scannerCode);
+      },
       // 手动填写
       fillInManually(value){
         if(value == 1){
           // 填写工号
           this.showSelectAccount();
+        }else if(value == 2){
+          // 动态密钥
+          this.isShowKey();
         }
       },
       // 填写交接人工号-确认
@@ -251,33 +311,7 @@
             mask: true,
           });
 
-          let postData = {
-            type: this.queryObj.drugsBagType,
-            orderStateValue: this.workOrder.gdState.value,
-            code: content,
-            orderId: this.workOrder.id,
-          }
-
-          post("/transflow/bigScan", postData)
-            .then((res) => {
-              this.SMFlag = true;
-              uni.hideLoading();
-              if (res.codeBean) {
-                if(res.codeBean.valid){
-                  this.pageNavigateByConfig(this.config, this.workOrder, this.queryObj, res.codeBean.userDTO, res.codeBean.departmentDTO);
-                }else{
-                  uni.showToast({
-                    icon: "none",
-                    title: res.codeBean.msg || "接口获取数据失败！",
-                  });
-                }
-              } else {
-                uni.showToast({
-                  icon: "none",
-                  title: "接口获取数据失败！",
-                });
-              }
-            });
+          this.bigScan(content);
         }).catch(err => {
           this.SMFlag = true;
         });
@@ -288,6 +322,36 @@
           url: `/pages/newDrug/detail?drugsBagType=${this.queryObj.drugsBagType}&drugsBagId=${drugsBagId}`,
         });
       },
+      // 扫码
+      bigScan(content){
+        let postData = {
+          type: this.queryObj.drugsBagType,
+          orderStateValue: this.workOrder.gdState.value,
+          code: content,
+          orderId: this.workOrder.id,
+        }
+
+        post("/transflow/bigScan", postData)
+          .then((res) => {
+            this.SMFlag = true;
+            uni.hideLoading();
+            if (res.codeBean) {
+              if(res.codeBean.valid){
+                this.pageNavigateByConfig(this.config, this.workOrder, this.queryObj, res.codeBean.userDTO, res.codeBean.departmentDTO);
+              }else{
+                uni.showToast({
+                  icon: "none",
+                  title: res.codeBean.msg || "接口获取数据失败！",
+                });
+              }
+            } else {
+              uni.showToast({
+                icon: "none",
+                title: "接口获取数据失败！",
+              });
+            }
+          });
+      },
       // 初始化
       init(){
         uni.showLoading({
@@ -347,6 +411,7 @@
       console.log(options, "options");
       this.queryObj = options;
       this.init();
+      this.getConfig();
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif

pages/newDrug/continueScanning/continueScanning.vue

@@ -8,7 +8,7 @@
       <scroll-view scroll-y class="scrollContent">
         <view class="column">
           <view class="name">单号：</view>
-          <view class="value">{{drugsBag.batchNo}}</view>
+          <view class="value">{{drugsBag.packid}}</view>
         </view>
         <view class="column">
           <view class="name">申请科室：</view>

pages/newDrug/createOrder/createOrder.vue

@@ -10,7 +10,7 @@
       <scroll-view scroll-y class="scrollContent">
         <view class="column">
           <view class="name">单号：</view>
-          <view class="value">{{drugsBag.batchNo}}</view>
+          <view class="value">{{drugsBag.packid}}</view>
         </view>
         <view class="column">
           <view class="name">申请科室：</view>

pages/newDrug/detail.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="Scanning_Result">
     <view class="Scanning_top">
-      <view class="Scanning_top_icon">{{drugsBag.batchNo}}</view>
+      <view class="Scanning_top_icon">{{drugsBag.packid}}</view>
     </view>
     <view class="Scanning_top_tips">
       <view class="info">申请：{{drugsBag.target ? drugsBag.target.dept : ''}}</view>
@@ -73,7 +73,7 @@
           title: "加载中",
           mask: true,
         });
-        
+
         if(this.queryObj.drugsBagId){
           // 根据药包id查询药品
           this.getDrugsByDrugsBugId(this.queryObj.drugsBagId);
@@ -194,7 +194,7 @@
       align-items: center;
       gap: 24rpx;
       font-weight: bold;
-      
+
       .column{
         width: 100%;
         height: 78rpx;
@@ -202,7 +202,7 @@
         align-items: center;
         justify-content: space-between;
         gap: 24rpx;
-        
+
         .btn {
           height: 100%;
           flex: 1;

pages/newDrug/list.vue

@@ -4,7 +4,7 @@
       <scroll-view scroll-y class="scrollContent">
         <view class="column" v-for="item in drugsBagList" :key="item.id" @click="toDetail(item.id)">
           <view class="head">
-            <view class="name">{{item.batchNo}}</view>
+            <view class="name">{{item.packid}}</view>
             <view class="value">{{item.drugsState ? item.drugsState.name : ''}}</view>
           </view>
           <view class="body">

pages/newDrug/photoRetention/photoRetention.vue

@@ -35,7 +35,7 @@
             </view>
             <view class="column">
               <view class="name">药品单号：</view>
-              <view class="value">{{drugsBagList.length ? drugsBagList[0].batchNo : ''}}</view>
+              <view class="value">{{drugsBagList.length ? drugsBagList[0].packid : ''}}</view>
             </view>
           </template>
           <template v-if="config.drugsModel === 2">