拉取代码

components/inspectRemoveModel/inspectRemoveModel.vue

@@ -66,6 +66,10 @@
 						value: '2',
 						name: '修改检查时间',
 					},
+					{
+						value: '3',
+						name: '错误建单申请',
+					},
 				],
 				current: -1,
 				userData: null,

manifest.json

@@ -111,8 +111,8 @@
         "domain" : "",
         "router" : {
             // 正常打包目录
-            // "base" : "/app/",
-            "base" : "/dstechbh/app/"
+            "base" : "/app/"
+            // "base" : "/dstechbh/app/"
         },
         "optimization" : {
             "treeShaking" : {

pages/checkAfterScanning/checkAfterScanning.vue

@@ -29,8 +29,8 @@
 		  <view class="btn3" @click="goBack">返回</view>
 		</view>
 		<view class="foot_btn_spe" v-if="enterDynamicDigitalKey==1">
-			<view class="btn1" @click="Scanning_complete('scan')">扫一扫核对</view>
-		  <view class="btn1" @click="isShowKey()">数字核对</view>
+			<view class="btn1" @click="Scanning_complete('scan')">扫码交接</view>
+		  <view class="btn1" @click="isShowKey()">数字交接</view>
 		  <view class="btn3" @click="goBack">返回</view>
 		</view>
     <!-- 弹窗 -->

pages/newSendBack/sendBackPatient/sendBackPatient.vue

@@ -6,17 +6,20 @@
 
     <view class="Scanning_cont">
       <scroll-view scroll-y class="scrollContent">
+				<checkbox-group @change="checkboxChange">
         <view class="column" v-for="(item, index) in patientList" :key="item.id">
-          <view class="top">
-            <view class="name">姓名：</view>
-            <view class="value">{{item.patientName}}</view>
-            <text class="orders green">{{index + 1}}</text>
-          </view>
-          <view class="bottom">
-            <view class="name">住院号：</view>
-            <view class="value">{{item.residenceNo}}</view>
-          </view>
+						<view class="top">
+							<checkbox :value="item.id" :checked="item.checked" activeBackgroundColor="#49b856" activeBorderColor="#49b856" iconColor="#fff"/>
+							<text class="orders green">{{index + 1}}</text>
+						  <view class="name">姓名：</view>
+						  <view class="value">{{item.patientName}}</view>
+						</view>
+						<view class="bottom">
+						  <view class="name">住院号：</view>
+						  <view class="value">{{item.residenceNo}}</view>
+						</view>
         </view>
+				</checkbox-group>
       </scroll-view>
     </view>
 
@@ -60,11 +63,33 @@
       this.SMFlag = true;
     },
     methods: {
+			checkboxChange (e) {
+				var items = this.patientList,
+					values = e.detail.value;
+				for (var i = 0, lenI = items.length; i < lenI; ++i) {
+					const item = items[i]
+					if(values.includes(item.id)){
+						this.$set(item,'checked',true)
+					}else{
+						this.$set(item,'checked',false)
+					}
+				}
+				console.log(8888,this.patientList)
+			},
 			// 送回病房-扫描科室
 			scanDept() {
 			  if (!this.SMFlag) {
 			    return;
 			  }
+				let isList = this.patientList.filter(i=>i.checked)
+				if(isList.length==0){
+					uni.showToast({
+					  icon: 'error',
+					  title: '请勾选患者',
+					  duration: 2000,
+					});
+					return
+				}
 			  this.SMFlag = false;
 			  let code = "";
 			  SM().then((ress1) => {
@@ -177,22 +202,23 @@
               let postData = {
                 "workOrder": [],
               };
-              console.log(this.patientList);
               this.patientList.forEach(v => {
-                postData.workOrder.push({
-                  sourceId: 4,
-                  "hosId": this.hosId,
-                  "startDept": {
-                    "id": this.currentStartDept.id
-                  },
-                  "createDept": this.currentStartDept.id,
-                  "patient": {
-                    "patientCode": v.patientCode
-                  },
-                  "worker": {
-                    "id": userId
-                  },
-                })
+								if(v.checked){
+									postData.workOrder.push({
+									  sourceId: 4,
+									  "hosId": this.hosId,
+									  "startDept": {
+									    "id": this.currentStartDept.id
+									  },
+									  "createDept": this.currentStartDept.id,
+									  "patient": {
+									    "patientCode": v.patientCode
+									  },
+									  "worker": {
+									    "id": userId
+									  },
+									})
+								}
               })
               post("/workerOrder/returnSickRoom", postData).then((res) => {
                 console.log(res)
@@ -297,7 +323,7 @@
     onLoad(options) {
       console.log(options, "options");
       this.queryObj = options;
-      this.patientList = [{id: options.patientId, patientName: options.patientName, residenceNo: options.patientResidenceNo, patientCode: options.patientCode}]
+      this.patientList = [{id: options.patientId, patientName: options.patientName, residenceNo: options.patientResidenceNo, patientCode: options.patientCode, checked:true}]
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif
@@ -338,7 +364,7 @@
         min-height: 0;
       }
       .column{
-        padding: 24rpx 64rpx;
+        padding: 24rpx 44rpx;
         font-size: 26rpx;
         margin-top: 16rpx;
         background-color: #fff;
@@ -356,12 +382,12 @@
         .top{
           position: relative;
           .orders{
-            width: 64rpx;
+            width: 54rpx;
             text-align: center;
-            position: absolute;
-            left: -64rpx;
-            top: 50%;
-            transform: translateY(-50%);
+            // position: absolute;
+            // left: -64rpx;
+            // top: 50%;
+            // transform: translateY(-50%);
             font-size: 28rpx;
             font-weight: bold;
           }

pages/receipt_infopage/receipt_infopage.vue

@@ -1211,8 +1211,8 @@
         let postData = {
           gdId: this.infoDATA.id,
           inspectId: this.currentInspect.id,
-          reason: value == 1 ? 'checkDone' : 'modificationTime',
-          yyTime: value == 1 ? undefined : yyTime,
+          reason: value == 1 ? 'checkDone' : value == 2 ? 'modificationTime' : 'wrongOrder',
+          yyTime: value == 2 ? yyTime : undefined,
         };
         uni.showLoading({
           title: '移除中',

pages/receiptpage/receiptpage.vue

@@ -2754,8 +2754,8 @@
       }
       // #ifdef APP-PLUS
       webHandle("no", "app");
-			this.isUpdate = true
-			this.isApp = true
+			// this.isUpdate = true
+			// this.isApp = true
       // #endif
       // #ifdef H5
       webHandle("no", "wx");
@@ -2765,8 +2765,8 @@
 			this.getConfig();
 			let that = this
 			// #ifdef APP-PLUS
-			this.isUpdate = true
-			this.isApp = true
+			// this.isUpdate = true
+			// this.isApp = true
 			uni.$off('scan') // 每次进来先 移除全局自定义事件监听器
 			uni.$on('scan', function(data) {
 				that.padChange(data)