Merge remote-tracking branch 'origin/busUser' into busUser

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

@@ -171,36 +171,36 @@
         <el-row :gutter="20" class="el-row" type="flex">
 
 
-<!--            <el-col :span="10" class="el-col">-->
+            <!--            <el-col :span="10" class="el-col">-->
-<!--                <div class="text item">-->
+            <!--                <div class="text item">-->
-<!--                    <div class="itemTag">-->
+            <!--                    <div class="itemTag">-->
-<!--                        <span>补单默认仓库:&nbsp;</span>-->
+            <!--                        <span>补单默认仓库:&nbsp;</span>-->
-<!--                    </div>-->
+            <!--                    </div>-->
-<!--                    <el-select v-model="inputQuery.defaultInv" placeholder="默认仓库" clearable="true"-->
+            <!--                    <el-select v-model="inputQuery.defaultInv" placeholder="默认仓库" clearable="true"-->
-<!--                               @change="invChange"-->
+            <!--                               @change="invChange"-->
-<!--                               style="width: 30%"-->
+            <!--                               style="width: 30%"-->
-<!--                               size="small">-->
+            <!--                               size="small">-->
-<!--                        <el-option-->
+            <!--                        <el-option-->
-<!--                            v-for="item in storageList"-->
+            <!--                            v-for="item in storageList"-->
-<!--                            :key="item.name"-->
+            <!--                            :key="item.name"-->
-<!--                            :label="item.name"-->
+            <!--                            :label="item.name"-->
-<!--                            :value="item.code">-->
+            <!--                            :value="item.code">-->
-<!--                            <span style="float: left">{{ item.name }}</span>-->
+            <!--                            <span style="float: left">{{ item.name }}</span>-->
-<!--                        </el-option>-->
+            <!--                        </el-option>-->
-<!--                    </el-select>-->
+            <!--                    </el-select>-->
-<!--                    <el-select v-model="inputQuery.defaultSubInv" placeholder="默认分库" clearable="true"-->
+            <!--                    <el-select v-model="inputQuery.defaultSubInv" placeholder="默认分库" clearable="true"-->
-<!--                               style="width: 30%"-->
+            <!--                               style="width: 30%"-->
-<!--                               size="small">-->
+            <!--                               size="small">-->
-<!--                        <el-option-->
+            <!--                        <el-option-->
-<!--                            v-for="item in subInvList"-->
+            <!--                            v-for="item in subInvList"-->
-<!--                            :key="item.name"-->
+            <!--                            :key="item.name"-->
-<!--                            :label="item.name"-->
+            <!--                            :label="item.name"-->
-<!--                            :value="item.code">-->
+            <!--                            :value="item.code">-->
-<!--                            <span style="float: left">{{ item.name }}</span>-->
+            <!--                            <span style="float: left">{{ item.name }}</span>-->
-<!--                        </el-option>-->
+            <!--                        </el-option>-->
-<!--                    </el-select>-->
+            <!--                    </el-select>-->
-<!--                </div>-->
+            <!--                </div>-->
-<!--            </el-col>-->
+            <!--            </el-col>-->
 
             <el-col :span="10" class="el-col">
                 <div class="text item">
@@ -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,6 +156,27 @@
                     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
+                    label="是否集采"
+                    prop="groupBuy"
+                    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 width="200" label="操作" fixed="right">
@@ -512,7 +556,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 +1061,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 +1080,10 @@ export default {
                 addType: 1,
                 thrPiId: null,
                 filterType: null,
-                diType: 1
+                diType: 1,
+                supId: null,
             },
+            fromOptions: [],
             productType: null,
             editQuery: null,
             productRemarkSet: {},
@@ -1074,7 +1131,11 @@ export default {
             selectLocalVisible: false,      //关联UDI
             isUseDyCheck: false,
             lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"},
-            activeNames: ['1']
+            activeNames: ['1'],
+            enableMap: {
+                true: "集采",
+                false: "非集采",
+            },
         };
     },
 
@@ -1094,7 +1155,8 @@ export default {
                 page: 1,
                 limit: 20,
                 addType: 1,
-                diType: 1
+                diType: 1,
+                supId: null,
             };
             this.getList();
         },
