11/01 bug优化1.0

src/api/basic/workPlace/sysWorkplaceManage.js

@@ -77,6 +77,16 @@ export function printWorkLabel(query) {
 
 
 
+export function printQueues(query) {
+  return axios({
+    url: "/udiwms/sysWorkplace/printQueues",
+    method: "post",
+    data: query,
+    headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
+    responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
+  });
+}
+
 export function getWorkplaces(query) {
   return axios({
     url: "/udiwms/sysWorkplace/getWorkplaces",

src/views/basic/workplace/cargowWorkplaceManage.vue

@@ -164,7 +164,7 @@
                     type="text"
                     size="small"
                     @click.native.stop="printQueueList(scope.row)"
-                  >分格标签
+                  >货位标签
                   </el-button>
 
                   <el-button
@@ -591,7 +591,7 @@ import {
   createWorkplaceId,
   deleteWorkplace,
   getUsers,
-  listPage,
+  listPage, printQueues,
   printWorkLabel, updateWorkplace
 } from '@/api/basic/workPlace/sysWorkplaceManage'
 import { addTree, deleteTree, getTree, updateTree } from '@/api/basic/collectPoint/collectPointManage'
@@ -685,9 +685,9 @@ export default {
         1: '采集工位',
         2: '上货工位'
       },
-      queueStatusMap:{
-        0 : '关闭',
-        1 : '启用',
+      queueStatusMap: {
+        0: '关闭',
+        1: '启用'
       },
       orderFinishVerifys: {
         0: '完全赋码',
@@ -777,7 +777,7 @@ export default {
         chargeUser: null,
         constituencies: null,
         invRemindNumber: 0,
-        queueStatus:0,
+        queueStatus: 0,
         remake: null
       },
       fromDeptOptions: [],
@@ -931,7 +931,7 @@ export default {
         keyWords: null,
         workPlaceCode: null
       }
-        this.getCargowBindCollectList()
+      this.getCargowBindCollectList()
     },
     onQueueList() {
       if (this.rowData.workplaceId == null) {
@@ -1057,7 +1057,7 @@ export default {
         chargeUser: null,
         constituencies: '1001',
         invRemindNumber: 0,
-        queueStatus:0,
+        queueStatus: 0,
         remake: null
       }
       if (this.groupData != null) {
@@ -1203,7 +1203,7 @@ export default {
     },
     edit(row) {
       this.formData = row
-      this.formData.queueStatus =  Number(row.queueStatus)
+      this.formData.queueStatus = Number(row.queueStatus)
       // this.formData.invCode = String(row.invCode)
       if (row.chargeUser == 0) {
         this.formData.chargeUser = null
@@ -1259,7 +1259,7 @@ export default {
     },
     printQueue(row) {
       row.labelId = 8
-      printQueueLabel(row).then(res  => {
+      printQueueLabel(row).then(res => {
         const binaryData = []
         binaryData.push(res)
         let url = window.URL.createObjectURL(
@@ -1271,8 +1271,20 @@ export default {
         this.loading = false
       })
     },
-    printQueueList(row){
+    printQueueList(row) {
+      row.labelId = 8
+      printQueues(row).then(res => {
+        const binaryData = []
+        binaryData.push(res)
+        let url = window.URL.createObjectURL(
+          new Blob(binaryData, { type: 'application/pdf' })
+        )
+        this.loading = false
+        window.open(url)
 
+      }).catch((error) => {
+        this.$message.error('工位未绑定货位')
+      })
     }
   },
   created() {

src/views/collect/DealOrder.vue

@@ -408,7 +408,7 @@ import {
   vailOrderFinish
 } from "@/api/collect/splitCreateOrder";
 import {selectCorpList} from "@/api/basic/basicUnitMaintain";
-import {getCurOrder, getNextOrder, findByBill, findFromCorp, orderDetail} from "@/api/collect/collectOrder";
+import {getCurOrder, getNextOrder, findByBill, findFromCorp, orderDetail,removeByScanCode} from "@/api/collect/collectOrder";
 import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
 import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 import {getInvListByUser} from "@/api/system/invWarehouse";
@@ -708,6 +708,14 @@ export default {
       _this.getBizDetailList();
       _this.vailOrderFinish();
     },
+    refreshCodesPanelBank(_this) {
+      _this.panelALive = false;
+      _this.$nextTick(() => {
+        _this.panelALive = true;
+      });
+      // _this.getBizDetailList();
+      _this.vailOrderFinish();
+    },
     refreshCodesPanelP() {
       let _this = this
       _this.panelALive = false;
@@ -759,6 +767,8 @@ export default {
           this.scanSplit = true
           return;
         } else {
+          //没有需要确认的
+          this.scanSplit = false
           this.overdeleteCode();
         }
 
@@ -1028,9 +1038,7 @@ export default {
     },
 
     saveDraftOrder() {
-      if (this.scanStatus == 1) {
-        this.overdeleteCode()
-      }
+
       this.$confirm('此操作将挂起当前正在处理单据，是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -1039,7 +1047,10 @@ export default {
         draftOrder(this.formData).then(res => {
           this.loading = false
           if (res.code == 20000) {
-            this.resetWork()
+            if (this.scanStatus == 1) {
+              this.overdeleteCode()
+            }
+            this.reset()
           }
         }).catch(() => {
           this.loading = false
@@ -1057,7 +1068,8 @@ export default {
         cancelOrder(this.formData).then(res => {
           this.loading = false
           if (res.code == 20000) {
-            this.resetWork()
+            this.overdeleteCode()
+            this.reset()
           }
         }).catch(() => {
           this.loading = false
@@ -1081,7 +1093,7 @@ export default {
       finishOrder(this.formData).then(res => {
         this.loading = false
         if (res.code == 20000) {
-          this.resetWork()
+          this.reset()
           this.findCurOrder()
         } else if (res.code == 502) {
           this.$confirm(res.message, '提示', {
@@ -1363,6 +1375,19 @@ export default {
       this.$refs.inputRef.focus();
       this.$refs.inputRef.select();
     },
+    reset(){
+      this.formData = {
+        tagStatus: -1,
+        workPlaceCode: this.formData.workPlaceCode,
+        busType: this.formData.busType
+      };
+      this.curRow = null
+      this.formData.confirmFinish = false;
+      this.refreshCodesPanelBank(this)
+      this.clearCode()
+      this.$refs.inputRef.focus();
+      this.$refs.inputRef.select();
+    },
     toggleBusType() {
       //隐藏下拉框内容
       // this.$refs.selectHeadEmpId.blur();
@@ -1469,16 +1494,11 @@ export default {
               })
               this.result = ''
         }else if (res.code == 501){
-              this.warnVisible = true
-              this.warnResult = res.data
-              this.panelALive = false
-              this.$nextTick(() => {
-                this.panelALive = true
-              })
+
         }else {
-              this.result = ''
-              this.scanCode = ''
-              this.$message.error(res.message)
+          this.result = ''
+          this.scanCode = ''
+          this.$message.error(res.message)
         }
       })
     },
@@ -1605,6 +1625,10 @@ export default {
       this.labelName = 2
       this.placeholder = "请点击输入框进行扫码剔除"
       this.scanStatus = 1
+      this.scanCode = ''
+      if (!isBlank(this.warnResult)){
+        this.warnResult = ""
+      }
     },
     overdeleteCode() {
       this.labelName = 1

src/views/collect/IoCreateOrder.vue

@@ -15,7 +15,7 @@
           >
             <el-button size="mini" type="primary" @click.native="deleteCode" :loading="submitLoading"
                        v-if="splitType=='out' && labelName == 1" style="margin-right: 8px;border-radius: 5%;"
-                       v-show="isLinkDisabled" :disabled="scanDeleteType"
+                       v-show="isLinkDisabled" :disabled="orderFormData.billNo == null"
             >扫码剔除
             </el-button>
             <el-button size="mini" type="primary" @click.native="overdeleteCode" :loading="submitLoading"
@@ -623,7 +623,7 @@ export default {
       },
       scanStatus: null, // 1:扫码剔除
       codeArray: [],
-      curQueueName: "当前货位：",
+      curQueueName: "",
       curQueue: null,
     }
   },
@@ -1153,12 +1153,14 @@ export default {
           return
         }
       }
-      if (this.curAction.corpType == 3) {
-        if (this.$isBlank(this.orderFormData.fromInvCode)) {
-          this.$message.warning('请选择往来仓库！')
-          return
-        }
-      }
+
+      //todo 没有找到this.orderFormData在哪赋值
+      // if (this.curAction.corpType == 3) {
+      //   if (this.$isBlank(this.orderFormData.fromInvCode)) {
+      //     this.$message.warning('请选择往来仓库！')
+      //     return
+      //   }
+      // }
       if (this.curAction.corpType === 1 && this.curAction.genUnit) {
         if (this.$isBlank(this.orderFormData.fromCorp) && this.$isBlank(this.orderFormData.sickerAdNum)) {
           this.$message.warning('请输入患者信息！')
@@ -1487,12 +1489,14 @@ export default {
           return
         }
       }
-      if (this.curAction.corpType == 3) {
-        if (this.$isBlank(this.orderFormData.fromInvCode)) {
-          this.$message.warning('请选择往来单位！')
-          return
-        }
-      }
+
+      //todo  没有找到 orderFormData 在哪里赋值
+      // if (this.curAction.corpType == 3) {
+      //   if (this.$isBlank(this.orderFormData.fromInvCode)) {
+      //     this.$message.warning('请选择往来单位！')
+      //     return
+      //   }
+      // }
       if (this.curAction.corpType === 1 && this.curAction.genUnit) {
         if (this.$isBlank(this.orderFormData.fromCorp) && this.$isBlank(this.orderFormData.sickerAdNum)) {
           this.$message.warning('请选择往来单位！')
@@ -1514,6 +1518,7 @@ export default {
       } else {
         this.submitLoading = true
       }
+      this.overdeleteCode()
       if (this.viewType == 2) {   //扫码单据立即提交
         submitCodes(tQuery).then((response) => {
           if (val == 1) {
@@ -1638,6 +1643,7 @@ export default {
       if (this.$route.query.busType != null) {
         this.orderFormData.busType = this.$route.query.busType
       }
+      this.overdeleteCode()
       this.selectPrescriptionVisible = true
     },
     deleteCode() {
@@ -1663,6 +1669,7 @@ export default {
         this.$message.warning('请选择工位！')
         return
       }
+      this.overdeleteCode()
       this.rowData.workPlaceCode = this.orderFormData.workPlaceCode
       this.rowData.fifoSplit = this.orderFormData.fifoSplit
       this.$router.push({query: {...this.$route.query, splitType: this.splitType}, path: this.$route.path})
@@ -1720,6 +1727,7 @@ export default {
       } else {
         tQuery.inoutType = 1
       }
+      this.overdeleteCode()
       saveOrderWeb(tQuery).then((response) => {
         this.saveLoading = false
         if (response.code === 20000) {
@@ -1943,12 +1951,20 @@ export default {
           console.log('字符串不是有效的 JSON 格式')
         }
       } else if (str.includes("DMQ")) {
-
+        if (!isBlank(this.curQueueName)){
+          this.scanCode = ''
+          return this.$message.warning("上货未完成")
+        }
+        if (!isBlank(this.orderFormData.billNo)){
+          this.scanCode = ''
+          return this.$message.warning("上货未完成")
+        }
         let query = {
           code: this.scanCode
         }
         if (str != null) {
           query.code = str
+          query.workPlaceIdFk = this.workplaceId
         }
         getByCode(query).then((response) => {
           this.loading = false;
@@ -1957,6 +1973,9 @@ export default {
             this.curQueueName = "当前货位:" + this.curQueue.name + "(" + this.curQueue.code + ")"
             this.orderFormData.workPlaceQueueCode = this.curQueue.code
             this.scanCode = '';
+          }else {
+            this.scanCode = ''
+            this.$message.error(response.message)
           }
         }).catch(() => {
         })

src/views/drugInventory/InvProducts.vue

@@ -487,10 +487,11 @@ export default {
         supId: null,
         zczbhhzbapzbh: null,
         ylqxzcrbarmc: null,
-        invCode: null,
         productsType: 2,
         page: 1,
         limit: 10,
+        invCode: this.$store.getters.locInvCode,
+        filterNoInv: '1',
       };
       this.getList();
       this.findMethod(this);

src/views/inout/DialogCreateOrder.vue

@@ -2018,7 +2018,7 @@ export default {
       this.curAction.genUnit = true
       this.curAction.inputSick = true
     }
-
+    this.findMethod("")
     // this.$refs.inputRef.focus();
     // this.$refs.inputRef.select();
 

src/views/inout/DialogSelectInvProduct.vue

@@ -225,7 +225,9 @@ export default {
       type: Object,
       required: true,
     },
-    orderQuery: {},
+    orderQuery: {
+      productType: 1
+    },
     type: {     //1.领用选入，2：业务单据选入
       type: Object,
       required: true,
@@ -431,6 +433,7 @@ export default {
           ids.push(data);
         });
 
+        this.orderQuery.productType = 1
         if (this.type == 2) {  //新增业务单据选入
           let data = {
             datas: ids,

src/views/inout/IoCheckAuditOrder.vue

@@ -1278,6 +1278,7 @@ export default {
         fromCorp: null,
         keyWords: null,
         invCode: this.$store.getters.locInvCode,
+        productType: 1
       },
       customerId: this.$store.getters.customerId,
       checkStatus: {
@@ -1430,6 +1431,7 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        productType: 1
       };
       this.actDateRange = [];
       this.getList();

src/views/inoutDrug/DialogCreateDrugOrder.vue

@@ -588,7 +588,7 @@ import DialogSelectSpace from "../inout/DialogSelectSpace";
 import {isBlank} from "@/utils/strUtil";
 import {filterNoPage, page, remoteFilter} from "@/api/basic/sicker/skPersonApi";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
-import dialogInvProduct from "@/views/inout/DialogSelectInvProduct";
+import dialogInvProduct from "@/views/inoutDrug/DialogSelectInvProduct";
 import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage";
 
 export default {
@@ -1820,6 +1820,7 @@ export default {
       this.curAction.genUnit = true
       this.curAction.inputSick = true
     }
+    this.findMethod("")
   },
 };
 </script>

src/views/inoutDrug/DialogSelectInvProduct.vue

@@ -129,7 +129,9 @@ export default {
       type: Object,
       required: true,
     },
-    orderQuery: {},
+    orderQuery: {
+      productType: 2
+    },
     type: {     //1.领用选入，2：业务单据选入
       type: Object,
       required: true,
@@ -318,6 +320,7 @@ export default {
           ids.push(data);
         });
 
+        this.orderQuery.productType = 2
         if (this.type == 2) {  //新增业务单据选入
           let data = {
             datas: ids,

src/views/inventory/inner/innerOrderEditDialog.vue

@@ -116,7 +116,7 @@
 
 
     <el-dialog
-      title="内部码打印"
+      title="选入单据"
       :visible.sync="haveDistributionVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"

src/views/inventory/inner/innerOrderSelectProduct.vue

@@ -26,6 +26,14 @@
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="物资类型:" class="query-form-item" >
+              <el-select v-model="listQuery.productsType" style="width: 90%" placeholder="物资类型" >
+                <el-option label="器械" :value="1"></el-option>
+                <el-option label="药品" :value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
 
@@ -47,6 +55,7 @@
             </el-form-item>
           </el-col>
         </el-row>
+
       </el-form>
 
       <div class="top-right-btn">
@@ -69,17 +78,17 @@
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
         <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
-        <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column>
+        <!--<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column>-->
         <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
         <el-table-column label="配送企业" prop="companyName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="操作" width="160">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.native.stop="handleDetailClick(scope.row)">详情</el-button>
-          </template>
-        </el-table-column>
+        <!--<el-table-column label="操作" width="160">-->
+        <!--  <template slot-scope="scope">-->
+        <!--    <el-button type="text" size="small" @click.native.stop="handleDetailClick(scope.row)">详情</el-button>-->
+        <!--  </template>-->
+        <!--</el-table-column>-->
       </el-table>
 
       <pagination
@@ -168,6 +177,7 @@ export default {
         thrPiId: null,
         page: 1,
         limit: 10,
+        productsType:1,
       },
       combineQuery: {
         thirdId: "",
@@ -243,7 +253,8 @@ export default {
         ylqxzcrbarmc: null,
         thrPiId: null,
         page: 1,
-        limit: 10
+        limit: 10,
+        productsType:1,
       }
       this.multipleSelection = [];
       this.radioCheck = null;
@@ -382,6 +393,7 @@ export default {
   components: {udiRlDetailDialog},
 
   created() {
+    this.getList()
     if (this.$isNotBlank(this.data)) {
       this.ids = [];
       if (this.data.stockOrderLists.length > 0) {