From b78451cff0323956b8a8b0ca7b386c58d2d94b75 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 31 May 2023 08:56:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=95=8C=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/udi/udiTrace.js              |   9 +
 src/views/udi/trace/search/index.vue | 283 ++++-----------------------
 2 files changed, 43 insertions(+), 249 deletions(-)

diff --git a/src/api/udi/udiTrace.js b/src/api/udi/udiTrace.js
index b720bd3..8d9dcd3 100644
--- a/src/api/udi/udiTrace.js
+++ b/src/api/udi/udiTrace.js
@@ -63,3 +63,12 @@ export function filterBatchNo(query) {
     params: query
   });
 }
+
+export function sourceSearch(query) {
+  return axios({
+    url: "/udi/trace/source/search",
+    method: "get",
+    params: query
+  });
+}
+
diff --git a/src/views/udi/trace/search/index.vue b/src/views/udi/trace/search/index.vue
index 0b99f12..ef3409e 100644
--- a/src/views/udi/trace/search/index.vue
+++ b/src/views/udi/trace/search/index.vue
@@ -1,43 +1,26 @@
 <template>
   <div>
     <el-card>
-      <el-form size="mini" label-width="110px">
-        <el-row type="flex">
-          <el-col type="flex" style="width: 300px">
-            <el-form-item prop="parent" label="查询方式:" class="query-form-item">
-              <el-select v-model="form.parent"
-                         @change="onReset"
-                         placeholder="请选择查询方式" clearable
-                         style="width: 200px"
-              >
-                <el-option v-for="item in options" :key="item.value"
-                           :label="item.label" :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <el-divider style="margin: 15px"></el-divider>
       <el-form size="mini">
-        <el-form-item prop="child" v-if="form.parent == 'A'">
-          <el-form v-show="showSearch" label-width="110px" size="mini">
+        <el-form-item prop="child">
+          <el-form v-show="showSearch" label-width="125px" size="mini">
             <el-row type="flex">
-              <el-col type="flex">
+              <el-col :span="18">
                 <el-form-item label="UDI码:" class="query-form-item">
-                  <el-input v-model="filterQuery.udiCode" placeholder="UDI码查询(源头查询)" style="width: 650px" clearable></el-input>
+                  <el-input v-model="filterQuery.udiCode" placeholder="UDI码查询"
+                            clearable></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row type="flex">
-              <el-col type="flex">
+              <el-col :span="6">
                 <el-form-item label="医疗器械注册人:" class="query-form-item">
                   <el-select
                     v-model="filterQuery.ylqxzcrbarmc"
                     filterable
                     remote
-                    style="width: 200px"
                     clearable="true"
+                    style="width: 100%"
                     reserve-keyword
                     placeholder="医疗器械注册人"
                     :remote-method="getYlqxzcrbarmcList"
@@ -55,19 +38,19 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col class="el-col">
+              <el-col :span="6">
                 <el-form-item label="产品名称:" class="query-form-item">
                   <el-select
                     v-model="filterQuery.cpmctymc"
                     filterable
                     remote
-                    style="width: 200px"
                     clearable="true"
                     :disabled="filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
                     reserve-keyword
                     placeholder="请输入产品名称"
                     :remote-method="getCpmctymcList"
                     :loading="loading"
+                    style="width: 100%"
                     @change="cpmctymcChange"
                   >
                     <el-option
@@ -79,22 +62,15 @@
 
                     </el-option>
                   </el-select>
-                  <!--                    <el-input
-                                        v-model="filterQuery.cpmctymc"
-                                        placeholder="请输入产品名称"
-                                        style="width: 200px"
-                                        clearable="true"
-                                        :disabled="filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
-                                      ></el-input>-->
                 </el-form-item>
               </el-col>
-              <el-col class="el-col">
+              <el-col :span="6">
                 <el-form-item label="规格型号:" class="query-form-item">
                   <el-select
                     v-model="filterQuery.ggxh"
                     filterable
                     remote
-                    style="width: 200px"
+                    style="width: 100%"
                     clearable="true"
                     :disabled="filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' ||
                                   filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
@@ -122,48 +98,26 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row type="flex">
-              <el-col type="flex">
+            <el-row>
+              <el-col :span="6">
                 <el-form-item label="DI标识:" class="query-form-item">
                   <el-input
+                    style="width: 100%"
                     v-model="filterQuery.nameCode"
                     placeholder="请输入DI标识"
-                    style="width: 200px"
                     clearable="true"
                   ></el-input>
                 </el-form-item>
               </el-col>
-              <el-col type="flex">
+              <el-col :span="6">
                 <el-form-item label="批次号:" class="query-form-item">
-                  <el-select
+                  <el-input
                     v-model="filterQuery.batchNo"
