From 5b6dd6a8e5c1e9edf32816a0b324fb8431cae56a Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 14 Nov 2024 10:49:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=961.0=2011/14?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../companyDrug/basicCompanyDrugProducts.vue  |  1 +
 .../basicCompanyProductsImport.vue            |  2 +-
 .../companyDrug/basicCompanyproductEdit.vue   | 27 +++++++------------
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue b/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue
index b75a7ca..fb4a04f 100644
--- a/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue
+++ b/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue
@@ -989,6 +989,7 @@ export default {
       this.multipleSelection = val;
     },
     closeSelDialog(val) {
+      this.nameCodes = []
       this.selectProductVisible = false;
       this.addProductVisible = false;
       this.getList();
diff --git a/src/views/supplier/companyDrug/basicCompanyProductsImport.vue b/src/views/supplier/companyDrug/basicCompanyProductsImport.vue
index 3515955..01a8d6f 100644
--- a/src/views/supplier/companyDrug/basicCompanyProductsImport.vue
+++ b/src/views/supplier/companyDrug/basicCompanyProductsImport.vue
@@ -358,7 +358,7 @@
 
     </el-card>
     <el-card class="el-card">
-      <el-form :model="repEditQuery" :rules="formRules" ref="editQuery" border label-width="100px">
+      <el-form :model="repEditQuery" :rules="formRules" ref="editQuery" border label-width="140px">
         <el-row :gutter="24" class="el-row" type="flex">
 
           <el-col :span="18" class="el-col">
diff --git a/src/views/supplier/companyDrug/basicCompanyproductEdit.vue b/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
index 72597b1..16df3bc 100644
--- a/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
+++ b/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
@@ -257,8 +257,8 @@
           </template>
           <el-row type="flex">
             <el-col :span="11" class="el-col">
-              <el-form-item label="明细分类:" prop="detailSort">
-                <el-select v-model="newProductData.detailSort" style="width: 90%" placeholder="选择明细分类">
+              <el-form-item label="药品明细分类:" prop="detailSort">
+                <el-select v-model="newProductData.detailSort" style="width: 90%" placeholder="选择药品明细分类">
                   <el-option label="麻醉药品原料药" :value="1"></el-option>
                   <el-option label="第一类精神药品原料药" :value="2"></el-option>
                   <el-option label="第二类精神药品原料药" :value="3"></el-option>
@@ -289,19 +289,16 @@
           </el-row>
           <el-row type="flex">
             <el-col :span="11" class="el-col">
-              <el-form-item label="商品条码:" prop="sptm">
-                <el-input style="width: 90%" size="small" placeholder="请输入药品商品条码"
-                          v-model.trim="newProductData.sptm"
+              <el-form-item label="药品通用名称:" prop="cpmctymc">
+                <el-input style="width: 90%" size="small" placeholder="请输入药品通用名称"
+                          v-model.trim="newProductData.cpmctymc"
                 ></el-input>
               </el-form-item>
             </el-col>
-
-          </el-row>
-          <el-row type="flex">
             <el-col :span="11" class="el-col">
-              <el-form-item label="药品通用名称:" prop="cpmctymc">
-                <el-input style="width: 90%" size="small" placeholder="请输入药品通用名称"
-                          v-model.trim="newProductData.cpmctymc"
+              <el-form-item label="商品条码:" prop="sptm">
+                <el-input style="width: 90%" size="small" placeholder="请输入药品商品条码"
+                          v-model.trim="newProductData.sptm"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -332,8 +329,6 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row type="flex">
             <el-col :span="11" class="el-col">
               <el-form-item label="制剂规格:" prop="prepnSpec">
                 <el-input style="width: 90%" size="small" placeholder="请输入制剂规格"
@@ -341,8 +336,8 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-
           </el-row>
+
           <el-row type="flex">
             <el-col :span="11" class="el-col">
               <el-form-item label="剂型:" prop="prepnUnit">
@@ -382,10 +377,6 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-
-
-
-
           </el-row>
           <el-row type="flex">
             <el-col :span="11" class="el-col">