src/views/collect/DealOrder.vue

@@ -929,6 +929,7 @@ export default {
           this.$refs.inputRef.focus()
           this.$refs.inputRef.select()
           this.isSuccess = true
+          this.printCodeResult(response.data, response.message)
           this.filterQuery.code = response.data.code
           this.scanCode = ''
           this.originCode = ''

src/views/collect/PannelOrderBiz.vue

@@ -116,15 +116,15 @@
               :row-style="{ height: '60px' }"
               :cell-style="{ padding: '0' }"
     >
-      <!--<el-table-column label="赋码状态" prop="cpmctymc">-->
+      <el-table-column label="赋码状态" prop="cpmctymc">
-      <!--  <template v-slot="scope">-->
+        <template v-slot="scope">
-      <!--    <div style="text-align: center;">-->
+          <div style="text-align: center;">
-      <!--      <el-tag :type="getTagColor(scope.row)" size="26">-->
+            <el-tag :type="getTagColor(scope.row)" size="26">
-      <!--        {{ codingStatus }}-->
+              {{ codingStatus }}
-      <!--      </el-tag>-->
+            </el-tag>
-      <!--    </div>-->
+          </div>
-      <!--  </template>-->
+        </template>
-      <!--</el-table-column>-->
+      </el-table-column>
       <el-table-column label="产品通用名" prop="cpmctymc">
         <template v-slot="scope">
           <div :style="{ fontSize: '16px' }">{{ scope.row.cpmctymc }}</div>
@@ -135,16 +135,16 @@
           <div :style="{ fontSize: '26px' }">{{ scope.row.count }}</div>
         </template>
       </el-table-column>
-      <!--<el-table-column label="应扫码数量" prop="scanActCount" :min-width="120">-->
+      <el-table-column label="应扫码数量" prop="scanActCount" :min-width="120">
-      <!--  <template v-slot="scope">-->
+        <template v-slot="scope">
-      <!--    <div v-if="scope.row.autoTagStatus == 2" :style="getCellStyle1(scope.row)" style="display: flex; align-items: center; height: 100%; min-height: 40px;">-->
+          <div v-if="scope.row.autoTagStatus == 2" :style="getCellStyle1(scope.row)" style="display: flex; align-items: center; height: 100%; min-height: 40px;">
-      <!--      无需扫码-->
+            无需扫码
-      <!--    </div>-->
+          </div>
-      <!--    <div :style="getCellStyle(scope.row)" style="display: flex; align-items: center; height: 100%; min-height: 60px;" v-else>-->
+          <div :style="getCellStyle(scope.row)" style="display: flex; align-items: center; height: 100%; min-height: 60px;" v-else>
-      <!--      {{ scope.row.scanCount }}/{{ scope.row.shouldCount }}-->
+            {{ scope.row.scanCount }}/{{ scope.row.shouldCount }}
-      <!--    </div>-->
+          </div>
-      <!--  </template>-->
+        </template>
-      <!--</el-table-column>-->
+      </el-table-column>
       <el-table-column label="制剂规格" prop="prepnSpec">
         <template v-slot="scope">
           <div :style="{ fontSize: '16px' }">{{ scope.row.prepnSpec }}</div>
@@ -351,7 +351,6 @@ export default {
         }
         _this.preDetailList = res.data.list
         _this.preLoading = false
-        console.log("获取明细数据成功")
       }).catch(() => {
         _this.preLoading = false
         _this.$message.error('数据加载失败')
@@ -368,21 +367,21 @@ export default {
       this.refreshPanel(this)
     },
 
-    // rowStyle({ row, rowIndex }) {
+    rowStyle({ row, rowIndex }) {
-    //   let rowBackground = {}
+      let rowBackground = {}
-    //   rowBackground.fontSize = '16px'
+      rowBackground.fontSize = '16px'
-    //   rowBackground.height = '50px'
+      rowBackground.height = '50px'
-    //   if (row.scanActCount < row.count) {
+      if (row.scanActCount < row.count) {
-    //     rowBackground.color = '#F56C6C'
+        rowBackground.color = '#F56C6C'
-    //   }
+      }
-    //   if (row.autoTagStatus == 2) {
+      if (row.autoTagStatus == 2) {
-    //     rowBackground.color = '#E6A23C'
+        rowBackground.color = '#E6A23C'
-    //   }
+      }
-    //   if (row.scanActCount >= row.count) {
+      if (row.scanActCount >= row.count) {
-    //     rowBackground.color = '#56a717'
+        rowBackground.color = '#56a717'
-    //   }
+      }
-    //   return rowBackground
+      return rowBackground
-    // },
+    },
 
     getCellStyle1(row) {
       let cellStyle = {}