1.修复禅道bug

src/utils/strUtil.js

@@ -1,11 +1,11 @@
 //封装字符串相关的方法
 export function isBlank(value) {
-    if (value === "" || value === null) {
+    if (value === "" || value === null || value === undefined) {
         return true;
     }
-
+    value = value + "";
     value = value.trim();
-    if (value === "string" || value === "undefined") {
+    if ("" === value || value === "string" || value === "undefined") {
         return true;
     }
 }

src/views/basic/BasicThirdSys.vue

@@ -89,7 +89,7 @@
 
         </el-card>
         <el-card class="el-card">
-            <el-table v-loading="loading" :data="detailList" style="width: 100%"
+            <el-table v-loading="loading" :data="detailList" style="width: 100%" highlight-current-row="true"
                       @current-change="handleBustypeChange">
                 <el-table-column label="序号" type="index" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="接口名称" prop="name" show-overflow-tooltip="true"></el-table-column>
@@ -165,7 +165,7 @@
 
         <el-card class="el-card">
             <el-button v-if="addBussinessTypeBtnVisible" type="primary" style="float: right; margin-bottom: 5px;" @click="addBussinessType">添加单据类型</el-button>
-            <el-table v-loading="busTypeLoading" :data="busTypeList" style="width: 100%">
+            <el-table v-loading="busTypeLoading" :data="busTypeList" style="width: 100%" highlight-current-row="true">
                 <el-table-column label="序号" type="index" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="单据类型" prop="name" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column v-if="submitOrderVisible" label="第三方单据类型" prop="thirdBuyName"></el-table-column>
@@ -410,6 +410,7 @@ import {getOriginBusType} from "../../api/basic/busOriginType";
 import modifyDialog from "./BasicThirdSysModify";
 import modifyDetailDialog from "./BasicThirdSysDetailModify";
 import {filterForThirdSys} from "../../api/basic/busLocalType";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
     data() {
@@ -472,7 +473,8 @@ export default {
             },
             thirdBuyList: [], //第三方系统单据类型,
             thirdSysDetailList: [],
-            selectInterfaceList: []
+            selectInterfaceList: [],
+            currentRow: null
         };
     },
 
@@ -491,6 +493,7 @@ export default {
             this.getList();
         },
         cancelDialog() {
+            this.getDetailList(this.currentRow);
             this.modifyDialogVisible = false;
             this.modifyDetailDialogVisible = false;
             this.modifyBusYypeDialogVisible = false;
@@ -499,6 +502,7 @@ export default {
             if (row != null) {
                 this.thirdSysFk = row.thirdId;
             }
+            this.currentRow = row;
             this.getDetailList(row);
         },
         handleBustypeChange(row) {
@@ -575,6 +579,10 @@ export default {
                 });
         },
         onModifySubmit() {
+            if (isBlank(this.inputQuery.thirdName)) {
+                this.$message.warning("系统名称不能为空")
+                return;
+            }
             this.modifyDialogVisible = false;
             updateBasicThirdSys(this.inputQuery)
                 .then((response) => {
@@ -680,13 +688,33 @@ export default {
             })
         },
         addBussinessTypeData() {
+            //校验表单数据
+            if (isBlank(this.thirdBuyForm.name)) {
+                this.$message.error("单据类型不能为空！")
+                return;
+            }
+            if (isBlank(this.thirdBuyForm.thirdBuyName)) {
+                this.$message.error("第三方单据类型不能为空！")
+                return;
+            }
+            if (isBlank(this.thirdBuyForm.url)) {
+                this.$message.error("接口地址不能为空！")
+                return;
+            }
+
+            if (!isBlank(this.thirdBuyForm.remark)) {
+                if (this.thirdBuyForm.remark.length > 200) {
+                    this.$message.error("备注信息不得超过200字");
+                    return;
+                }
+            }
+
             if (this.getOrdersEditBtnVisible) {
                 this.editGeOrderParamVisible = false;
             } else {
                 this.bussinessTypeFormVisible = false;
             }
 
-
             //匹配编码
             this.bussinessTypeList.forEach(item =>{
                 //单据业务类型编码
@@ -709,12 +737,29 @@ export default {
             })
         },
         handleDelete(index, row) {
-            let params = {id: row.id};
+            this.$confirm('是否确认删除业务单据类型？', '提示', {
-            deleteThirdSysBusType(params).then((res) => {
+                confirmButtonText: '确定',
-                this.handleBustypeChange(this.submitOrderRow);
+                cancelButtonText: '取消',
-            }).catch((error) => {
+                type: 'warning'
-                this.$message.error(error.message);
+            }).then(() => {
-            })
+                let params = {id: row.id};
+                deleteThirdSysBusType(params).then((res) => {
+                    if (res.code === 20000) {
+                        this.$message({
+                            type: 'success',
+                            message: '删除成功!'
+                        });
+                    }
+                    this.handleBustypeChange(this.submitOrderRow);
+                }).catch((error) => {
+                    this.$message.error(error.message);
+                })
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: '已取消删除'
+                });
+            });
         },
         getThirdBuyType() {
             let query = {
@@ -787,28 +832,40 @@ export default {
             });
         },
         disableInterface(row) {
-            let data = [{id: row.id, enabled: false}];
+            this.$confirm('是否确认移除此接口?', '提示', {
-            updateInterfaceStatus(data).then((res) => {
+                confirmButtonText: '确定',
-                if (res.code === 20000) {
+                cancelButtonText: '取消',
-                    this.$message.success("移除成功");
+                type: 'warning'
-                    let query = {
+            }).then(() => {
-                        thirdSysFk: this.thirdSysFk,
+                let data = [{id: row.id, enabled: false}];
-                        enabled: true
+                updateInterfaceStatus(data).then((res) => {
-                    };
+                    if (res.code === 20000) {
-                    this.loading = true;
+                        this.$message.success("移除成功");
-                    getDetailBasicThirdSys(query)
+                        let query = {
-                        .then((response) => {
+                            thirdSysFk: this.thirdSysFk,
-                            this.loading = false;
+                            enabled: true
-                            this.detailList = response.data.list || [];
+                        };
-                            this.total = response.data.total || 0;
+                        this.loading = true;
-                        })
+                        getDetailBasicThirdSys(query)
-                        .catch(() => {
+                            .then((response) => {
-                            this.loading = false;
+                                this.loading = false;
-                            this.list = [];
+                                this.detailList = response.data.list || [];
-                            this.total = 0;
+                                this.total = response.data.total || 0;
-                        });
+                            })
-                }
+                            .catch(() => {
-            })
+                                this.loading = false;
+                                this.list = [];
+                                this.total = 0;
+                            });
+                    }
+                })
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: '已取消删除'
+                });
+            });
+
         },
         editGeOrderParam(index,row) {
             this.formName = "edit";

src/views/basic/CorpRelevance.vue

@@ -65,8 +65,8 @@
                     <!--                    </el-form-item>-->
                     <el-form-item class="query-form-item">
                         <el-input
-                            v-model="unitQuery.name"
+                            v-model="unitQuery.unitId"
-                            placeholder="往来单位"
+                            placeholder="往来单位编码"
                             clearable
                         ></el-input>
                     </el-form-item>
@@ -84,6 +84,7 @@
                     </el-form-item>
                     <el-form-item style="display: flex">
                         <el-button-group>
+                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                             <el-button type="primary" icon="search" @click="getList">查询</el-button>
                             <el-button type="primary" size="mini" icon="search" @click="combine"
                             >选入
@@ -162,6 +163,18 @@ export default {
         };
     },
     methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.unitQuery = {
+                key: "",
+                page: 1,
+                limit: 10,
+                thirdSys: null,
+            };
+            this.getList();
+        },
         handlepageChange(val) {
             this.unitQuery.page = val;
             this.getList();

src/views/basic/UdiInfoManage.vue

@@ -789,6 +789,7 @@
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
                 :total="total"
+                :current-page="filterQuery.page"
             ></el-pagination>
         </el-card>
     </div>

src/views/basic/UdiInfoselectErpUdi.vue

@@ -64,6 +64,7 @@
 
                         <el-form-item style="display: flex">
                             <el-button-group>
+                                <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                                 <el-button type="primary" icon="search" @click="searchErpList">查询</el-button>
                                 <el-button type="primary" icon="search" @click="combine" :loading="combineLoading"
                                 >选入
@@ -105,6 +106,7 @@
                     @current-change="handleErpPageChange"
                     layout="prev, pager, next"
                     :total="pageTotal"
+                    :current-page="erpQuery.page"
                 ></el-pagination>
             </div>
         </el-card>
@@ -391,6 +393,22 @@ export default {
         };
     },
     methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.erpQuery = {
+                code: null,
+                name: null,
+                spec: null,
+                registerNo: null,
+                manufactory: null,
+                supName: null,
+                page: 1,
+                limit: 10,
+            };
+            this.getErpList();
+        },
         tableRowClassName({row}) {
             if (row.checked) return "warning-row";
             return "";

src/views/basic/invWarehouse.vue

@@ -611,11 +611,9 @@ import {
     deleteWarehouseUser, deleteWarehouseBussinessType,
     bindThrWarehouse, unbindThrWarehouse, getThrsysDetail
 } from "../../api/basic/invWarehouse";
-
 import {
     filterSubAll, saveSubWarehouse, deleteSubWarehouse
 } from "../../api/basic/invSubWarehouse";
-
 import {filterThrList} from "@/api/thrsys/thrInvWarehouse";
 import {getHospitalUserList} from "../../api/auth/authUser";
 import {getJoinBussinessType} from "../../api/basic/bussinessType";
@@ -623,6 +621,7 @@ import {formatDate} from "@/utils/date";
 import axios from "axios";
 import store from "@/store";
 import {findConfig} from "@/api/thrsys/spsSyncStatus";
+import {isBlank} from "@/utils/strUtil";
 
 const formJson = {
     id: null,
@@ -718,7 +717,6 @@ export default {
             configParms: {},
             subData: {},
             subFromName: "add",
-
         };
     },
     methods: {
@@ -762,6 +760,7 @@ export default {
             // 更改值
             this.formVisible = false;
             this.subFormVisible = false;
+            this.loadSubData(this.currentCode);
             return true;
         },
         // 显示表单
@@ -827,10 +826,14 @@ export default {
             this.$refs["dataForm"].validate((valid) => {
 
                 if (valid) {
-                    if (this.formData.pcode == null && this.formData.level != 1) {
+                    if (isBlank(this.formData.pcode) && this.formData.level != 1) {
                         this.$message.warning("上级仓库不能为空");
                         return;
                     }
+                    if (isBlank(this.formData.name)) {
+                        this.$message.warning("仓库名称不能为空");
+                        return;
+                    }
                     this.formLoading = true;
                     let data = Object.assign({}, this.formData);
                     saveWarehouse(data, this.formName)
@@ -1060,6 +1063,7 @@ export default {
             this.subList = [];
             this.userList = null;
             this.bussinessTypeList = null;
+            this.currentCode = row.code;
             this.loadSubData(row.code);
         },
 

src/views/business/stockOrderNewDistribution.vue

@@ -530,7 +530,6 @@ export default {
     },
     methods: {
         saveOrder(status) {
-
             this.code = "";
             this.$refs.multipleTable.setCurrentRow();
             this.currentRow = {};
@@ -769,6 +768,10 @@ export default {
                     this.$message.error("往来信息和单据类型不能为空！")
                     return;
                 }
+                if (isBlank(this.formData.invWarehouseCode)) {
+                    this.$message.error("当前分库未选择！");
+                    return;
+                }
                 this.code = "";
                 this.$refs.multipleTable.setCurrentRow();
                 this.currentRow = {};

src/views/thrsys/ThrCorpsImport.vue

@@ -9,9 +9,9 @@
                 <el-form-item class="query-form-item">
                     <el-select v-model="filterQuery.status" placeholder="处理状态">
                         <el-option label="全部" value=""></el-option>
-                        <el-option label="处理中" value="0"></el-option>
+                        <el-option label="正在处理" value="0"></el-option>
-                        <el-option label="已处理" value="1"></el-option>
+                        <el-option label="处理完成" value="3"></el-option>
-                        <el-option label="异常" value="2"></el-option>
+                        <el-option label="处理异常" value="2"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item class="query-form-item">
@@ -242,13 +242,11 @@
             },
             sysChange() {
                 this.getThirdSysDetail();
-                // console.log( this.thirdSysDetail.thirdId+"\n"+ this.thirdSysDetail.fromType+"\n"+this.thirdSysDetail.enable);
             },
 
 
             handleDetailClick(row) {
                 this.currentRow = row;
-                console.log(this.currentRow.genKey)
                 this.udiImportDetailVisible = true;
 
             }
@@ -315,7 +313,6 @@
                 //     // 基础地址
                 //     let response = res.data.BASE_URL;
                 //     this.uploadFileUrl = response + "/udiwms/thrOrder/importLog/upload";
-                //     console.log(res.data.BASE_URL + "\n" + res.data.BASE_URL2);
                 //
                 // });
 
@@ -334,12 +331,10 @@
             }
             ,
             handleChange(response, files, fileList) {
-                console.log(response);
                 if (response.code != 20000) {
                     this.$message.error(response.message);
                     this.getList();
                 } else {
-                    // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
                     this.$message.success(response.data);
                     this.getList();
                 }

src/views/thrsys/ThrInvWarehouse.vue

@@ -180,8 +180,9 @@
         >
             <el-form :model="formData" :rules="formRules" ref="dataForm">
 
-                <el-form-item label="仓库编码" prop="title" class="query-form-item">
+                <el-form-item label="仓库编码" prop="code" class="query-form-item">
                     <el-input
+                        disabled
                         v-model.trim="formData.code" style="width: 80%"
                         auto-complete="off"
                     ></el-input>
@@ -194,13 +195,13 @@
                 </el-form-item>
 
 
-                <el-form-item class="query-form-item" label="仓库类型:">
+                <el-form-item class="query-form-item" prop="advanceType" label="仓库类型">
                     <el-select v-model="formData.advanceType" placeholder="仓库类型" clearable>
                         <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" prop="thirdSysFk" label="第三方系统:">
+                <el-form-item class="query-form-item" prop="thirdSysFk" label="第三方系统">
                     <el-select v-model="formData.thirdSysFk" placeholder="请选择第三方系统" clearable>
                         <el-option
                             v-for="item in thirdSys"
@@ -242,6 +243,7 @@ import {
 } from "../../api/thrsys/thrInvWarehouse";
 import {filterDetailByKey, getBasicThirdSys} from "../../api/basic/basicThirdSys";
 import {findConfig} from "@/api/thrsys/spsSyncStatus";
+import {isBlank} from "@/utils/strUtil";
 
 
 const formJson = {
@@ -308,6 +310,9 @@ export default {
                 ],
                 thirdSysFk: [
                     {required: true, message: "请选择第三方系统", trigger: "blur"}
+                ],
+                advanceType: [
+                    {required: true, message: "请选择仓库类型", trigger: "blur"}
                 ]
             },
             pidData: {},
@@ -472,6 +477,13 @@ export default {
             }
         },
         formSubmit() {
+            if (!isBlank(this.formData.code)) {
+                if (Number(this.formData.code)+'' ===NaN+'' ) {
+                    this.$message.error("仓库编码格式错误！")
+                    return;
+                }
+            }
+
             this.$refs["dataForm"].validate((valid) => {
                 if (valid) {
                     this.formLoading = true;