From f7f64df860987ece0db94d7b00ffbf81aa155758 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 25 Nov 2024 18:10:24 +0800
Subject: [PATCH] =?UTF-8?q?11/25=20=E9=A2=86=E7=94=A8=20=E7=94=B3=E8=B4=AD?=
 =?UTF-8?q?=20=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purApplyDrug/purApplyEditDiaolog.vue      |  4 +-
 .../purApplyDrug/purOrderSelectProduct.vue    | 92 ++++++++++---------
 .../receive/DialogNewReceive.vue              |  2 +-
 .../receive/DialogSelectInvProduct.vue        |  3 +-
 .../receive/receiveAuditDetail.vue            |  4 +-
 5 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/src/views/pharmaceuticals/purApplyDrug/purApplyEditDiaolog.vue b/src/views/pharmaceuticals/purApplyDrug/purApplyEditDiaolog.vue
index f7539d44..b4002a9e 100644
--- a/src/views/pharmaceuticals/purApplyDrug/purApplyEditDiaolog.vue
+++ b/src/views/pharmaceuticals/purApplyDrug/purApplyEditDiaolog.vue
@@ -114,8 +114,8 @@
           <el-table-column label="序号" type="index" width="60"></el-table-column>
           <el-table-column label="药品标识" prop="nameCode" width="120"></el-table-column>
           <el-table-column label="药品通用名称" prop="productName" show-overflow-tooltip="true" width="140"></el-table-column>
-          <el-table-column label="商品名称" prop="spmc" show-overflow-tooltip="true" width="110"></el-table-column>
-          <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true" width="140"></el-table-column>
+          <!--<el-table-column label="商品名称" prop="spmc" show-overflow-tooltip="true" width="110"></el-table-column>-->
+          <el-table-column label="包装规格" prop="bzgg" show-overflow-tooltip="true" width="140"></el-table-column>
           <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="80"></el-table-column>
           <el-table-column width="110" label="申购数量">
             <template slot-scope="scope">
diff --git a/src/views/pharmaceuticals/purApplyDrug/purOrderSelectProduct.vue b/src/views/pharmaceuticals/purApplyDrug/purOrderSelectProduct.vue
index 1c70ffed..2ecb61b7 100644
--- a/src/views/pharmaceuticals/purApplyDrug/purOrderSelectProduct.vue
+++ b/src/views/pharmaceuticals/purApplyDrug/purOrderSelectProduct.vue
@@ -4,39 +4,37 @@
       <el-form :model="listQuery" label-width="120px" v-if="showSearch">
         <el-row>
           <el-col :span="18">
-            <el-form-item label="UDI码:" class="query-form-item">
-              <el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true"
+            <el-form-item label="追溯码:" class="query-form-item">
+              <el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入追溯码" clearable="true"
                         @keyup.enter.native="keyup_submit($event)"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
+          <!--<el-col :span="6">-->
+          <!--  <el-form-item label="拼音简写:" class="query-form-item">-->
+          <!--    <el-input v-model="listQuery.pinyinInitial" @input="search" style="width: 100%" placeholder="请输入物资拼音简写"-->
+          <!--              clearable="true"></el-input>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
           <el-col :span="6">
-            <el-form-item label="拼音简写:" class="query-form-item">
-              <el-input v-model="listQuery.pinyinInitial" @input="search" style="width: 100%" placeholder="请输入物资拼音简写"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="第三方物资编码:" class="query-form-item">
+            <el-form-item label="第三方系统编码:" class="query-form-item">
               <el-input v-model="listQuery.thrPiId" style="width: 100%" placeholder="第三方物资编码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="分类编码:" class="query-form-item">
-              <el-input v-model="listQuery.flbm" style="width: 100%" placeholder="请输入分类编码"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="6">-->
+          <!--  <el-form-item label="分类编码:" class="query-form-item">-->
+          <!--    <el-input v-model="listQuery.flbm" style="width: 100%" placeholder="请输入分类编码"-->
+          <!--              clearable="true"></el-input>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
           <el-col :span="6">
             <el-form-item label="供应商:" class="query-form-item">
               <el-input v-model="listQuery.companyName" style="width: 100%" placeholder="请输入供应商"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="6">
             <el-form-item label="药品标识:" class="query-form-item">
               <el-input v-model="listQuery.unionCode" style="width: 100%" placeholder="请输入DI/医保编码/商品条码"
@@ -49,9 +47,12 @@
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
+
           <el-col :span="6">
