From ed892369f00c7d8ce27aae893951234899f12cb5 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 1 Mar 2023 10:10:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E9=87=87=E9=97=AE=E9=A2=98=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/views/basic/UdiInfoManage.vue             | 45 +++++++++++-
 src/views/basic/basicCompanyProducts.vue      | 73 ++++++++++++++++++-
 src/views/basic/basicProductEdit.vue          |  8 ++
 .../warehouse/stockOrderNewSelectProduct.vue  | 22 +++++-
 4 files changed, 138 insertions(+), 10 deletions(-)

diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue
index febb24b..775b43c 100644
--- a/src/views/basic/UdiInfoManage.vue
+++ b/src/views/basic/UdiInfoManage.vue
@@ -36,13 +36,14 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                </el-row>
-
-                <el-row>
                     <el-form-item class="query-form-item">
                         <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
                                   clearable="true"></el-input>
                     </el-form-item>
+                </el-row>
+
+                <el-row>
+
                     <el-form-item class="query-form-item">
                         <el-input v-model="filterQuery.thrPiId" placeholder="第三方产品编码" clearable="true"></el-input>
                     </el-form-item>
@@ -69,6 +70,21 @@
                         </el-select>
                     </el-form-item>
 
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.groupBuy" placeholder="集采状态" clearable>
+                            <el-option label="全部" value=""></el-option>
+                            <el-option label="集采" value="true"></el-option>
+                            <el-option label="非集采" value="false"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.dispatch" placeholder="可配送状态" clearable>
+                            <el-option label="全部" value=""></el-option>
+                            <el-option label="可配送" value="true"></el-option>
+                            <el-option label="不可配送" value="false"></el-option>
+                        </el-select>
+                    </el-form-item>
+
                     <el-form-item>
                         <el-button-group>
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
@@ -137,11 +153,13 @@
                 <el-table-column
                     label="器械类别"
                     prop="qxlb"
+                    width="100"
                     show-overflow-tooltip
                 ></el-table-column>
                 <el-table-column
                     label="是否集采"
                     prop="groupBuy"
+                    width="100"
                     show-overflow-tooltip
                 >
                     <template slot-scope="scope">
@@ -149,8 +167,21 @@
                             <span>{{ enableMap[scope.row.groupBuy] }}</span>
                         </el-tag>
                     </template>
+                </el-table-column>
 
+                <el-table-column
+                    label="是否可配送"
+                    prop="groupBuy"
+                    width="100"
+                    show-overflow-tooltip
+                >
+                    <template slot-scope="scope">
+                        <el-tag :type="(scope.row.dispatch) | statusFilterType">
+                            <span>{{ enableDispatchMap[scope.row.dispatch] }}</span>
+                        </el-tag>
+                    </template>
                 </el-table-column>
+
                 <el-table-column width="200" label="操作" fixed="right">
                     <template slot-scope="scope">
                         <el-button
@@ -1072,6 +1103,8 @@ export default {
                 addType: 1,
                 thrPiId: null,
                 filterType: null,
+                groupBuy: null,
+                dispatch: null,
             },
             fromOptions: [],
             productType: null,
@@ -1129,6 +1162,10 @@ export default {
                 true: "集采",
                 false: "非集采",
             },
+            enableDispatchMap: {
+                true: "是",
+                false: "否",
+            },
         };
     },
 
@@ -1149,6 +1186,8 @@ export default {
                 limit: 20,
                 addType: 1,
                 supId: null,
+                groupBuy: null,
+                dispatch: null,
             };
             this.getList();
         },
diff --git a/src/views/basic/basicCompanyProducts.vue b/src/views/basic/basicCompanyProducts.vue
index 9a6bae0..8156d34 100644
--- a/src/views/basic/basicCompanyProducts.vue
+++ b/src/views/basic/basicCompanyProducts.vue
@@ -24,12 +24,13 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                </el-row>
-                <el-row>
                     <el-form-item class="query-form-item">
                         <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
                                   clearable="true"></el-input>
                     </el-form-item>
+                </el-row>
+                <el-row>
+
                     <el-form-item class="query-form-item">
                         <el-input v-model="filterQuery.thrPiId" placeholder="第三方产品编码" clearable="true"></el-input>
                     </el-form-item>
@@ -42,6 +43,22 @@
                         </el-select>
                     </el-form-item>
 
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.groupBuy" placeholder="集采状态" clearable>
+                            <el-option label="全部" value=""></el-option>
+                            <el-option label="集采" value="true"></el-option>
+                            <el-option label="非集采" value="false"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.dispatch" placeholder="可配送状态" clearable>
+                            <el-option label="全部" value=""></el-option>
+                            <el-option label="可配送" value="true"></el-option>
+                            <el-option label="不可配送" value="false"></el-option>
+                        </el-select>
+                    </el-form-item>
+
+
                     <el-form-item>
                         <el-button-group>
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
@@ -98,11 +115,40 @@
                 <el-table-column
                     label="器械类别"
                     prop="qxlb"
