Merge remote-tracking branch 'origin/master'

src/views/purchase/purApply/purOrderSelectProduct.vue

@@ -3,20 +3,39 @@
     <el-card class="el-card">
       <el-form :model="listQuery" label-width="120px" v-show="showSearch">
         <el-row>
-          <el-col :span="12">
+          <el-col :span="15">
             <el-form-item label="UDI码:" class="query-form-item">
               <el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" 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: 90%" 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.thrPiId" 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-input v-model="listQuery.code" 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-input v-model="listQuery.companyName" style="width: 90%" 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">
@@ -44,6 +63,7 @@
         </el-row>
       </el-form>
 
+
       <div class="top-right-btn">
         <el-button-group style="display:flex;">
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
@@ -63,13 +83,13 @@
         </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" show-overflow-tooltip></el-table-column>
+        <el-table-column label="物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" 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="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
-        <el-table-column label="配送企业" prop="companyName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="供应商" prop="companyName" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.native.stop="handleDetailClick(scope.row)">详情</el-button>
@@ -155,6 +175,7 @@ export default {
         ggxh: null,
         ylqxzcrbarmc: null,
         thrPiId: null,
+        pinyinInitial: null,
         page: 1,
         limit: 10,
       },