UDI
/
spms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

中继服务同步

Browse Source
master
anthonywj 4 years ago
parent ac6a9a85ac
commit 40924b4d5a
12 changed files with 395 additions and 344 deletions
Show Stats Download Patch File Download Diff File

9
src/api/basic/invWarehouse.js
Unescape Escape View File

@ -49,6 +49,15 @@ export function deleteWarehouse(data) {
data: data data: data
}); });
} }
export function uploadStatus(data) {
return axios({
url: "/spms/inv/warehouse/upload",
method: "post",
data: data
});
}
export function exportJson(query) { export function exportJson(query) {
return axios({ return axios({

16
src/api/thrsys/smp.js
Unescape Escape View File

@ -17,6 +17,14 @@ export function corpUpload(query) {
data: query data: query
}); });
} }
export function corpUploadStatus(query) {
return axios({
url: "/udiwms/corps/importLog/exportStatus",
method: "post",
data: query
});
}
//产品信息上传 //产品信息上传
export function udiUpload(query) { export function udiUpload(query) {
@ -26,6 +34,14 @@ export function udiUpload(query) {
data: query data: query
}); });
} }
export function udiUploadStatus(query) {
return axios({
url: "/udiwms/products/importLog/exportStatus",
method: "post",
data: query
});
}
//第三方业务单据上传 //第三方业务单据上传

27
src/views/basic/BasicThirdSys.vue
Unescape Escape View File

