预验收库存删除，耗材字典新增供应商查询

public/config.json

@@ -3,5 +3,5 @@
     "BASE_URL":"http://192.168.0.166:9992",
     "SERVER_IP": "http://192.168.0.166:9992/",
     "WEBSOCKET_URL": "ws://192.168.0.166:9992/UDI_WMS_MC/api/websocket/",
-    "hosp_name": "片仔癀诊断"
+    "hosp_name": "云霄县中医院"
 }

src/api/inventory/InvPreInProducts.js

@@ -26,6 +26,7 @@ export function deleteProducts(query) {
         }
     )
 }
+
 export function statDetailProducts(query) {
     return axios({
         url: "/spms/prein/inv/products/stat",
@@ -34,3 +35,14 @@ export function statDetailProducts(query) {
     });
 }
 
+export function clearAllProducts(query) {
+    return axios(
+        {
+            url: "/spms/prein/inv/products/clearAll",
+            method: "post",
+            data: query
+        }
+    )
+}
+
+

src/views/basic/BussinessType.vue

@@ -213,6 +213,10 @@ export default {
                 checkBalacne: null,
                 secCheckBalacne: null,
                 secCheckCopy: null,
+
+                checkUdiwms: null,
+                secCheckUdiwms: null,
+
                 corpType: null,
                 storageCode: null,
                 supplementOrderType: null,
@@ -229,6 +233,8 @@ export default {
                 defaultInv: null,
                 defaultSubInv: null,
                 orderVisibleType: 0,
+                vailDispatch: false,
+                vailGroupBuy: 0,
             },
             enableMap: {
                 true: "是",
@@ -426,6 +432,8 @@ export default {
                 orderVisibleType: row.orderVisibleType,
                 checkCopy: row.checkCopy,
                 secCheckCopy: row.secCheckCopy,
+                vailDispatch: row.vailDispatch,
+                vailGroupBuy: row.vailGroupBuy
 
             };
             this.modifyDialogVisible = true;

src/views/basic/BussinessTypeModify.vue

@@ -223,7 +223,8 @@
 
 
                 <div class="text item" style="margin-top: 6px">
-                    <el-checkbox v-model="inputQuery.enable" :disabled="inputQuery.localAction==null">启用单据类型</el-checkbox>
+                    <el-checkbox v-model="inputQuery.enable" :disabled="inputQuery.localAction==null">启用单据类型
+                    </el-checkbox>
                     <el-checkbox v-model="inputQuery.genUnit" :disabled="inputQuery.corpType !=2">允许手动输入客户信息
                     </el-checkbox>
                     <el-checkbox v-model="inputQuery.useDyCount" :disabled="true">以使用单元计量出库
@@ -256,13 +257,30 @@
                     </el-checkbox>
                     <el-checkbox v-model="inputQuery.scanPreIn" :disabled="inputQuery.corpType!='2'">出库时必须校验预验收库存
                     </el-checkbox>
-                    <el-checkbox v-model="inputQuery.vailInv" :disabled="inputQuery.mainAction!='WareHouseOut'">是否只允许有库存产品出库
+                    <el-checkbox v-model="inputQuery.vailInv" :disabled="inputQuery.mainAction!='WareHouseOut'">
+                        是否只允许有库存产品出库
                     </el-checkbox>
                     <el-checkbox v-model="inputQuery.codeFillCheck">采集UDI码时进行三期校验
                     </el-checkbox>
                 </div>
             </el-col>
         </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+            <el-col :span="24" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.vailDispatch">校验产品是否可配送
+                    </el-checkbox>
+
+                    <span style="margin-left: 15px">校验是否集采产品:</span>
+                    <el-select v-model="inputQuery.vailGroupBuy" style="margin-left: 5px"
+                               size="mini">
+                        <el-option label="无需校验" :value=0></el-option>
+                        <el-option label="只采集集采产品" :value=1></el-option>
+                        <el-option label="只采集非集采产品" :value=2></el-option>
+                    </el-select>
+                </div>
+            </el-col>
+        </el-row>
 
 
         <!--                <el-divider></el-divider>-->

src/views/basic/UdiInfoManage.vue

@@ -54,6 +54,29 @@
                     <!--                        <el-option label="已锁定" value="3"></el-option>-->
                     <!--                    </el-select>-->
                     <!--                </el-form-item>-->
+
+
+                    <el-form-item class="query-form-item">
+                        <el-select
+                            v-model="filterQuery.supId"
+                            filterable
+                            remote
+                            clearable="true"
+                            reserve-keyword
+                            placeholder="供应商"
+                            :remote-method="findMethod"
+                        >
+                            <el-option
+                                v-for="item in fromOptions"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.erpId"
+                            >
+                                <span style="float: left">{{ item.name }}</span>
+                            </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>
@@ -133,7 +156,16 @@
                     prop="qxlb"
                     show-overflow-tooltip
                 ></el-table-column>
+                <el-table-column
+                    label="是否集采"
+                    prop="groupBuy"
+                    show-overflow-tooltip
+                >
+                    <template slot-scope="scope">
+                        <span>{{ enableMap[scope.row.groupBuy] }}</span>
+                    </template>
 
+                </el-table-column>
 
                 <el-table-column width="200" label="操作" fixed="right">
                     <template slot-scope="scope">
@@ -512,7 +544,17 @@
                                 </div>
                             </el-col>
                         </el-row>
+                        <el-row :gutter="20" class="el-row" type="flex">
+                            <el-checkbox v-model="editQuery.dispatch"
+                            >是否可配送
+                            </el-checkbox>
 
+                            <el-checkbox v-model="editQuery.groupBuy"
+                                         @change="groupBuyChange"
+                            >是否集采产品
+                            </el-checkbox>
+
+                        </el-row>
                         <el-divider></el-divider>
 
                         <el-collapse v-model="activeNames">
@@ -1007,6 +1049,7 @@ import selectUdi from "./UdiInfoRelevance.vue";
 import selectErp from "./UdiInfoselectErpUdi";
 import selectLocalUdi from "./UdiInfoSelectLocalUdi";
 import selectUdiVersion from "./UdiinfoSelectVersion";
+import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 
 
 export default {
@@ -1025,8 +1068,10 @@ export default {
                 addType: 1,
                 thrPiId: null,
                 filterType: null,
-                diType: 1
+                diType: 1,
+                supId: null,
             },
+            fromOptions: [],
             productType: null,
             editQuery: null,
             productRemarkSet: {},
@@ -1074,7 +1119,11 @@ export default {
             selectLocalVisible: false,      //关联UDI
             isUseDyCheck: false,
             lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"},
-            activeNames: ['1']
+            activeNames: ['1'],
+            enableMap: {
+                true: "是",
+                false: "否",
+            },
         };
     },
 
@@ -1094,7 +1143,8 @@ export default {
                 page: 1,
                 limit: 20,
                 addType: 1,
-                diType: 1
+                diType: 1,
+                supId: null,
             };
             this.getList();
         },
@@ -1134,6 +1184,15 @@ export default {
                     this.detailList = [];
                 });
         },
+
+        groupBuyChange() {
+            if (this.editQuery.groupBuy == true) {
+                this.editQuery.dispatch = true;
+            } else {
+                this.editQuery.dispatch = false;
+            }
+        },
+
         keyup_submit(event) {
             this.filterQuery.page = 1;
             this.getList();
@@ -1552,6 +1611,23 @@ export default {
                 }
             });
         },
+        findMethod(query) {
+            this.fromOptions = [];
+            let cQuery = {
+                key: query,
+                page: 1,
+                limit: 10,
+            };
+            getBasicUnitMaintains(cQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.fromOptions = response.data.page.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.fromOptions = [];
+                });
+        },
 
     },
     mounted() {

src/views/inout/IOAddOrder.vue

@@ -834,10 +834,14 @@ export default {
 
 
                     } else {
-                        this.$message({
+                        this.$alert(response.message, '提示', {
-                            type: 'error',
+                            confirmButtonText: '确定',
-                            message: "提交失败！" + this.editTitle,
+                            type: 'warning',
-                            customClass: 'messageIndex'
+                            closeOnClickModal: true,
+                            callback: action => {
+                                this.$refs.inputRef.focus();
+                                this.$refs.inputRef.select();
+                            }
                         });
                     }
                 }