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

仓库信息 页面改动

Browse Source
ywj_dev
CTP 2 years ago
parent a7f2865935
commit ed5dada8af
2 changed files with 389 additions and 360 deletions
Show Stats Download Patch File Download Diff File

458
src/views/system/dept/invWarehouse.vue
Unescape Escape View File

@ -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> <el-table-column prop="code" label="仓库编码"> </el-table-column>
<el-table-column <el-table-column prop="name" label="仓库名称"> </el-table-column>
width="160" <el-table-column prop="parentName" label="所属部门"> </el-table-column>
prop="name" <el-table-column prop="parentInvName" label="上级仓库">
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>
<el-table-column <el-table-column prop="advanceType" label="仓库类型">
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' ||
scope.row.advanceType == '3'
"
@click.native="handleSubForm(scope.row, 'add')"
>新增 >新增
</el-button </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' ||
scope.row.advanceType == '3'
"
@click.native="handleDelInv(scope.row)"
>删除 >删除
</el-button </el-button>
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!--<pagination--> <!--<pagination-->
@ -138,11 +134,20 @@
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"
@ -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
v-model="subData.parentCode"
:options="invOptions"
:normalizer="normalizer"
:disabled="isShow" :disabled="isShow"
style="width: 80%" style="width: 80%"
placeholder="选择上级仓库"/> 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="外部系统名称"
@ -254,10 +283,15 @@
: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>
@ -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,9 +361,7 @@
<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>
@ -344,7 +376,8 @@
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="relUserVisible" v-if="relUserVisible"
> >
<inv-rel-users :inputQuery="currentRow" <inv-rel-users
:inputQuery="currentRow"
:configParms="configParms" :configParms="configParms"
:closeDialog="cancelRelUser" :closeDialog="cancelRelUser"
></inv-rel-users> ></inv-rel-users>
@ -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
:inputQuery="currentRow"
:configParms="configParms" :configParms="configParms"
:closeDialog="cancelRelBustype" :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
:inputQuery="currentRow"
:configParms="configParms" :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) => { filterThridSubByInv(this.thirdSubQuery)
.then((res) => {
if (res.code == 20000) { if (res.code == 20000) {
this.thrSubWarehouseData = res.data.list; this.thrSubWarehouseData = res.data.list;
this.subTotal = res.data.total || 0; this.subTotal = res.data.total || 0;
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
} }
})
}).catch((error) => { .catch((error) => {
this.thrWarehouseData = []; this.thrWarehouseData = [];
this.subTotal = 0; this.subTotal = 0;
this.$message.error("第三方分库库数据加载失败"); 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)
.then((response) => {
this.subFormVisible = false; this.subFormVisible = false;
if (response.code == 20000) { if (response.code == 20000) {
this.getList(); this.getList();
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
}).catch(() => { })
.catch(() => {
this.subFormVisible = false; 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,15 +749,16 @@ export default {
} }
this.thrSubWarehouseData = []; this.thrSubWarehouseData = [];
this.thrSubWareHouseVisible = true; this.thrSubWareHouseVisible = true;
filterThridSubByInv(this.thirdSubQuery).then((res) => { filterThridSubByInv(this.thirdSubQuery)
.then((res) => {
if (res.code == 20000) { if (res.code == 20000) {
this.thrSubWarehouseData = res.data.list; this.thrSubWarehouseData = res.data.list;
this.subTotal = res.data.total || 0; this.subTotal = res.data.total || 0;
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
} }
})
}).catch((error) => { .catch((error) => {
this.thrWarehouseData = []; this.thrWarehouseData = [];
this.subTotal = 0; this.subTotal = 0;
this.$message.error("第三方分库库数据加载失败"); this.$message.error("第三方分库库数据加载失败");
@ -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)
.then((res) => {
if (res.code == 20000) { if (res.code == 20000) {
this.$message.success("绑定成功") this.$message.success("绑定成功");
this.getSubThrsysDetailData(); this.getSubThrsysDetailData();
} }
this.thrSubWareHouseVisible = false; this.thrSubWareHouseVisible = false;
}).catch((error) => { })
.catch((error) => {
this.$message.error("绑定失败"); this.$message.error("绑定失败");
this.thrSubWareHouseVisible = false; 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)
.then((res) => {
this.$message.success("解绑成功"); this.$message.success("解绑成功");
this.getSubThrsysDetailData(); this.getSubThrsysDetailData();
}).catch((error) => {
this.$message.error("解绑失败");
}) })
}) .catch((error) => {
.catch(() => { this.$message.error("解绑失败");
}); });
})
.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,7 +846,8 @@ 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)
.then((res) => {
this.selectBussinessTypeList = []; this.selectBussinessTypeList = [];
this.bussinessTypeList = res.data.list; this.bussinessTypeList = res.data.list;
this.bussinessTypeTotal = res.data.total; this.bussinessTypeTotal = res.data.total;
@ -817,14 +856,14 @@ export default {
if (that.$refs.typeList) { if (that.$refs.typeList) {
that.$refs.typeList.clearSelection(); that.$refs.typeList.clearSelection();
} }
that.bussinessTypeList.forEach(row => { that.bussinessTypeList.forEach((row) => {
if (row.checkSelect == true) { if (row.checkSelect == true) {
that.$refs.typeList.toggleRowSelection(row, 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>

127
vue.config.js
Unescape Escape View File

@ -1,15 +1,15 @@
'use strict' "use strict";
const path = require('path') const path = require("path");
function resolve(dir) { function resolve(dir) {
return path.join(__dirname, dir) return path.join(__dirname, dir);
} }
const CompressionPlugin = require('compression-webpack-plugin') const CompressionPlugin = require("compression-webpack-plugin");
const name = process.env.VUE_APP_TITLE || 'UDI自助平台' // 网页标题 const name = process.env.VUE_APP_TITLE || "UDI自助平台"; // 网页标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口 const port = process.env.port || process.env.npm_config_port || 80; // 端口
// vue.config.js 配置说明 // vue.config.js 配置说明
//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
@ -20,117 +20,112 @@ module.exports = {
// 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
publicPath: process.env.VUE_APP_CONTEXT_PATH, publicPath: process.env.VUE_APP_CONTEXT_PATH,
// 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
outputDir: 'UDI_SPMS_CLIENT', outputDir: "UDI_SPMS_CLIENT",
// 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
assetsDir: 'static', assetsDir: "static",
// 是否开启eslint保存检测，有效值：ture | false | 'error' // 是否开启eslint保存检测，有效值：ture | false | 'error'
lintOnSave: process.env.NODE_ENV === 'development', lintOnSave: process.env.NODE_ENV === "development",
// 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。 // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
productionSourceMap: false, productionSourceMap: false,
// webpack-dev-server 相关配置 // webpack-dev-server 相关配置
devServer: { devServer: {
host: '0.0.0.0', host: "0.0.0.0",
port: port, port: port,
open: false, open: false,
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: `http://192.168.0.166:9993/`, target: `http://192.168.0.66:9160/UDI_SPMS_SERVER/`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: '' ["^" + process.env.VUE_APP_BASE_API]: "",
}
}
}, },
disableHostCheck: true },
},
disableHostCheck: true,
}, },
css: { css: {
loaderOptions: { loaderOptions: {
sass: { sass: {
sassOptions: {outputStyle: "expanded"} sassOptions: { outputStyle: "expanded" },
} },
} },
}, },
configureWebpack: { configureWebpack: {
name: name, name: name,
resolve: { resolve: {
alias: { alias: {
'@': resolve('src') "@": resolve("src"),
} },
}, },
plugins: [ plugins: [
// http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件 // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
new CompressionPlugin({ new CompressionPlugin({
cache: false, // 不启用文件缓存 cache: false, // 不启用文件缓存
test: /\.(js|css|html)?$/i, // 压缩文件格式 test: /\.(js|css|html)?$/i, // 压缩文件格式
filename: '[path].gz[query]', // 压缩后的文件名 filename: "[path].gz[query]", // 压缩后的文件名
algorithm: 'gzip', // 使用gzip压缩 algorithm: "gzip", // 使用gzip压缩
minRatio: 0.8 // 压缩率小于1才会压缩 minRatio: 0.8, // 压缩率小于1才会压缩
}) }),
], ],
}, },
chainWebpack(config) { chainWebpack(config) {
config.plugins.delete('preload') // TODO: need test config.plugins.delete("preload"); // TODO: need test
config.plugins.delete('prefetch') // TODO: need test config.plugins.delete("prefetch"); // TODO: need test
// set svg-sprite-loader // set svg-sprite-loader
config.module.rule("svg").exclude.add(resolve("src/assets/icons")).end();
config.module config.module
.rule('svg') .rule("icons")
.exclude.add(resolve('src/assets/icons'))
.end()
config.module
.rule('icons')
.test(/\.svg$/) .test(/\.svg$/)
.include.add(resolve('src/assets/icons')) .include.add(resolve("src/assets/icons"))
.end() .end()
.use('svg-sprite-loader') .use("svg-sprite-loader")
.loader('svg-sprite-loader') .loader("svg-sprite-loader")
.options({ .options({
symbolId: 'icon-[name]' symbolId: "icon-[name]",
}) })
.end() .end();
config.when(process.env.NODE_ENV !== "development", (config) => {
config config
.when(process.env.NODE_ENV !== 'development', .plugin("ScriptExtHtmlWebpackPlugin")
config => { .after("html")
config .use("script-ext-html-webpack-plugin", [
.plugin('ScriptExtHtmlWebpackPlugin') {
.after('html')
.use('script-ext-html-webpack-plugin', [{
// `runtime` must same as runtimeChunk name. default is `runtime` // `runtime` must same as runtimeChunk name. default is `runtime`
inline: /runtime\..*\.js$/ inline: /runtime\..*\.js$/,
}]) },
.end() ])
config .end();
.optimization.splitChunks({ config.optimization.splitChunks({
chunks: 'all', chunks: "all",
cacheGroups: { cacheGroups: {
libs: { libs: {
name: 'chunk-libs', name: "chunk-libs",
test: /[\\/]node_modules[\\/]/, test: /[\\/]node_modules[\\/]/,
priority: 10, priority: 10,
chunks: 'initial' // only package third parties that are initially dependent chunks: "initial", // only package third parties that are initially dependent
}, },
elementUI: { elementUI: {
name: 'chunk-elementUI', // split elementUI into a single package name: "chunk-elementUI", // split elementUI into a single package
priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
}, },
commons: { commons: {
name: 'chunk-commons', name: "chunk-commons",
test: resolve('src/components'), // can customize your rules test: resolve("src/components"), // can customize your rules
minChunks: 3, // minimum common number minChunks: 3, // minimum common number
priority: 5, priority: 5,
reuseExistingChunk: true reuseExistingChunk: true,
} },
} },
}) });
config.optimization.runtimeChunk('single'), config.optimization.runtimeChunk("single"),
{ {
from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件 from: path.resolve(__dirname, "./public/robots.txt"), //防爬虫文件
to: './' //到根目录下 to: "./", //到根目录下
} };
} });
) },
} };
}

Write Preview
Loading…
Cancel
Save