4/9 优化1.0

src/api/collect/IoCollectCodeSelect.js

@@ -19,13 +19,17 @@ export function getCodeEndList(query) {
 
 
 
-// export function IoCollectCodePageList(query) {
+
-//   return axios({
+export function codeOrders(query) {
-//     url: "/udiwms/basic/collect/ioCollectCodeBackup/list",
+  return axios({
-//     method: "get",
+    url: "/udiwms/basic/collect/ioCollectCodeBackup/codeOrders",
-//     params: query
+    method: "get",
-//   });
+    params: query
-// }
+  });
+}
+
+
+
 //
 //
 // export function deleteCollectCode(query) {

src/views/collect/IoReturnOrderBiz.vue

@@ -24,7 +24,7 @@
           <div class="table-cell count">{{ 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">
           <!--<div v-if="scope.row.autoTagStatus === 2" class="table-cell warning">-->
           <!--  无需扫码-->
@@ -108,7 +108,7 @@
                 label="序号"
               >
               </el-table-column>
-              <el-table-column property="udiCode" label="追溯码" width="180" />
+              <el-table-column property="code" label="追溯码" width="180" />
               <el-table-column property="cpmctymc" label="产品通用名称" width="100" />
               <el-table-column property="nameCode" label="产品标识" width="100" />
               <el-table-column property="ggxh" label="规格" width="80" />
@@ -173,6 +173,7 @@ import {
   manualCodeDetail,
   autoCodeResult, codeReturnRemove
 } from '@/api/collect/collectOrder'
+import { codeOrders, ioCollectCodePageList } from '@/api/collect/IoCollectCodeSelect'
 
 /**
  * 处方退药码明细
@@ -310,7 +311,7 @@ export default {
       returnOrderDetail(_this.preQuery).then(res => {
         _this.preLoading = false
         if (res.code != 20000) {
-          _this.$message.error(res.message)
+          // _this.$message.error(res.message)
           return
         }
         _this.preDetailList = res.data.list
@@ -368,10 +369,10 @@ export default {
       if (this.prescribeData == null)
         return
       if (this.prescribeData != null) {
-        this.codeQuery.orderIdFk = this.prescribeData.remark
+        this.codeQuery.billNo = this.prescribeData.remark
         this.codeQuery.relId = row.relId
       }
-      manualCodeDetail(this.codeQuery).then(res => {
+      codeOrders(this.codeQuery).then(res => {
         this.codeLoading = false
         if (res.code != 20000) {
           this.$message.error(res.message)

src/views/collect/IoReturncllectOrder.vue

@@ -395,7 +395,8 @@ export default {
         busType: null,
         workPlaceCode: null,
         fromCorp: null,
-        confirmFinish: false
+        confirmFinish: false,
+        remark:null,
       },
       selectPrescriptionVisible: false,
       corpOrderIdDisabled: false,
@@ -692,7 +693,7 @@ export default {
       }
       orderDetail(preQuery).then(res => {
         if (res.code != 20000) {
-          this.$message.error(res.message)
+          // this.$message.error(res.message)
           return
         }
           this.overdeleteCode()
@@ -1022,7 +1023,7 @@ export default {
           if (res.code == 20000){
             // const audio = new Audio(require('@/assets/audioFiles/order.mp3'))
             // audio.play()
-            this.resetSplit()
+            this.reset()
             return this.$message.success("退货成功")
           }else {
             return this.$message.error(res.message)

src/views/collect/retraceCode.vue

@@ -56,17 +56,23 @@
         <el-table-column type="index" label="序号"></el-table-column>
         <el-table-column label="目录编码" prop="ybbm" width="240"></el-table-column>
         <el-table-column label="目录名称" prop="cpmctymc" width="240"></el-table-column>
-        <el-table-column label="去重追溯码医保采集数量" prop="busTypeName" width="220"></el-table-column>
+        <el-table-column label="去重追溯码医保采集数量" prop="busTypeName" width="200">
-        <el-table-column label="出库销售追溯码采集数" prop="shouldCount" width="240"></el-table-column>
+        </el-table-column>
-        <el-table-column label="应扫码结算药品总数" prop="scanCount" width="240"></el-table-column>
+        <el-table-column label="出库销售追溯码采集数" prop="shouldCount" width="200">
+        </el-table-column>
+        <el-table-column label="应扫码结算药品总数" prop="scanCount" width="240">
+        </el-table-column>
         <el-table-column label="无码类型" prop="notCodeType" width="120">
           <template slot-scope="scope">
-            <el-tag :type="scope.row.notCodeType == 1 ? 'success' : 'info'">{{ notCodeTypeMap[scope.row.notCodeType] }}</el-tag>
+            <el-tag :type="scope.row.notCodeType == 0 ? 'success' : 'info'">{{ notCodeTypeMap[scope.row.notCodeType] }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="上传率" prop="scanRate" width="120"></el-table-column>
+        <el-table-column label="上传率" prop="scanRate" width="120">
-        <el-table-column label="结算开始时间" prop="scanRate" width="220"></el-table-column>
+        </el-table-column>
-        <el-table-column label="结算结束时间" prop="scanRate" width="220"></el-table-column>
+        <el-table-column label="结算开始时间" prop="scanRate" width="220">
+        </el-table-column>
+        <el-table-column label="结算结束时间" prop="scanRate" width="220">
+        </el-table-column>
         <!--<el-table-column label="所属工位" prop="workplaceName"></el-table-column>-->
         <!--<el-table-column label="操作" fixed="right" width="240">-->
         <!--  <template slot-scope="scope">-->