bug修改

wms_pzh
anthonyywj2 3 years ago
parent aecea406ab
commit c405841975

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

@ -16,6 +16,14 @@ export function filterCompany(query) {
}); });
} }
export function superSearch(query) {
return axios({
url: "/udiwms/udiinfo/superSearch",
method: "get",
params: query
});
}
export function filterByUuid(query) { export function filterByUuid(query) {
return axios({ return axios({
url: "/udiwms/udiinfo/local/filterByUuid", url: "/udiwms/udiinfo/local/filterByUuid",

@ -81,6 +81,10 @@
>查询 >查询
</el-button </el-button
> >
<el-button type="primary" icon="search" @click="getSuperSeaech" size="mini"
>国家同步库查询
</el-button
>
<el-button type="primary" size="mini" icon="search" @click="checkCombine" <el-button type="primary" size="mini" icon="search" @click="checkCombine"
:loading="combineLoading" :loading="combineLoading"
>选入 >选入
@ -95,7 +99,6 @@
</el-form-item> </el-form-item>
</el-row> </el-row>
</el-form> </el-form>
<el-table <el-table
:data="udidlList" :data="udidlList"
style="width: 100%" style="width: 100%"
@ -159,7 +162,6 @@
:total="total" :total="total"
:current-page="unionQuery.page" :current-page="unionQuery.page"
></el-pagination> ></el-pagination>
</div> </div>
</el-card> </el-card>
<el-card class="el-card" v-if="isImport"> <el-card class="el-card" v-if="isImport">
@ -375,7 +377,7 @@
</template> </template>
<script> <script>
import {getUdiInfos, filterCompany} from "../../api/basic/udiInfo"; import {getUdiInfos, filterCompany,superSearch} from "../../api/basic/udiInfo";
import {combineUdi, combineAllUdi, checkExitUdi} from "../../api/basic/udiRelevance"; import {combineUdi, combineAllUdi, checkExitUdi} from "../../api/basic/udiRelevance";
import selectDiDetail from "./SelectDIDetailDialog" import selectDiDetail from "./SelectDIDetailDialog"
import selectUdi from "@/views/basic/UdiInfoRelevance"; import selectUdi from "@/views/basic/UdiInfoRelevance";
@ -472,6 +474,41 @@ export default {
this.getList(); this.getList();
}, },
getSuperSeaech() {
this.$confirm("此操作将访问国家库查询DI数据, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
if (this.unionQuery.nameCode == "") {
this.$message.warning("请输入完成DI信息进行查询");
return;
}
this.loading = true;
superSearch(this.unionQuery)
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.udidlList = response.data.list || [];
this.total = response.data.total || 0;
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.udidlList = [];
this.total = 0;
});
})
.catch(() => {
});
},
getList() { getList() {
if ( if (
this.unionQuery.udiCode == "" && this.unionQuery.udiCode == "" &&

@ -90,19 +90,17 @@
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index" width="60"></el-table-column> <el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="单据号" prop="billNo"></el-table-column> <el-table-column label="单据号" prop="billNo"></el-table-column>
<el-table-column label="往来单位ID" prop="corpId" width="100"></el-table-column>
<el-table-column label="往来单位" prop="corpName" width="300"
show-overflow-tooltip="true"></el-table-column>
<el-table-column label="第三方单据类型" prop="originType"></el-table-column>
<el-table-column label="扫码单据类型" prop="billType"> <el-table-column label="扫码单据类型" prop="billType">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ geActionName(scope.row.billType) }}</span> <span>{{ geActionName(scope.row.billType) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单据状态" prop="billFlag" width="80"></el-table-column> <el-table-column label="往来单位ID" prop="corpId" width="100"></el-table-column>
<el-table-column label="往来单位" prop="corpName" width="300"
show-overflow-tooltip="true"></el-table-column>
<!-- <el-table-column label="第三方单据类型" prop="originType"></el-table-column>-->
<!-- <el-table-column label="单据状态" prop="billFlag" width="80"></el-table-column>-->
<el-table-column label="单据日期" prop="billdate"></el-table-column> <el-table-column label="单据日期" prop="billdate"></el-table-column>
<el-table-column label="操作" fixed="right" v-if="thirdSysDetail.fromType!=0"> <el-table-column label="操作" fixed="right" v-if="thirdSysDetail.fromType!=0">

Loading…
Cancel
Save