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

中继服务，第三方接口，批次号校验

Browse Source
master
anthonyywj2 3 years ago
parent 9e75bf1971
commit d670f5d03f
12 changed files with 593 additions and 457 deletions
Show Stats Download Patch File Download Diff File

4
public/config.json
Unescape Escape View File

@ -1,6 +1,6 @@
{ {
"UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/", "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/",
"BASE_URL":"http://192.168.0.109:9991/", "BASE_URL":"http://139.9.178.73:8080/UDI_WMS_MC/",
"SERVER_IP": "http://192.168.0.109:9991/", "SERVER_IP": "http://139.9.178.73:8080/",
"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/"
} }

21
src/api/basic/basicThirdSys.js
Unescape Escape View File

@ -43,3 +43,24 @@ export function updateDetailBasicThirdSys(query) {
} }
export function filterBusTypeDetail(query) {
return axios({
url: "/udiwms/basic/thirdsys/filterBusTypeDetail",
method: "get",
params: query
});
}
export function saveBusTypeDetail(query) {
return axios({
url: "/udiwms/basic/thirdsys/saveBusTypeDetail",
method: "post",
data: query
});
}

8
src/api/basic/busOriginType.js
Unescape Escape View File

@ -22,3 +22,11 @@ export function insertBussinessType(query) {
data: query data: query
}); });
} }
export function downloadBussinessType(query) {
return axios({
url: "/udiwms/originBusType/download",
method: "post",
data: query
});
}

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

