第三方服务提交

purchase
anthonyywj2 3 years ago
parent 451778589f
commit e5cfea56e7

@ -1,10 +1,7 @@
{ {
"UDI_SYNC_SERVER_IP": "http://192.168.0.109:9991/",
"UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/", "BASE_URL": "http://192.168.0.109:9991",
"BASE_URL":"http://192.168.0.66:8500/UDI_WMS_MC", "SERVER_IP": "http://192.168.0.109:9991",
"SERVER_IP": "http://192.168.0.66:8500/UDI_WMS_MC/",
"WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/", "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/",
"hosp_name": "平和县医院" "hosp_name": "平和县医院"
} }

@ -5,8 +5,16 @@
"BASE_URL":"http://192.168.0.66:8500/UDI_WMS_MC", "BASE_URL":"http://192.168.0.66:8500/UDI_WMS_MC",
"SERVER_IP": "http://192.168.0.66:8500/UDI_WMS_MC/", "SERVER_IP": "http://192.168.0.66:8500/UDI_WMS_MC/",
"WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/", "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/",
"hosp_name": "平和县医院" "hosp_name": "福建省XX市医院"
//139
"UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/",
"BASE_URL":" http://139.9.178.73:8080/UDI_WMS_MC",
"SERVER_IP": " http://139.9.178.73:8080/UDI_WMS_MC,
"WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/",
"hosp_name": "诏安县总医院"
//文明东 //文明东

@ -104,6 +104,11 @@
<span>{{ getStorageName(scope.row.locStorageCode) }}</span> <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="当前分库" prop="invWarehouseCode" width="150">
<template slot-scope="scope">
<span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
</template>
</el-table-column>
<el-table-column label="提交状态"> <el-table-column label="提交状态">
@ -179,6 +184,7 @@ import {
import {stockOrderUploadList} from "@/api/inout/stockOrderUpload"; import {stockOrderUploadList} from "@/api/inout/stockOrderUpload";
import {getLocalJoinByUser} from "../../api/basic/busLocalType"; import {getLocalJoinByUser} from "../../api/basic/busLocalType";
import {filterAllByUser} from "@/api/basic/invWarehouse"; import {filterAllByUser} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
export default { export default {
name: "stockOrderDelSearch", name: "stockOrderDelSearch",
@ -207,6 +213,7 @@ export default {
total: 0, total: 0,
detailTotal: 0, detailTotal: 0,
storageList: [], storageList: [],
subInvList: [],
loading: false, loading: false,
detailLoading: false, detailLoading: false,
idQuery: { idQuery: {
@ -466,6 +473,24 @@ export default {
} }
} }
}, },
getSubStorageName(code) {
for (let i = 0; i < this.subInvList.length; i++) {
if (this.subInvList[i].code === code) {
return this.subInvList[i].name;
}
}
},
getSubInvList() {
let query = {};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
})
.catch(() => {
});
},
getStorage() { getStorage() {
this.storageList = []; this.storageList = [];
filterAllByUser() filterAllByUser()
@ -473,6 +498,7 @@ export default {
this.storageList = response.data || []; this.storageList = response.data || [];
if (this.storageList.length > 0) { if (this.storageList.length > 0) {
this.query.locStorageCode = this.storageList[0].code; this.query.locStorageCode = this.storageList[0].code;
this.getSubInvList();
this.getList(); this.getList();
} }
}) })

@ -60,7 +60,6 @@
<script> <script>
import {filterAllByUser} from "@/api/basic/invWarehouse"; import {filterAllByUser} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse"; import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {updateInv} from "@/api/auth/authAdmin";
export default { export default {
name: "DialogSelectInv", name: "DialogSelectInv",

@ -74,7 +74,6 @@
<script> <script>
import { import {
filterProducts, filterProducts,
filterDetailProducts,
deleteProducts, deleteProducts,
} from "../../api/inventory/InvProducts"; } from "../../api/inventory/InvProducts";
import draggable from "vuedraggable"; import draggable from "vuedraggable";

@ -123,8 +123,6 @@
:close-on-press-escape="false" :close-on-press-escape="false"
width="85%" width="85%"
v-if="codeDetailVisible" v-if="codeDetailVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
> >
<codeDetail <codeDetail
:idQuery="idQuery" :idQuery="idQuery"

@ -120,6 +120,7 @@ export default {
uploadData: { uploadData: {
thirdSys: "thirdId", thirdSys: "thirdId",
}, },
loading:false,
}; };
}, },
@ -208,7 +209,7 @@ export default {
}, },
thirdSysChange() { thirdSysChange() {
this.uploadData.thirdSys = this.filterQuery.thirdSys; this.uploadData.thirdSys = this.filterQuery.thirdSys;
this.getThirdSysDetail(); // this.getThirdSysDetail();
}, },
getThirdSysDetail() { getThirdSysDetail() {
let query = { let query = {

@ -43,9 +43,9 @@
> >
<el-button size="mini" type="primary">导入库存产品信息</el-button> <el-button size="mini" type="primary">导入库存产品信息</el-button>
</el-upload> </el-upload>
<el-button type="primary" icon="search" @click="jumpDl" <!-- <el-button type="primary" icon="search" @click="jumpDl"-->
v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1">模板下载 <!-- v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1">模板下载-->
</el-button> <!-- </el-button>-->
<el-button type="primary" icon="search" @click="downloadInpi" <el-button type="primary" icon="search" @click="downloadInpi"
v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3"> v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3">
下载库存产品信息 下载库存产品信息

@ -44,9 +44,9 @@
> >
<el-button size="mini" type="primary">导入业务单据</el-button> <el-button size="mini" type="primary">导入业务单据</el-button>
</el-upload> </el-upload>
<el-button type="primary" icon="search" @click="jumpDl" <!-- <el-button type="primary" icon="search" @click="jumpDl"-->
v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1">模板下载 <!-- v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1">模板下载-->
</el-button> <!-- </el-button>-->
<el-button type="primary" icon="search" @click="downloadOrderss" <el-button type="primary" icon="search" @click="downloadOrderss"
v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3"> v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3">
下载业务单据 下载业务单据

@ -43,9 +43,9 @@
> >
<el-button size="mini" type="primary">导入产品信息</el-button> <el-button size="mini" type="primary">导入产品信息</el-button>
</el-upload> </el-upload>
<el-button type="primary" icon="search" @click="jumpDl" <!-- <el-button type="primary" icon="search" @click="jumpDl"-->
v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1">模板下载 <!-- v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1">模板下载-->
</el-button> <!-- </el-button>-->
<el-button type="primary" icon="search" @click="downloadProducts" <el-button type="primary" icon="search" @click="downloadProducts"
v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3"> v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3">
下载产品信息 下载产品信息

Loading…
Cancel
Save