集采修改

src/views/basic/UdiInfoManage.vue

@@ -36,13 +36,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>
@@ -76,6 +76,20 @@
                             </el-option>
                         </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>
@@ -154,26 +168,31 @@
                 <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">
-                        <span>{{ enableMap[scope.row.groupBuy] }}</span>
+                        <el-tag :type="(scope.row.groupBuy) | statusFilterType">
+                            <span>{{ enableMap[scope.row.groupBuy] }}</span>
+                        </el-tag>
                     </template>
                 </el-table-column>
 
                 <el-table-column
-                    label="是否集采"
+                    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 :type="(scope.row.dispatch) | statusFilterType">
+                            <span>{{ enableDispatchMap[scope.row.dispatch] }}</span>
                         </el-tag>
                     </template>
                 </el-table-column>
@@ -1082,6 +1101,8 @@ export default {
                 filterType: null,
                 diType: 1,
                 supId: null,
+                groupBuy: null,
+                dispatch: null,
             },
             fromOptions: [],
             productType: null,
@@ -1136,6 +1157,10 @@ export default {
                 true: "集采",
                 false: "非集采",
             },
+            enableDispatchMap: {
+                true: "是",
+                false: "否",
+            },
         };
     },
 
@@ -1157,6 +1182,8 @@ export default {
                 addType: 1,
                 diType: 1,
                 supId: null,
+                groupBuy: null,
+                dispatch: null,
             };
             this.getList();
         },

src/views/business/stockOrderNewSelectProduct.vue

@@ -98,10 +98,12 @@
                     <el-table-column
                         label="器械类别"
                         prop="qxlb"
+                        width="100"
                         show-overflow-tooltip
                     ></el-table-column>
                     <el-table-column
                         label="是否集采"
+                        width="100"
                         prop="groupBuy"
                         show-overflow-tooltip
                     >
@@ -111,6 +113,18 @@
                             </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="操作" fixed="right" width="160">
                         <template slot-scope="scope">
                             <el-button
@@ -214,6 +228,10 @@ export default {
                 true: "集采",
                 false: "非集采",
             },
+            enableDispatchMap: {
+                true: "是",
+                false: "否",
+            },
             pickerOptions: {
                 shortcuts: [
                     {