@ -65,7 +65,7 @@
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
:visible.sync="modifyDialogVisible" :visible.sync="modifyDialogVisible"
width="70%" width="60%"
v-if="modifyDialogVisible" v-if="modifyDialogVisible"
> >
<modifyDialog :inputQuery="inputQuery"></modifyDialog> <modifyDialog :inputQuery="inputQuery"></modifyDialog>
@ -155,15 +155,15 @@
</div> </div>
</template> </template>
<script> <script>
import { import {
getBasicThirdSys, getBasicThirdSys,
updateBasicThirdSys, getDetailBasicThirdSys, updateDetailBasicThirdSys updateBasicThirdSys, getDetailBasicThirdSys, updateDetailBasicThirdSys
} from "../../api/basic/basicThirdSys"; } from "../../api/basic/basicThirdSys";
import modifyDialog from "./BasicThirdSysModify"; import modifyDialog from "./BasicThirdSysModify";
import modifyDetailDialog from "./BasicThirdSysDetailModify"; import modifyDetailDialog from "./BasicThirdSysDetailModify";
export default { export default {
data() { data() {
return { return {
filterQuery: { filterQuery: {
@ -185,8 +185,8 @@
dataMap: { dataMap: {
0: "接口实时获取", 0: "接口实时获取",
1: "文件缓存", 1: "文件缓存",
2:"第三方上传缓存", 2: "第三方上传缓存",
3:"接口本地缓存" 3: "接口本地缓存"
}, },
detailList: null, detailList: null,
total: 0, total: 0,
@ -212,7 +212,12 @@
this.modifyDetailDialogVisible = false; this.modifyDetailDialogVisible = false;
}, },
handleCurrentChange(row) { handleCurrentChange(row) {
if (row.mainSys) {
this.detailList = [];
} else {
this.getDetailList(row); this.getDetailList(row);
}
}, },
getList() { getList() {
this.loading = true; this.loading = true;
@ -308,14 +313,14 @@
created() { created() {
this.getList(); this.getList();
}, },
}; };
</script> </script>
<style scoped> <style scoped>
.el-card { .el-card {
margin-right: 20px; margin-right: 20px;
/*transition: all .5s;*/ /*transition: all .5s;*/
} }
</style> </style>

1
src/views/basic/CorpExport.vue
Unescape Escape View File

@ -10,6 +10,7 @@
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <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" icon="search" @click="getList">查询</el-button>
<el-button type="primary" icon="search" @click="exportExcel">导出往来单位信息</el-button> <el-button type="primary" icon="search" @click="exportExcel">导出往来单位信息</el-button>
<el-button type="primary" icon="search" @click="uploadSmp">同步至UDI管理系统</el-button>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-row> </el-row>

6
src/views/basic/CorpSelect.vue
Unescape Escape View File

@ -33,7 +33,7 @@
</el-button> </el-button>
<el-button type="primary" icon="search" @click="uploadSMP" <el-button type="primary" icon="search" @click="uploadSMP"
v-if="selectType==1" v-if="selectType==1"
>一键上传 >结果全部上传
</el-button> </el-button>
</el-button-group> </el-button-group>
@ -231,7 +231,7 @@
basicUnitMaintainSave, basicUnitMaintainSave,
deleteBasicUnitMaintain, getThrsysUnit deleteBasicUnitMaintain, getThrsysUnit
} from "../../api/basic/basicUnitMaintain"; } from "../../api/basic/basicUnitMaintain";
import {corpUpload} from "../../api/thrsys/smp" import {corpUpload,corpUploadStatus} from "../../api/thrsys/smp"
import {getBasicThirdSys} from "../../api/basic/basicThirdSys"; import {getBasicThirdSys} from "../../api/basic/basicThirdSys";
import {exportExcel} from "../../api/basic/corpExport" import {exportExcel} from "../../api/basic/corpExport"
@ -499,7 +499,7 @@
}, },
allUploadSMP() { allUploadSMP() {
corpUpload(this.query) corpUploadStatus(this.query)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.$message.success("提交成功，后台正在上传！") this.$message.success("提交成功，后台正在上传！")

6
src/views/basic/UdIInfoSelect.vue
Unescape Escape View File

@ -72,7 +72,7 @@
</el-button> </el-button>
<el-button type="primary" icon="search" @click="allUploadSMP" <el-button type="primary" icon="search" @click="allUploadSMP"
v-if="selectType==1" v-if="selectType==1"
>一键上传 >结果全部上传
</el-button> </el-button>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
@ -541,7 +541,7 @@ import {
updateErpProduct, updateErpProduct,
thirdSysDetail, thirdSysDetail,
} from "../../api/basic/udiRelevance"; } from "../../api/basic/udiRelevance";
import {udiUpload} from "../../api/thrsys/smp" import {udiUpload,udiUploadStatus} from "../../api/thrsys/smp"
import {exportExcel} from "../../api/basic/udiInfoExport" import {exportExcel} from "../../api/basic/udiInfoExport"
import {selectSysParamByKey} from "../../api/param/systemParamConfig"; import {selectSysParamByKey} from "../../api/param/systemParamConfig";
import {filterByUuid} from "../../api/basic/udiInfo"; import {filterByUuid} from "../../api/basic/udiInfo";
@ -703,7 +703,7 @@ export default {
}, },
allUploadSMP() { allUploadSMP() {
udiUpload(this.filterQuery) udiUploadStatus(this.filterQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.$message({ this.$message({

31
src/views/basic/UdiinfoExport.vue
Unescape Escape View File

@ -9,7 +9,8 @@
<el-button-group style="display:flex;"> <el-button-group style="display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <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" icon="search" @click="getList">查询</el-button>
<el-button type="primary" icon="search" @click="exportExcel">导出医疗器械信息</el-button> <el-button type="primary" icon="search" @click="exportExcel">导出文件</el-button>
<el-button type="primary" icon="search" @click="uploadSmp">同步至UDI管理系统</el-button>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-row> </el-row>
@ -96,12 +97,12 @@
</template> </template>
<script> <script>
import axios from "axios"; import axios from "axios";
import {filterLog, downloadLog, deleteLog} from "../../api/basic/udiInfoExport"; import {filterLog, downloadLog, deleteLog} from "../../api/basic/udiInfoExport";
import udiInfoSelect from "./UdIInfoSelect"; import udiInfoSelect from "./UdIInfoSelect";
import store from "@/store"; import store from "@/store";
export default { export default {
data() { data() {
return { return {
filterQuery: { filterQuery: {
@ -264,29 +265,29 @@
// this.getBasicThirdSys(); // this.getBasicThirdSys();
this.getList(); this.getList();
}, },
}; };
</script> </script>
<style> <style>
.itemTag { .itemTag {
float: left; float: left;
text-align: left; text-align: left;
margin-top: 10px; margin-top: 10px;
width: 100px; width: 100px;
} }
.text { .text {
font-size: 13px; font-size: 13px;
font-family: "Microsoft YaHei"; font-family: "Microsoft YaHei";
} }
.el-row { .el-row {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
} }
.el-col { .el-col {
border-radius: 4px; border-radius: 4px;
flex-wrap: wrap; flex-wrap: wrap;
} }
</style> </style>

37
src/views/basic/invWarehouse.vue
Unescape Escape View File

@ -39,6 +39,8 @@
</el-upload> </el-upload>
<el-button type="primary" icon="search" @click="exportInvwarehouse">导出</el-button> <el-button type="primary" icon="search" @click="exportInvwarehouse">导出</el-button>
<el-button type="primary" icon="search" @click="uploadInvwarehouse">同步至UDI管理系统</el-button>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -138,11 +140,11 @@
stripe stripe
style="width: 100%"> style="width: 100%">
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- prop="username"--> <!-- prop="username"-->
<!-- label="账号"--> <!-- label="账号"-->
<!-- min-width="20%">--> <!-- min-width="20%">-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column <el-table-column
prop="employeeName" prop="employeeName"
label="用户名" label="用户名"
@ -604,7 +606,7 @@
<script> <script>
import { import {
filterList, filterAll, filterList, filterAll,
saveWarehouse, exportJson, saveWarehouse, exportJson, uploadStatus,
deleteWarehouse, warehouseBussinessTypeList, deleteWarehouse, warehouseBussinessTypeList,
warehouseUserList, saveWarehouseBussinessType, warehouseUserList, saveWarehouseBussinessType,
saveWarehouseUser, updateDirector, saveWarehouseUser, updateDirector,
@ -626,7 +628,7 @@ const formJson = {
status: 1, status: 1,
advanceType: false, advanceType: false,
isDefault: false, isDefault: false,
level:1, level: 1,
}; };
export default { export default {
data() { data() {
@ -691,7 +693,7 @@ export default {
selectUserList: [], selectUserList: [],
selectBussinessTypeList: [], selectBussinessTypeList: [],
bussinessTypeFormVisible: false, bussinessTypeFormVisible: false,
thrWarehouseData : null, thrWarehouseData: null,
currentId: null, currentId: null,
thrWareHouseVisible: false, thrWareHouseVisible: false,
sysList: [], sysList: [],
@ -942,6 +944,21 @@ export default {
} }
return CurrentDate return CurrentDate
}, },
uploadInvwarehouse() {
let tempQuery = {};
uploadStatus(tempQuery)
.then((response) => {
if (response.code == 20000) {
this.$message.success(response.data);
} else {
this.$message.error(response.message);
}
})
.catch(() => {
});
},
exportInvwarehouse() { exportInvwarehouse() {
let tquery = {}; let tquery = {};
exportJson(tquery).then((response) => { exportJson(tquery).then((response) => {
@ -996,7 +1013,7 @@ export default {
}); });
}, },
changeLevel(row) { changeLevel(row) {
this.formData.pcode =null; this.formData.pcode = null;
this.getParentInv(this.formData.level); this.getParentInv(this.formData.level);
}, },
@ -1220,7 +1237,7 @@ export default {
this.$message.error("第三方仓库数据加载失败"); this.$message.error("第三方仓库数据加载失败");
}); });
}, },
changeThrWarehouse(row){ changeThrWarehouse(row) {
this.checkThrWarehouseRow = row; this.checkThrWarehouseRow = row;
}, },
hideThrWarehouseTable() { hideThrWarehouseTable() {

1
src/views/thrsys/ThrOrderImport.vue
Unescape Escape View File

@ -162,6 +162,7 @@
import {getBussinessType} from "../../api/basic/bussinessType"; import {getBussinessType} from "../../api/basic/bussinessType";
import thrOrderImportDetail from "./ThrOrderImportDetail"; import thrOrderImportDetail from "./ThrOrderImportDetail";
import thrOrderSelect from "./ThrOrderSelect"; import thrOrderSelect from "./ThrOrderSelect";
import store from "@/store";
export default { export default {
data() { data() {

4
src/views/userManage/param/systemParamConfig.vue
Unescape Escape View File

@ -14,9 +14,9 @@
<el-table v-loading="loading" :data="list" style="width: 100%"> <el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column type="index" label="序号" width="50"></el-table-column> <el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="参数名" prop="paramName" width="200"></el-table-column> <el-table-column label="参数名" prop="paramName" ></el-table-column>
<el-table-column label="参数键" prop="paramKey" width="200"></el-table-column> <el-table-column label="参数键" prop="paramKey" width="200"></el-table-column>
<el-table-column label="参数值" prop="paramValue" width="300"></el-table-column> <el-table-column label="参数值" prop="paramValue" width="100"></el-table-column>
<!--<el-table-column label="参数状态">--> <!--<el-table-column label="参数状态">-->
<!--<template slot-scope="scope">--> <!--<template slot-scope="scope">-->
<!--<el-tag :type="scope.row.paramStatus | paramStatusFilterType">{{--> <!--<el-tag :type="scope.row.paramStatus | paramStatusFilterType">{{-->

2
src/views/warehouse/IONewOrder.vue
Unescape Escape View File

@ -15,7 +15,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="filterQuery.action" placeholder="请选择业务类型"> <el-select v-model="filterQuery.action" placeholder="请选择扫码单据类型">
<el-option <el-option
v-for="item in busTypes" v-for="item in busTypes"
:key="item.name" :key="item.name"

9
src/views/warehouse/stockOrderNewDistribution.vue
Unescape Escape View File

@ -75,7 +75,7 @@
<!--<el-option label="送货单" value="deliveryNote"></el-option>--> <!--<el-option label="送货单" value="deliveryNote"></el-option>-->
<!--</el-select>--> <!--</el-select>-->
<!-- @change="getStorage"--> <!-- @change="getStorage"-->
<el-select v-model="formData.billType" placeholder="请选择业务类型" clearable> <el-select v-model="formData.billType" placeholder="请选择业务类型" @change="getStorage" clearable>
<el-option <el-option
v-for="item in busTypes" v-for="item in busTypes"
:key="item.localName" :key="item.localName"
@ -130,7 +130,8 @@
<!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">--> <!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
<!--<el-option label="送货单" value="deliveryNote"></el-option>--> <!--<el-option label="送货单" value="deliveryNote"></el-option>-->
<!--</el-select>--> <!--</el-select>-->
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable @change="getBusType"> <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable
@change="getBusType">
<el-option <el-option
v-for="item in storageList" v-for="item in storageList"
:key="item.name" :key="item.name"
@ -451,7 +452,7 @@ import stockOrderNewSelectProduct from "./stockOrderNewSelectProduct";
import dialogInvProduct from "../inventory/DialogInvProduct" import dialogInvProduct from "../inventory/DialogInvProduct"
import {getBasicUnitMaintains, getBasicUnitMaintains2} from "../../api/basic/basicUnitMaintain"; import {getBasicUnitMaintains, getBasicUnitMaintains2} from "../../api/basic/basicUnitMaintain";
import {getBussinessType} from "../../api/basic/bussinessType"; import {getBussinessType} from "../../api/basic/bussinessType";
import {getLocalBusType, getLocalJoinBusType,getLocalJoinByUser} from "../../api/basic/busLocalType"; import {getLocalBusType, getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
export default { export default {
name: "idQuery", name: "idQuery",
@ -1083,7 +1084,7 @@ export default {
getBusType() { getBusType() {
let query = { let query = {
enabled: true, enabled: true,
code:this.formData.locStorageCode code: this.formData.locStorageCode
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
.then((response) => { .then((response) => {

Write Preview
Loading…
Cancel
Save