diff --git a/public/config.js b/public/config.js
index 3ac1b91..c2a36c1 100644
--- a/public/config.js
+++ b/public/config.js
@@ -1,6 +1,6 @@
window.global_config = {
- "BASE_URL": "http://139.159.187.130:8080/UDI_WMS_MC",
- // "BASE_URL":"http://127.0.0.1:9991",
+ // "BASE_URL": "http://139.159.187.130:8080/UDI_WMS_MC",
+ "BASE_URL":"http://127.0.0.1:9991",
/**
*
"UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/",
diff --git a/src/api/inventory/invCountOrder.js b/src/api/inventory/invCountOrder.js
new file mode 100644
index 0000000..f3c1d7f
--- /dev/null
+++ b/src/api/inventory/invCountOrder.js
@@ -0,0 +1,2 @@
+import axios from "../../utils/axios";
+
diff --git a/src/router/index.js b/src/router/index.js
index 7ed39f3..8f08423 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1413,15 +1413,6 @@ export const asyncRouterMap = [
},
]
},
-
- // {
- // path: "stockCheck",
- // name: "盘点单据",
- // component: stockCheck,
- // meta: {
- // authRule: ["inv/stockCheck"]
- // }
- // },
{
path: "udiTrace",
name: "UDI码流向",
diff --git a/src/views/basic/BussinessTypeLoclModify.vue b/src/views/basic/BussinessTypeLoclModify.vue
index 8f38ef3..8289850 100644
--- a/src/views/basic/BussinessTypeLoclModify.vue
+++ b/src/views/basic/BussinessTypeLoclModify.vue
@@ -393,6 +393,7 @@ export default {
key: query,
onlyMain: true,
}
+
getOriginBusType(tQuery)
.then((response) => {
this.originTypes = response.data.list || [];
diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue
index a96ba89..4c85732 100644
--- a/src/views/basic/BussinessTypeModify.vue
+++ b/src/views/basic/BussinessTypeModify.vue
@@ -256,7 +256,7 @@
</el-checkbox>
<el-checkbox v-model="inputQuery.scanPreIn" :disabled="inputQuery.corpType!='2'">出库时必须校验预验收库存
</el-checkbox>
- <el-checkbox v-model="inputQuery.vailInv">是否允许无库存出库
+ <el-checkbox v-model="inputQuery.vailInv" :disabled="inputQuery.mainAction!='WareHouseOut'">是否允许无库存出库
</el-checkbox>
<el-checkbox v-model="inputQuery.codeFillCheck">采集UDI码时进行三期校验
</el-checkbox>
@@ -579,6 +579,7 @@ export default {
,
//获取单据类型
getOrderType() {
+
this.orderTypeList = [];
let query = {
mainAction: this.inputQuery.mainAction,
diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index d00ba8c..8cf3119 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -877,7 +877,7 @@ export default {
bussinessTypeQuery: {
enabled: true,
page: 1,
- limit: 100
+ limit: 10
},
bussinessTypeTotal: 0,
curSeleUser: null,
@@ -1027,7 +1027,9 @@ export default {
}
this.$message.success("操作成功");
this.formVisible = false;
+
if (this.formName !== "edit") {
+
if (response.data && response.data.id) {
data.id = response.data.id;
if (this.pidData) {
@@ -1357,6 +1359,7 @@ export default {
if (val != null) {
this.bussinessTypeQuery.page = val;
}
+ this.bussinessTypeQuery.code=this.busQuery.code;
getJoinBussinessType(this.bussinessTypeQuery).then((res) => {
this.selectBussinessTypeList = [];
this.bussinessTypeList = res.data.list;
@@ -1367,10 +1370,8 @@ export default {
that.$refs.typeList.clearSelection();
}
that.bussinessTypeList.forEach(row => {
- for (let j in that.bussinessTypeData) {
- if (row.action == that.bussinessTypeData[j].action) {
+ if (row.checkSelect==true) {
that.$refs.typeList.toggleRowSelection(row, true);
- }
}
});
});
diff --git a/src/views/business/stockOrderDelSearch.vue b/src/views/business/stockOrderDelSearch.vue
index 2ec9f3c..2b0369e 100644
--- a/src/views/business/stockOrderDelSearch.vue
+++ b/src/views/business/stockOrderDelSearch.vue
@@ -24,7 +24,7 @@
</el-select>
</el-form-item>
- <el-form-item class="query-form-item" v-if="isSp ==110">
+ <el-form-item class="query-form-item" >
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item">
@@ -147,7 +147,6 @@
</el-button>
</div>
<el-button
- v-if="isSp ==110"
type="text"
size="small"
@click.native="rollback(scope.row)"
@@ -420,7 +419,7 @@ export default {
"2": "第三方系统",
"3": "扫码单据转换",
},
- isSp: store.getters.customerId,
+
detailFormVisible: false,
stockOrderEditVisible: false,
stockChangeVisible: false,
diff --git a/src/views/business/stockOrderSearch.vue b/src/views/business/stockOrderSearch.vue
index db758c8..a535667 100644
--- a/src/views/business/stockOrderSearch.vue
+++ b/src/views/business/stockOrderSearch.vue
@@ -129,7 +129,7 @@
type="text"
size="small"
@click.native="receiveFinish(scope.row)"
- >完成验收
+ >验收
</el-button
>
<el-button
@@ -284,7 +284,7 @@
<StockOrderEdit
:closeDialog="closeDialog"
:detailList="detailList"
-
+ v-on:childByValue="parentByFn"
></StockOrderEdit>
</el-dialog>
@@ -458,6 +458,20 @@
:idQuery="idQuery"
></stockQRCodeExport>
</el-dialog>
+ <el-dialog
+ title="单据验收"
+ :visible.sync="acceptOrderVisible"
+ width="80%"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ v-if="acceptOrderVisible"
+ >
+ <acceptOrder
+ :closeDialog="closeAcceptDialog"
+ :orderQuery="acceptQuery"
+ v-on:childByValue="acceptOrderFn"
+ ></acceptOrder>
+ </el-dialog>
</div>
</template>
@@ -474,6 +488,7 @@ import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail";
import stockOrderEditDistribution from "./stockOrderEditDistribution";
import stockQRCodeExport from "./stockQRCodeExport";
import draggable from "vuedraggable";
+import acceptOrder from "@/views/inout/acceptOrder";
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
import store from "../../store";
import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
@@ -555,8 +570,10 @@ export default {
detailFormLoading: false,
haveDistributionVisible: true,
qrcodeDetailVisible: false,
+ acceptOrderVisible: false,
qrcodeExportVisible: false,
actDateRange: [],
+ acceptQuery: null,
isReceAble: false,
pickerOptions: {
shortcuts: [
@@ -740,6 +757,12 @@ export default {
this.detailList = [];
});
},
+ parentByFn: function (childValue) {
+ this.getList();
+ },
+ acceptOrderFn: function (childValue) {
+ this.getList();
+ },
distributionForm(index, row) {
this.idQuery.id = '';
if (this.$isNotBlank(row.id)) {
@@ -917,6 +940,10 @@ export default {
}
}
},
+ closeAcceptDialog() {
+ this.acceptOrderVisible = false;
+
+ },
getBusType() {
let query = {
code: this.query.invWarehouseCode,
@@ -1017,18 +1044,20 @@ export default {
let query = {
stockOrderId: row.billNo,
};
- updateStatus(query)
- .then((response) => {
- if (response.code == 20000) {
- this.getList();
- this.$message.success("验收成功！");
- } else {
- this.$message.error(response.message);
- }
+ this.acceptQuery = row;
+ this.acceptOrderVisible = true;
+ // updateStatus(query)
+ // .then((response) => {
+ // if (response.code == 20000) {
+ // this.getList();
+ // this.$message.success("验收成功！");
+ // } else {
+ // this.$message.error(response.message);
+ // }
- })
- .catch(() => {
- });
+ // })
+ // .catch(() => {
+ // });
},
rollback(row) {
this.$confirm('此操作将回退单据, 是否继续?', '提示', {
@@ -1055,6 +1084,7 @@ export default {
stockOrderEditDistribution,
stockOrderQRCodeDetail,
stockQRCodeExport,
+ acceptOrder,
}
,
filters: {
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 12f632c..4df565b 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -62,12 +62,8 @@
</div>
<div class="header-tabs-box">
<el-breadcrumb class="app-levelbar" separator="/">
- <el-breadcrumb-item
- v-for="(item, index) in levelList"
- :key="item.path"
- >
- <span
- v-if="
+ <el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path" >
+ <span v-if="
item.redirect === 'noredirect' ||
index == levelList.length - 1
"
@@ -82,10 +78,21 @@
</el-breadcrumb>
</div>
<div class="header-right">
+ <div>
+ <h3>
+ <span style=" margin-top: 2px ;
+ font-weight: bold;color: #303133;">{{ hospitalName }}</span>
+
+ <span
+ style="margin-top: 2px;margin-right: 18px;color: #2d8cf0;font-size: 12px;">({{
+ curInv
+ }})</span>
+ </h3>
+ </div>
<!-- <span style="margin-right: 10px; margin-top: 2px">{{ username }}</span>-->
<el-dropdown trigger="click">
<!--<i class="el-icon-setting" style="margin-right: 15px"></i>-->
- <span>{{ title }}<i class="el-icon-arrow-down el-icon--right"></i></span>
+ <span style=" font-size: 14px;font-weight: bold;color: #303133;">{{ title }}<i class="el-icon-arrow-down el-icon--right"></i></span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item><span @click="changeInv">切换仓库</span></el-dropdown-item>
<el-dropdown-item><span @click="handlePassword">修改密码</span></el-dropdown-item>
@@ -264,6 +271,7 @@ import {filterAllByUser} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {updateInv} from "@/api/auth/authAdmin";
import * as types from "../../store/mutation-types";
+import axios from "axios";
export default {
data() {
@@ -294,6 +302,7 @@ export default {
passwordLoading: false,
passwordFormVisible: false,
company: "",
+ curInv: "",
passwordFormData: {
oldPassword: "",
newPassword: "",
@@ -329,6 +338,7 @@ export default {
userInfo: {},
storageList: [],
subInvList: [],
+ hospitalName:"",
selInvVisible: false,
locInvName: "",
locSubInvName: "",
@@ -438,7 +448,7 @@ export default {
userInfo()
.then((response) => {
if (response.code == 20000) {
-
+
this.userInfo = response.data;
this.locInvName = this.userInfo.locInvName;
this.locSubInvName = this.userInfo.locSubInvName;
@@ -450,7 +460,8 @@ export default {
this.$store.commit(types.RECEIVE_LOCINVNAME, this.locInvName);
this.$store.commit(types.RECEIVE_LOCSUBINVNAME, this.locInvName);
let username = this.$store.getters.employeeName;
- this.title = username + "(" + this.locInvName + " " + this.locSubInvName + ")";
+ this.curInv = "仓库:" + this.locInvName + "; 分库:" + this.locSubInvName + " ";
+ this.title = username + "（" + this.userInfo.userName + "）";
this.getStorage();
}
}
@@ -550,6 +561,11 @@ export default {
this.findSubInvByInv();
this.getUserInfo();
socket.init(this)
+ axios.get("./config.json").then(res => {
+
+ // 基础地址
+ this.hospitalName = res.data.hosp_name;
+ });
},
watch: {
$route() {
diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue
index c796030..6e06b0c 100644
--- a/src/views/inout/IOAddOrder.vue
+++ b/src/views/inout/IOAddOrder.vue
@@ -200,7 +200,7 @@
</el-col>
</el-row>
- <el-row :gutter="20">
+ <el-row :gutter="20" v-if="enableDept">
<el-col :span="2">
<div class="ao-text">
<span>使用科室：</span>
@@ -651,6 +651,7 @@ export default {
code: this.formData.code.trim(),
}
enterCodeWeb(tQuery).then((response) => {
+
if (response.code === 20000) {
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
@@ -926,6 +927,7 @@ export default {
}
getLocalJoinByUser(query)
.then((response) => {
+
this.busTypes = response.data.list || [];
if (this.formData.action != null) {
this.curAction = this.getActionItem(this.formData.action);
@@ -1215,6 +1217,7 @@ export default {
}
,
created() {
+
this.formData.code = '';
this.formData.actDate = new Date();
this.codeArray = [];
diff --git a/src/views/inout/acceptOrder.vue b/src/views/inout/acceptOrder.vue
index 80826a7..76cbcd4 100644
--- a/src/views/inout/acceptOrder.vue
+++ b/src/views/inout/acceptOrder.vue
@@ -170,9 +170,9 @@
<script>
import A from "@/plugin/KeyScaner";
-import {stockOrderDetail, updateStatus} from "@/api/warehouse/stockOrder";
-import {getAcceptOrder, acceptClear, acceptAddCode} from "@/api/warehouse/acceptOrder";
-import {enterCodeWeb} from "@/api/warehouse/order";
+import {stockOrderDetail, updateStatus} from "@/api/inout/stockOrder";
+import {getAcceptOrder, acceptClear, acceptAddCode} from "@/api/inout/acceptOrder";
+import {enterCodeWeb} from "@/api/inout/order";
export default {
@@ -341,6 +341,7 @@ export default {
.then((response) => {
if (response.code == 20000) {
this.$message.success("验收成功！");
+ this.$emit('childByValue', 1)
this.closeDialog();
} else {
this.$message.error(response.message);
diff --git a/src/views/thrsys/SysUdimsConfig.vue b/src/views/thrsys/SysUdimsConfig.vue
index 168e411..429a881 100644
--- a/src/views/thrsys/SysUdimsConfig.vue
+++ b/src/views/thrsys/SysUdimsConfig.vue
@@ -188,7 +188,7 @@
<el-descriptions-item>
<template slot="label">
单据(单据状态)
- </template>
+ </template>addBusTypeDialog
<el-checkbox v-model="configQuery.orderUnCheck" :disabled="configQuery.downstreamEnable">待校验单据
</el-checkbox>
<el-checkbox v-model="configQuery.orderUnReceive" :disabled="configQuery.downstreamEnable">未验收单据
@@ -338,6 +338,7 @@ export default {
getConfig() {
findConfig()
.then((response) => {
+
this.configQuery = response.data;
this.checkedBusTypes = this.configQuery.busTypes;
if (this.configQuery.busTypes != null) {
@@ -418,7 +419,7 @@ export default {
.then((response) => {
this.busTypes = response.data.list || [];
this.total = response.data.total || 0;
- this.getConfig();
+ // this.getConfig();
})
.catch(() => {
});
@@ -455,6 +456,7 @@ export default {
handleCurrentChange(val) {
this.busQuery.page = val;
this.getBusType();
+
},
},
created() {
@@ -464,6 +466,7 @@ export default {
};
this.getBusType();
+ this.getConfig();
},
}
</script>
diff --git a/src/views/thrsys/ThrCorps.vue b/src/views/thrsys/ThrCorps.vue
index a17f2d9..926f1f8 100644
--- a/src/views/thrsys/ThrCorps.vue
+++ b/src/views/thrsys/ThrCorps.vue
@@ -49,7 +49,7 @@
<el-table-column label="联系电话" prop="mobile" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" fixed="right" v-if="thirdSysDetail.fromType!=0">
<template slot-scope="scope">
- <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
+ <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" :disabled="!delFalg"
>删除
</el-button>
</template>
@@ -73,6 +73,7 @@ import {
import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys";
import {ucloudUnit} from "../../api/basic/basicUnitMaintain";
import {selectIp} from "../../api/param/systemParamConfig";
+import {findConfig} from "../../api/thrsys/spsSyncStatus";
export default {
data() {
@@ -88,6 +89,7 @@ export default {
list: [],
thirdSys: [],
thirdSysDetail: null,
+ delFalg:true,
uploadFileUrl: null,
fileList: [],
uploadData: {
@@ -252,6 +254,15 @@ export default {
});
},
+ getConFig(){
+ findConfig().then((response) =>{
+ if (response.code == 20000) {
+ this.delFalg=response.data.basicThirdCorp;
+ } else {
+ this.$message.error(response.message);
+ }
+ });
+ },
downloadDatas() {
let query = {
thirdSysFk: this.filterQuery.thirdSys
@@ -270,6 +281,7 @@ export default {
mounted() {
},
created() {
+ this.getConFig();
this.getBasicThirdSys();
},
};
diff --git a/src/views/userManage/param/systemPDFModule.vue b/src/views/userManage/param/systemPDFModule.vue
index 3289970..ff55901 100644
--- a/src/views/userManage/param/systemPDFModule.vue
+++ b/src/views/userManage/param/systemPDFModule.vue
@@ -494,7 +494,7 @@ export default {
this.$router.push({
path: ""
});
- this.query = {
+ this.moduleQuery = {
templateType: null,
moduleId: null,
name: "",