4/9 优化1.1

src/views/collect/DealOrder.vue

@@ -1037,16 +1037,22 @@ export default {
           }
         } else if (res.code == 502) {
           loading.close();
-          this.$confirm(res.message, '提示', {
+          if (this.formDataVisible.coercionSubmit == 1){
-            confirmButtonText: '确定',
+            this.confirmDialogVisible = false
-            cancelButtonText: '取消',
+            return this.$message.error("单据已经开启强制提交")
-            type: 'warning'
+          }else {
-          }).then(() => {
+            this.$confirm(res.message, '提示', {
-            this.formData.confirmFinish = true
+              confirmButtonText: '确定',
-            this.finishOrder()
+              cancelButtonText: '取消',
-            this.reset()
+              type: 'warning'
-          }).catch(() => {
+            }).then(() => {
-          })
+                this.formData.confirmFinish = true
+                this.finishOrder()
+                this.reset()
+            }).catch(() => {
+            })
+          }
+
         } else if (res.code == 503) {
           loading.close();
           this.$alert('该单据未全部赋码无法完成,请检查后重试', '提示', {
@@ -1056,11 +1062,7 @@ export default {
           })
         } else {
           loading.close();
-          this.$alert(res.message, '提示', {
+          return this.$message.error(res.message)
-            confirmButtonText: '确定',
-            callback: action => {
-            }
-          })
         }
       }).catch(() => {
         loading.close();
@@ -1673,8 +1675,9 @@ export default {
             this.handleConfirm()
             return
           } else {
-            MessageBox.close()
             this.finishOrder()
+            MessageBox.close()
+
           }
 
 

src/views/collect/PannelOrderBiz.vue

@@ -26,14 +26,20 @@
       </el-table-column>
       <el-table-column label="应扫码数量" prop="scanActCount" :min-width="120" width="200">
         <template v-slot="scope">
-          <!--<div v-if="scope.row.autoTagStatus === 2" class="table-cell warning">-->
-          <!--  无需扫码-->
-          <!--</div> v-else -->
           <div :class="getScanCountClass(scope.row)" class="table-cell">
             {{ scope.row.scanCount }}/{{ scope.row.shouldCount }}
           </div>
         </template>
       </el-table-column>
+      <el-table-column label="拆零数量" prop="scanActCount" :min-width="120" width="200">
+          <template v-slot="scope">
+            <div class="table-cell count" :class="getSplitCountClass(scope.row)" style="font-size: 26px">
+              {{ scope.row.splitCount }}
+            </div>
+          </template>
+      </el-table-column>
+
+
       <el-table-column label="制剂规格" prop="prepnSpec" width="200">
         <template v-slot="scope">
           <div class="table-cell">{{ scope.row.prepnSpec }}</div>
@@ -233,6 +239,7 @@ export default {
         return 'warning'
       }
       if (row.scanActCount == null) return 'danger'
+      if (row.scanActCount + row.tempWorkPlaceCount > row.count) return 'success'
       if (row.scanActCount < row.count) return 'danger'
       if (row.scanActCount >= row.count) return 'success'
       return  "success"
@@ -274,6 +281,27 @@ export default {
       return row.scanCount < row.shouldCount ? 'error' : 'success'
     },
 
+    getSplitCountClass(row) {
+       //判断是否已经预付码
+      if (row.autoTagStatus === 2){
+        if (row.scanCount > row.shouldCount){
+          return "success"
+        }
+        return  'warning'
+      }
+      if (row.scanCount === 0 && row.splitCount > row.tempWorkPlaceCount){
+        return 'error'
+      }
+      if (row.splitCount != 0 &&row.splitCount <= row.tempWorkPlaceCount && (row.scanActCount + row.tempWorkPlaceCount < row.count) ){
+        return 'warning'
+      }
+      if(row.scanActCount + row.tempWorkPlaceCount >= row.count){
+        return "success"
+      }
+      if(row.scanActCount < row.count){
+        return "error"
+      }
+    },
     customSort(a, b) {
       // 如果扫码数量和应扫码数量相等，则排在最后
       if (a.scanCount >= a.shouldCount ) {