患者送回添加勾选框

pages/newSendBack/sendBackOrder/sendBackOrder.vue

@@ -6,9 +6,11 @@
 
     <view class="Scanning_cont">
       <scroll-view scroll-y class="scrollContent">
+				<checkbox-group @change="checkboxChange">
         <view class="column" v-for="(item, index) in orderList" :key="item.id">
           <view class="top">
             <text class="">
+							<checkbox :value="item.id" :checked="item.checked"/>
               <text class="orders green">{{index + 1}}</text>
               <text class="gdcode">{{item.gdcode}}</text>
             </text>
@@ -22,6 +24,7 @@
             <view class="name">{{item.patient.patientName}}（{{item.patient.residenceNo}}）</view>
           </view>
         </view>
+				</checkbox-group>
       </scroll-view>
     </view>
 
@@ -49,11 +52,33 @@
       };
     },
     methods: {
+			checkboxChange (e) {
+				var items = this.orderList,
+					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.orderList)
+			},
       goBack(){
         uni.navigateBack();
       },
       // 一键签到
       orderSignAll(){
+				let isList = this.orderList.filter(i=>i.checked)
+				if(isList.length==0){
+					uni.showToast({
+					  icon: 'error',
+					  title: '请勾选工单',
+					  duration: 2000,
+					});
+					return
+				}
         uni.showModal({
           title: "提示",
           content: "您确定一键签到吗？",
@@ -66,9 +91,9 @@
               })
               let postData = {
                 "deptCode": this.queryObj.code,
-                "ids": this.orderList.map(v => v.id),
+                "ids": isList.map(v => v.id),
               };
-              console.log(this.orderList);
+              console.log(isList);
               post("/workerOrder/handleInsAndTrans", postData).then((res) => {
                 console.log(res)
                 uni.hideLoading();
@@ -111,6 +136,9 @@
           console.log(res)
           uni.hideLoading();
           if (res.status == 200) {
+						for(let i of res.data){
+							i.checked = true
+						}
             this.orderList = res.data || [];
           } else {
             uni.showToast({
@@ -180,6 +208,11 @@
           }
         }
         .top{
+					/deep/ .uni-checkbox-input.uni-checkbox-input-checked{
+						 color: #fff !important;
+						 background: #49b856 !important;
+						 border-color: #49b856 !important;
+					}
           .orders{
             font-size: 28rpx;
             font-weight: bold;

pages/newSendBack/sendBackPatient/sendBackPatient.vue

@@ -6,10 +6,8 @@
 
     <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">
-							<checkbox :value="item.id" :checked="item.checked"/>
 							<text class="orders green">{{index + 1}}</text>
 						  <view class="name">姓名：</view>
 						  <view class="value">{{item.patientName}}</view>
@@ -19,7 +17,6 @@
 						  <view class="value">{{item.residenceNo}}</view>
 						</view>
         </view>
-				</checkbox-group>
       </scroll-view>
     </view>
 
@@ -63,33 +60,11 @@
       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) => {
@@ -203,22 +178,20 @@
                 "workOrder": [],
               };
               this.patientList.forEach(v => {
-								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
-									  },
-									})
-								}
+								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)
@@ -298,7 +271,6 @@
         post("/patient/patientByCode ", { code: ress1 }).then((ress) => {
           uni.hideLoading();
           if (ress.status == 200) {
-						ress.data.checked = true
             let flag = this.patientList.find(v => v.id == ress.data.id);
             if(flag){
               uni.showToast({
@@ -324,7 +296,7 @@
     onLoad(options) {
       console.log(options, "options");
       this.queryObj = options;
-      this.patientList = [{id: options.patientId, patientName: options.patientName, residenceNo: options.patientResidenceNo, patientCode: options.patientCode, checked:true}]
+      this.patientList = [{id: options.patientId, patientName: options.patientName, residenceNo: options.patientResidenceNo, patientCode: options.patientCode}]
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif