患者处方

.env.production

@@ -16,7 +16,7 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://192.168.0.127:9150/UDI_WMS_MC/'
 # VUE_APP_BASE_API = 'http://192.168.0.127:9160/UDI_WMS_MC/'
 # VUE_APP_BASE_API = 'http://192.168.0.127:9170/UDI_WMS_MC/'
-# VUE_APP_BASE_API = 'http://dm.xmglxp.com:8082/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://dm.xmglxp.com:8082/UDI_WMS_MC/'
 
 # VUE_APP_BASE_API = 'http://192.168.8.58:9150/UDI_WMS_MC/'
 
@@ -37,7 +37,7 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
 
 # 长泰医院
-VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/'
 
 # 三明大田医院
 # VUE_APP_BASE_API = 'http://172.20.124.4:9150/UDI_WMS_MC/'

src/api/basic/sicker/skPersonApi.js

@@ -38,6 +38,15 @@ export function skPrescribeDi(query) {
   });
 }
 
+export function skPrescribeCheck(query) {
+  return axios({
+    url: "/udiwms/basic/sk/prescribe/check",
+    method: "get",
+    params: query
+  });
+}
+
+
 
 /**
  * 下载并查询处方信息

src/api/dev/deviceInfoApi.js

@@ -79,7 +79,7 @@ export function genDeviceQR(deviceCode) {
 
 export function printDevLabel(query) {
   return axios({
-    url: "/udiwms/inv/deptDevice/printOrder",
+    url: "/udiwms/inv/deptDev/label/print",
     method: "post",
     data: query,
     headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},

src/views/dev/deviceChangeOrder.vue

@@ -256,7 +256,7 @@
           <el-table-column label="过期时间" v-if="createData.type==deviceChangeType.ADD.key" width="160"
                            prop="expireDate">
             <template scope="scope">
-              <<el-date-picker v-if="scope.row.editFlag" type="date" v-model="scope.row.expireDate" placeholder="格式yyyy-MM-dd" />
+              <el-date-picker v-if="scope.row.editFlag" type="date" v-model="scope.row.expireDate" placeholder="格式yyyy-MM-dd" />
               <span v-else>{{scope.row.expireDate}}</span>
             </template>
           </el-table-column>

src/views/inout/DialogCreateOrder.vue

@@ -455,7 +455,7 @@
           :refreshPanel="refreshCodesPanel"
           :sickerAdNum="orderFormData.sickerAdNum"
           :viewType="viewType"
-          v-if="viewSickVisible"
+          v-if="isSickerAlive"
         ></diSkPrescribePanel>
       </el-tab-pane>
       <el-tab-pane label="校验详情" v-if="viewCheckVisible || viewType == 7">
@@ -718,6 +718,7 @@ export default {
       isCheckResultAlive: true,
       isBizDetailAlive: true,
       isCodeDetailAlive: true,
+      isSickerAlive: true,
       editCodeVisible: false,
       actionEnable: false,
       editOriginCodeVisible: false,
@@ -1155,7 +1156,7 @@ export default {
         }
       }
       if (this.curAction.corpType === 1 && this.curAction.genUnit) {
-        if (this.$isBlank(this.orderFormData.fromCorp)) {
+        if (this.$isBlank(this.orderFormData.fromCorp) && this.$isBlank(this.orderFormData.sickerAdNum)) {
           this.$message.warning("请选择往来单位！");
           return;
         }
@@ -1347,12 +1348,14 @@ export default {
       this.isCodeAlive = false;
       this.isBizDetailAlive = false;
       this.isCodeDetailAlive = false;
+      this.isSickerAlive = false;
 
       this.$nextTick(() => {
         //重新加载组件
         this.isCodeAlive = true;
         this.isBizDetailAlive = true;
         this.isCodeDetailAlive = true;
+        this.isSickerAlive = true;
 
       });
 

src/views/inout/PanelSkPrescribeDi.vue

@@ -32,19 +32,27 @@
 
 
     <el-table :data="list" style="width: 100%" border
+              max-height="350" height="350"
               highlight-current-row>
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column label="序号" type="index"></el-table-column>
       <el-table-column label="处方编码" prop="prescribeCode" width="140" show-overflow-tooltip></el-table-column>
-      <el-table-column label="DI标识" prop="nameCode" show-overflow-tooltip></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="measureUnit" show-overflow-tooltip></el-table-column>
-      <el-table-column label="数量" prop="count" show-overflow-tooltip></el-table-column>
-      <el-table-column label="价格" prop="price" show-overflow-tooltip></el-table-column>
-      <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-      <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-      <el-table-column width="60" label="操作">
+      <el-table-column label="DI标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
+      <el-table-column label="产品通用名" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
+      <el-table-column label="规格型号" prop="ggxh" width="140" show-overflow-tooltip></el-table-column>
+      <el-table-column label="计量单位" prop="measureUnit" width="100" show-overflow-tooltip></el-table-column>
+      <el-table-column label="数量" header-align="center">
+        <el-table-column label="处方数量" prop="count" width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column label="扫码数量" prop="realCount" width="100" show-overflow-tooltip></el-table-column>
+      </el-table-column>
+      <el-table-column label="价格" header-align="center">
+        <el-table-column label="处方价格" prop="price" width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column label="实际价格" prop="realPrice" width="100" show-overflow-tooltip></el-table-column>
+      </el-table-column>
+
+      <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" width="160" show-overflow-tooltip></el-table-column>
+      <el-table-column label="生产企业" prop="ylqxzcrbarmc" width="160" show-overflow-tooltip></el-table-column>
+      <el-table-column width="60" label="操作"  fixed="right">
         <template slot-scope="scope">
           <el-button type="text" @click.native.stop="handleModifyClick(scope.row)">详情</el-button>
         </template>
@@ -56,7 +64,7 @@
 </template>
 
 <script>
-import {dlOrFilter, skPrescribeDi} from "@/api/basic/sicker/skPersonApi";
+import {dlOrFilter, skPrescribeCheck, skPrescribeDi} from "@/api/basic/sicker/skPersonApi";
 
 export default {
   name: "skPrescribeDi",
@@ -75,6 +83,7 @@ export default {
   data() {
     return {
       filterQuery: {
+        billNo: null,
         adNum: null,
         page: 1,
         limit: 10,
@@ -89,16 +98,17 @@ export default {
     getList() {
       this.loading = true;
       this.filterQuery.adNum = this.sickerAdNum;
-      skPrescribeDi(this.filterQuery)
+      this.filterQuery.billNo = this.perscribeData.billNo;
+      skPrescribeCheck(this.filterQuery)
         .then((response) => {
           this.loading = false;
-          this.list = response.data.list || [];
-          this.total = response.data.total || 0;
+          this.list = response.data || [];
+          // this.total = response.data.total || 0;
         })
         .catch(() => {
           this.loading = false;
-          this.list = [];
-          this.total = 0;
+          // this.list = [];
+          // this.total = 0;
         });
     },