拉取代码

components/cancelBlood/cancelBlood.vue

@@ -64,7 +64,7 @@
           bloodIds: this.coopData.children.map(v => v.children).flat().map(v => v.id).toString(),
           closeOrder: this.isShowTips ? 1 : 0,
           handoverUser: data.accountId,
-          cancelReason: data.cancelReason.id,
+          cancelReason: data.cancelReason,
         };
       
         post('/transflow/extra', postData).then(res => {
@@ -186,14 +186,13 @@
       showSelectAccount2(isShowTips = false) {
         this.isShowTips = isShowTips;
         this.hosModels2 = {
-          content: `请填写取消原因和交接人信息`,
+          content: `请填写取消送血原因和交接人信息`,
           disjunctor: true,
-          tips: isShowTips ? '本患者取消发血后，工单将关闭！' : '',
+          tips: isShowTips ? '本患者取消送血后，工单将关闭！' : '',
         };
       },
       // 取消发血
       selectAccountHandler(data, index){
-        console.log(this.cancelBlood)
         if(this.cancelBlood != 1 || !this.signType4){
           return;
         }

components/selectAccount2/selectAccount2.vue

@@ -5,19 +5,19 @@
         提示
       </view>
       <view class="changeHospital__article">
-        <view class="uni-list-cell content" v-show="content">
+        <view class="uni-list-cell content red size-30" v-show="content">
           {{content}}
         </view>
-        <view class="uni-list-cell content red" v-show="tips">
+        <view class="uni-list-cell content red size-32" v-show="tips">
           {{tips}}
         </view>
         <view class="uni-list-cell">
           <view class="uni-list-cell-left">
             <text class="red">*</text>取消原因：
           </view>
-          <view class="uni-list-cell-db">
+          <view class="uni-list-cell-db" v-if="cancelReason.length">
             <picker @change="changeCancelReason" :value="cancelReasonIndex" :range="cancelReason" range-key="name">
-              <view class="uni-input">{{cancelReason[cancelReasonIndex].name}}</view>
+              <view class="uni-input">{{cancelReason[cancelReasonIndex] ? cancelReason[cancelReasonIndex].name : '请选择'}}</view>
             </picker>
           </view>
         </view>
@@ -102,8 +102,8 @@
         account: '', //交接人工号
         accountName: '', //交接人姓名
         accountId: '' ,//交接人ID
-        cancelReasonIndex: 0,
-        cancelReason: [{id: 1, name: '输血科取消'}, {id: 2, name: '临时取消'}],
+        cancelReasonIndex: null,
+        cancelReason: [],
       };
     },
     watch: {
@@ -153,6 +153,15 @@
       },
     },
     methods: {
+			// 获取取消原因字典
+			getCancelDic(){
+				post('/common/common/getDictionary', {
+					"type": "list",
+					"key": "blood_trans_cancel_reason"
+				}).then(res => {
+					this.cancelReason = res;
+				})
+			},
       // 修改取消原因
       changeCancelReason(e){
         this.cancelReasonIndex = e.detail.value;
@@ -200,7 +209,7 @@
           e.accountId = this.accountId;
         }
         if (this.cancelReason[this.cancelReasonIndex]) {
-          e.cancelReason = this.cancelReason[this.cancelReasonIndex];
+          e.cancelReason = this.cancelReason[this.cancelReasonIndex].id;
         }
         this.$emit("ok", e);
       },
@@ -210,6 +219,7 @@
       },
     },
     created() {
+			this.getCancelDic()
       this.hosId = uni.getStorageSync('userData').user.currentHospital.id;
     }
   };
@@ -236,11 +246,12 @@
       
       &.content{
         justify-content: center;
-        color: #000;
+        color: red;
         margin-top: 0;
         font-weight: bold;
+				margin-bottom: 10rpx;
       }
-
+			
       .uni-list-cell-left {
         flex: 3;
         font-size: 32rpx;
@@ -291,7 +302,15 @@
         flex-direction: column;
         justify-content: center;
         align-items: center;
-
+				
+				.size-30{
+					font-size: 30rpx;
+				}
+				
+				.size-32{
+					font-size: 32rpx;
+				}
+				
         &.p0 {
           padding: 0;
         }