Merge branch 'master' into CTP

ywj_dev
CTP 2 years ago
commit 1a1e459090

@ -0,0 +1,20 @@
# 页面标题
VUE_APP_TITLE = 供应商自助管理平台
# 开发环境配置
ENV = 'test'
# 若依管理系统/开发环境
VUE_APP_BASE_API = 'http://192.168.0.66:8881/UDI_SPMS_SERVER'
# 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/'
# 监控地址
VUE_APP_MONITRO_ADMIN = 'http://localhost:9090/admin/login'
# xxl-job 控制台地址
VUE_APP_XXL_JOB_ADMIN = 'http://localhost:9100/xxl-job-admin'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

@ -6,7 +6,8 @@
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"dev": "vue-cli-service serve", "dev": "vue-cli-service serve",
"build:prod": "vue-cli-service build", "build:prod": "vue-cli-service build --mode production",
"build:test": "vue-cli-service build --mode test",
"preview": "node build/index.js --preview", "preview": "node build/index.js --preview",
"lint": "eslint --ext .js,.vue src" "lint": "eslint --ext .js,.vue src"
}, },

@ -49,6 +49,13 @@ export function submitBiz(query) {
}); });
} }
export function submitAllocateBiz(query) {
return axios({
url: "/warehouse/inout/waitAllocate/submitOrderWeb",
method: "post",
data: query
});
}
export function saveOrderWeb(query) { export function saveOrderWeb(query) {
return axios({ return axios({

@ -41,7 +41,6 @@ export function insertInvoice(params) {
} }
export function getCheckDetailList(params) { export function getCheckDetailList(params) {
return axios({ return axios({
url: "/udiwms/inout/wditCheck/filterList", url: "/udiwms/inout/wditCheck/filterList",
@ -50,6 +49,14 @@ export function getCheckDetailList(params) {
}); });
} }
export function getWaitAllocateList(params) {
return axios({
url: "/udiwms/inout/waitAllocate/filterList",
method: "get",
params: params
});
}
export function updateOrder(params) { export function updateOrder(params) {
return axios({ return axios({

@ -25,4 +25,13 @@ export function findConfig(query) {
}); });
} }
export function downloadFile(query) {
return axios({
url: "/sps/sync/download/info/file",
method: "get",
params: query,
responseType: 'blob'
});
}

@ -96,7 +96,8 @@ export default {
handleCurrentChange(val) { handleCurrentChange(val) {
this.$emit('pagination', { page: val, limit: this.pageSize }) this.$emit('pagination', { page: val, limit: this.pageSize })
if (this.autoScroll) { if (this.autoScroll) {
scrollTo(0, 800) //
// scrollTo(0, 800)
} }
} }
} }

@ -0,0 +1,9 @@
export function DefaultCheck (line,dataList){
this.$nextTick(() => {
if (line === null) {
this.$refs.refDom.setCurrentRow(dataList[0]);
} else {
this.$refs.refDom.setCurrentRow(line,true);
}
});
}

@ -526,11 +526,14 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.checkWebNew" style="width: 65%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkWebNew" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" placeholder="是否启用"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="不启用" :value="false"></el-option> <el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
@ -546,11 +549,14 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.checkPdaUn" style="width: 65%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkPdaUn" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" placeholder="是否启用"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="不启用" :value="false"></el-option> <el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
@ -566,11 +572,14 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.checkPdaEd" style="width: 65%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkPdaEd" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" placeholder="是否启用"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="不启用" :value="false"></el-option> <el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
@ -586,11 +595,14 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.checkUdims" style="width: 65%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkUdims" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" placeholder="是否启用"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="不启用" :value="false"></el-option> <el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
@ -606,11 +618,14 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.checkPc" style="width: 65%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkPc" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" placeholder="是否启用"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="不启用" :value="false"></el-option> <el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
@ -626,11 +641,14 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.checkSp" style="width: 65%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkSp" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" placeholder="是否启用"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="不启用" :value="false"></el-option> <el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
@ -645,11 +663,14 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.checkChange" style="width: 65%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkChange" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" placeholder="是否启用"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="不启用" :value="false"></el-option> <el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
@ -665,11 +686,14 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.checkBalance" :disabled="!inputQuery.checkEnable" style="width: 65%" <el-select v-model="inputQuery.checkBalance" :disabled="!inputQuery.checkEnable" style="width: 75%"
placeholder="是否启用" placeholder="是否启用"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="不启用" :value="false"></el-option> <el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
@ -684,11 +708,14 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.checkCopy" style="width: 65%" :disabled="!inputQuery.checkEnable" <el-select v-model="inputQuery.checkCopy" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用" placeholder="是否启用"
> >
<el-option label="启用" :value="true"></el-option> <el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="不启用" :value="false"></el-option> <el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>

@ -13,7 +13,7 @@
<el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择处理状态"> <el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择处理状态">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
<el-option label="处理中" value="0"></el-option> <el-option label="处理中" value="0"></el-option>
<el-option label="已处理" value="1"></el-option> <el-option label="已处理" value="3"></el-option>
<el-option label="异常" value="2"></el-option> <el-option label="异常" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>

@ -159,7 +159,8 @@ export default {
page: 1, page: 1,
limit: 20, limit: 20,
addType: 1, addType: 1,
diType: 1 diType: 1,
bindType: 1
}; };
this.getList(); this.getList();
}, },

File diff suppressed because it is too large Load Diff

@ -647,7 +647,7 @@ export default {
} }
, ,
created() { created() {
// this.getList(); this.getList();
this.selectSysParam(); this.selectSysParam();
this.getSysFilter(); this.getSysFilter();
this.findMethod(); this.findMethod();

@ -18,6 +18,12 @@
>立即提交 >立即提交
</el-button </el-button
> >
<el-button size="mini" type="primary" @click.native="submit(1)"
v-if="curAction.checkWebNew == 3"
>未配货提交
</el-button>
</el-button-group> </el-button-group>
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
@ -232,7 +238,7 @@
<script> <script>
import { import {
submitBiz, addOrderWeb, submitCodes, submitOrderWeb, saveOrderWeb, submitBiz, addOrderWeb, submitCodes, submitOrderWeb, saveOrderWeb,
updateCodeBindSup, enterCodeWeb updateCodeBindSup, enterCodeWeb, submitAllocateBiz
} from "../../api/inout/order"; } from "../../api/inout/order";
import {findByFrom, findInvByUser} from "../../api/system/invSubWarehouse"; import {findByFrom, findInvByUser} from "../../api/system/invSubWarehouse";
import {parseTime} from "../../utils/coTools"; import {parseTime} from "../../utils/coTools";
@ -261,7 +267,7 @@ export default {
type: Object, type: Object,
required: true, required: true,
}, },
viewType: { //12.3 viewType: { //12.3,4.
type: Object, type: Object,
required: true, required: true,
}, },
@ -447,7 +453,7 @@ export default {
// //
actionChange(item) { actionChange(item) {
this.curAction = this.getActionItem(item); this.curAction = this.getActionItem(item);
if ((this.curAction.checkEnable && this.curAction.checkWebNew) || this.viewType == 1) { if ((this.curAction.checkEnable && this.curAction.checkWebNew != 0) || this.viewType == 1) {
// 1 // 1
this.bizShow = true; this.bizShow = true;
} else } else
@ -602,8 +608,7 @@ export default {
}); });
return; return;
} } else if (response.code == 604) {
else if (response.code == 604) {
this.$confirm(response.message, "提示", { this.$confirm(response.message, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
@ -614,8 +619,7 @@ export default {
}); });
return; return;
} } else if (response.code == 507) {
else if (response.code == 507) {
this.editOriginCodeVisible = true; this.editOriginCodeVisible = true;
this.editTitle = response.message; this.editTitle = response.message;
this.codeFormData.produceDate = response.data.produceDate; this.codeFormData.produceDate = response.data.produceDate;
@ -661,10 +665,10 @@ export default {
}, },
submit() { submit(val) {
let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData))); let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
tQuery.orderId = this.orderFormData.billNo; tQuery.orderId = this.orderFormData.billNo;
if (this.viewType == 2) { if (this.viewType == 2) { //
submitCodes(tQuery) submitCodes(tQuery)
.then((response) => { .then((response) => {
if (response.code === 20000) { if (response.code === 20000) {
@ -674,17 +678,29 @@ export default {
this.$message.error(response.message); this.$message.error(response.message);
} }
}); });
} else if (this.viewType == 1) { } else if (this.viewType == 1) { //
submitBiz(tQuery) if (val == 1 || this.curAction.checkWebNew == 2)
.then((response) => { tQuery.fromVailPi = 2;
if (response.code === 20000) { else
this.$message.success("提交成功"); tQuery.fromVailPi = 1;
this.closeDialog(); submitBiz(tQuery).then((response) => {
} else { if (response.code === 20000) {
this.$message.error(response.message); this.$message.success("提交成功");
} this.closeDialog();
}); } else {
} else this.$message.error(response.message);
}
});
} else if (this.viewType == 4) {
submitAllocateBiz(tQuery).then((response) => {
if (response.code === 20000) {
this.$message.success("提交成功");
this.closeDialog();
} else {
this.$message.error(response.message);
}
});
} else { //
submitOrderWeb(tQuery) submitOrderWeb(tQuery)
.then((response) => { .then((response) => {
if (response.code === 20000) { if (response.code === 20000) {
@ -694,7 +710,9 @@ export default {
this.$message.error(response.message); this.$message.error(response.message);
} }
}); });
}, }
}
,
saveOrder() { saveOrder() {
let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData))); let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
tQuery.billNo = this.orderFormData.billNo; tQuery.billNo = this.orderFormData.billNo;
@ -710,7 +728,8 @@ export default {
} }
this.loading = false; this.loading = false;
}); });
}, }
,
// //
@ -721,7 +740,8 @@ export default {
// //
this.$refs["dataForm"].resetFields(); this.$refs["dataForm"].resetFields();
} }
}, }
,
enterKey(event) { enterKey(event) {
this.checkSuccess = true; this.checkSuccess = true;
let tQuery = { let tQuery = {
@ -774,28 +794,34 @@ export default {
} }
this.loading = false; this.loading = false;
}); });
}, }
,
getInputFocus(event) { getInputFocus(event) {
event.currentTarget.select(); event.currentTarget.select();
}, }
,
tableSelection() { tableSelection() {
this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleAllSelection(); this.$refs.multipleTable.toggleAllSelection();
}, }
,
handleSizeChange(val) { handleSizeChange(val) {
this.query.limit = val; this.query.limit = val;
this.getCodeList(); this.getCodeList();
}, }
,
handleCurrentChange(val) { handleCurrentChange(val) {
this.query.page = val; this.query.page = val;
this.getCodeList(); this.getCodeList();
}, }
,
intentBack() { intentBack() {
this.$router.go(-1); this.$router.go(-1);
}, }
,
selectSupUnit(row) { selectSupUnit(row) {
let query = { let query = {
id: this.curRow.id, id: this.curRow.id,
@ -812,11 +838,13 @@ export default {
}).catch(() => { }).catch(() => {
}); });
}, }
,
closeCodeDialog() { closeCodeDialog() {
this.editOriginCodeVisible = false; this.editOriginCodeVisible = false;
this.refreshCodesPanel(); this.refreshCodesPanel();
}, }
,
}, },
filters: {}, filters: {},
mounted() { mounted() {

@ -0,0 +1,677 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="单号:">
<el-input v-model="filterQuery.billNo" placeholder="单号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="出入库类型:">
<el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
<el-option label="全部" value=""></el-option>
<el-option label="入库" value="WareHouseIn"></el-option>
<el-option label="出库" value="WareHouseOut"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%"
clearable>
<el-option
v-for="item in busTypes"
:key="item.name"
:label="item.name"
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="采购仓库:">-->
<!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in deptList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="所属仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%"
@change="invChange"
>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 90%"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
<el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onReset"
>重置
</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"
>查询
</el-button
>
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%"
highlight-current-row
@row-click="handleSelectionChange"
border
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="往来单位" prop="fromName" width="220">
</el-table-column>
<el-table-column label="所属部门" prop="deptName" width="120">
</el-table-column>
<el-table-column label="所属仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="140">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
<el-table-column label="单据状态" prop="status" width="100">
<template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.status)">{{
checkStatus[scope.row.status]
}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="150" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="addOrders(scope.row)"
>编辑
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row.billNo)"
>删除
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="onUpload(scope.row.billNo)"
>校验提交
</el-button
>
</template>
</el-table-column>
</el-table>
<el-dialog
title="编辑单据"
:visible.sync="addOrderVisible"
width="85%"
append-to-body
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="addOrderVisible"
@close='closeDialog'
>
<addOrder
:closeDialog="closeDialog"
:orderQuery="idQuery"
:viewType="viewType"
></addOrder>
</el-dialog>
<el-dialog
title="单号详情"
:visible.sync="codeDetailVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="80%"
v-if="codeDetailVisible"
>
<codeDetail
:idQuery="idQuery"
v-on:closeDetailDialog="closeDetailDialog"
></codeDetail>
</el-dialog>
<pagination
v-show="total>0"
:total="total"
:page.sync="filterQuery.page"
:limit.sync="filterQuery.limit"
@pagination="getList"
/>
</el-card>
<el-tabs type="border-card" style="margin: 15px">
<!--单据业务详情-->
<el-tab-pane>
<span slot="label">单据 {{ currentRow == null ? '' : currentRow.billNo }}-业务扫码校验结果</span>
<!--<el-form :inline="true" :model="bizQuery" class="query-form" size="mini">-->
<!-- <el-form-item class="query-form-item" label="物资名称:">-->
<!-- <el-input-->
<!-- v-model="bizQuery.productName"-->
<!-- placeholder="请输入物资名称"-->
<!-- clearable-->
<!-- >-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item>-->
<!-- <el-button-group>-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- icon="el-icon-refresh"-->
<!-- @click="onBizReset"-->
<!-- >重置-->
<!-- </el-button>-->
<!-- <el-button type="primary" @click="onBizSubmit"-->
<!-- icon="el-icon-search"-->
<!-- >查询-->
<!-- </el-button>-->
<!-- </el-button-group>-->
<!-- </el-form-item>-->
<!--</el-form>-->
<el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
:row-style="rowStyle"
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="物资名称" width="150"
prop="coName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="规格型号" width="150"
prop="spec"
></el-table-column>
<el-table-column
header-align="center"
label="单据数量" width="100"
prop="count"
></el-table-column>
<el-table-column
header-align="center"
label="扫码数量" width="100"
prop="scanCount"
></el-table-column>
<el-table-column
label="价格"
prop="price" width="100"
></el-table-column>
<el-table-column width="100" label="计量单位" prop="measname">
</el-table-column>
<el-table-column
label="生产企业"
prop="manufacturer" width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案号" width="160"
prop="certCode"
show-overflow-tooltip
></el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import {
deleteByOrderId,
submitOrderWeb,
updateUnit, mergeOrder,
getOrderList, submitAllocateBiz
} from "../../api/inout/order";
import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
import draggable from "vuedraggable";
import addOrder from "./DialogCreateOrder";
import store from "../../store";
import {getInvListByUser} from "@/api/system/invWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busType";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {isBlank} from "@/utils/strUtil";
import {getBizDetailList, getWaitAllocateList} from "@/api/inout/orderDetailBiz";
export default {
name: "IoWaitAllocateOrder",
data() {
return {
showSearch: true,
filterQuery: {
id: "",
billNo: null,
mainAction: null,
action: null,
statusType: "unAllocate",
page: 1,
limit: 10,
startTime: null,
endTime: null,
invCode: this.$store.getters.locInvCode,
},
viewType: 4,
checkStatus: {
1: "草稿",
2: "等待处理",
3: "等待校验",
4: "处理异常",
5: "校验成功",
6: "校验异常",
7: "审核通过",
8: "审核拒绝",
9: "正在处理", 10: "待审核",
11: "待配货",
},
curIndex: "",
idQuery: {},
storageList: [],
invList: [],
list: [],
codeDetailVisible: false,
addOrderVisible: false,
total: 0,
loading: false,
index: null,
formName: null,
errorDetail: "",
formMap: {
add: "新增",
edit: "编辑",
},
enableDept: false,
fromTypeMap: {
"1": "UDIMS平台",
"2": "网页新增",
"3": "pda即时校验",
"4": "pda未校验",
"5": "pc端扫码精灵",
"6": "流转自动补单",
"7": "UDI供应商平台",
"8": "平衡补录单据",
"10": "手动补单",
"11": "仓库盘点",
"12": "采购计划",
"13": "领用单据",
"14": "第三方系统单据",
},
deleteData: {
billNo: "",
status: 10,
},
dialogTableVisible: false,
formLoading: false,
deleteLoading: false,
busTypes: [],
actDateRange: [],
pickerOptions: {
shortcuts: [
{
text: "最近一周",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近一个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近三个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit("pick", [start, end]);
},
},
],
},
currentRow: {
billNo: ""
},
bizQuery: {
productName: null,
orderIdFk: null,
page: 1,
limit: 10
},
bizTotal: 0,
bizDetailLoading: false,
bizDetailList: [],
};
},
components: {
addOrder,
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
id: "",
billNo: null,
mainAction: null,
action: null,
statusType: "unAllocate",
page: 1,
limit: 10,
startTime: null,
endTime: null,
invCode: this.$store.getters.locInvCode,
};
this.actDateRange = [];
this.getList();
},
onSubmit() {
if (this.actDateRange !== null) {
this.filterQuery.startTime = this.actDateRange[0];
this.filterQuery.endTime = this.actDateRange[1];
} else {
this.filterQuery.startTime = null;
this.filterQuery.endTime = null;
}
this.filterQuery.page = 1;
this.getList();
},
hideSearch() {
this.showSearch = !this.showSearch;
},
handleSizeChange(val) {
this.filterQuery.limit = val;
this.getList();
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
closeDetailDialog(val) {
this.codeDetailVisible = false;
},
getBusType() {
let query = {
code: this.filterQuery.invCode,
enabled: true,
vueType: "supDelivery",
};
getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.getList();
})
.catch(() => {
});
},
addOrders(row) {
this.currentRow = row;
this.idQuery = {};
this.idQuery = row;
this.addOrderVisible = true;
},
closeDialog() {
this.addOrderVisible = false;
this.addHosOrderVisible = false;
this.getList();
},
//
getList() {
this.loading = true;
getOrderList(this.filterQuery)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.list = response.data.list || [];
this.total = response.data.total || 0;
if (this.list.length == 0) {
this.bizDetailList = [];
}
} else {
this.$message.error(response.message);
}
})
.catch((error) => {
this.$message.error(error.message)
this.loading = false;
this.list = [];
this.total = 0;
});
},
deleteOrders(data) {
this.loading = true;
this.deleteData.billNo = data;
deleteByOrderId(this.deleteData)
.then((response) => {
if (response.code == 20000) {
this.getList();
this.$message({
type: "success",
message: "删除成功!",
});
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据!");
this.getList();
}
})
.catch(() => {
});
},
deleteDialog(rowId) {
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.deleteOrders(rowId);
})
.catch(() => {
});
},
onUpload(data) {
this.loading = true;
var idQuery = {
billNo: "",
};
idQuery.billNo = data;
submitAllocateBiz(idQuery)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.$message.success("提交成功");
this.getList();
this.bizDetailList = [];
} else {
this.$message.error(response.message);
}
this.loading = false;
});
},
getInvList() {
getInvListByUser()
.then((response) => {
this.invList = response.data || [];
})
.catch(() => {
});
},
invChange() {
this.filterQuery.action = null;
this.getBusType();
},
statusFilterType(status) {
const statusMap = {
2: "warning",
1: "warning",
4: "danger",
3: "success",
};
return statusMap[status];
},
rowStyle({row, rowIndex}) {
let rowBackground = {};
if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.bindRlFk)) {
rowBackground.color = '#f60303';
return rowBackground;
}
if (!row.checkSuccess) {
rowBackground.color = '#f60303';
}
return rowBackground;
},
onBizReset() {
this.bizQuery = {
productName: null,
orderIdFk: null,
page: 1,
limit: 10
};
this.getBizDetailList();
},
onBizSubmit() {
this.bizQuery.page = 1;
this.getBizDetailList();
},
handleSelectionChange(val) {
this.currentRow = val;
this.getBizDetailList();
},
getBizDetailList() {
if (this.currentRow == null || isBlank(this.currentRow.billNo)) {
this.$message.error("请先选择需要查询的单据!")
return;
}
this.bizDetailLoading = true;
this.bizQuery.orderIdFk = this.currentRow.billNo;
getWaitAllocateList(this.bizQuery).then((res) => {
this.bizDetailLoading = false;
if (res.code === 20000) {
this.bizDetailList = res.data || [];
} else {
this.$message.error(res.message);
this.bizDetailList = [];
}
}).catch((error) => {
this.bizDetailLoading = false;
this.$message.error(error.message);
this.bizDetailList = [];
this.bizTotal = 0;
})
},
},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
this.getInvList();
this.getBusType();
selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
if (res.code === 20000) {
if (res.data.paramValue === "0") {
this.enableDept = true;
}
}
});
this.getList();
},
};
</script>
<style type="text/scss" lang="scss">
</style>