@ -83,8 +83,8 @@
</el-card> </el-card>
<el-card class="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%"> @current-change="handleBustypeChange">
<el-table-column label="序号" type="index" show-overflow-tooltip="true"></el-table-column> <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 label="接口名称" prop="name" show-overflow-tooltip="true"></el-table-column>
@ -101,9 +101,9 @@
</el-table-column> </el-table-column>
<!--<el-table-column label="本地缓存" prop="itrCache">--> <!--<el-table-column label="本地缓存" prop="itrCache">-->
<!--<template slot-scope="scope">--> <!--<template slot-scope="scope">-->
<!--<span>{{ enableMap[scope.row.enabled] }}</span>--> <!--<span>{{ enableMap[scope.row.enabled] }}</span>-->
<!--</template>--> <!--</template>-->
<!--</el-table-column>--> <!--</el-table-column>-->
<el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column> <el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column>
@ -148,175 +148,264 @@
></el-pagination> ></el-pagination>
<div style="margin-top: 18px ; color: #F71616;"> </el-card>
<span>重要提示：本页功能仅供技术提供方修改&nbsp;</span>
</div> <el-card class="el-card">
<el-table v-loading="busTypeLoading" :data="busTypeList" style="width: 100%">
<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 label="单据类型代码" prop="code">
</el-table-column>
<el-table-column label="接口地址" prop="url" width="400" show-overflow-tooltip>
<template slot-scope="scope">
<el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.url"
placeholder="请输入"></el-input>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="150" prop="price" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click="handleEdit(scope.$index, scope.row)"
>编辑
</el-button>
<el-button
type="text"
size="small"
@click="handleSave(scope.$index, scope.row)"
>保存
</el-button>
</template>
</el-table-column>
</el-table>
<div style="margin-top: 18px ; color: #F71616;">
<span>重要提示：本页功能仅供技术提供方修改&nbsp;</span>
</div>
</el-card> </el-card>
</div> </div>
</template> </template>
<script> <script>
import { import {
getBasicThirdSys, getBasicThirdSys,
updateBasicThirdSys, getDetailBasicThirdSys, updateDetailBasicThirdSys updateBasicThirdSys, getDetailBasicThirdSys, updateDetailBasicThirdSys, filterBusTypeDetail, saveBusTypeDetail
} from "../../api/basic/basicThirdSys"; } from "../../api/basic/basicThirdSys";
import modifyDialog from "./BasicThirdSysModify";
import modifyDetailDialog from "./BasicThirdSysDetailModify";
export default {
data() {
return {
filterQuery: {
thirdId: "",
thirdName: "",
enabled: "1",
page: 1,
limit: 20,
},
modifyDialogVisible: false,
modifyDetailDialogVisible: false,
list: [],
inputQuery: null,
inputDetailQuery: null,
enableMap: {
true: "是",
false: "否",
},
dataMap: {
0: "接口实时获取",
1: "文件缓存",
2:"第三方上传缓存",
3:"接口本地缓存"
},
detailList: null,
total: 0,
};
},
methods: { import modifyDialog from "./BasicThirdSysModify";
onReset() { import modifyDetailDialog from "./BasicThirdSysDetailModify";
this.$router.push({
path: "", export default {
}); data() {
this.filterQuery = { return {
thirdId: "", filterQuery: {
thirdName: "", thirdId: "",
enabled: null, thirdName: "",
page: 1, enabled: "1",
limit: 20, page: 1,
}; limit: 20,
this.getList();
}, },
cancelDialog() { modifyDialogVisible: false,
this.modifyDialogVisible = false; modifyDetailDialogVisible: false,
this.modifyDetailDialogVisible = false; modifyBusYypeDialogVisible: false,
list: [],
inputQuery: null,
inputDetailQuery: null,
inputBusTypeQuery: null,
enableMap: {
true: "是",
false: "否",
}, },
handleCurrentChange(row) { dataMap: {
this.getDetailList(row); 0: "接口实时获取",
1: "文件缓存",
2: "第三方上传缓存",
3: "接口本地缓存"
}, },
getList() { detailList: null,
this.loading = true; busTypeList: [],
getBasicThirdSys(this.filterQuery) total: 0,
.then((response) => { loading: false,
this.loading = false; busTypeLoading:false,
this.list = response.data.list || []; currentCheckIndex: -1,
this.detailList = []; };
this.total = response.data.total || 0; },
// this.getDetailList(this.list[0]);
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
thirdId: "",
thirdName: "",
enabled: null,
page: 1,
limit: 20,
};
this.getList();
},
cancelDialog() {
this.modifyDialogVisible = false;
this.modifyDetailDialogVisible = false;
this.modifyBusYypeDialogVisible = false;
},
handleCurrentChange(row) {
this.getDetailList(row);
},
handleBustypeChange(row) {
this.getBustyList(row);
},
getList() {
this.loading = true;
getBasicThirdSys(this.filterQuery)
.then((response) => {
this.loading = false;
this.list = response.data.list || [];
this.detailList = [];
this.total = response.data.total || 0;
// this.getDetailList(this.list[0]);
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
getDetailList(row) {
let query = { getDetailList(row) {
thirdSysFk: row.thirdId let query = {
}; thirdSysFk: row.thirdId
this.loading = true; };
getDetailBasicThirdSys(query) this.loading = true;
.then((response) => { getDetailBasicThirdSys(query)
this.loading = false; .then((response) => {
this.detailList = response.data.list || []; this.loading = false;
this.total = response.data.total || 0; this.detailList = response.data.list || [];
}) this.total = response.data.total || 0;
.catch(() => { })
this.loading = false; .catch(() => {
this.list = []; this.loading = false;
this.total = 0; this.list = [];
}); this.total = 0;
}, });
},
getBustyList(row) {
let query = {
thirdSysFk: row.thirdSysFk,
type: 0,
};
if (row.key == "orderQueryUrl") {
query.type = 1;
} else if (row.key == "orderSubmitUrl") {
query.type = 2;
} else {
this.busTypeList = [];
return;
}
this.busTypeLoading = true;
filterBusTypeDetail(query)
.then((response) => {
this.busTypeLoading = false;
this.busTypeList = response.data.list || [];
})
.catch(() => {
this.busTypeLoading = false;
this.busTypeList = [];
});
},
onModifySubmit() { onModifySubmit() {
updateBasicThirdSys(this.inputQuery) updateBasicThirdSys(this.inputQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.loading = false;
this.cancelDialog();
this.getList();
this.$message.success(response.data);
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false; this.loading = false;
this.cancelDialog(); this.cancelDialog();
}); this.getList();
}, this.$message.success(response.data);
onDetailModifySubmit() { } else {
updateDetailBasicThirdSys(this.inputDetailQuery) this.$message.error(response.message);
.then((response) => { }
if (response.code == 20000) {
this.loading = false; })
this.cancelDialog(); .catch(() => {
this.getList(); this.loading = false;
this.$message.success(response.data); this.cancelDialog();
} else { });
this.$message.error(response.message); },
} onDetailModifySubmit() {
updateDetailBasicThirdSys(this.inputDetailQuery)
}) .then((response) => {
.catch(() => { if (response.code == 20000) {
this.loading = false; this.loading = false;
this.cancelDialog(); this.cancelDialog();
}); this.getList();
}, this.$message.success(response.data);
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.cancelDialog();
});
},
handleModifyClick(row) {
this.modifyDialogVisible = true; handleModifyClick(row) {
this.inputQuery = row; this.modifyDialogVisible = true;
}, this.inputQuery = row;
handleDetailModifyClick(row) {
this.modifyDetailDialogVisible = true;
this.inputDetailQuery = row;
},
}, },
components: { handleDetailModifyClick(row) {
modifyDialog, modifyDetailDialog this.modifyDetailDialogVisible = true;
this.inputDetailQuery = row;
}, },
mounted() {
handleEdit(index, row) {
this.currentCheckIndex = index;
}, },
created() { handleSave(index, row) {
this.getList(); this.currentCheckIndex = -1;
saveBusTypeDetail(row).then((res) => {
if (res.code == 20000) {
this.$message.success(res.data);
}
})
}, },
}; },
components: {
modifyDialog, modifyDetailDialog
},
mounted() {
},
created() {
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>

550
src/views/basic/BussinessTypeThird.vue
Unescape Escape View File

@ -1,293 +1,325 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini"> <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input <el-input
v-model="filterQuery.name" v-model="filterQuery.name"
placeholder="业务类型" placeholder="业务类型"
style="width: 400px" style="width: 400px"
></el-input> ></el-input>
</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.enable" placeholder="启用状态" clearable>--> <!-- <el-select v-model="filterQuery.enable" placeholder="启用状态" clearable>-->
<!-- <el-option label="全部" value=""></el-option>--> <!-- <el-option label="全部" value=""></el-option>-->
<!-- <el-option label="已启用" value="1"></el-option>--> <!-- <el-option label="已启用" value="1"></el-option>-->
<!-- <el-option label="未启用" value="0"></el-option>--> <!-- <el-option label="未启用" value="0"></el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item>
<el-button-group style="margin-left: 10px;display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="getList">查询</el-button>
<!-- <el-upload-->
<!-- :action="uploadFileUrl"-->
<!-- multiple-->
<!-- :limit="3"-->
<!-- :show-file-list="false"-->
<!-- :on-success="handleChange"-->
<!-- :file-list="fileList"-->
<!-- >-->
<!-- <el-button size="mini" type="primary">导入单据类型</el-button>-->
<!-- </el-upload>-->
</el-button-group>
<!-- <el-button type="primary" icon="search" @click="handleAddClick"
>新增</el-button
> -->
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%"> <el-form-item class="query-form-item">
<el-table-column label="序号" type="index" width="55" ></el-table-column> <el-select v-model="filterQuery.thirdSys" placeholder="请选择第三方系统" @change="thirdSysChange">
<el-option
v-for="item in thirdSys"
:key="item.value"
:label="item.thirdName"
:value="item.thirdId">
<span style="float: left">{{ item.thirdName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button-group style="margin-left: 10px;display:flex;">
<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="updateDownload">更新下载</el-button>
<!-- <el-upload-->
<!-- :action="uploadFileUrl"-->
<!-- multiple-->
<!-- :limit="3"-->
<!-- :show-file-list="false"-->
<!-- :on-success="handleChange"-->
<!-- :file-list="fileList"-->
<!-- >-->
<!-- <el-button size="mini" type="primary">导入单据类型</el-button>-->
<!-- </el-upload>-->
</el-button-group>
<!-- <el-button type="primary" icon="search" @click="handleAddClick"
>新增</el-button
> -->
</el-form-item>
</el-form>
<el-table-column label="单据类型名称" prop="name" ></el-table-column> <el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="单据类型代码" prop="action" ></el-table-column> <el-table-column label="序号" type="index" width="55"></el-table-column>
<!-- <el-table-column label="是否启用" prop="enable" fixed>-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ enableMap[scope.row.enable] }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="第三方系统" prop="thirdSysName" ></el-table-column>
<el-table-column label="备注" prop="remark" ></el-table-column>
<el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="handleModifyClick(scope.row)"
>编辑
</el-button
>
</template>
</el-table-column>
</el-table>
<el-dialog <el-table-column label="单据类型名称" prop="name"></el-table-column>
title="新增扫码单据类型关联" <el-table-column label="单据类型代码" prop="action"></el-table-column>
:visible.sync="addDialogVisible" <!-- <el-table-column label="是否启用" prop="enable" fixed>-->
width="70%" <!-- <template slot-scope="scope">-->
:close-on-click-modal="false" <!-- <span>{{ enableMap[scope.row.enable] }}</span>-->
:close-on-press-escape="false" <!-- </template>-->
v-if="addDialogVisible" <!-- </el-table-column>-->
<el-table-column label="第三方系统" prop="thirdSys"></el-table-column>
<el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="handleModifyClick(scope.row)"
>编辑
</el-button
> >
<modifyDialog :inputQuery="inputQuery"></modifyDialog> </template>
<div style="text-align: center"> </el-table-column>
<el-button type="primary" size="small" icon="search" @click="onAddSubmit" </el-table>
>提交
</el-button
>
<el-button type="primary" size="small" icon="search" @click="cancelDialog"
>取消
</el-button
>
</div>
</el-dialog>
<el-dialog <el-dialog
title="编辑扫码单据类型关联" title="新增扫码单据类型关联"
:visible.sync="modifyDialogVisible" :visible.sync="addDialogVisible"
width="70%" width="70%"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="modifyDialogVisible" v-if="addDialogVisible"
> >
<modifyDialog :inputQuery="inputQuery"></modifyDialog> <modifyDialog :inputQuery="inputQuery"></modifyDialog>
<div style="text-align: center"> <div style="text-align: center">
<el-button type="primary" size="small" icon="search" @click="onModifySubmit" <el-button type="primary" size="small" icon="search" @click="onAddSubmit"
>提交 >提交
</el-button </el-button
> >
<el-button type="primary" size="small" icon="search" @click="cancelDialog" <el-button type="primary" size="small" icon="search" @click="cancelDialog"
>取消 >取消
</el-button </el-button
> >
</div> </div>
</el-dialog> </el-dialog>
<el-pagination
:page-size="filterQuery.limit" <el-dialog
@current-change="handleCurrentChange" title="编辑扫码单据类型关联"
layout="prev, pager, next" :visible.sync="modifyDialogVisible"
:total="total" width="70%"
></el-pagination> :close-on-click-modal="false"
</el-card> :close-on-press-escape="false"
</div> v-if="modifyDialogVisible"
>
<modifyDialog :inputQuery="inputQuery"></modifyDialog>
<div style="text-align: center">
<el-button type="primary" size="small" icon="search" @click="onModifySubmit"
>提交
</el-button
>
<el-button type="primary" size="small" icon="search" @click="cancelDialog"
>取消
</el-button
>
</div>
</el-dialog>
<el-pagination
:page-size="filterQuery.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
></el-pagination>
</el-card>
</div>
</template> </template>
<script> <script>
import { import {
getOriginBusType, getOriginBusType,
updateBussinessType, updateBussinessType,
insertBussinessType, insertBussinessType, downloadBussinessType
} from "../../api/basic/busOriginType"; } from "../../api/basic/busOriginType";
import modifyDialog from "./BussinessTypeThirdModify"; import modifyDialog from "./BussinessTypeThirdModify";
import axios from "axios"; import axios from "axios";
import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
export default { export default {
data() { data() {
return { return {
filterQuery: { filterQuery: {
name: "", name: "",
page: 1, page: 1,
limit: 20, limit: 20,
}, },
addDialogVisible: false, addDialogVisible: false,
modifyDialogVisible: false, modifyDialogVisible: false,
list: [], list: [],
inputQuery: { inputQuery: {
action: "", action: "",
name: "", name: "",
enable: "", enable: "",
remark: "", remark: "",
thirdSys: null, thirdSys: null,
thirdSysName: null, thirdSysName: null,
}, },
enableMap: { enableMap: {
true: "是", true: "是",
false: "否", false: "否",
}, },
thirdSys: [],
total: 0,
multipleSelection: [],
uploadFileUrl: null,
loading: false,
};
},
total: 0, methods: {
multipleSelection: [], onReset() {
uploadFileUrl: null, this.$router.push({
}; path: "",
});
this.filterQuery = {
thirdSys: "thirdId",
name: null,
enable: null,
page: 1,
limit: 20,
};
this.getList();
},
cancelDialog() {
this.modifyDialogVisible = false;
this.addDialogVisible = false;
}, },
methods: { getList() {
onReset() { this.loading = true;
this.$router.push({ getOriginBusType(this.filterQuery)
path: "", .then((response) => {
}); this.loading = false;
this.filterQuery = { this.list = response.data.list || [];
name: null, this.total = response.data.total || 0;
enable: null, })
page: 1, .catch(() => {
limit: 20, this.loading = false;
}; this.list = [];
this.total = 0;
});
},
getBasicThirdSys() {
let query = {
enabled: true,
};
getBasicThirdSys(query)
.then((response) => {
this.thirdSys = response.data.list || [];
this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
})
.catch(() => {
this.loading = false;
this.list = [];
});
},
updateDownload() {
let query = {
thirdSys: this.filterQuery.thirdSys,
}
downloadBussinessType(query)
.then((response) => {
this.loading = false;
this.getList(); this.getList();
}, })
cancelDialog() { .catch(() => {
this.modifyDialogVisible = false; this.loading = false;
this.addDialogVisible = false; });
}, },
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
getList() { onAddSubmit() {
this.loading = true; insertBussinessType(this.inputQuery)
getOriginBusType(this.filterQuery) .then((response) => {
.then((response) => { this.loading = false;
this.loading = false; this.cancelDialog();
this.list = response.data.list || [];
this.total = response.data.total || 0;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList(); this.getList();
}, })
.catch(() => {
onAddSubmit() { this.loading = false;
insertBussinessType(this.inputQuery) this.cancelDialog();
.then((response) => { });
this.loading = false; },
this.cancelDialog();
this.getList();
})
.catch(() => {
this.loading = false;
this.cancelDialog();
});
},
onModifySubmit() {
updateBussinessType(this.inputQuery)
.then((response) => {
this.loading = false;
this.cancelDialog();
this.getList();
})
.catch(() => {
this.loading = false;
this.cancelDialog();
});
},
handleModifyClick(row) {
this.modifyDialogVisible = true;
this.inputQuery = {
id: row.id,
remark: row.remark,
action: row.action,
name: row.name,
enable: row.enable,
thirdSys: row.thirdSys,
thirdSysName: row.thirdSysName
};
},
deleteDialog(rowId) { onModifySubmit() {
this.$confirm("此操作将永久删除该业务类型信息, 是否继续?", "提示", { updateBussinessType(this.inputQuery)
confirmButtonText: "确定", .then((response) => {
cancelButtonText: "取消", this.loading = false;
type: "warning", this.cancelDialog();
}) this.getList();
.then(() => { })
this.deleteOrders(rowId); .catch(() => {
}) this.loading = false;
.catch(() => { this.cancelDialog();
}); });
}, },
deleteOrders(data) { handleModifyClick(row) {
this.loading = true; this.modifyDialogVisible = true;
let tquery = { this.inputQuery = {
id: data.id + "", id: row.id,
}; remark: row.remark,
action: row.action,
name: row.name,
enable: row.enable,
thirdSys: row.thirdSys,
thirdSysName: row.thirdSysName
};
},
// deleteBussinessType(tquery) deleteDialog(rowId) {
// .then((response) => { this.$confirm("此操作将永久删除该业务类型信息, 是否继续?", "提示", {
// this.getList(); confirmButtonText: "确定",
// this.$message({ cancelButtonText: "取消",
// type: "success", type: "warning",
// message: "删除成功！", })
// }); .then(() => {
// }) this.deleteOrders(rowId);
// .catch(() => { })
// }); .catch(() => {
}, });
init() {
axios.get("./config.json").then(res => {
// 基础地址
let response = res.data.BASE_URL;
this.uploadFileUrl = response + "udiwms/busstiness/file/upload";
});
},
handleChange(response, files, fileList) {
console.log(response);
if (response.code != 20000) {
this.$message.error(response.message);
} else {
// console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
this.$message.success(response.data);
this.getList();
}
},
}, },
components: {
modifyDialog, thirdSysChange() {
this.getList();
}, },
mounted() {
init() {
axios.get("./config.json").then(res => {
// 基础地址
let response = res.data.BASE_URL;
this.uploadFileUrl = response + "udiwms/busstiness/file/upload";
});
}, },
created() { handleChange(response, files, fileList) {
this.init(); console.log(response);
if (response.code != 20000) {
this.$message.error(response.message);
} else {
// console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
this.$message.success(response.data);
this.getList(); this.getList();
}
}, },
},
components: {
modifyDialog,
},
mounted() {
},
created() {
this.init();
this.getBasicThirdSys();
this.getList();
},
}; };
</script> </script>

36
src/views/basic/UdiInfoManage.vue
Unescape Escape View File

@ -158,7 +158,7 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
:disabled="scope.row.thirdId == null || scope.row.thirdId == '' || scope.row.flbm!=null" :disabled="scope.row.originUuid != null"
@click.native.stop="intentSelectUdi(scope.row)" @click.native.stop="intentSelectUdi(scope.row)"
>关联DI >关联DI
</el-button> </el-button>
@ -697,39 +697,24 @@
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col"> <el-col :span="24" class="el-col">
</el-col> <div style="margin-top: 18px;margin-bottom: 18px">
<el-col :span="4" class="el-col"> <el-checkbox v-model="checked" class=""
<el-form-item prop="name">
<el-checkbox v-model="checked" class="text item itemTag"
:disabled="!isUseDyCheck" :disabled="!isUseDyCheck"
>以使用单元数量入库 >以使用单元数量入库
</el-checkbox> </el-checkbox>
</el-form-item> <el-checkbox v-model="editQuery.isDisable" class=""
</el-col>
<!-- <el-col :span="3" class="el-col">-->
<!-- <el-form-item prop="name">-->
<!-- <el-checkbox v-model="editQuery.isLock" class="text item itemTag"-->
<!-- >是否锁定-->
<!-- </el-checkbox>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="3" class="el-col">
<el-form-item prop="name">
<el-checkbox v-model="editQuery.isDisable" class="text item itemTag"
@change="diableChange" @change="diableChange"
>是否禁用 >是否禁用
</el-checkbox> </el-checkbox>
</el-form-item> <el-checkbox v-model="editQuery.isAdavence" class=""
</el-col>
<el-col :span="3" class="el-col">
<el-form-item prop="name">
<el-checkbox v-model="editQuery.isAdavence" class="text item itemTag"
>是否寄售 >是否寄售
</el-checkbox> </el-checkbox>
</el-form-item> <el-checkbox v-model="editQuery.allowNoBatch" class=""
>是否允许无批次号扫码
</el-checkbox>
</div>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
@ -859,6 +844,7 @@ export default {
isUseDy: false, isUseDy: false,
isLock: null, isLock: null,
isAdavence: null, isAdavence: null,
allowNoBatch:null,
}, },
defaultSys: null, defaultSys: null,
isImport: false, isImport: false,

4
src/views/business/stockOrderEditDistribution.vue
Unescape Escape View File

@ -576,7 +576,9 @@ export default {
} else { } else {
for (let i = 0; i < this.codeArray.length; i++) { for (let i = 0; i < this.codeArray.length; i++) {
if (this.$isBlank(this.codeArray[i].batchNo)) { if (this.$isBlank(this.codeArray[i].batchNo)) {
return this.$message.error('批次号不能为空'); if (!this.codeArray[i].allowNoBatch) {
return this.$message.error('批次号不能为空');
}
} }
if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) { if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
return this.$message.error('生产日期与失效日期不能全部为空'); return this.$message.error('生产日期与失效日期不能全部为空');

2
src/views/business/stockOrderNewDistribution.vue
Unescape Escape View File

@ -644,7 +644,9 @@ export default {
return this.$message.error('单据数量不能为0'); return this.$message.error('单据数量不能为0');
} }
if (this.$isBlank(this.codeArray[i].batchNo)) { if (this.$isBlank(this.codeArray[i].batchNo)) {
if (!this.codeArray[i].allowNoBatch) {
return this.$message.error('批次号不能为空'); return this.$message.error('批次号不能为空');
}
} }
if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) { if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
return this.$message.error('生产日期与失效日期不能全部为空'); return this.$message.error('生产日期与失效日期不能全部为空');

38
src/views/inout/DialogSelectRl.vue
Unescape Escape View File

@ -451,29 +451,21 @@
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col"> <el-col :span="24" class="el-col">
</el-col> <div style="margin-top: 18px;margin-bottom: 18px">
<el-col :span="4" class="el-col"> <el-checkbox v-model="checked"
<el-form-item prop="name">
<el-checkbox v-model="checked" class="text item itemTag"
:disabled="!isUseDyCheck"
>以使用单元数量入库 >以使用单元数量入库
</el-checkbox> </el-checkbox>
</el-form-item> <el-checkbox v-model="editQuery.isDisable"
</el-col>
<el-col :span="3" class="el-col">
<el-form-item prop="name">
<el-checkbox v-model="editQuery.isLock" class="text item itemTag" :disabled="true"
>是否锁定
</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="3" class="el-col">
<el-form-item prop="name">
<el-checkbox v-model="editQuery.isDisable" class="text item itemTag" :disabled="true"
>是否禁用 >是否禁用
</el-checkbox> </el-checkbox>
</el-form-item> <el-checkbox v-model="editQuery.isAdavence"
>是否寄售
</el-checkbox>
<el-checkbox v-model="editQuery.allowNoBatch"
>是否允许无批次号扫码
</el-checkbox>
</div>
</el-col> </el-col>
</el-row> </el-row>
@ -723,18 +715,18 @@ export default {
id: this.curRow.id, id: this.curRow.id,
bindStatus: 0, bindStatus: 0,
bindRlFk: val.id, bindRlFk: val.id,
mySupId:this.curRow.unitFk, mySupId: this.curRow.unitFk,
}; };
updateBind(query).then((response) => { updateBind(query).then((response) => {
console.log(response.code+response.message) console.log(response.code + response.message)
if (response.code == 20000) { if (response.code == 20000) {
this.$message.success("绑定成功"); this.$message.success("绑定成功");
this.closeBindDialog(this.curRow.id); this.closeBindDialog(this.curRow.id);
} else { } else {
this.$message.error("-----503码？？"+response.message); this.$message.error("-----503码？？" + response.message);
if(response.code == 503){ if (response.code == 503) {
this.closeBindDialog(503); this.closeBindDialog(503);
} }

4
src/views/inout/IOAddOrder.vue
Unescape Escape View File

@ -911,6 +911,7 @@ export default {
event.stopPropagation(); event.stopPropagation();
}; };
var that = this; var that = this;
let sictomText = "";
var inputer = document.getElementById("inputer"); var inputer = document.getElementById("inputer");
window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点 window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点
sc.onInput = function (text) { sc.onInput = function (text) {
@ -920,7 +921,8 @@ export default {
return; return;
} }
if (that.sitcomScan) { if (that.sitcomScan) {
that.formData.code = that.formData.code; sictomText = sictomText+text;
that.formData.code = sictomText;
} else { } else {
that.formData.code = text; that.formData.code = text;
} }

1
src/views/inout/IOCheckWaitOrder.vue
Unescape Escape View File

@ -557,6 +557,7 @@ export default {
}); });
let tquery = { let tquery = {
orderList: orderList, orderList: orderList,
type: 1,
}; };
this.$confirm( this.$confirm(

1
src/views/inout/IONewOrder.vue
Unescape Escape View File

@ -566,6 +566,7 @@ export default {
}); });
let tquery = { let tquery = {
orderList: orderList, orderList: orderList,
type: 2,
}; };
this.$confirm( this.$confirm(

Write Preview
Loading…
Cancel
Save