Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

src/views/basic/product/basicYbNotCode.vue

@@ -83,7 +83,6 @@
       >
       </pagination>
 
-
       <el-dialog
         :title="fromMap[fromName]"
         :visible.sync="addYbNotCodeVisible"
@@ -95,7 +94,7 @@
       >
         <el-form :model="formData" ref="dataForm" :rules="formRules" >
           <el-row>
-            <el-col :span="12" class="el-col">
+            <el-col :span="9" class="el-col">
               <el-form-item label="机构编码:" prop="organizationCode">
                 <el-input
                   v-model="formData.organizationCode"
@@ -106,7 +105,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12" class="el-col">
+            <el-col :span="9" class="el-col">
               <el-form-item label="国家医保目录编码:" prop="ybbm">
                 <el-input
                   v-model="formData.ybbm"
@@ -114,9 +113,15 @@
                   clearable
                   size="small"
                 ></el-input>
+                <el-button
+                  type="text"
+                  size="small"
+                  @click.native.stop="selectProduct()"
+                >选入
+                </el-button>
               </el-form-item>
-            </el-col>
 
+            </el-col>
 
           </el-row>
           <br>
@@ -148,21 +153,90 @@
           <el-button @click.native="closeDialog" size="small">取消</el-button>
         </div>
       </el-dialog>
+
       <el-dialog
-        title="选入-药品信息"
-        :visible.sync="chooseYbNotCodeVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="70%"
-        v-if="chooseYbNotCodeVisible"
+        title="选入产品信息"
+        :visible.sync="selectProductVisible"
+
+        width="85%"
+        v-if="selectProductVisible"
+        @close="closeProductVisible"
       >
-        <chooseDrug
+
+        <el-form  :model="filterProduct" class="query-form" label-width="100px"
+                 ref="formSelectedDrug">
+          <el-row>
+            <el-col :span="4">
+              <el-form-item label="层级标识:">
+                <el-input v-model="filterProduct.nameCode" placeholder="请输入层级标识" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="药品通用名:" prop="cpmctymc">
+                <el-input v-model="filterProduct.cpmctymc" placeholder="请输入药品通用名" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="批准文号:">
+                <el-input v-model="filterProduct.zczbhhzbapzbh" placeholder="请输入批准文号" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="生产厂家:">
+                <el-input v-model="filterProduct.manufactory" placeholder="请输入生产厂家" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div style=" float: right;
+                        text-align: right;
+                        margin-bottom: 8px;
+                        margin-right: 15px;"
               >
-        </chooseDrug>
+                <el-button type="primary" icon="search" @click="handleCurrentChange"
+                           style="text-align:right"
+                >查询
+                </el-button>
+              </div>
+            </el-col>
+
+          </el-row>
+        </el-form>
+
+        <el-table :data="productList" style="width: 100%;   margin-bottom: 8px" key="2" border>
+          <el-table-column type="index" label="序号"></el-table-column>
+          <el-table-column label="医保编码" prop="ybbm" width="200"></el-table-column>
+          <el-table-column label="药品标识码" prop="nameCode" width="160"></el-table-column>
+          <!--<el-table-column label="收费项目编码" prop="payFeeCode" width="100"></el-table-column>-->
+          <el-table-column label="药品通用名称" prop="cpmctymc" width="160"></el-table-column>
+          <el-table-column label="制剂规格" prop="prepnSpec" width="90"></el-table-column>
+          <el-table-column label="制剂单位" prop="prepnUnit" width="90"></el-table-column>
+          <el-table-column label="包装规格" prop="bzgg" width="100"></el-table-column>
+          <el-table-column label="包装单位" prop="packUnit" width="100"></el-table-column>
+          <!--<el-table-column label="包装比例" prop="packRatio" width="90"></el-table-column>-->
+          <el-table-column label="价格" prop="price" width="90"></el-table-column>
+          <el-table-column label="批准文号" prop="zczbhhzbapzbh" width="100"></el-table-column>
+          <el-table-column label="生产企业" prop="manufactory" width="100"></el-table-column>
+          <el-table-column label="操作" prop="majorStatus" width="200">
+            <template slot-scope="scope">
+              <el-button type="text" @click="selectOne(scope.row)">
+                选入
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          :total="productTotal"
+          :limit.sync="filterProduct.limit"
+          :page.sync="filterProduct.page"
+          @pagination="getProductList"
+        >
+        </pagination>
+
       </el-dialog>
 
 
 