-            <el-form-item label="规格型号:" class="query-form-item">
-              <el-input v-model="listQuery.ggxh" style="width: 100%" placeholder="请输入规格型号" clearable="true"></el-input>
+            <el-form-item label="包装规格:" class="query-form-item">
+              <el-input v-model="listQuery.bzgg" style="width: 100%" placeholder="请输入规格型号" clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -62,28 +63,28 @@
           </el-col>
         </el-row>
 
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="物资分类:" class="query-form-item">
-              <el-input v-model="listQuery.category" style="width: 100%" placeholder="请输入物资分类名称"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6" v-if="productRemarkSet.remarkEnable1">
-            <el-form-item :label="productRemarkSet.remarkTitle1+':'" class="query-form-item">
-              <el-input v-model="listQuery.basicPrductRemak1" style="width: 100%"
-                        :placeholder="productRemarkSet.remarkTitle1"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6" v-if="productRemarkSet.remarkEnable2">
-            <el-form-item :label="productRemarkSet.remarkTitle2 +':'" class="query-form-item">
-              <el-input v-model="listQuery.basicPrductRemak2" style="width: 100%"
-                        :placeholder="productRemarkSet.remarkTitle2"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <!--<el-row>-->
+        <!--  <el-col :span="6">-->
+        <!--    <el-form-item label="物资分类:" class="query-form-item">-->
+        <!--      <el-input v-model="listQuery.category" style="width: 100%" placeholder="请输入物资分类名称"-->
+        <!--                clearable="true"></el-input>-->
+        <!--    </el-form-item>-->
+        <!--  </el-col>-->
+        <!--  <el-col :span="6" v-if="productRemarkSet.remarkEnable1">-->
+        <!--    <el-form-item :label="productRemarkSet.remarkTitle1+':'" class="query-form-item">-->
+        <!--      <el-input v-model="listQuery.basicPrductRemak1" style="width: 100%"-->
+        <!--                :placeholder="productRemarkSet.remarkTitle1"-->
+        <!--                clearable="true"></el-input>-->
+        <!--    </el-form-item>-->
+        <!--  </el-col>-->
+        <!--  <el-col :span="6" v-if="productRemarkSet.remarkEnable2">-->
+        <!--    <el-form-item :label="productRemarkSet.remarkTitle2 +':'" class="query-form-item">-->
+        <!--      <el-input v-model="listQuery.basicPrductRemak2" style="width: 100%"-->
+        <!--                :placeholder="productRemarkSet.remarkTitle2"-->
+        <!--                clearable="true"></el-input>-->
+        <!--    </el-form-item>-->
+        <!--  </el-col>-->
+        <!--</el-row>-->
       </el-form>
       <div class="top-right-btn">
         <el-button-group style="display:flex;">
@@ -101,10 +102,10 @@
         <el-table-column type="selection" :reserve-selection="true"></el-table-column>
         <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" width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column label="第三方系统编码" prop="thirdId" width="120" 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="spmc" 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="spmc" 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="bzgg" width="140" show-overflow-tooltip></el-table-column>
         <el-table-column label="批准文号" prop="zczbhhzbapzbh" width="160" show-overflow-tooltip></el-table-column>
         <!--<el-table-column label="医疗器械注册人" width="160" prop="ylqxzcrbarmc"></el-table-column>-->
@@ -324,7 +325,8 @@ export default {
         ylqxzcrbarmc: null,
         thrPiId: null,
         page: 1,
-        limit: 10
+        limit: 10,
+        productsType: 2
       }
       this.multipleSelection = [];
       this.radioCheck = null;
diff --git a/src/views/pharmaceuticals/receive/DialogNewReceive.vue b/src/views/pharmaceuticals/receive/DialogNewReceive.vue
index 5bfb0979..aaccbdc3 100644
--- a/src/views/pharmaceuticals/receive/DialogNewReceive.vue
+++ b/src/views/pharmaceuticals/receive/DialogNewReceive.vue
@@ -130,7 +130,7 @@
           <el-table-column label="序号" type="index" width="60"></el-table-column>
           <el-table-column label="药品标识" prop="nameCode" width="160"></el-table-column>
           <el-table-column label="药品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip="true"></el-table-column>
-          <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip="true"></el-table-column>
+          <el-table-column label="包装规格" prop="bzgg" width="180" show-overflow-tooltip="true"></el-table-column>
           <el-table-column label="批次号" prop="batchNo" width="120" show-overflow-tooltip="true"></el-table-column>
           <el-table-column label="价格" prop="price" width="100" show-overflow-tooltip="true"></el-table-column>
           <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
diff --git a/src/views/pharmaceuticals/receive/DialogSelectInvProduct.vue b/src/views/pharmaceuticals/receive/DialogSelectInvProduct.vue
index 362aec66..104e2394 100644
--- a/src/views/pharmaceuticals/receive/DialogSelectInvProduct.vue
+++ b/src/views/pharmaceuticals/receive/DialogSelectInvProduct.vue
@@ -77,7 +77,6 @@
         <el-table-column label="序号" type="index" width="55"></el-table-column>
         <el-table-column label="药品标识" prop="nameCode" width="120" 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="160"></el-table-column>
         <el-table-column label="包装规格" prop="bzgg" width="100"></el-table-column>
         <el-table-column label="计量单位" prop="measname" width="90"></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="90"></el-table-column>
@@ -87,7 +86,7 @@
         <el-table-column label="入库数量" prop="inCount" width="90"></el-table-column>
         <el-table-column label="出库数量" prop="outCount" width="90"></el-table-column>
         <el-table-column label="结余数量" prop="reCount" width="90"></el-table-column>
-        <el-table-column label="生产企业" prop="ylqxzcrbarmc" width="180"></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory" width="180"></el-table-column>
         <el-table-column label="批准文号" prop="zczbhhzbapzbh" width="180"></el-table-column>
         <el-table-column label="供应商" prop="supName" width="180"></el-table-column>
       </el-table>
diff --git a/src/views/pharmaceuticals/receive/receiveAuditDetail.vue b/src/views/pharmaceuticals/receive/receiveAuditDetail.vue
index 28fa637c..17ae4aa9 100644
--- a/src/views/pharmaceuticals/receive/receiveAuditDetail.vue
+++ b/src/views/pharmaceuticals/receive/receiveAuditDetail.vue
@@ -83,10 +83,10 @@
                   ref="multipleTable">
           <el-table-column label="序号" type="index" width="50"></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="bzgg" show-overflow-tooltip></el-table-column>
           <el-table-column label="单据数量" prop="count" 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 label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
         </el-table>
       </el-card>
     </el-form>