数据同步相关问题

ywj_dev
anthonywj 2 years ago
parent ba04be815b
commit 8cbe3fc649

@ -9,13 +9,13 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/'
# 吴总测试服务器 # 吴总测试服务器
VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
# 平潭 # 平潭
# VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
# 文明点 # 文明点
# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/' VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/' VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'

@ -4,9 +4,9 @@
<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" label="单据类型:"> <el-form-item class="query-form-item" label="单据类型:">
<el-input <el-input
v-model="filterQuery.name" v-model="filterQuery.name"
placeholder="请输入单据类型" placeholder="请输入单据类型"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item" label="出入库类型:"> <el-form-item class="query-form-item" label="出入库类型:">
@ -32,13 +32,13 @@
> >
<el-button type="primary" icon="el-icon-download" @click="exportJsonFile"></el-button> <el-button type="primary" icon="el-icon-download" @click="exportJsonFile"></el-button>
<el-upload <el-upload
:action="uploadFileUrl" :action="uploadFileUrl"
multiple multiple
:limit="3" :limit="3"
:headers="headers" :headers="headers"
:show-file-list="false" :show-file-list="false"
:on-success="handleChange" :on-success="handleChange"
:file-list="fileList" :file-list="fileList"
> >
<el-button icon="el-icon-upload2" type="primary">导入单据类型</el-button> <el-button icon="el-icon-upload2" type="primary">导入单据类型</el-button>
</el-upload> </el-upload>
@ -79,15 +79,15 @@
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@click.native.stop="handleModifyClick(scope.row)" @click.native.stop="handleModifyClick(scope.row)"
>编辑 >编辑
</el-button </el-button
> >
<el-button <el-button
type="text" type="text"
:disabled="!configParams.typeScan" :disabled="!configParams.typeScan"
@click.native.stop="deleteDialog(scope.row)" @click.native.stop="deleteDialog(scope.row)"
>删除 >删除
</el-button </el-button
> >
@ -97,19 +97,20 @@
</el-table> </el-table>
<el-dialog <el-dialog
title="新增扫码单据类型" title="新增扫码单据类型"
:visible.sync="addDialogVisible" :visible.sync="addDialogVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="addDialogVisible" v-if="addDialogVisible"
class="dialog-two" class="dialog-two"
width="60%" width="60%"
top="5vh" top="5vh"
> >
<modifyDialog :inputQuery="inputQuery"></modifyDialog> <modifyDialog :inputQuery="inputQuery"></modifyDialog>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<!-- :disabled="!configParams.typeScan"-->
<el-button type="primary" size="small" @click="onAddSubmit" <el-button type="primary" size="small" @click="onAddSubmit"
:disabled="!configParams.typeScan"
>提交 >提交
</el-button </el-button
> >
@ -121,12 +122,12 @@
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="编辑单据类型" title="编辑单据类型"
:visible.sync="modifyDialogVisible" :visible.sync="modifyDialogVisible"
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="modifyDialogVisible"
> >
<modifyDialog :inputQuery="inputQuery" :modifySubmit="onModifySubmit"></modifyDialog> <modifyDialog :inputQuery="inputQuery" :modifySubmit="onModifySubmit"></modifyDialog>
<div style="text-align: center;margin-top: 12px"> <div style="text-align: center;margin-top: 12px">
@ -143,11 +144,11 @@
</el-dialog> </el-dialog>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:limit.sync="filterQuery.limit" :limit.sync="filterQuery.limit"
:page.sync="filterQuery.page" :page.sync="filterQuery.page"
@pagination="getList" @pagination="getList"
></pagination> ></pagination>
</el-card> </el-card>
</div> </div>
@ -215,7 +216,7 @@ export default {
scanPreIn: false, scanPreIn: false,
vailInv: false, vailInv: false,
entrutSpms: null, entrutSpms: null,
codeFillCheck: null, codeFillCheck: false,
defaultInv: null, defaultInv: null,
defaultSubInv: null, defaultSubInv: null,
orderVisibleType: null, orderVisibleType: null,
@ -225,8 +226,8 @@ export default {
checkBalance: null, checkBalance: null,
secCheckBalance: null, secCheckBalance: null,
preInBack: true, preInBack: true,
vailDispatch: null, vailDispatch: false,
vailGroupBuy: null, vailGroupBuy: 0,
inStock: false, inStock: false,
actionType: 1, actionType: 1,
fillCodeRel: false, fillCodeRel: false,
@ -291,20 +292,20 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
getBusTypeList(this.filterQuery) getBusTypeList(this.filterQuery)
.then((response) => { .then((response) => {
if (response.code === 20000) { if (response.code === 20000) {
this.list = response.data.list || []; this.list = response.data.list || [];
this.total = response.data.total || 0; this.total = response.data.total || 0;
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
this.loading = false; this.loading = false;
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
this.list = []; this.list = [];
this.total = 0; this.total = 0;
}); });
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.filterQuery.page = val; this.filterQuery.page = val;
@ -341,18 +342,18 @@ export default {
// return; // return;
// } // }
insertBusType(this.inputQuery) insertBusType(this.inputQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.loading = false;
this.cancelDialog();
this.getList();
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false; this.loading = false;
this.cancelDialog(); });
this.getList();
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
});
}, },
onModifySubmit() { onModifySubmit() {
@ -383,26 +384,26 @@ export default {
// } // }
updateBusType(this.inputQuery) updateBusType(this.inputQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.loading = false;
this.cancelDialog();
this.getList();
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false; this.loading = false;
this.cancelDialog(); this.cancelDialog();
this.getList(); });
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.cancelDialog();
});
}, },
exportJsonFile() { exportJsonFile() {
exportFile().then((response) => { exportFile().then((response) => {
const binaryData = []; const binaryData = [];
binaryData.push(response); binaryData.push(response);
let url = window.URL.createObjectURL( let url = window.URL.createObjectURL(
new Blob(binaryData, {type: "application/json"}) new Blob(binaryData, {type: "application/json"})
); );
this.loading = false; this.loading = false;
const eleLink = document.createElement('a'); const eleLink = document.createElement('a');
@ -463,7 +464,7 @@ export default {
scanPreIn: false, scanPreIn: false,
vailInv: false, vailInv: false,
entrutSpms: null, entrutSpms: null,
codeFillCheck: null, codeFillCheck: false,
defaultInv: null, defaultInv: null,
defaultSubInv: null, defaultSubInv: null,
orderVisibleType: null, orderVisibleType: null,
@ -471,8 +472,8 @@ export default {
preIn: null, preIn: null,
originAction: null, originAction: null,
preInBack: true, preInBack: true,
vailDispatch: null, vailDispatch: false,
vailGroupBuy: null, vailGroupBuy: 0,
inStock: false, inStock: false,
actionType: 1, actionType: 1,
fillCodeRel: false, fillCodeRel: false,
@ -505,11 +506,11 @@ export default {
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
this.deleteOrders(rowId); this.deleteOrders(rowId);
}) })
.catch(() => { .catch(() => {
}); });
}, },
deleteOrders(data) { deleteOrders(data) {
@ -518,20 +519,20 @@ export default {
id: data.id + "", id: data.id + "",
}; };
deleteBusType(tquery) deleteBusType(tquery)
.then((response) => { .then((response) => {
this.getList(); this.getList();
if (response.code == 20000) { if (response.code == 20000) {
this.$message({ this.$message({
type: "success", type: "success",
message: "删除成功!", message: "删除成功!",
}); });
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
}) })
.catch(() => { .catch(() => {
}); });
}, },
handleChange(response, files, fileList) { handleChange(response, files, fileList) {
if (response.code != 20000) { if (response.code != 20000) {
@ -554,13 +555,13 @@ export default {
}, },
getSyncConfig() { getSyncConfig() {
findConfig() findConfig()
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.configParams = response.data; this.configParams = response.data;
} }
}) })
.catch(() => { .catch(() => {
}); });
}, },
}, },
components: { components: {

@ -64,51 +64,52 @@
</el-row> </el-row>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <!-- <el-descriptions-item>-->
<template slot="label"> <!-- <template slot="label">-->
运行参数 <!-- 运行参数-->
</template> <!-- </template>-->
<el-checkbox v-model="configQuery.entrustAction" :disabled="configQuery.downstreamEnable"> <!-- <el-checkbox v-model="configQuery.entrustAction" :disabled="configQuery.downstreamEnable">-->
</el-checkbox> <!-- </el-checkbox>-->
</el-descriptions-item> <!-- </el-descriptions-item>-->
<el-descriptions-item> <!-- <el-descriptions-item>-->
<template slot="label"> <!-- <template slot="label">-->
单据类型 <!-- 单据类型-->
</template> <!-- </template>-->
<el-checkbox v-model="configQuery.typeBus" :disabled="configQuery.downstreamEnable"></el-checkbox> <!-- <el-checkbox v-model="configQuery.typeBus" :disabled="configQuery.downstreamEnable"></el-checkbox>-->
<el-checkbox v-model="configQuery.typeScan" :disabled="configQuery.downstreamEnable"> <!-- <el-checkbox v-model="configQuery.typeScan" :disabled="configQuery.downstreamEnable">-->
</el-checkbox> <!-- </el-checkbox>-->
<el-checkbox v-model="configQuery.typeThird" :disabled="configQuery.downstreamEnable"> <!-- <el-checkbox v-model="configQuery.typeThird" :disabled="configQuery.downstreamEnable">-->
</el-checkbox> <!-- </el-checkbox>-->
</el-descriptions-item> <!-- </el-descriptions-item>-->
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
基础信息 基础信息
</template> </template>
<el-checkbox v-model="configQuery.sysUser" :disabled="configQuery.downstreamEnable"></el-checkbox> <!-- <el-checkbox v-model="configQuery.sysUser" :disabled="configQuery.downstreamEnable"></el-checkbox>-->
<el-checkbox v-model="configQuery.basicProducts" :disabled="configQuery.downstreamEnable">
</el-checkbox>
<el-checkbox v-model="configQuery.basicType" :disabled="configQuery.downstreamEnable"> <el-checkbox v-model="configQuery.basicType" :disabled="configQuery.downstreamEnable">
</el-checkbox> </el-checkbox>
<el-checkbox v-model="configQuery.basicCorp" :disabled="configQuery.downstreamEnable"> <el-checkbox v-model="configQuery.basicProducts" :disabled="configQuery.downstreamEnable">
</el-checkbox>
<el-checkbox v-model="configQuery.basicDept" :disabled="configQuery.downstreamEnable"></el-checkbox>
<el-checkbox v-model="configQuery.basicInv" :disabled="configQuery.downstreamEnable"></el-checkbox>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
第三方基础信息
</template>
<el-checkbox v-model="configQuery.basicThirdProducts" :disabled="configQuery.downstreamEnable">
</el-checkbox>
<el-checkbox v-model="configQuery.basicThirdCorp" :disabled="configQuery.downstreamEnable">
</el-checkbox>
<el-checkbox v-model="configQuery.basicThirdInv" :disabled="configQuery.downstreamEnable">
</el-checkbox> </el-checkbox>
<el-checkbox v-model="configQuery.basicThirdBusOrder" :disabled="configQuery.downstreamEnable">
<el-checkbox v-model="configQuery.basicCorp" :disabled="configQuery.downstreamEnable">
</el-checkbox> </el-checkbox>
<!-- <el-checkbox v-model="configQuery.basicDept" :disabled="configQuery.downstreamEnable"></el-checkbox>-->
<!-- <el-checkbox v-model="configQuery.basicInv" :disabled="configQuery.downstreamEnable"></el-checkbox>-->
</el-descriptions-item> </el-descriptions-item>
<!-- <el-descriptions-item>-->
<!-- <template slot="label">-->
<!-- 第三方基础信息-->
<!-- </template>-->
<!-- <el-checkbox v-model="configQuery.basicThirdProducts" :disabled="configQuery.downstreamEnable">-->
<!-- </el-checkbox>-->
<!-- <el-checkbox v-model="configQuery.basicThirdCorp" :disabled="configQuery.downstreamEnable">-->
<!-- </el-checkbox>-->
<!-- <el-checkbox v-model="configQuery.basicThirdInv" :disabled="configQuery.downstreamEnable">-->
<!-- </el-checkbox>-->
<!-- <el-checkbox v-model="configQuery.basicThirdBusOrder" :disabled="configQuery.downstreamEnable">-->
<!-- </el-checkbox>-->
<!-- </el-descriptions-item>-->
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">

@ -13,42 +13,44 @@
<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="el-icon-search" @click="getList"></el-button> <el-button type="primary" icon="el-icon-search" @click="getList"></el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleAddClick" <el-button type="primary" icon="el-icon-plus" @click="handleAddClick"
:disabled="!configParms.entrustAction"
>新增 >新增
</el-button </el-button
> >
<!-- :disabled="!configParms.entrustAction"-->
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="list" style="width: 100%" border> <el-table v-loading="loading" :data="list" style="width: 100%" border>
<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="curName" ></el-table-column> <el-table-column label="扫码单据类型" prop="curName"></el-table-column>
<el-table-column label="当前仓库" prop="curInvName" ></el-table-column> <el-table-column label="当前仓库" prop="curInvName"></el-table-column>
<el-table-column label="委托验收仓库" prop="entrustInvName" ></el-table-column> <el-table-column label="委托验收仓库" prop="entrustInvName"></el-table-column>
<el-table-column label="委托验收人" prop="employeeName" > <el-table-column label="委托验收人" prop="employeeName">
</el-table-column> </el-table-column>
<el-table-column label="操作" > <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
size="small" size="small"
:disabled="!configParms.entrustAction"
@click.native.stop="handleModifyClick(scope.row)" @click.native.stop="handleModifyClick(scope.row)"
>编辑 >编辑
</el-button </el-button
> >
<!-- :disabled="!configParms.entrustAction"-->
<el-button <el-button
type="text" type="text"
size="small" size="small"
:disabled="!configParms.entrustAction"
@click.native.stop="deleteDialog(scope.row)" @click.native.stop="deleteDialog(scope.row)"
>删除 >删除
</el-button </el-button
> >
</template> </template>
<!-- :disabled="!configParms.entrustAction"-->
</el-table-column> </el-table-column>
</el-table> </el-table>

@ -35,7 +35,7 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: `http://127.0.0.1:9993/`, target: `http://192.168.0.166:9993/`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: '' ['^' + process.env.VUE_APP_BASE_API]: ''

Loading…
Cancel
Save