-                    filterable
-                    remote
-                    style="width: 200px"
+                    placeholder="请输入批次号"
+                    style="width: 100%"
                     clearable="true"
-                    :disabled="filterQuery.ggxh==null || filterQuery.ggxh=='' ||
-                                  filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' ||
-                                  filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
-                    reserve-keyword
-                    placeholder="请输入产品名称"
-                    :remote-method="getBatchNoList"
-                    :loading="loading"
-                  >
-                    <el-option
-                      v-for="item in batchNoList"
-                      :key="item.batchNo"
-                      :label="item.batchNo"
-                      :value="item.batchNo"
-                    >
-                    </el-option>
-                  </el-select>
-                  <!--                    <el-input
-                                        v-model="filterQuery.batchNo"
-                                        placeholder="请输入批次号"
-                                        style="width: 200px"
-                                        clearable="true"
-                                        :disabled="filterQuery.ggxh==null || filterQuery.ggxh==''"
-                                      ></el-input>-->
+                    :disabled="filterQuery.ggxh==null || filterQuery.ggxh==''"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col type="flex">
@@ -184,172 +138,6 @@
           </div>
         </el-form-item>
       </el-form>
-        <el-form size="mini">
-          <el-form-item prop="child" v-if="form.parent == 'B'">
-            <el-form v-show="showSearch" label-width="110px" size="mini">
-              <el-row type="flex">
-                <el-col type="flex">
-                  <el-form-item label="UDI码:" class="query-form-item">
-                    <el-input v-model="filterQuery.udiCode" placeholder="UDI码查询(源头查询)" style="width: 650px" clearable></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row type="flex">
-                <el-col type="flex">
-                  <el-form-item label="医疗器械注册人:" class="query-form-item">
-                    <el-select
-                      v-model="filterQuery.ylqxzcrbarmc"
-                      filterable
-                      remote
-                      style="width: 200px"
-                      clearable="true"
-                      reserve-keyword
-                      placeholder="医疗器械注册人"
-                      :remote-method="getYlqxzcrbarmcList"
-                      :loading="loading"
-                      @change="ylqxzcrbarmcChange"
-                    >
-                      <el-option
-                        v-for="item in fromOptions"
-                        :key="item.ylqxzcrbarmc"
-                        :label="item.ylqxzcrbarmc"
-                        :value="item.ylqxzcrbarmc"
-                      >
-
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col class="el-col">
-                  <el-form-item label="产品名称:" class="query-form-item">
-                    <el-select
-                      v-model="filterQuery.cpmctymc"
-                      filterable
-                      remote
-                      style="width: 200px"
-                      clearable="true"
-                      :disabled="filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
-                      reserve-keyword
-                      placeholder="请输入产品名称"
-                      :remote-method="getCpmctymcList"
-                      :loading="loading"
-                      @change="cpmctymcChange"
-                    >
-                      <el-option
-                        v-for="item in cpmctymcList"
-                        :key="item.cpmctymc"
-                        :label="item.cpmctymc"
-                        :value="item.cpmctymc"
-                      >
-
-                      </el-option>
-                    </el-select>
-<!--                    <el-input
-                      v-model="filterQuery.cpmctymc"
-                      placeholder="请输入产品名称"
-                      style="width: 200px"
-                      clearable="true"
-                      :disabled="filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
-                    ></el-input>-->
-                  </el-form-item>
-                </el-col>
-                <el-col class="el-col">
-                  <el-form-item label="规格型号:" class="query-form-item">
-                    <el-select
-                      v-model="filterQuery.ggxh"
-                      filterable
-                      remote
-                      style="width: 200px"
-                      clearable="true"
-                      :disabled="filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' ||
-                                  filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
-                      reserve-keyword
-                      placeholder="请输入产品名称"
-                      :remote-method="getGgxhList"
-                      :loading="loading"
-                      @change="ggxhChange"
-                    >
-                      <el-option
-                        v-for="item in ggxhList"
-                        :key="item.ggxh"
-                        :label="item.ggxh"
-                        :value="item.ggxh"
-                      >
-                      </el-option>
-                    </el-select>
-<!--                    <el-input
-                      v-model="filterQuery.ggxh"
-                      placeholder="请输入规格型号"
-                      style="width: 200px"
-                      clearable="true"
-                      :disabled="filterQuery.cpmctymc==null || filterQuery.cpmctymc==''"
-                    ></el-input>-->
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row type="flex">
-                <el-col type="flex">
-                  <el-form-item label="DI标识:" class="query-form-item">
-                    <el-input
-                      v-model="filterQuery.nameCode"
-                      placeholder="请输入DI标识"
-                      style="width: 200px"
-                      clearable="true"
-                    ></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col type="flex">
-                  <el-form-item label="批次号:" class="query-form-item">
-                    <el-select
-                      v-model="filterQuery.batchNo"
-                      filterable
-                      remote
-                      style="width: 200px"
-                      clearable="true"
-                      :disabled="filterQuery.ggxh==null || filterQuery.ggxh=='' ||
-                                  filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' ||
-                                  filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
-                      reserve-keyword
-                      placeholder="请输入产品名称"
-                      :remote-method="getBatchNoList"
-                      :loading="loading"
-                    >
-                      <el-option
-                        v-for="item in batchNoList"
-                        :key="item.batchNo"
-                        :label="item.batchNo"
-                        :value="item.batchNo"
-                      >
-                      </el-option>
-                    </el-select>
-<!--                    <el-input
-                      v-model="filterQuery.batchNo"
-                      placeholder="请输入批次号"
-                      style="width: 200px"
-                      clearable="true"
-                      :disabled="filterQuery.ggxh==null || filterQuery.ggxh==''"
-                    ></el-input>-->
-                  </el-form-item>
-                </el-col>
-                <el-col type="flex">
-                </el-col>
-              </el-row>
-            </el-form>
-            <el-divider style="margin: 15px"></el-divider>
-            <div class="top-right-btn" style="display:flex;">
-              <el-button-group>
-                <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏
-                </el-button>
-                <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-                <el-button type="primary" icon="el-icon-search" @click="onSubmit" size="mini"
-                >查询
-                </el-button
-                >
-              </el-button-group>
-            </div>
-          </el-form-item>
-        </el-form>
-
       <el-table v-loading="loading" :data="list"
                 style="width: 100%"
                 border highlight-current-row>
