Merge branch 'dev_drug' of http://116.204.71.86:3000/UDI/udi-spms-vue into dev_drug

src/views/basic/product/drug/drugAdd.vue

@@ -558,6 +558,7 @@
         <el-table-column label="序号" type="index" ></el-table-column>
         <el-table-column label="层级标识" prop="nameCode" show-overflow-tooltip></el-table-column>
         <el-table-column label="药品类型" prop="type" show-overflow-tooltip></el-table-column>
+        <el-table-column label="批准文号" prop="approvalNum" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="manufacturer" show-overflow-tooltip width="200px"></el-table-column>
         <el-table-column label="产品名称通用名称" prop="cpmctymc" show-overflow-tooltip width="200px"></el-table-column>
         <el-table-column label="剂型" prop="form" show-overflow-tooltip></el-table-column>
@@ -652,6 +653,7 @@ export default {
         page: 1,
         limit: 20,
         total: 0,
+        approvalNum:"",
       },
       newProductData: {
         cpmctymc: null,
@@ -995,6 +997,7 @@ export default {
     },
     selectDrugLevel(){
       //获取分页列表
+      this.filterQueryDrugLevel.approvalNum = this.newProductData.zczbhhzbapzbh
       getDrugLevelList(this.filterQueryDrugLevel).then((response) => {
         if (response.code == 20000) {
           this.selectDrugLevelList = response.data.list || []

src/views/basic/product/drug/drugMaintain.vue

@@ -363,7 +363,7 @@ export default {
     },
     beforeUpload(file) {
       const isXML = file.name.endsWith('.txt');
-      const isLt5M = file.size / 1024 / 1024 < 10;
+      const isLt5M = file.size / 1024 / 1024 < 100;
       if (!isXML) {
         this.$message.error('上传文件只能是 TXT 格式!');
       }

src/views/supplier/companyDrug/basicCompanyDrugProducts.vue

@@ -680,7 +680,7 @@ export default {
     },
     beforeUpload(file) {
       const isXML = file.name.endsWith('.txt');
-      const isLt5M = file.size / 1024 / 1024 < 10;
+      const isLt5M = file.size / 1024 / 1024 < 100;
       if (!isXML) {
         this.$message.error('上传文件只能是 TXT 格式!');
       }

src/views/supplier/companyDrug/basicCompanyProductsImport.vue

@@ -15,6 +15,16 @@
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="制剂规格:">
+              <el-input v-model="filterQuery.prepnSpec" style="width: 90%" placeholder="制剂规格" clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="包装规格:">
+              <el-input v-model="filterQuery.bzgg" style="width: 90%" placeholder="包装规格" clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="医保编码:">
               <el-input v-model="filterQuery.ybbm" style="width: 90%" placeholder="医保编码" clearable="true"></el-input>
@@ -26,25 +36,26 @@
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="6">
             <el-form-item label="生产企业:">
               <el-input v-model="filterQuery.manufactory" style="width: 90%" placeholder="生产企业" clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="对照条件:" class="query-form-item">
-              <el-select v-model="filterQuery.filterType" style="width: 100%" placeholder="对照条件" clearable>
-                <el-option label="全部" :value="0"></el-option>
-                <el-option label="对照完成" :value="1"></el-option>
-                <el-option label="未对照产品编码" :value="2"></el-option>
-                <!--<el-option label="未对照" :value="3"></el-option>-->
-                <el-option label="未对照其他产品编码" :value="4"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
         </el-row>
+        <!--<el-row>-->
+
+          <!--<el-col :span="6">-->
+          <!--  <el-form-item label="对照条件:" class="query-form-item">-->
+          <!--    <el-select v-model="filterQuery.filterType" style="width: 100%" placeholder="对照条件" clearable>-->
+          <!--      <el-option label="全部" :value="0"></el-option>-->
+          <!--      <el-option label="对照完成" :value="1"></el-option>-->
+          <!--      <el-option label="未对照产品编码" :value="2"></el-option>-->
+          <!--      &lt;!&ndash;<el-option label="未对照" :value="3"></el-option>&ndash;&gt;-->
+          <!--      <el-option label="未对照其他产品编码" :value="4"></el-option>-->
+          <!--    </el-select>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
+        <!--</el-row>-->
       </el-form>
 
 
@@ -796,7 +807,9 @@ export default {
         limit: 10,
         addType: 1,
         isDisable: false,
-        productsType: 2
+        productsType: 2,
+        bzgg:"",
+        prepnSpec:"",
       },
 
 
@@ -949,7 +962,9 @@ export default {
         page: 1,
         limit: 10,
         addType: 1,
-        productsType: 2
+        productsType: 2,
+        bzgg:"",
+        prepnSpec:"",
       };
       this.getList();
     },

src/views/supplier/companyDrug/basicCompanyproductEdit.vue

@@ -733,6 +733,7 @@
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="层级标识" prop="nameCode" show-overflow-tooltip></el-table-column>
         <el-table-column label="药品类型" prop="type" show-overflow-tooltip></el-table-column>
+        <el-table-column label="批准文号" prop="approvalNum" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="manufacturer" show-overflow-tooltip width="200px"></el-table-column>
         <el-table-column label="产品名称通用名称" prop="cpmctymc" show-overflow-tooltip width="200px"></el-table-column>
         <el-table-column label="剂型" prop="form" show-overflow-tooltip></el-table-column>
@@ -935,7 +936,8 @@ export default {
         cpmctymc: '',
         page: 1,
         limit: 20,
-        total: 0
+        total: 0,
+        approvalNum: "",
       }
     }
 
@@ -1170,6 +1172,7 @@ export default {
     },
     selectDrugLevel() {
       //获取分页列表
+      this.filterQueryDrugLevel.approvalNum = this.newProductData.zczbhhzbapzbh
       getDrugLevelList(this.filterQueryDrugLevel).then((response) => {
         if (response.code == 20000) {
           this.selectDrugLevelList = response.data.list || []