优化

components/changeSpeNum/changeSpeNum.vue

@@ -6,6 +6,7 @@
       </view>
       <view class="changeSpeNum__article">
         <view class="tips" v-html="content" v-if="content"></view>
+        <view class="tips-l" v-if="modifyReason">修改原因：{{modifyReason}}</view>
         <view class="uni-list-cell">
           <view class="uni-list-cell-left">
             标本数量：
@@ -14,7 +15,7 @@
             <uni-number-box v-model="speNum" :max="9999"></uni-number-box>
           </view>
         </view>
-        <view class="uni-list-cell" v-if="speNum != num">
+        <view class="uni-list-cell" v-if="isFirstShowReason || (!isFirstShowReason && speNum != num)">
           <view class="uni-list-cell-left">
             修改原因：
           </view>
@@ -27,8 +28,8 @@
             上传图片：
           </view>
           <view class="uni-list-cell-db">
-            <uni-file-picker :auto-upload="false" :limit="3" title="最多选择3张图片" v-model="imageValue" fileMediatype="image" mode="grid"
-              @select="selectFile" @delete="deleteFile"></uni-file-picker>
+            <uni-file-picker :auto-upload="false" :limit="3" title="最多选择3张图片" v-model="imageValue" fileMediatype="image"
+              mode="grid" @select="selectFile" @delete="deleteFile"></uni-file-picker>
           </view>
         </view>
       </view>
@@ -107,7 +108,15 @@
       num: {
         type: Number,
         default: 0
-      }
+      },
+      modifyReason: {
+        type: String,
+        default: ''
+      },
+      isFirstShowReason: {
+        type: Boolean,
+        default: true
+      },
     },
     methods: {
       // 获取上传状态
@@ -119,7 +128,7 @@
       // 移除
       deleteFile(e) {
         console.log('移除：', e);
-        this.imageValue = this.imageValue.filter(v=>v.uuid != e.tempFile.uuid);
+        this.imageValue = this.imageValue.filter(v => v.uuid != e.tempFile.uuid);
       },
       // 确定
       ok() {
@@ -154,8 +163,15 @@
     bottom: 0;
     background-color: rgba(0, 0, 0, 0.2);
     z-index: 999;
-    
-    .tips{}
+
+    .tips {
+      text-align: center;
+    }
+
+    .tips-l {
+      text-align: left;
+      color: #000;
+    }
 
     .uni-list-cell {
       width: 94%;
@@ -297,6 +313,7 @@
             height: 87rpx;
             background-color: rgb(229, 233, 237);
           }
+
           &:first-of-type::before {
             display: none;
           }

main.js

@@ -2,9 +2,9 @@ import Vue from 'vue'
 import App from './App'
 // #ifdef H5
 import wx from 'weixin-jsapi'
-import VConsole from 'vconsole';
-new VConsole();
-console.info('v2.4.10');
+// import VConsole from 'vconsole';
+// new VConsole();
+console.info('v2.4.11');
 Vue.prototype.wx = wx //声明扫码
 Vue.prototype.audios = [] //待播放的语音集合
 // #endif

pages/scanning_code/scanning_code.vue

@@ -363,7 +363,7 @@
     </handViewDrugsBag>
     <!-- 修改标本数量弹窗 -->
     <changeSpeNum v-if="changeSpeModels.disjunctor" :operate="{ok:'确认数量',check:'详细核对',cancel:'取消'}" :title="changeSpeModels.title" :content="changeSpeModels.content"
-      :disjunctor="changeSpeModels.disjunctor" @ok="changeSpeOk" @check="changeSpeCheck" @cancel="changeSpeCancel" :num="speNumChange">
+      :disjunctor="changeSpeModels.disjunctor" @ok="changeSpeOk" @check="changeSpeCheck" @cancel="changeSpeCancel" :num="speNumChange" :modifyReason="modifyReason" :isFirstShowReason="false">
     </changeSpeNum>
   </view>
 </template>
@@ -382,6 +382,7 @@
     data() {
       return {
         speNumChange: 0,
+        modifyReason:'',
         changeSpeObj: {},
         // 修改标本数量弹窗model
         changeSpeModels: {
@@ -688,6 +689,7 @@
           uni.hideLoading();
           if (res.status == 200) {
             this.speNumChange = res.deptSpecimensNum;
+            this.modifyReason = res.modifyReason;
             this.changeSpeModels = {
               title: "修改标本数量",
               content: `您已到达<span class="red">${this.DEPT}</span>本科室标本数量为<span class="red">${this.speNumChange}</span>，请确认标本数量`,
@@ -695,6 +697,7 @@
             };
           } else {
             this.speNumChange = "";
+            this.modifyReason = '';
             uni.showToast({
               icon: "none",
               title: "请求失败！",

pages/scanning_djEnd/scanning_djEnd.vue

@@ -206,7 +206,7 @@
     <!-- 修改标本数量弹窗 -->
     <changeSpeNum v-if="changeSpeModels.disjunctor" :operate="{ok:'确认数量',check:'详细核对',cancel:'取消'}"
       :title="changeSpeModels.title" :content="changeSpeModels.content" :disjunctor="changeSpeModels.disjunctor"
-      @ok="changeSpeOk" @check="changeSpeCheck" @cancel="changeSpeCancel" :num="speNumChange">
+      @ok="changeSpeOk" @check="changeSpeCheck" @cancel="changeSpeCancel" :num="speNumChange" :modifyReason="modifyReason" :isFirstShowReason="false">
     </changeSpeNum>
   </view>
 </template>
@@ -222,6 +222,7 @@
     data() {
       return {
         speNumChange: 0,
+        modifyReason:'',
         changeSpeObj: {},
         // 修改标本数量弹窗model
         changeSpeModels: {
@@ -523,6 +524,7 @@
           uni.hideLoading();
           if (res.status == 200) {
             this.speNumChange = res.deptSpecimensNum;
+            this.modifyReason = res.modifyReason;
             this.changeSpeModels = {
               title: "修改标本数量",
               content: `您已到达<span class="red">${this.queryObj.dept}</span>本科室标本数量为<span class="red">${this.speNumChange}</span>，请确认标本数量`,
@@ -530,6 +532,7 @@
             };
           } else {
             this.speNumChange = "";
+            this.modifyReason = "";
             uni.showToast({
               icon: "none",
               title: "请求失败！",