@ -88,6 +88,7 @@
:loading="corpLoading" :loading="corpLoading"
@change="corpChange" @change="corpChange"
style="width: 90%" style="width: 90%"
@clear="clear"
> >
<el-option <el-option
v-for="item in fromOptions" v-for="item in fromOptions"
@ -272,6 +273,11 @@ export default {
event.target.select(); event.target.select();
}, },
clear(){
this.findMethod();
},
getList() { getList() {
this.loading = true; this.loading = true;
// this.filterQuery.supId = this.$store.getters.customerId; // this.filterQuery.supId = this.$store.getters.customerId;

@ -88,6 +88,7 @@
:loading="corpLoading" :loading="corpLoading"
@change="corpChange" @change="corpChange"
style="width: 90%" style="width: 90%"
@clear="clear"
> >
<el-option <el-option
v-for="item in fromOptions" v-for="item in fromOptions"
@ -270,6 +271,9 @@ export default {
this.getList(); this.getList();
event.target.select(); event.target.select();
}, },
clear(){
this.findMethod();
},
getList() { getList() {
this.loading = true; this.loading = true;

@ -87,6 +87,7 @@
:loading="corpLoading" :loading="corpLoading"
@change="corpChange" @change="corpChange"
style="width: 90%" style="width: 90%"
@clear="clear"
> >
<el-option <el-option
v-for="item in fromOptions" v-for="item in fromOptions"
@ -280,7 +281,9 @@ export default {
this.getList(); this.getList();
event.target.select(); event.target.select();
}, },
clear(){
this.findMethod();
},
onSubmit() { onSubmit() {
this.filterQuery.page = 1; this.filterQuery.page = 1;

@ -211,6 +211,8 @@ export default {
onSubmitFind() { onSubmitFind() {
this.filterQuery.page = 1; this.filterQuery.page = 1;
this.getList(); this.getList();
this.detailList=[];
}, },
getList() { getList() {
@ -355,10 +357,10 @@ export default {
} }
, ,
created() { created() {
let end = new Date(); // let end = new Date();
let start = new Date(); // let start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); // start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
this.actDateRange = [start, end]; // this.actDateRange = [start, end];
this.getList(); this.getList();
} }
, ,

@ -113,6 +113,7 @@
<script> <script>
import {getResultDetailList, getResultOrderList} from '@/api/inout/orderDetailResult' import {getResultDetailList, getResultOrderList} from '@/api/inout/orderDetailResult'
import {isBlank} from "@/utils/strUtil";
export default { export default {
name: "supInoutSearchOrder", name: "supInoutSearchOrder",
@ -190,7 +191,7 @@ export default {
limit: 10, limit: 10,
startAduditTime: null, startAduditTime: null,
endAduditTime: null, endAduditTime: null,
actionType: "norDetail", actionType: this.actionType,
}; };
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
@ -216,6 +217,9 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
this.filterQuery.actionType = this.actionType; this.filterQuery.actionType = this.actionType;
if (isBlank(this.filterQuery.actionType)) {
this.filterQuery.actionType = "norDetail";
}
getResultOrderList(this.filterQuery) getResultOrderList(this.filterQuery)
.then((response) => { .then((response) => {
if (response.code === 20000) { if (response.code === 20000) {

@ -3,9 +3,17 @@
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch"> <el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="6" v-if="this.ckeck">
<el-form-item class="query-form-item" label="配送企业名称:">
<el-input v-model="filterQuery.name" placeholder="配送企业名称"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item class="query-form-item" label="名称:"> <el-form-item class="query-form-item" label="证书名称:">
<el-input v-model="filterQuery.name" placeholder="名称" <el-input v-model="filterQuery.certName" placeholder="证书名称"
style="width: 90%" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
@ -52,6 +60,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
@ -217,11 +226,13 @@ export default {
type: 1, type: 1,
page: 1, page: 1,
limit: 20, limit: 20,
certName:null
}, },
list: [], list: [],
total: 0, total: 0,
loading: true, loading: true,
index: null, index: null,
ckeck:null,
statusMap: { statusMap: {
1: "未确认", 1: "未确认",
2: "已确认" 2: "已确认"
@ -342,6 +353,9 @@ export default {
created() { created() {
// //
this.getList(); this.getList();
if(this.$store.getters.customerId == 110){
this.ckeck=true;
}
}, },
}; };
</script> </script>

@ -4,7 +4,7 @@
<el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch"> <el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="产品编码:"> <el-form-item label="物资编码:">
<el-input v-model="filterQuery.code" placeholder="请输入产品编码/商品条码/医保编码" clearable <el-input v-model="filterQuery.code" placeholder="请输入产品编码/商品条码/医保编码" clearable
style="width: 90%" @keyup.enter.native="keyupErp_submit($event)" style="width: 90%" @keyup.enter.native="keyupErp_submit($event)"
></el-input> ></el-input>

@ -5,8 +5,8 @@
<el-collapse-item title="数据同步设置" name="1"> <el-collapse-item title="数据同步设置" name="1">
<el-descriptions class="margin-top" :column="1" :size="100" border> <el-descriptions class="margin-top" :column="1" :size="100" border>
<template slot="extra"> <template slot="extra">
<el-button type="primary" size="small" @click="saveConfig()" <el-button type="primary" size="small" @click="saveConfig()" disabled
>保存 >保存
</el-button> </el-button>
</template> </template>
<el-descriptions-item> <el-descriptions-item>
@ -14,6 +14,7 @@
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="6" class="el-col"> <el-col :span="6" class="el-col">
<el-switch <el-switch
disabled
v-model="configQuery.downstreamEnable" v-model="configQuery.downstreamEnable"
active-text="是否启用数据同步" active-text="是否启用数据同步"
> >
@ -22,7 +23,7 @@
<el-col :span="14" class="el-col"> <el-col :span="14" class="el-col">
<div> <div>
<span style="color: red" <span style="color: red"
>说明:&nbsp;修改同步参数时,请关闭数据同步服务 >说明:&nbsp;修改同步参数时,请关闭数据同步服务
</span> </span>
</div> </div>
</el-col> </el-col>
@ -40,7 +41,7 @@
style="width: 50%" style="width: 50%"
size="small" size="small"
v-model="configQuery.syncIp" v-model="configQuery.syncIp"
:disabled="configQuery.downstreamEnable" disabled
splaceholder="请输入内容" splaceholder="请输入内容"
></el-input> ></el-input>
<el-button <el-button
@ -48,9 +49,9 @@
size="small" size="small"
@click="testConnect()" @click="testConnect()"
style="margin-left: 20px" style="margin-left: 20px"
:disabled="configQuery.downstreamEnable" disabled
:loading="testLoading" :loading="testLoading"
>测试连通 >测试连通
</el-button> </el-button>
</div> </div>
</el-col> </el-col>
@ -113,6 +114,7 @@
style="width: 100px" style="width: 100px"
size="small" size="small"
type="number" type="number"
disabled
v-model="configQuery.syncTime" v-model="configQuery.syncTime"
splaceholder="请输入内容" splaceholder="请输入内容"
></el-input> ></el-input>
@ -120,7 +122,7 @@
<el-form-item label="延时上传(单位:分钟):"> <el-form-item label="延时上传(单位:分钟):">
<el-input <el-input
style="width: 100px" style="width: 100px"
size="small" size="small" disabled
type="number" type="number"
v-model="configQuery.delaySyncTime" v-model="configQuery.delaySyncTime"
splaceholder="请输入内容" splaceholder="请输入内容"
@ -129,7 +131,7 @@
<el-form-item label="数据下载时间间隔(单位:分钟):"> <el-form-item label="数据下载时间间隔(单位:分钟):">
<el-input <el-input
style="width: 100px" style="width: 100px"
size="small" size="small" disabled
type="number" type="number"
v-model="configQuery.syncDownloadTime" v-model="configQuery.syncDownloadTime"
splaceholder="请输入内容" splaceholder="请输入内容"
@ -383,7 +385,7 @@
size="small" size="small"
type="number" type="number"
v-model="configQuery.orderToInSyncTime" v-model="configQuery.orderToInSyncTime"
:disabled="configQuery.downstreamEnable" disabled
splaceholder="请输入内容" splaceholder="请输入内容"
></el-input> ></el-input>
</div> </div>
@ -399,9 +401,9 @@
<el-button <el-button
type="primary" type="primary"
size="small" size="small"
:disabled="configQuery.downstreamEnable" disabled
@click="addToInBusTypeDialog()" @click="addToInBusTypeDialog()"
>添加扫码单据类型 >添加扫码单据类型
</el-button> </el-button>
</div> </div>
<el-table :data="checkedToInBusTypes" border style="width: 100%"> <el-table :data="checkedToInBusTypes" border style="width: 100%">
@ -434,9 +436,9 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
:disabled="configQuery.downstreamEnable" disabled
@click.native="removeToInBus(scope.$index, scope.row)" @click.native="removeToInBus(scope.$index, scope.row)"
>移除 >移除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -465,19 +467,19 @@
size="small" size="small"
type="number" type="number"
v-model="configQuery.orderSyncTime" v-model="configQuery.orderSyncTime"
:disabled="configQuery.downstreamEnable" disabled
splaceholder="请输入内容" splaceholder="请输入内容"
></el-input> ></el-input>
<span style="margin-left: 30px" <span style="margin-left: 30px"
>单据下载时间间隔(单位:分钟):&nbsp;</span >单据下载时间间隔(单位:分钟):&nbsp;</span
> >
<el-input <el-input
style="width: 100px" style="width: 100px"
size="small" size="small"
type="number" type="number"
v-model="configQuery.orderSyncDlTime" v-model="configQuery.orderSyncDlTime"
:disabled="configQuery.downstreamEnable" disabled
splaceholder="请输入内容" splaceholder="请输入内容"
></el-input> ></el-input>
</div> </div>
@ -493,9 +495,9 @@
<el-button <el-button
type="primary" type="primary"
size="small" size="small"
:disabled="configQuery.downstreamEnable" disabled
@click="addBusTypeDialog()" @click="addBusTypeDialog()"
>添加扫码单据类型 >添加扫码单据类型
</el-button> </el-button>
</div> </div>
<el-table :data="checkedBusTypes" border style="width: 100%"> <el-table :data="checkedBusTypes" border style="width: 100%">
@ -528,9 +530,9 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
:disabled="configQuery.downstreamEnable" disabled
@click.native="remveBus(scope.$index, scope.row)" @click.native="remveBus(scope.$index, scope.row)"
>移除 >移除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -555,9 +557,9 @@
<el-button <el-button
type="primary" type="primary"
size="small" size="small"
:disabled="configQuery.downstreamEnable" disabled
@click="addChangeBusTypeDialog()" @click="addChangeBusTypeDialog()"
>添加业务单据类型 >添加业务单据类型
</el-button> </el-button>
</div> </div>
<el-table :data="checkedChangeBusTypes" border style="width: 100%"> <el-table :data="checkedChangeBusTypes" border style="width: 100%">
@ -589,9 +591,9 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
:disabled="configQuery.downstreamEnable" disabled
@click.native="removeChangeBus(scope.$index, scope.row)" @click.native="removeChangeBus(scope.$index, scope.row)"
>移除 >移除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -608,8 +610,8 @@
v-if="addBusToInDialogVisible" v-if="addBusToInDialogVisible"
> >
<div style="float: right; margin-bottom: 10px; margin-right: 25px"> <div style="float: right; margin-bottom: 10px; margin-right: 25px">
<el-button type="primary" size="small" @click="addToInBusType()" <el-button type="primary" size="small" @click="addToInBusType()" disabled
>选入 >选入
</el-button> </el-button>
</div> </div>
<el-table <el-table
@ -653,8 +655,8 @@
v-if="addBusDialogVisible" v-if="addBusDialogVisible"
> >
<div style="float: right; margin-bottom: 10px; margin-right: 25px"> <div style="float: right; margin-bottom: 10px; margin-right: 25px">
<el-button type="primary" size="small" @click="addBusType()" <el-button type="primary" size="small" @click="addBusType()" disabled
>选入 >选入
</el-button> </el-button>
</div> </div>
<el-table <el-table
@ -699,8 +701,8 @@
v-if="addChangeBusDialogVisible" v-if="addChangeBusDialogVisible"
> >
<div style="float: right; margin-bottom: 10px; margin-right: 25px"> <div style="float: right; margin-bottom: 10px; margin-right: 25px">
<el-button type="primary" size="small" @click="addChangeBusType()" <el-button type="primary" size="small" @click="addChangeBusType()" disabled
>选入 >选入
</el-button> </el-button>
</div> </div>
<el-table <el-table
@ -746,8 +748,8 @@ import {
updateConfig, updateConfig,
} from "@/api/sync/spsSyncStatus"; } from "@/api/sync/spsSyncStatus";
import store from "@/store"; import store from "@/store";
import { getBussinessType } from "@/api/basic/bussinessType"; import {getBussinessType} from "@/api/basic/bussinessType";
import { getBusTypeChangeList } from "@/api/basic/busTypeChange"; import {getBusTypeChangeList} from "@/api/basic/busTypeChange";
export default { export default {
name: "SysUdimsConfig", name: "SysUdimsConfig",
@ -863,7 +865,8 @@ export default {
this.loading = false; this.loading = false;
}); });
}) })
.catch(() => {}); .catch(() => {
});
}, },
testConnect() { testConnect() {
@ -896,7 +899,8 @@ export default {
this.busTypes = response.data.list || []; this.busTypes = response.data.list || [];
this.total = response.data.total || 0; this.total = response.data.total || 0;
}) })
.catch(() => {}); .catch(() => {
});
}, },
addBusTypeDialog() { addBusTypeDialog() {

@ -28,7 +28,7 @@
<el-form-item> <el-form-item>
<el-button-group style="display:flex;"> <el-button-group style="display:flex;">
<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="search" @click="getList"></el-button> <el-button type="primary" icon="search" @click="search"></el-button>
<el-button type="primary" icon="search" @click="createScheduleDialog(1)"> <el-button type="primary" icon="search" @click="createScheduleDialog(1)">
</el-button> </el-button>
<!-- :disabled="!configParms.orderScanFinish&& !configParms.orderUnReceive&& !configParms.orderUnCheck"--> <!-- :disabled="!configParms.orderScanFinish&& !configParms.orderUnReceive&& !configParms.orderUnCheck"-->
@ -83,7 +83,7 @@
<el-button type="text" size="small" slot="reference">下载 <el-button type="text" size="small" slot="reference">下载
</el-button> </el-button>
</el-popconfirm> </el-popconfirm>
<el-popconfirm @confirm="deleteData(scope.row.id)" confirm-button-text='' cancel-button-text='' <el-popconfirm v-if="scope.row.status==4" @confirm="deleteData(scope.row.id)" confirm-button-text='' cancel-button-text=''
icon="el-icon-info" icon-color="red" title="是否确认要删除这条数据?"> icon="el-icon-info" icon-color="red" title="是否确认要删除这条数据?">
<el-button type="text" size="small" slot="reference">删除 <el-button type="text" size="small" slot="reference">删除
</el-button> </el-button>
@ -191,12 +191,16 @@ export default {
id: null, id: null,
status: null, status: null,
page: 1, page: 1,
limit: 20, limit: 10,
}; };
this.syncTime = null; this.syncTime = null;
this.getList(); this.getList();
}, },
search(){
this.filterQuery.page=1;
this.getList();
},
getList() { getList() {
this.loading = true; this.loading = true;
this.filterQuery.syncTime = this.syncTime; this.filterQuery.syncTime = this.syncTime;
@ -342,18 +346,15 @@ export default {
}, },
statusFilterType(status) { statusFilterType(status) {
const statusMap = { const statusMap = {
0: "warning", 1: "danger",
1: "success",
2: "danger", 2: "danger",
3: "danger",
4: "success",
}; };
return statusMap[status]; return statusMap[status];
}, },
wmsFilterType(status) { wmsFilterType(status) {
const statusMap = { return status?'success':'warning';
"未处理": "warning",
"处理成功": "success",
};
return statusMap[status];
}, },

@ -12,9 +12,8 @@
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="filterQuery.status" placeholder="处理状态"> <el-select v-model="filterQuery.status" placeholder="处理状态">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
<el-option label="等待处理" value="0"></el-option> <el-option label="异常" value="1"></el-option>
<el-option label="已处理" value="1"></el-option> <el-option label="已处理" value="2"></el-option>
<el-option label="异常" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -79,30 +78,32 @@
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column
label="文件地址"
prop="cacheFilePath"
show-overflow-tooltip
></el-table-column>
<el-table-column label="操作" fixed="right" width="160"> <el-table-column label="操作" fixed="right" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-popconfirm @confirm="downFile(scope.row)" confirm-button-text='' cancel-button-text='' class="mr10"
type="text" icon="el-icon-info" icon-color="blck" title="是否确认要下载文件?" v-if="scope.row.cacheFilePath">
size="small" <el-button type="text" size="small" slot="reference">下载
@click.native.stop="detailDialog(scope.row.id)" </el-button>
>详情 </el-popconfirm>
</el-button <el-popconfirm @confirm="deleteData(scope.row.id)" confirm-button-text='' cancel-button-text=''
> icon="el-icon-info" icon-color="red" title="是否确认要删除这条数据?">
<el-button <el-button type="text" size="small" slot="reference">删除
type="text" </el-button>
size="small" </el-popconfirm>
@click.native.stop="deleteDialog(scope.row.id)"
>删除
</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
:total="total"
:page-size="filterQuery.limit" :page-size="filterQuery.limit"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
layout="prev, pager, next" layout="prev, pager, next"
:total="total"
:current-page="filterQuery.page" :current-page="filterQuery.page"
></el-pagination> ></el-pagination>
</el-card> </el-card>
@ -121,7 +122,7 @@
</template> </template>
<script> <script>
import {filterLog, deleteLog, findConfig} from "@/api/sync/spsSyncDownload"; import {filterLog, deleteLog, findConfig,downloadFile} from "@/api/sync/spsSyncDownload";
import store from "@/store"; import store from "@/store";
export default { export default {
@ -129,7 +130,7 @@ export default {
return { return {
filterQuery: { filterQuery: {
taskId: null, taskId: null,
status: "1", status: "",
page: 1, page: 1,
limit: 10, limit: 10,
syncTime: null, syncTime: null,
@ -150,8 +151,8 @@ export default {
}, },
status: { status: {
0: "等待处理", 0: "等待处理",
1: "处理完成", 1: "处理异常",
2: "处理异常", 2: "处理完成",
}, },
configQuery: { configQuery: {
@ -190,7 +191,7 @@ export default {
}); });
this.filterQuery = { this.filterQuery = {
taskId: null, taskId: null,
status: "1", status: "",
page: 1, page: 1,
limit: 20, limit: 20,
}; };
@ -203,7 +204,7 @@ export default {
this.loading = false; this.loading = false;
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?Number.parseInt(response.data.total):0;
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
@ -284,8 +285,8 @@ export default {
statusFilterType(status) { statusFilterType(status) {
const statusMap = { const statusMap = {
0: "warning", 0: "warning",
1: "success", 1: "danger",
2: "danger", 2: "success",
}; };
return statusMap[status]; return statusMap[status];
}, },
@ -296,7 +297,35 @@ export default {
this.syncInfo = item.remark; this.syncInfo = item.remark;
} }
}) })
} },
downFile(rows) {
downloadFile({
'id': rows.id
}).then(res => {
let blob = new Blob([res])
let fileName = rows.cacheFilePath.substring(rows.cacheFilePath.lastIndexOf('/'))
let link = document.createElement("a")
link.href = window.URL.createObjectURL(blob)
link.download = fileName
link.style.display = 'none'
document.body.appendChild(link)
link.click()
window.URL.revokeObjectURL(link.href)
document.body.removeChild(link)
})
},
deleteData(id) {
deleteLog({id}).then((response) => {
if (response.code == 20000) {
this.filterQuery.page = 1
this.$message.success("删除成功");
} else {
this.$message.error(response.message);
}
this.getList();
})
.catch(() => {});
}
}, },
mounted() { mounted() {
@ -307,8 +336,9 @@ export default {
ADMIN_ID: store.getters.adminId, ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token, ADMIN_TOKEN: store.getters.token,
}; };
this.getList(); this.total = 0;
this.getConfig(); this.getConfig();
this.getList();
}, },
}; };
</script> </script>