@@ -1134,6 +1196,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();
@@ -1147,8 +1218,8 @@ export default {
                     this.loading = false;
                     this.detailList = response.data || [];
                     this.detailList.forEach((item, index, array) => {
-                        this.detailList[index].isAdavence=item.adavence
+                        this.detailList[index].isAdavence = item.adavence
-                        this.detailList[index].isDisable=item.disable
+                        this.detailList[index].isDisable = item.disable
                         if (item.zxxsbzbhsydysl > 1) {
                             this.isUseDyCheck = true;
                         }
@@ -1365,7 +1436,7 @@ export default {
             this.thisData = row;
             this.editDialogVisible = true;
             this.editQuery = row;
-            this.pId=row.id;
+            this.pId = row.id;
             this.relevanceEdit = {
                 id: row.id,
                 // thirdId: row.thirdId,
@@ -1552,10 +1623,36 @@ 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() {
     },
+    filters: {
+        statusFilterType(status) {
+            const statusMap = {
+                false: "warning",
+                true: "success",
+            };
+            return statusMap[status];
+        },
+    },
     components: {
         selectUdi,
         selectErp,

src/views/business/stockOrderNewSelectProduct.vue

@@ -100,6 +100,17 @@
                         prop="qxlb"
                         show-overflow-tooltip
                     ></el-table-column>
+                    <el-table-column
+                        label="是否集采"
+                        prop="groupBuy"
+                        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="操作" fixed="right" width="160">
                         <template slot-scope="scope">
                             <el-button
@@ -187,7 +198,7 @@ export default {
                 page: 1,
                 limit: 10
             },
-            ids:[],
+            ids: [],
             radioCheck: null,
             dataList: [],
             pageTotal: 1,
@@ -199,6 +210,10 @@ export default {
             thirdSysFk: null,
             busTypes: [],
             actDateRange: [],
+            enableMap: {
+                true: "集采",
+                false: "非集采",
+            },
             pickerOptions: {
                 shortcuts: [
                     {
@@ -295,7 +310,7 @@ export default {
         getList() {
             this.loading = true;
             this.listQuery.customerId = store.getters.customerId;
-            if( this.data.companyName!=undefined && this.data.companyName!=null ){
+            if (this.data.companyName != undefined && this.data.companyName != null) {
                 this.listQuery.companyName = this.data.companyName;
             }
 
@@ -351,9 +366,9 @@ export default {
                 return;
             }
 
-            if(this.ids.length>0){
+            if (this.ids.length > 0) {
-                for(var i=0;i<this.ids.length;i++){
+                for (var i = 0; i < this.ids.length; i++) {
-                   if(this.ids[i]==this.multipleSelection.rlId){
+                    if (this.ids[i] == this.multipleSelection.rlId) {
                         this.$message.error("该产品已录入！");
                         return
                     }
@@ -403,7 +418,7 @@ export default {
         selectCert() {
             if (this.currentCert == null) {
                 this.$message.error("请先选择对应的注册证！");
-            }else{
+            } else {
                 this.multipleSelection.zczbhhzbapzbh = this.currentCert;
                 this.combine();
             }
@@ -411,7 +426,15 @@ export default {
         },
     },
     components: {udiRlDetailDialog},
-
+    filters: {
+        statusFilterType(status) {
+            const statusMap = {
+                false: "warning",
+                true: "success",
+            };
+            return statusMap[status];
+        },
+    },
     created() {
         if (this.$isNotBlank(this.data)) {
             // this.listQuery.nameCode = this.data.udi;
@@ -425,9 +448,9 @@ export default {
             // }
             // this.orderEditor = this.data.orderEditor;
             // this.orderId = this.data.orderId;
-            this.ids=[];
+            this.ids = [];
-            if(this.data.stockOrderLists.length>0){
+            if (this.data.stockOrderLists.length > 0) {
-                for(var i=0;i<this.data.stockOrderLists.length;i++){
+                for (var i = 0; i < this.data.stockOrderLists.length; i++) {
                     this.ids.push(this.data.stockOrderLists[i].productId);
                 }
             }

src/views/home/index.vue

@@ -32,7 +32,7 @@
                     :item="item"
                 ></sidebar-item>
             </el-menu>
-            <div style="position: absolute;bottom: 15px; color:rgb(105, 105, 105);left: 35px;    font-size: 11px">{{this.version}}</div>
+            <div style="position: relative;bottom: -500px; color:rgb(105, 105, 105);left: 35px;    font-size: 11px">{{this.version}}</div>
         </el-scrollbar>
         <el-container
             class="container-box"

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();
+                            }
                         });
                     }
                 }