+                    width="100"
                     show-overflow-tooltip
                 ></el-table-column>
+
+                <el-table-column
+                    label="是否集采"
+                    prop="groupBuy"
+                    width="100"
+                    show-overflow-tooltip
+                >
+                    <template slot-scope="scope">
+                        <el-tag :type="(scope.row.groupBuy) | statusFilterType">
+                            <span>{{ enableMap[scope.row.groupBuy] }}</span>
+                        </el-tag>
+                    </template>
+                </el-table-column>
+
+                <el-table-column
+                    label="是否可配送"
+                    prop="groupBuy"
+                    width="100"
+                    show-overflow-tooltip
+                >
+                    <template slot-scope="scope">
+                        <el-tag :type="(scope.row.dispatch) | statusFilterType">
+                            <span>{{ enableDispatchMap[scope.row.dispatch] }}</span>
+                        </el-tag>
+                    </template>
+                </el-table-column>
+
                 <el-table-column
                     v-if="isSpCombine"
                     label="审核状态"
+                    width="100"
                     prop="lockStatus"
                     show-overflow-tooltip
                 >
@@ -337,6 +383,8 @@ export default {
                 thrPiId: null,
                 filterType: null,
                 auditStatus: null,
+                groupBuy:null,
+                dispatch:null,
             },
             idSpliUdi: false,
             newType: 2,
@@ -397,7 +445,15 @@ export default {
             lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"},
             isUseDyCheck: false,
             loading: false,
-            activeNames: ['1']
+            activeNames: ['1'],
+            enableMap: {
+                true: "集采",
+                false: "非集采",
+            },
+            enableDispatchMap: {
+                true: "是",
+                false: "否",
+            },
         };
     },
 
@@ -416,6 +472,8 @@ export default {
                 page: 1,
                 limit: 20,
                 addType: 1,
+                groupBuy:null,
+                dispatch:null,
             };
             this.getList();
         },
@@ -923,6 +981,15 @@ export default {
         basicProductDetail
     }
     ,
+    filters: {
+        statusFilterType(status) {
+            const statusMap = {
+                false: "warning",
+                true: "success",
+            };
+            return statusMap[status];
+        },
+    },
     created() {
         this.findBasicProductSet();
         this.getList();
diff --git a/src/views/basic/basicProductEdit.vue b/src/views/basic/basicProductEdit.vue
index 0151c66..ee4b69c 100644
--- a/src/views/basic/basicProductEdit.vue
+++ b/src/views/basic/basicProductEdit.vue
@@ -346,10 +346,18 @@
                             <el-checkbox v-model="editQuery.allowNoProduct" class="" disabled
                             >允许无生产日期
                             </el-checkbox>
+                            <el-checkbox v-model="editQuery.groupBuy"
+                            >是否集采产品
+                            </el-checkbox>
                         </div>
                     </el-col>
                 </el-row>
 
+                <el-row :gutter="20" class="el-row" type="flex">
+
+
+                </el-row>
+
                 <el-divider></el-divider>
 
                 <el-collapse v-model="activeNames">
diff --git a/src/views/warehouse/stockOrderNewSelectProduct.vue b/src/views/warehouse/stockOrderNewSelectProduct.vue
index 3e1ecfa..c08738d 100644
--- a/src/views/warehouse/stockOrderNewSelectProduct.vue
+++ b/src/views/warehouse/stockOrderNewSelectProduct.vue
@@ -106,22 +106,32 @@
                     <el-table-column
                         label="器械类别"
                         prop="qxlb"
+                        width="100"
                         show-overflow-tooltip
                     ></el-table-column>
                     <el-table-column
                         label="是否集采"
                         prop="groupBuy"
+                        width="100"
                         show-overflow-tooltip
                     >
                         <template slot-scope="scope">
-
                             <el-tag :type="(scope.row.groupBuy) | statusFilterType">
                                 <span>{{ enableMap[scope.row.groupBuy] }}</span>
                             </el-tag>
-
-
                         </template>
-
+                    </el-table-column>
+                    <el-table-column
+                        label="是否可配送"
+                        prop="groupBuy"
+                        width="100"
+                        show-overflow-tooltip
+                    >
+                        <template slot-scope="scope">
+                            <el-tag :type="(scope.row.dispatch) | statusFilterType">
+                                <span>{{ enableDispatchMap[scope.row.dispatch] }}</span>
+                            </el-tag>
+                        </template>
                     </el-table-column>
                     <el-table-column
                         label="配送企业"
@@ -228,6 +238,10 @@ export default {
                 true: "集采",
                 false: "非集采",
             },
+            enableDispatchMap: {
+                true: "是",
+                false: "否",
+            },
             pickerOptions: {
                 shortcuts: [
                     {