@ -1,4 +1,5 @@
<template> <template>
<!-- 系统管理 组织架构 仓库信息组件 -->
<div> <div>
<el-card> <el-card>
<el-form :inline="true" :model="query" class="query-form" size="mini"> <el-form :inline="true" :model="query" class="query-form" size="mini">
@ -9,18 +10,31 @@
placeholder="仓库名称" placeholder="仓库名称"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="仓库类型:" prop="advanceType" > <el-form-item label="仓库类型:" prop="advanceType">
<el-select v-model="subDataType.advanceType" placeholder="请选择仓库类型" style="width: 90%"> <el-select
<el-option label="入账库" :value="1"/> v-model="subDataType.advanceType"
<el-option label="预验收库" :value="2"/> placeholder="请选择仓库类型"
<el-option label="寄售库" :value="3"/> style="width: 90%"
>
<el-option label="入账库" :value="1" />
<el-option label="预验收库" :value="2" />
<el-option label="寄售库" :value="3" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button-group style="margin-left: 10px;display:flex;"> <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="el-icon-refresh" @click="onReset"
<el-button type="primary" icon="el-icon-search" @click="onSubmit"></el-button> >重置</el-button
<el-button type="primary" icon="el-icon-plus" @click="handleSubForm( null, 'add')">新增</el-button> >
<el-button type="primary" icon="el-icon-search" @click="onSubmit"
>查询</el-button
>
<el-button
type="primary"
icon="el-icon-plus"
@click="handleSubForm(null, 'add')"
>新增</el-button
>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -31,48 +45,28 @@
@current-change="handSubInvCurrentChange" @current-change="handSubInvCurrentChange"
row-key="id" row-key="id"
:default-expand-all="isExpandAll" :default-expand-all="isExpandAll"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
style="width: 100%"
> >
<el-table-column label="序号" type="index" ref="dataForm"></el-table-column>
<el-table-column <el-table-column
prop="code" label="序号"
width="140" type="index"
label="仓库编码" ref="dataForm"
> ></el-table-column>
<el-table-column prop="code" label="仓库编码"> </el-table-column>
<el-table-column prop="name" label="仓库名称"> </el-table-column>
<el-table-column prop="parentName" label="所属部门"> </el-table-column>
<el-table-column prop="parentInvName" label="上级仓库">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="advanceType" label="仓库类型">
width="160"
prop="name"
label="仓库名称"
>
</el-table-column>
<el-table-column
prop="parentName"
width="180"
label="所属部门"
>
</el-table-column>
<el-table-column width="160"
prop="parentInvName"
label="上级仓库"
>
</el-table-column>
<el-table-column
width="140"
prop="advanceType"
label="仓库类型"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ advanceTypeTypeMap[scope.row.advanceType] }}</span> <span>{{ advanceTypeTypeMap[scope.row.advanceType] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="允许供应商使用" prop="spUse" width="140"> <el-table-column label="允许供应商使用" prop="spUse">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="scope.row.spUse | spUerFilterType">{{ <el-tag :type="scope.row.spUse | spUerFilterType"
scope.row.spUse | spUerFilterName >{{ scope.row.spUse | spUerFilterName }}
}}
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
@ -80,18 +74,20 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
:disabled="!configParms.basicInv || scope.row.advanceType =='2' || scope.row.advanceType =='3'" :disabled="
@click.native.stop="handleSubForm( scope.row, 'add')" !configParms.basicInv ||
>新增 scope.row.advanceType == '2' ||
</el-button scope.row.advanceType == '3'
> "
@click.native="handleSubForm(scope.row, 'add')"
>新增
</el-button>
<el-button <el-button
type="text" type="text"
:disabled="!configParms.basicInv " :disabled="!configParms.basicInv"
@click.native.stop="handleSubForm( scope.row, 'edit')" @click.native="handleSubForm(scope.row, 'edit')"
>编辑 >编辑
</el-button </el-button>
>
<!-- <el-button--> <!-- <el-button-->
<!-- type="text"--> <!-- type="text"-->
@ -101,24 +97,24 @@
<!-- </el-button--> <!-- </el-button-->
<!-- >--> <!-- >-->
<el-button <el-button
type="text" type="text"
:disabled="!configParms.basicInv" :disabled="!configParms.basicInv"
@click.native.stop="popInvRelBustype(scope.row)" @click.native="popInvRelBustype(scope.row)"
>仓库可用单据 >仓库可用单据
</el-button </el-button>
>
<el-button <el-button
type="text" type="text"
:disabled="!configParms.basicInv || scope.row.advanceType =='2' || scope.row.advanceType =='3' " :disabled="
@click.native.stop="handleDelInv(scope.row)" !configParms.basicInv ||
>删除 scope.row.advanceType == '2' ||
</el-button scope.row.advanceType == '3'
> "
@click.native="handleDelInv(scope.row)"
>删除
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!--<pagination--> <!--<pagination-->
@ -138,20 +134,29 @@
width="60%" width="60%"
top="5vh" top="5vh"
> >
<el-form :model="subData" ref="dataForm" :rules="formRules" label-width="130px"> <el-form
:model="subData"
ref="dataForm"
:rules="formRules"
label-width="130px"
>
<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="12" class="el-col">
<el-form-item label="所属部门" prop="parentId"> <el-form-item label="所属部门" prop="parentId">
<el-select v-model="subData.parentId" placeholder="顶级" style="width: 80%"> <el-select
v-model="subData.parentId"
placeholder="顶级"
style="width: 80%"
>
<el-option <el-option
v-for="item in fromDeptOptions" v-for="item in fromDeptOptions"
:key="item.code" :key="item.code"
:label="item.name" :label="item.name"
:value="item.code" :value="item.code"
> >
<span style="float: left" <span style="float: left"
><span v-html="item.html"></span>{{ item.name }}</span ><span v-html="item.html"></span>{{ item.name }}</span
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -159,28 +164,41 @@
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="上级仓库" prop="parentCode"> <el-form-item label="上级仓库" prop="parentCode">
<treeselect v-model="subData.parentCode" :options="invOptions" :normalizer="normalizer" <treeselect
:disabled="isShow" v-model="subData.parentCode"
style="width: 80%" :options="invOptions"
placeholder="选择上级仓库"/> :normalizer="normalizer"
:disabled="isShow"
style="width: 80%"
placeholder="选择上级仓库"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</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="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="仓库编码" prop="code" class="query-form-item"> <el-form-item
label="仓库编码"
prop="code"
class="query-form-item"
>
<el-input <el-input
disabled disabled
v-model="subData.code" style="width: 80%" v-model="subData.code"
style="width: 80%"
auto-complete="off" auto-complete="off"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="仓库名称" prop="name" class="query-form-item"> <el-form-item
label="仓库名称"
prop="name"
class="query-form-item"
>
<el-input <el-input
v-model="subData.name" style="width: 80%" v-model="subData.name"
style="width: 80%"
placeholder="请输入仓库名称" placeholder="请输入仓库名称"
auto-complete="off" auto-complete="off"
></el-input> ></el-input>
@ -190,11 +208,15 @@
<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="12" class="el-col">
<el-form-item label="仓库类型" prop="advanceType"> <el-form-item label="仓库类型" prop="advanceType">
<el-select v-model="subData.advanceType" :disabled="invWouse != null" placeholder="请选择仓库类型" <el-select
style="width: 80%"> v-model="subData.advanceType"
<el-option label="入账库" value="1"/> :disabled="invWouse != null"
<el-option label="预验收库" value="2"/> placeholder="请选择仓库类型"
<el-option label="寄售库" value="3"/> style="width: 80%"
>
<el-option label="入账库" value="1" />
<el-option label="预验收库" value="2" />
<el-option label="寄售库" value="3" />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -207,7 +229,11 @@
</el-col> </el-col>
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="是否能被供应商使用" prop="spUse" class="query-form-item"> <el-form-item
label="是否能被供应商使用"
prop="spUse"
class="query-form-item"
>
<el-radio-group v-model="subData.spUse"> <el-radio-group v-model="subData.spUse">
<el-radio :label="true"></el-radio> <el-radio :label="true"></el-radio>
<el-radio :label="false"></el-radio> <el-radio :label="false"></el-radio>
@ -216,7 +242,6 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row class="el-row" type="flex"> <el-row class="el-row" type="flex">
<el-col class="el-col"> <el-col class="el-col">
<el-form-item label="备注" prop="remark" class="query-form-item"> <el-form-item label="备注" prop="remark" class="query-form-item">
@ -230,7 +255,11 @@
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="sysSubList" style="width: 100%; margin-bottom: 30px;" border> <el-table
:data="sysSubList"
style="width: 100%; margin-bottom: 30px"
border
>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column <el-table-column
label="外部系统名称" label="外部系统名称"
@ -253,12 +282,17 @@
type="text" type="text"
:disabled="!configParms.basicInv" :disabled="!configParms.basicInv"
@click="intentSubSelect(scope.row)" @click="intentSubSelect(scope.row)"
>关联 >关联
</el-button </el-button>
> <el-button
<el-button type="text" @click.native.stop="unbindSubThrWarehouse(scope.row)" type="text"
:disabled="scope.row.thirdId=='' ||scope.row.thirdId==null ||!configParms.basicInv" @click.native.stop="unbindSubThrWarehouse(scope.row)"
>解绑 :disabled="
scope.row.thirdId == '' ||
scope.row.thirdId == null ||
!configParms.basicInv
"
>解绑
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -266,17 +300,22 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click.native="hideForm">取消</el-button> <el-button @click.native="hideForm">取消</el-button>
<el-button <el-button type="primary" @click.native="forInvSubmit()"
type="primary" >提交
@click.native="forInvSubmit()" </el-button>
>提交
</el-button
>
</div> </div>
</el-dialog> </el-dialog>
<!-- 仓库关联第三方分库对话框--> <!-- 仓库关联第三方分库对话框-->
<el-dialog title="仓库信息-关联第三方仓库" :visible.sync="thrSubWareHouseVisible"> <el-dialog
<el-form :inline="true" :model="thirdSubQuery" class="query-form" size="mini"> title="仓库信息-关联第三方仓库"
:visible.sync="thrSubWareHouseVisible"
>
<el-form
:inline="true"
:model="thirdSubQuery"
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="thirdSubQuery.name" v-model="thirdSubQuery.name"
@ -287,38 +326,33 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button-group> <el-button-group>
<el-button type="primary" icon="search" @click="intentSubSelect"></el-button> <el-button type="primary" icon="search" @click="intentSubSelect"
<el-button type="primary" icon="el-icon-refresh" @click="onResetintent"></el-button> >查询</el-button
>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onResetintent"
>重置</el-button
>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
:data="thrSubWarehouseData" :data="thrSubWarehouseData"
style="width: 100%;margin-top: 10px;" style="width: 100%; margin-top: 10px"
row-key="id" row-key="id"
border border
highlight-current-row highlight-current-row
@current-change="changeSubThrWarehouse" @current-change="changeSubThrWarehouse"
> >
<el-table-column <el-table-column type="index" label="序号"> </el-table-column>
type="index" <el-table-column prop="code" label="仓库编码"> </el-table-column>
label="序号" <el-table-column prop="name" label="仓库名称"> </el-table-column>
>
</el-table-column>
<el-table-column
prop="code"
label="仓库编码"
>
</el-table-column>
<el-table-column
prop="name"
label="仓库名称"
>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="subTotal>0" v-show="subTotal > 0"
:total="subTotal" :total="subTotal"
:page.sync="thirdSubQuery.page" :page.sync="thirdSubQuery.page"
:limit.sync="thirdSubQuery.limit" :limit.sync="thirdSubQuery.limit"
@ -327,10 +361,8 @@
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click.native="hideThrWarehouseTable()">取消</el-button> <el-button @click.native="hideThrWarehouseTable()">取消</el-button>
<el-button <el-button type="primary" @click.native="bindSubThrWarehouse()"
type="primary" >提交
@click.native="bindSubThrWarehouse()"
>提交
</el-button> </el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -344,9 +376,10 @@
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="relUserVisible" v-if="relUserVisible"
> >
<inv-rel-users :inputQuery="currentRow" <inv-rel-users
:configParms="configParms" :inputQuery="currentRow"
:closeDialog="cancelRelUser" :configParms="configParms"
:closeDialog="cancelRelUser"
></inv-rel-users> ></inv-rel-users>
</el-dialog> </el-dialog>
@ -359,21 +392,21 @@
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="relBusTypeVisible" v-if="relBusTypeVisible"
> >
<inv-rel-bus-type :inputQuery="currentRow" <inv-rel-bus-type
:configParms="configParms" :inputQuery="currentRow"
:closeDialog="cancelRelBustype" :configParms="configParms"
:closeDialog="cancelRelBustype"
></inv-rel-bus-type> ></inv-rel-bus-type>
</el-dialog> </el-dialog>
</el-card> </el-card>
<el-tabs type="border-card" style="margin: 15px"> <el-tabs type="border-card" style="margin: 15px">
<el-tab-pane> <el-tab-pane>
<span slot="label">{{ currentRow.name }}-用户列表</span> <span slot="label">{{ currentRow.name }}-用户列表</span>
<inv-rel-users :inputQuery="currentRow" <inv-rel-users
:configParms="configParms" :inputQuery="currentRow"
:configParms="configParms"
></inv-rel-users> ></inv-rel-users>
</el-tab-pane> </el-tab-pane>
<!-- <el-tab-pane>--> <!-- <el-tab-pane>-->
<!-- <span slot="label">{{ currentRow.name }}-单据类型</span>--> <!-- <span slot="label">{{ currentRow.name }}-单据类型</span>-->
@ -383,29 +416,28 @@
<invSpaceManage :invInfo="currentInvInfo"></invSpaceManage> <invSpaceManage :invInfo="currentInvInfo"></invSpaceManage>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</template> </template>
<script> <script>
import { import {
filterSubAll, saveSubWarehouse, deleteSubWarehouse, filterSubAll,
getSubThrsysDetail, bindThrSubWarehouse, unbindSubThrWarehouse, saveSubWarehouse,
deleteSubWarehouse,
getSubThrsysDetail,
bindThrSubWarehouse,
unbindSubThrWarehouse,
} from "@/api/system/invSubWarehouse"; } from "@/api/system/invSubWarehouse";
import {getJoinBussinessType} from "@/api/basic/bussinessType"; import { getJoinBussinessType } from "@/api/basic/bussinessType";
import {findConfig} from "@/api/sync/spsSyncStatus"; import { findConfig } from "@/api/sync/spsSyncStatus";
import {selectSysParamByKey} from "@/api/system/param/systemParamConfig"; import { selectSysParamByKey } from "@/api/system/param/systemParamConfig";
import invSpaceManage from "@/views/inventory/InvSpaceManage"; import invSpaceManage from "@/views/inventory/InvSpaceManage";
import { import { filterList, filterThridSubByInv } from "@/api/system/invWarehouse";
filterList,
filterThridSubByInv,
} from "@/api/system/invWarehouse";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import InvRelBusType from "@/views/system/dept/invRelBusType"; import InvRelBusType from "@/views/system/dept/invRelBusType";
import InvRelUsers from "@/views/system/dept/invRelUsers"; import InvRelUsers from "@/views/system/dept/invRelUsers";
import {isBlank} from "@/utils/strUtil"; import { isBlank } from "@/utils/strUtil";
export default { export default {
data() { data() {
@ -431,28 +463,26 @@ export default {
}, },
formMap: { formMap: {
add: "仓库信息-新增", add: "仓库信息-新增",
edit: "仓库信息-编辑" edit: "仓库信息-编辑",
}, },
invWouse: {}, invWouse: {},
formName: null, formName: null,
configParms: {}, configParms: {},
currentCode: null, currentCode: null,
currentRow: {name: "仓库"}, currentRow: { name: "仓库" },
mutiInvMode: true, mutiInvMode: true,
subFormVisible: false, subFormVisible: false,
formRules: { formRules: {
parentId: [ parentId: [
{required: true, message: "请选择所属部门", trigger: "blur"} { required: true, message: "请选择所属部门", trigger: "blur" },
],
name: [
{required: true, message: "请输入仓库名称", trigger: "blur"}
], ],
name: [{ required: true, message: "请输入仓库名称", trigger: "blur" }],
advanceType: [ advanceType: [
{required: true, message: "请选择是否寄售", trigger: "blur"} { required: true, message: "请选择是否寄售", trigger: "blur" },
] ],
}, },
subData: {}, subData: {},
subDataType:{}, subDataType: {},
fromDeptOptions: [], fromDeptOptions: [],
invOptions: [], invOptions: [],
thirdSubQuery: { thirdSubQuery: {
@ -474,7 +504,7 @@ export default {
currentInvInfo: { currentInvInfo: {
invStorageCode: null, invStorageCode: null,
invWarehouseCode: null, invWarehouseCode: null,
invName: null invName: null,
}, },
sysList: [], sysList: [],
sysSubList: [], sysSubList: [],
@ -483,7 +513,8 @@ export default {
}, },
methods: { methods: {
//--------------------------------- //---------------------------------
onReset() { // onReset() {
//
this.$router.push({ this.$router.push({
path: "", path: "",
}); });
@ -491,52 +522,54 @@ export default {
name: "", name: "",
status: "", status: "",
}; };
this.subDataType.advanceType=null; this.subDataType.advanceType = null;
this.getList(); this.getList();
// //
this.currentRow = {name: "仓库"}; this.currentRow = { name: "仓库" };
this.currentInvInfo = { this.currentInvInfo = {
invStorageCode: null, invStorageCode: null,
invWarehouseCode: null, invWarehouseCode: null,
invName: null invName: null,
}; };
}, },
onResetintent(){ onResetintent() {
debugger debugger;
this.$router.push({ this.$router.push({
path: "", path: "",
}); });
this.thirdSubQuery = { this.thirdSubQuery = {
thirdSysFk: this.thirdSubQuery.thirdSysFk, thirdSysFk: this.thirdSubQuery.thirdSysFk,
page:1, page: 1,
limit: 10 limit: 10,
} };
filterThridSubByInv(this.thirdSubQuery).then((res) => {
if (res.code == 20000) {
this.thrSubWarehouseData = res.data.list;
this.subTotal = res.data.total || 0;
} else {
this.$message.error(res.message);
}
}).catch((error) => {
this.thrWarehouseData = [];
this.subTotal = 0;
this.$message.error("第三方分库库数据加载失败");
});
filterThridSubByInv(this.thirdSubQuery)
.then((res) => {
if (res.code == 20000) {
this.thrSubWarehouseData = res.data.list;
this.subTotal = res.data.total || 0;
} else {
this.$message.error(res.message);
}
})
.catch((error) => {
this.thrWarehouseData = [];
this.subTotal = 0;
this.$message.error("第三方分库库数据加载失败");
});
}, },
onSubmit() { // onSubmit() {
this.query.advanceType=this.subDataType.advanceType; //
this.query.advanceType = this.subDataType.advanceType;
this.getList(); this.getList();
}, },
getList() { // getList() {
//
this.loading = true; this.loading = true;
this.list = []; this.list = [];
filterSubAll(this.query) filterSubAll(this.query)
@ -552,7 +585,8 @@ export default {
this.list = []; this.list = [];
}); });
}, },
handleSubForm(data, formName) { // handleSubForm(data, formName) {
//
if (data != null) { if (data != null) {
this.invWouse = data; this.invWouse = data;
} }
@ -565,22 +599,25 @@ export default {
this.isShow = false; this.isShow = false;
} else { } else {
this.isAdvanceTypeShow = false; this.isAdvanceTypeShow = false;
this.isShow = true this.isShow = true;
this.subData.parentCode = null; this.subData.parentCode = null;
} }
} else if (formName === "add") { } else if (formName === "add") {
this.isShow = true this.isShow = true;
if (data == null) { if (data == null) {
this.isAdvanceTypeShow = false; this.isAdvanceTypeShow = false;
this.subData = {advanceType: '1', spUse: false, parentCode: null}; this.subData = { advanceType: "1", spUse: false, parentCode: null };
} else { } else {
this.isAdvanceTypeShow = true; this.isAdvanceTypeShow = true;
this.subData = {advanceType: data.advanceType.toString(), spUse: false, parentCode: data.code}; this.subData = {
advanceType: data.advanceType.toString(),
spUse: false,
parentCode: data.code,
};
} }
} }
// //
let advanceTypese = this.subData.advanceType let advanceTypese = this.subData.advanceType;
this.subFormVisible = true; this.subFormVisible = true;
this.getSubThrsysDetailData(); this.getSubThrsysDetailData();
@ -590,8 +627,7 @@ export default {
let invList = response.data || []; let invList = response.data || [];
this.invOptions = this.handleTree(invList, "code", "parentCode"); this.invOptions = this.handleTree(invList, "code", "parentCode");
}) })
.catch(() => { .catch(() => {});
});
} }
filterSubAll(this.query) filterSubAll(this.query)
.then((response) => { .then((response) => {
@ -607,12 +643,12 @@ export default {
} }
this.invOptions = this.handleTree(invList, "code", "parentCode"); this.invOptions = this.handleTree(invList, "code", "parentCode");
}) })
.catch(() => { .catch(() => {});
});
this.sysSubList = null; this.sysSubList = null;
}, },
hideForm() { // --- hideForm() {
// ---
this.formVisible = false; this.formVisible = false;
this.subFormVisible = false; this.subFormVisible = false;
this.resetForm(); this.resetForm();
@ -628,23 +664,27 @@ export default {
this.getList(); this.getList();
} }
}, },
forInvSubmit() { // --- forInvSubmit() {
this.$refs["dataForm"].validate(valid => { // ---
this.$refs["dataForm"].validate((valid) => {
if (valid) { if (valid) {
saveSubWarehouse(this.subData, this.formName).then((response) => { saveSubWarehouse(this.subData, this.formName)
this.subFormVisible = false; .then((response) => {
if (response.code == 20000) { this.subFormVisible = false;
this.getList(); if (response.code == 20000) {
} else { this.getList();
this.$message.error(response.message); } else {
} this.$message.error(response.message);
}).catch(() => { }
this.subFormVisible = false; })
}); .catch(() => {
this.subFormVisible = false;
});
} }
}); });
}, },
findDeptMethod() { //--- findDeptMethod() {
//---
let query = { let query = {
status: 1, status: 1,
}; };
@ -657,7 +697,6 @@ export default {
this.loading = false; this.loading = false;
this.fromDeptOptions = []; this.fromDeptOptions = [];
}); });
}, },
normalizer(node) { normalizer(node) {
if (node.children && !node.children.length) { if (node.children && !node.children.length) {
@ -666,18 +705,18 @@ export default {
return { return {
id: node.code, id: node.code,
label: node.name, label: node.name,
children: node.children children: node.children,
}; };
}, },
getSyncConfig() {// getSyncConfig() {
//
findConfig() findConfig()
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.configParms = response.data; this.configParms = response.data;
} }
}) })
.catch(() => { .catch(() => {});
});
let query = { let query = {
paramKey: "muti_inv_mode", paramKey: "muti_inv_mode",
}; };
@ -691,7 +730,8 @@ export default {
} }
}); });
}, },
handSubInvCurrentChange(row) { // handSubInvCurrentChange(row) {
//
this.currentCode = row.code; this.currentCode = row.code;
this.currentRow = row; this.currentRow = row;
this.curSeleUser = null; this.curSeleUser = null;
@ -699,7 +739,6 @@ export default {
this.invSpaceManage(row); this.invSpaceManage(row);
// //
this.selsectBussinessType(row); this.selsectBussinessType(row);
}, },
// //
intentSubSelect(row) { intentSubSelect(row) {
@ -710,19 +749,20 @@ export default {
} }
this.thrSubWarehouseData = []; this.thrSubWarehouseData = [];
this.thrSubWareHouseVisible = true; this.thrSubWareHouseVisible = true;
filterThridSubByInv(this.thirdSubQuery).then((res) => { filterThridSubByInv(this.thirdSubQuery)
if (res.code == 20000) { .then((res) => {
this.thrSubWarehouseData = res.data.list; if (res.code == 20000) {
this.subTotal = res.data.total || 0; this.thrSubWarehouseData = res.data.list;
} else { this.subTotal = res.data.total || 0;
this.$message.error(res.message); } else {
} this.$message.error(res.message);
}
}).catch((error) => { })
this.thrWarehouseData = []; .catch((error) => {
this.subTotal = 0; this.thrWarehouseData = [];
this.$message.error("第三方分库库数据加载失败"); this.subTotal = 0;
}); this.$message.error("第三方分库库数据加载失败");
});
}, },
changeSubThrWarehouse(row) { changeSubThrWarehouse(row) {
this.checkSubThrWarehouseRow = row; this.checkSubThrWarehouseRow = row;
@ -737,26 +777,26 @@ export default {
}, },
// //
bindSubThrWarehouse() { bindSubThrWarehouse() {
let params = { let params = {
id: this.subData.id, id: this.subData.id,
thridWarehouseId: this.checkSubThrWarehouseRow.code, thridWarehouseId: this.checkSubThrWarehouseRow.code,
sysId: this.checkSubThrWarehouseRow.thirdSysFk sysId: this.checkSubThrWarehouseRow.thirdSysFk,
} };
bindThrSubWarehouse(params).then((res) => { bindThrSubWarehouse(params)
if (res.code == 20000) { .then((res) => {
this.$message.success("绑定成功") if (res.code == 20000) {
this.getSubThrsysDetailData(); this.$message.success("绑定成功");
} this.getSubThrsysDetailData();
this.thrSubWareHouseVisible = false; }
}).catch((error) => { this.thrSubWareHouseVisible = false;
this.$message.error("绑定失败"); })
this.thrSubWareHouseVisible = false; .catch((error) => {
}) this.$message.error("绑定失败");
this.thrSubWareHouseVisible = false;
});
}, },
// //
unbindSubThrWarehouse(row) { unbindSubThrWarehouse(row) {
this.$confirm("确定解绑已关联第三方仓库信息?", "提示", { this.$confirm("确定解绑已关联第三方仓库信息?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
@ -765,19 +805,18 @@ export default {
.then(() => { .then(() => {
let params = { let params = {
id: this.subData.id, id: this.subData.id,
sysId: row.sysId sysId: row.sysId,
}; };
unbindSubThrWarehouse(params).then((res) => { unbindSubThrWarehouse(params)
this.$message.success("解绑成功"); .then((res) => {
this.getSubThrsysDetailData(); this.$message.success("解绑成功");
}).catch((error) => { this.getSubThrsysDetailData();
this.$message.error("解绑失败"); })
}) .catch((error) => {
this.$message.error("解绑失败");
});
}) })
.catch(() => { .catch(() => {});
});
}, },
popInvRelBustype(row) { popInvRelBustype(row) {
@ -798,7 +837,6 @@ export default {
this.relUserVisible = false; this.relUserVisible = false;
}, },
getBussinessType(val, obj) { getBussinessType(val, obj) {
if (val != null) { if (val != null) {
this.bussinessTypeQuery.page = val; this.bussinessTypeQuery.page = val;
@ -808,23 +846,24 @@ export default {
this.bussinessTypeQuery.ids = action; this.bussinessTypeQuery.ids = action;
} }
this.bussinessTypeQuery.code = this.busQuery.code; this.bussinessTypeQuery.code = this.busQuery.code;
getJoinBussinessType(this.bussinessTypeQuery).then((res) => { getJoinBussinessType(this.bussinessTypeQuery)
this.selectBussinessTypeList = []; .then((res) => {
this.bussinessTypeList = res.data.list; this.selectBussinessTypeList = [];
this.bussinessTypeTotal = res.data.total; this.bussinessTypeList = res.data.list;
var that = this; this.bussinessTypeTotal = res.data.total;
that.$nextTick(() => { var that = this;
if (that.$refs.typeList) { that.$nextTick(() => {
that.$refs.typeList.clearSelection(); if (that.$refs.typeList) {
} that.$refs.typeList.clearSelection();
that.bussinessTypeList.forEach(row => {
if (row.checkSelect == true) {
that.$refs.typeList.toggleRowSelection(row, true);
} }
that.bussinessTypeList.forEach((row) => {
if (row.checkSelect == true) {
that.$refs.typeList.toggleRowSelection(row, true);
}
});
}); });
}); })
}).catch((error) => { .catch((error) => {});
});
}, },
invSpaceManage(row) { invSpaceManage(row) {
@ -833,11 +872,10 @@ export default {
invWarehouseCode: row.code, invWarehouseCode: row.code,
invName: row.name, invName: row.name,
flag: row.id, flag: row.id,
page: 1 page: 1,
}; };
}, },
getSubThrsysDetailData() { getSubThrsysDetailData() {
if (!isBlank(this.subData.code)) { if (!isBlank(this.subData.code)) {
let params = { let params = {
@ -855,7 +893,6 @@ export default {
} }
}, },
handleDelInv(row) { handleDelInv(row) {
if (row.id) { if (row.id) {
this.$confirm("确认删除该仓库吗?", "提示", { this.$confirm("确认删除该仓库吗?", "提示", {
@ -863,7 +900,7 @@ export default {
}) })
.then(() => { .then(() => {
this.deleteLoading = true; this.deleteLoading = true;
let para = {id: row.id}; let para = { id: row.id };
deleteSubWarehouse(para) deleteSubWarehouse(para)
.then((response) => { .then((response) => {
this.deleteLoading = false; this.deleteLoading = false;
@ -900,24 +937,22 @@ export default {
return upUerMap[status]; return upUerMap[status];
}, },
}, },
mounted() { mounted() {},
},
components: { components: {
InvRelUsers, InvRelUsers,
InvRelBusType, InvRelBusType,
invSpaceManage, Treeselect invSpaceManage,
Treeselect,
}, },
created() { created() {
this.getList(); this.getList();
this.getSyncConfig(); this.getSyncConfig();
this.findDeptMethod(); this.findDeptMethod();
},
}
}; };
</script> </script>
<style scoped> <style scoped>
.vue-treeselect >>> .vue-treeselect__placeholder { .vue-treeselect >>> .vue-treeselect__placeholder {
font-size: 12px; font-size: 12px;
} }
@ -930,5 +965,4 @@ export default {
.vue-treeselect >>> .vue-treeselect__control { .vue-treeselect >>> .vue-treeselect__control {
height: 20px; height: 20px;
} }
</style> </style>

Loading…
Cancel
Save