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

同步设置修改，规格型号问题（未解决)

Browse Source
master
anthonywj 3 years ago
parent 2a536b3dce
commit 169f4fa538
9 changed files with 290 additions and 209 deletions
Show Stats Download Patch File Download Diff File

4
public/config.json
Unescape Escape View File

@ -1,5 +1,5 @@
{ {
"BASE_URL": "http://192.168.0.109:9996", "BASE_URL": "http://127.0.0.1:9996",
"SERVER_IP": "http://192.168.0.109:9996", "SERVER_IP": "http://127.0.0.1:9996",
"hosp_name": "诏安县总医院（测试）" "hosp_name": "诏安县总医院（测试）"
} }

2
src/views/home/index.vue
Unescape Escape View File

@ -390,7 +390,7 @@
<style type="text/scss" lang="scss"> <style type="text/scss" lang="scss">
@import "../../styles/mixin"; @import "../../styles/mixin";
.el-table .cell.el-tooltip { .el-table .cell {
white-space: pre-wrap; white-space: pre-wrap;
} }
.el-header { .el-header {

3
src/views/inventory/invUdiTraceOrder.vue
Unescape Escape View File

@ -87,9 +87,6 @@
</el-table-column> </el-table-column>
<el-table-column label="往来单位" prop="fromCorp" width="250"> <el-table-column label="往来单位" prop="fromCorp" width="250">
<template slot-scope="scope">
{{ scope.row.fromCorp }}
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="创建时间" label="创建时间"

469
src/views/thrsys/SysUdimsConfig.vue
Unescape Escape View File

@ -1,92 +1,171 @@
<template> <template>
<el-card> <el-card>
<el-descriptions class="margin-top" title="数据同步设置" :column="1" :size="100" border> <el-descriptions class="margin-top" title="数据同步设置" :column="1" :size="100" border>
<template slot="extra"> <template slot="extra">
<el-button type="primary" size="small" @click="saveConfig()">保存</el-button> <el-button type="primary" size="small" @click="saveConfig()">保存</el-button>
</template>
<el-descriptions-item>
<template slot="label">
参数设置
</template>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="4" class="el-col" style="margin-top: 6px">
<el-checkbox v-model="configQuery.downstreamEnable">是否连通中继服务</el-checkbox>
</el-col>
<el-col :span="20" class="el-col">
<div>
<span>数据同步轮询时间(单位:分钟):&nbsp;</span>
<el-input
style="width: 100px"
size="small"
type="number"
v-model="configQuery.syncTime"
splaceholder="请输入内容"
></el-input>
</div>
</el-col>
</el-row>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
单据类型
</template>
<el-checkbox v-model="configQuery.typeBus">业务单据类型</el-checkbox>
<el-checkbox v-model="configQuery.typeScan">扫码单据类型</el-checkbox>
<el-checkbox v-model="configQuery.typeThird">第三方单据类型</el-checkbox>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
基础信息
</template>
<el-checkbox v-model="configQuery.basicProducts">耗材字典</el-checkbox>
<el-checkbox v-model="configQuery.basicCorp">往来单位字典</el-checkbox>
<el-checkbox v-model="configQuery.basicInv">仓库字典</el-checkbox>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
第三方基础信息
</template>
<el-checkbox v-model="configQuery.basicThirdProducts">第三方产品信息</el-checkbox>
<el-checkbox v-model="configQuery.basicThirdCorp">第三方往来信息</el-checkbox>
<el-checkbox v-model="configQuery.basicThirdInv">第三方仓库信息</el-checkbox>
<el-checkbox v-model="configQuery.basicThirdBusOrder">第三方业务单据</el-checkbox>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
国家库DI数据
</template>
<el-checkbox v-model="configQuery.dbDiProducts">DI产品信息</el-checkbox>
</el-descriptions-item>
</el-descriptions>
<el-descriptions class="margin-top" title="" :column="1" :size="100" style="margin-top: 30px" border>
<el-descriptions-item>
<template slot="label">
单据(单据状态)
</template>
<el-checkbox v-model="configQuery.orderUnCheck">待校验单据</el-checkbox>
<el-checkbox v-model="configQuery.orderUnReceive">未验收单据</el-checkbox>
<el-checkbox v-model="configQuery.orderScanFinish">已完成单据</el-checkbox>
</el-descriptions-item>
<el-descriptions-item label="单据(单据类型)" label-style="width: 150px">
<div style="float: right;margin-bottom: 10px;margin-right: 25px">
<el-button type="primary" size="small" @click="addBusTypeDialog()">添加扫码单据类型</el-button>
</div>
<el-table
:data="checkedBusTypes"
border
style="width: 100%"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="单据类型"
prop="name"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="单据类型代码"
prop="action"
show-overflow-tooltip
></el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native="remveBus(scope.$index, scope.row)"
>移除
</el-button
>
</template> </template>
<el-descriptions-item> </el-table-column>
<template slot="label"> </el-table>
参数设置
</template> </el-descriptions-item>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="4" class="el-col" style="margin-top: 6px">
<el-checkbox v-model="configQuery.downstreamEnable">下游是否联通</el-checkbox> <!-- <el-descriptions-item label="单据(单据类型)" label-style="width: 150px">-->
</el-col> <!-- <el-checkbox-group v-model="checkedBusTypes" @change="handleCheckedChange">-->
<el-col :span="20" class="el-col"> <!-- <el-checkbox-->
<div> <!-- style="padding-top: 10px"-->
<span>数据同步轮询时间(单位:分钟):&nbsp;</span> <!-- v-for="busType in busTypes" :label="busType" :key="busType.action"-->
<el-input <!-- :value="busType.action">{{ busType.name }}-->
style="width: 100px" <!-- </el-checkbox>-->
size="small" <!-- </el-checkbox-group>-->
type="number" <!-- </el-descriptions-item>-->
v-model="configQuery.syncTime"
splaceholder="请输入内容" </el-descriptions>
></el-input>
</div> <el-dialog
</el-col> title="添加扫码单据类型"
</el-row> :visible.sync="addBusDialogVisible"
width="55%"
</el-descriptions-item> :close-on-click-modal="false"
:close-on-press-escape="false"
<el-descriptions-item> v-if="addBusDialogVisible"
<template slot="label"> >
单据类型
</template> <div style="float: right;margin-bottom: 10px;margin-right: 25px">
<el-checkbox v-model="configQuery.typeBus">业务单据类型</el-checkbox> <el-button type="primary" size="small" @click="addBusType()">选入</el-button>
<el-checkbox v-model="configQuery.typeScan">扫码单据类型</el-checkbox> </div>
<el-checkbox v-model="configQuery.typeThird">第三方单据类型</el-checkbox> <el-table
</el-descriptions-item> :data="busTypes"
border
<el-descriptions-item> style="width: 100%"
<template slot="label"> @selection-change="handleCheckedChange"
基础信息 >
</template> <el-table-column type="selection" width="55" :selectable="checkSelectable"></el-table-column>
<el-checkbox v-model="configQuery.basicProducts">耗材字典</el-checkbox> <el-table-column label="序号" type="index"></el-table-column>
<el-checkbox v-model="configQuery.basicCorp">往来单位字典</el-checkbox> <el-table-column
<el-checkbox v-model="configQuery.basicInv">仓库字典</el-checkbox> label="单据类型"
<el-checkbox v-model="configQuery.basicThirdProducts">第三方产品信息</el-checkbox> prop="name"
<el-checkbox v-model="configQuery.basicThirdCorp">第三方往来信息</el-checkbox> show-overflow-tooltip
<el-checkbox v-model="configQuery.basicThirdInv">第三方仓库信息</el-checkbox> ></el-table-column>
<el-checkbox v-model="configQuery.basicThirdBusOrder">第三方业务单据</el-checkbox> <el-table-column
</el-descriptions-item> label="单据类型代码"
prop="action"
show-overflow-tooltip
<el-descriptions-item> ></el-table-column>
<template slot="label"> </el-table>
国家库DI数据
</template> <el-pagination
<el-checkbox v-model="configQuery.dbDiProducts">DI产品信息</el-checkbox> :page-size="busQuery.limit"
</el-descriptions-item> @current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
</el-descriptions> ></el-pagination>
<el-descriptions class="margin-top" title="" :column="1" :size="100" style="margin-top: 30px" border> </el-dialog>
</el-card>
<el-descriptions-item label="单据(单据类型)" label-style="width: 150px">
<el-checkbox-group v-model="checkedBusTypes" @change="handleCheckedChange" >
<el-checkbox
style="padding-top: 10px"
v-for="busType in busTypes" :label="busType" :key="busType.action"
:value="busType.action">{{ busType.name }}
</el-checkbox>
</el-checkbox-group>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
单据(单据状态)
</template>
<el-checkbox v-model="configQuery.orderUnCheck">待校验单据</el-checkbox>
<el-checkbox v-model="configQuery.orderUnReceive">未验收单据</el-checkbox>
<el-checkbox v-model="configQuery.orderScanFinish">已完成单据</el-checkbox>
</el-descriptions-item>
</el-descriptions>
</el-card>
</template> </template>
<script> <script>
@ -95,112 +174,136 @@ import store from "@/store";
import {getBussinessType} from "@/api/basic/bussinessType"; import {getBussinessType} from "@/api/basic/bussinessType";
export default { export default {
name: "SysUdimsConfig", name: "SysUdimsConfig",
data() { data() {
return { return {
configQuery: { configQuery: {
id: null, id: null,
typeBus: null, typeBus: null,
typeScan: null, typeScan: null,
typeThird: null, typeThird: null,
basicProducts: null, basicProducts: null,
basicCorp: null, basicCorp: null,
basicInv: null, basicInv: null,
basicThirdProducts: null, basicThirdProducts: null,
basicThirdCorp: null, basicThirdCorp: null,
basicThirdInv: null, basicThirdInv: null,
basicThirdBusOrder: null, basicThirdBusOrder: null,
orderScanFinish: null, orderScanFinish: null,
dbDiProducts: null, dbDiProducts: null,
downstreamEnable: null, downstreamEnable: null,
syncTime: null, syncTime: null,
orderUnCheck: null, orderUnCheck: null,
orderUnReceive: null, orderUnReceive: null,
busTypes: [], busTypes: [],
}, },
checkedBusTypes: [], checkedBusTypes: [],
busTypes: [], busQuery: {
} page: 1,
}, limit: 10,
methods: { },
getConfig() { busTypes: [],
findConfig() multipleSelection: [],
.then((response) => { addBusDialogVisible: false,
if (response.code == 20000) { total: 0,
// debugger }
this.configQuery = response.data; },
if (this.configQuery.busTypes != null) { methods: {
for (let i = 0; i < this.configQuery.busTypes.length; i++) { getConfig() {
findConfig()
for (let k = 0; k < this.busTypes.length; k++) { .then((response) => {
if (this.busTypes[k].action == this.configQuery.busTypes[i]) { if (response.code == 20000) {
this.checkedBusTypes.push(this.busTypes[k]); this.configQuery = response.data;
} this.checkedBusTypes = [];
} if (this.configQuery.busTypes != null) {
for (let i = 0; i < this.configQuery.busTypes.length; i++) {
} for (let k = 0; k < this.busTypes.length; k++) {
} if (this.busTypes[k].action == this.configQuery.busTypes[i]) {
this.checkedBusTypes.push(this.busTypes[k]);
console.log(this.checkedBusTypes); this.busTypes[k].isSelect = true;
} else {
this.$message.error(response.message);
} }
}) }
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
saveConfig() {
if (this.checkedBusTypes != null) {
this.configQuery.busTypes = [];
for (let i = 0; i < this.checkedBusTypes.length; i++) {
this.configQuery.busTypes.push(this.checkedBusTypes[i].action);
} }
}
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
saveConfig() {
if (this.checkedBusTypes != null) {
this.configQuery.busTypes = [];
for (let i = 0; i < this.checkedBusTypes.length; i++) {
this.configQuery.busTypes.push(this.checkedBusTypes[i].action);
}
}
updateConfig(this.configQuery)
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.$message.success("更新成功！");
this.getConfig();
} }
})
.catch(() => {
this.loading = false;
});
},
handleCheckedChange(val) {
this.multipleSelection = val;
},
getBusType() {
getBussinessType(this.busQuery)
.then((response) => {
this.busTypes = response.data.list || [];
this.total = response.data.total || 0;
this.getConfig();
})
.catch(() => {
});
},
updateConfig(this.configQuery) addBusTypeDialog() {
.then((response) => { this.addBusDialogVisible = true;
this.loading = false; this.multipleSelection = [];
if (response.code == 20000) { },
this.$message.success("更新成功！");
this.getConfig();
}
})
.catch(() => {
this.loading = false;
});
},
handleCheckedChange() {
},
getBusType() {
let query = {
enabled: true,
};
getBussinessType(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.getConfig();
})
.catch(() => {
});
},
addBusType(){
var selectData = this.multipleSelection;
selectData.forEach((obj) => {
this.checkedBusTypes.push(obj);
});
this.addBusDialogVisible = false;
}, },
created() {
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
};
this.getBusType();
remveBus(index,row){
this.checkedBusTypes.splice(index,1);
},
checkSelectable(row) {
return !row.isSelect;
}, },
handleCurrentChange(val) {
this.busQuery.page = val;
this.getBusType();
},
},
created() {
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
};
this.getBusType();
},
} }
</script> </script>

3
src/views/warehouse/AdditionalOrder.vue
Unescape Escape View File

@ -68,9 +68,6 @@
</el-table-column> </el-table-column>
<el-table-column label="往来单位" prop="fromCorp" width="250"> <el-table-column label="往来单位" prop="fromCorp" width="250">
<template slot-scope="scope">
{{ scope.row.fromCorp }}
</template>
</el-table-column> </el-table-column>
<el-table-column label="当前仓库" prop="locStorageCode" width="150"> <el-table-column label="当前仓库" prop="locStorageCode" width="150">
<template slot-scope="scope"> <template slot-scope="scope">

3
src/views/warehouse/IOCheckErrOrder.vue
Unescape Escape View File

@ -115,9 +115,6 @@
</el-table-column> </el-table-column>
<el-table-column label="往来单位" prop="fromCorp" width="250"> <el-table-column label="往来单位" prop="fromCorp" width="250">
<template slot-scope="scope">
{{ scope.row.fromCorp }}
</template>
</el-table-column> </el-table-column>
<el-table-column label="当前仓库" prop="locStorageCode" width="150"> <el-table-column label="当前仓库" prop="locStorageCode" width="150">
<template slot-scope="scope"> <template slot-scope="scope">

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

@ -78,9 +78,7 @@
</el-table-column> </el-table-column>
<el-table-column label="往来单位" prop="fromCorp" width="220"> <el-table-column label="往来单位" prop="fromCorp" width="220">
<template slot-scope="scope">
{{ scope.row.fromCorp }}
</template>
</el-table-column> </el-table-column>
<el-table-column label="当前仓库" prop="locStorageCode" width="150"> <el-table-column label="当前仓库" prop="locStorageCode" width="150">
<template slot-scope="scope"> <template slot-scope="scope">

8
src/views/warehouse/IOSearchOrder.vue
Unescape Escape View File

@ -91,11 +91,6 @@
prop="id" prop="id"
show-overflow-tooltip="true" show-overflow-tooltip="true"
></el-table-column> ></el-table-column>
<!-- <el-table-column
label="来源订单号"
prop="corpOrderId"
:show-overflow-tooltip="true"
></el-table-column> -->
<el-table-column label="来源" prop="fromType"> <el-table-column label="来源" prop="fromType">
<template slot-scope="scope"> <template slot-scope="scope">
@ -105,9 +100,6 @@
</el-table-column> </el-table-column>
<el-table-column label="往来单位" prop="fromCorp" width="250"> <el-table-column label="往来单位" prop="fromCorp" width="250">
<template slot-scope="scope">
{{ scope.row.fromCorp }}
</template>
</el-table-column> </el-table-column>
<el-table-column label="当前仓库" prop="locStorageCode" width="150"> <el-table-column label="当前仓库" prop="locStorageCode" width="150">
<template slot-scope="scope"> <template slot-scope="scope">

3
src/views/warehouse/IOWaitOrder.vue
Unescape Escape View File

@ -101,9 +101,6 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="往来单位" prop="fromCorp" width="250"> <el-table-column label="往来单位" prop="fromCorp" width="250">
<template slot-scope="scope">
{{ scope.row.fromCorp }}
</template>
</el-table-column> </el-table-column>
<el-table-column label="当前仓库" prop="locStorageCode" width="150"> <el-table-column label="当前仓库" prop="locStorageCode" width="150">
<template slot-scope="scope"> <template slot-scope="scope">

Write Preview
Loading…
Cancel
Save