@@ -550,7 +338,7 @@
 
 <script>
 
-import {getTraceOrderList,filterCpmctymc,filterGgxh,filterBatchNo} from "@/api/udi/udiTrace";
+import {getTraceOrderList, filterCpmctymc, filterGgxh, filterBatchNo, sourceSearch} from "@/api/udi/udiTrace";
 import {filterCompany} from "@/api/basic/udiInfo";
 import {isBlank} from "@/utils/strUtil";
 
@@ -572,9 +360,9 @@ export default {
         {value: 'A', label: 'UDI码查询(源头查询)'},
         {value: 'B', label: '按产品信息组合查询'},
       ],
-      form:{
-        parent:'',
-        child:'',
+      form: {
+        parent: '',
+        child: '',
       },
       total: 0,
       loading: false,
@@ -589,10 +377,10 @@ export default {
     }
   },
   methods: {
-    ggxhChange(){
+    ggxhChange() {
       this.getBatchNoList()
     },
-    getBatchNoList(query){
+    getBatchNoList(query) {
       let params = {
         ylqxzcrbarmc: this.filterQuery.ylqxzcrbarmc,
         cpmctymc: this.filterQuery.cpmctymc,
@@ -606,10 +394,10 @@ export default {
         console.log(this.batchNoList)
       })
     },
-    cpmctymcChange(){
+    cpmctymcChange() {
       this.getGgxhList()
     },
-    getGgxhList(query){
+    getGgxhList(query) {
       let params = {
         ylqxzcrbarmc: this.filterQuery.ylqxzcrbarmc,
         cpmctymc: this.filterQuery.cpmctymc,
@@ -622,10 +410,10 @@ export default {
         console.log(this.ggxhList)
       })
     },
-    ylqxzcrbarmcChange(){
+    ylqxzcrbarmcChange() {
       this.getCpmctymcList()
     },
-    getCpmctymcList(query){
+    getCpmctymcList(query) {
       let params = {
         ylqxzcrbarmc: this.filterQuery.ylqxzcrbarmc,
         cpmctymc: query,
@@ -656,7 +444,7 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
-    handleView(row){
+    handleView(row) {
       this.list.forEach(obj => {
         if (row.id == obj.id) {
           this.formView = obj
@@ -665,7 +453,7 @@ export default {
       console.log(this.formView)
       this.open = true
     },
-    onReset(){
+    onReset() {
       this.$router.push({
         path: "",
       });
@@ -682,15 +470,14 @@ export default {
       };
       //this.list = null
       //this.total = 0
-      this.getList();
     },
-    onSubmit(){
+    onSubmit() {
       this.filterQuery.page = 1;
       this.getList()
     },
     getList() {
       this.loading = true;
-      getTraceOrderList(this.filterQuery).then((res) => {
+      sourceSearch(this.filterQuery).then((res) => {
         this.loading = false;
         if (res.code === 20000) {
           this.list = res.data.list || [];
@@ -710,7 +497,6 @@ export default {
     },
   },
   created() {
-    this.getList()
   }
 }
 </script>
@@ -738,7 +524,6 @@ div /deep/ .el-table .success-row {
 
 .query-form-item {
   display: block !important;
-  margin-right: 10px;
   margin-bottom: 5px;
 }
 </style>