+
     </el-card>
 
   </div>
@@ -179,7 +253,9 @@ import {
   getOrganizationCode
 
 } from '@/api/basic/ybNotCode'
-
+import {
+  getUdiInfos
+} from '@/api/basic/product/udiRelevance'
 import { getAdminId, getToken } from '@/utils/auth'
 import { executeFuc, getHead } from '@/utils/customConfig'
 import Treeselect from '@riophae/vue-treeselect'
@@ -257,7 +333,17 @@ export default {
       uploadLoading: false,
       action: process.env.VUE_APP_BASE_API + '/udiwms/aliDrug/txtUpload',
       fileList: [],
-      thrYbData:{}
+      thrYbData:{},
+      productList:[],
+      productMainIds:{},
+      selectProductVisible:false,
+      filterProduct:{
+        productsType: 2,
+        page: 1,
+        limit: 20,
+        addType: 1,
+      },
+      productTotal:0
     }
   },
   methods: {
@@ -420,6 +506,36 @@ export default {
       }).catch((error) => {
         this.$message.error(error.message)
       })
+    },
+    getProductList() {
+      getUdiInfos(this.filterProduct)
+        .then((response) => {
+          this.loading = false
+          this.productList = response.data.list || []
+          this.productTotal = response.data.total || 0
+        })
+        .catch(() => {
+          this.productLoading = false
+          this.productList = []
+          this.productTotal = 0
+        })
+    },
+    closeProductVisible(){
+      this.selectProductVisible = false
+      this.productList = []
+    },
+    handleCurrentChange() {
+      this.getProductList()
+
+    },
+    selectProduct(){
+      this.selectProductVisible = true
+      this.getProductList()
+    },
+    selectOne(row){
+      this.formData.ybbm  = row.ybbm
+      this.selectProductVisible = false
+
     }
   },
   filters: {

src/views/inout/DialogCreateOrderSelect.vue

@@ -22,6 +22,7 @@
           <el-col :span="8">
             <el-form-item label="往来单位:">
               <el-select v-model="filterQuery.fromCorp"
+                         :remote-method="findMethod"
                          filterable
                          remote
                          reserve-keyword
@@ -325,6 +326,7 @@ import {
   orderPDFFromTemplateFile,
 } from "@/api/itextpdf/orderPrint";
 import {selectCorpList} from "@/api/basic/basicUnitMaintain";
+import { getBasicUnitMaintains } from '@/api/basic/basicUnitMaintain'
 
 const formJson = {
   site_id: "",
@@ -773,13 +775,34 @@ export default {
       this.resultQuery.page = 1;
       this.getResultDetailList();
     },
-    findFromInvList(val) {
-      let cQuery = {};
-      selectCorpList(cQuery)
+    // findFromInvList(val) {
+    //   let cQuery = {
+    //     corpType: 4,
+    //   };
+    //   selectCorpList(cQuery)
+    //     .then((response) => {
+    //       this.fromInvOptions = response.data || [];
+    //     })
+    //     .catch(() => {
+    //     });
+    // },
+    //获取往来单位候选列表
+    findMethod(query) {
+      this.fromOptions = [];
+      let cQuery = {
+        key: query,
+        corpType: null,
+        page: 1,
+        limit: 20,
+      };
+
+      getBasicUnitMaintains(cQuery)
         .then((response) => {
-          this.fromInvOptions = response.data || [];
+          this.loading = false;
+          this.fromInvOptions = response.data.list || [];
         })
         .catch(() => {
+          this.loading = false;
         });
     },
     getResultDetailList() {
@@ -827,7 +850,7 @@ export default {
   },
   created() {
     this.getInvList();
-    this.findFromInvList();
+    // this.findFromInvList();
     this.getBusType();
     this.getList();
   },