|
@@ -7,7 +7,8 @@
|
|
|
<el-row type="flex" :gutter="10">
|
|
|
<el-col :span="4">
|
|
|
<el-select v-model="query.waterDataId" placeholder="所在水厂" size="small" style="width:100%" clearable>
|
|
|
- <el-option v-for="(item, index) in waterData" :key="index" :label="item.name" :value="item.id"></el-option>
|
|
|
+ <el-option v-for="(item, index) in waterData" :key="index" :label="item.name"
|
|
|
+ :value="item.id"></el-option>
|
|
|
</el-select>
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
@@ -21,27 +22,25 @@
|
|
|
<el-col :span="4">
|
|
|
<el-row type="flex" class="row-bg" justify="end">
|
|
|
<el-button type="primary" size="small" icon="el-icon-plus" @click="add">新 增</el-button>
|
|
|
- <el-button type="primary" size="small" icon="el-icon-edit" @click="editor" :disabled="disabledBtn1">修 改</el-button>
|
|
|
- <el-button type="danger" size="small" icon="el-icon-delete" @click="deleteShelf" :disabled="disabledBtn2">删 除</el-button>
|
|
|
+ <el-button type="primary" size="small" icon="el-icon-edit" @click="editor" :disabled="disabledBtn1">修
|
|
|
+ 改</el-button>
|
|
|
+ <el-button type="danger" size="small" icon="el-icon-delete" @click="deleteShelf" :disabled="disabledBtn2">删
|
|
|
+ 除</el-button>
|
|
|
</el-row>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</div>
|
|
|
<div class="table_width">
|
|
|
- <table-item
|
|
|
- :table-data="list" :column="column" :pagination="true" :pagesize="pagination.size"
|
|
|
- :currentpage="pagination.current" :tableheight="tableheight" :border="true"
|
|
|
- :multiple="true" :stripe="true" :total="pagination.total"
|
|
|
- :fixed="false" :isdelete="true" forId
|
|
|
- @handleCurrentChange="handleCurrentChange"
|
|
|
- @handleSizeChange="handleSizeChange"
|
|
|
- @handleSelectionChange="handleSelectionChange"
|
|
|
- @detail = "detail"
|
|
|
- v-loading="loading"/>
|
|
|
+ <table-item :table-data="list" :column="column" :pagination="true" :pagesize="pagination.size"
|
|
|
+ :currentpage="pagination.current" :tableheight="tableheight" :border="true" :multiple="true" :stripe="true"
|
|
|
+ :total="pagination.total" :fixed="false" :isdelete="true" forId @handleCurrentChange="handleCurrentChange"
|
|
|
+ @handleSizeChange="handleSizeChange" @handleSelectionChange="handleSelectionChange" @detail="detail"
|
|
|
+ v-loading="loading" />
|
|
|
</div>
|
|
|
|
|
|
<!-- 表单 -->
|
|
|
- <el-dialog v-if="dialogVisible" v-dialogDrag top="20vh" :title="dialogTitle" :visible.sync="dialogVisible" width="800px" class="dialog">
|
|
|
+ <el-dialog v-if="dialogVisible" v-dialogDrag top="20vh" :title="dialogTitle" :visible.sync="dialogVisible"
|
|
|
+ width="800px" class="dialog">
|
|
|
<div class="dialog_style">
|
|
|
<el-form :model="form" label-width="80px" size="small" ref="form" :rules="formRules">
|
|
|
<el-row>
|
|
@@ -49,39 +48,44 @@
|
|
|
<el-form-item label="所在水厂" prop="waterworksId">
|
|
|
<el-select v-model="form.waterworksId" placeholder="请选择所在水厂" style="width:100%" size="small" clearable
|
|
|
:disabled="nameEditState">
|
|
|
- <el-option v-for="(item, index) in waterData" :key="index" :label="item.name" :value="item.id">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
+ <el-option v-for="(item, index) in waterData" :key="index" :label="item.name" :value="item.id">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="仓库名称" prop="storeName">
|
|
|
- <el-input v-model="form.storeName" style="width:100%" placeholder="仓库名称" :disabled="nameEditState"></el-input>
|
|
|
+ <el-input v-model="form.storeName" style="width:100%" placeholder="仓库名称"
|
|
|
+ :disabled="nameEditState"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="管理员" prop="storeManagerUserName">
|
|
|
- <el-input v-model="form.storeManagerUserName" style="width:100%" placeholder="仓库管理员" :disabled="personState"></el-input>
|
|
|
+ <el-input v-model="form.storeManagerUserName" style="width:100%" placeholder="仓库管理员"
|
|
|
+ :disabled="personState"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="仓库作用" prop="storeFunction">
|
|
|
+ <el-form-item label="仓库作用" prop="storeFunction">
|
|
|
<el-select v-model="form.storeFunction" placeholder="请选择仓库作用" style="width:100%" size="small" clearable
|
|
|
:disabled="nameEditState">
|
|
|
- <el-option v-for="(item, index) in warehouseTypes" :key="item.index" :label="item.cname" :value="item.id">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
+ <el-option v-for="(item, index) in warehouseTypes" :key="item.index" :label="item.cname"
|
|
|
+ :value="item.id">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="备注">
|
|
|
- <el-input type="textarea" v-model="form.remark" style="width:100%" placeholder="备注" :disabled="nameEditState"></el-input>
|
|
|
+ <el-input type="textarea" v-model="form.remark" style="width:100%" placeholder="备注"
|
|
|
+ :disabled="nameEditState"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="是否启用">
|
|
|
- <el-switch v-model="form.storeEnable" active-text="是" inactive-text="否" :disabled="nameEditState" @change="changeStatus">
|
|
|
+ <el-switch v-model="form.storeEnable" active-text="是" inactive-text="否" :disabled="nameEditState"
|
|
|
+ @change="changeStatus">
|
|
|
</el-switch>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
@@ -91,14 +95,14 @@
|
|
|
</div>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button type="primary" size="small" class="throttle" @click="submit()" v-if="!nameEditState">确 定</el-button>
|
|
|
- <el-button type="primary" size="small" @click="dialogVisible=false">关 闭</el-button>
|
|
|
+ <el-button type="primary" size="small" @click="dialogVisible = false">关 闭</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import {getWaterData} from "@/api/dispatch/dispatch";
|
|
|
+import { getWaterData } from "@/api/dispatch/dispatch";
|
|
|
import { client } from "@/utils/index";
|
|
|
import TableItem from "@/components/Table";
|
|
|
import { addInventoryManage, getInventoryManagePage, editInventoryManage, deleteInventoryManage } from "@/api/dcApi/inventoryApi";
|
|
@@ -114,35 +118,35 @@ export default {
|
|
|
// 控制表单显示
|
|
|
dialogVisible: false,
|
|
|
// 表单名
|
|
|
- dialogTitle:"",
|
|
|
+ dialogTitle: "",
|
|
|
// 仓库类型数据
|
|
|
- warehouseTypes:[],
|
|
|
+ warehouseTypes: [],
|
|
|
list: [],
|
|
|
//
|
|
|
- disabledBtn1:true,
|
|
|
- disabledBtn2:true,
|
|
|
+ disabledBtn1: true,
|
|
|
+ disabledBtn2: true,
|
|
|
form: {
|
|
|
- id:"",
|
|
|
- sotreName:"",
|
|
|
- waterworksId:"",
|
|
|
- storeManagerUserName:"",
|
|
|
- storeFunction:"",
|
|
|
- remark:"",
|
|
|
- storeEnable:1,
|
|
|
- remark:"",
|
|
|
+ id: "",
|
|
|
+ sotreName: "",
|
|
|
+ waterworksId: "",
|
|
|
+ storeManagerUserName: "",
|
|
|
+ storeFunction: "",
|
|
|
+ remark: "",
|
|
|
+ storeEnable: 1,
|
|
|
+ remark: "",
|
|
|
},
|
|
|
formRules: {
|
|
|
waterworksId: [
|
|
|
- { required: true, message: "请选择水厂", trigger: "change" },
|
|
|
+ { required: true, message: "请选择水厂", trigger: "change" },
|
|
|
],
|
|
|
storeName: [
|
|
|
- { required: true, message: "请填写仓库名称", trigger: "change" },
|
|
|
+ { required: true, message: "请填写仓库名称", trigger: "change" },
|
|
|
],
|
|
|
},
|
|
|
- nameEditState:false,
|
|
|
- personState:true,
|
|
|
+ nameEditState: false,
|
|
|
+ personState: true,
|
|
|
query: {
|
|
|
- waterDataId:"",
|
|
|
+ waterDataId: "",
|
|
|
sotreName: "",
|
|
|
},
|
|
|
column: [
|
|
@@ -175,12 +179,12 @@ export default {
|
|
|
// 选中行数据
|
|
|
multipleSelection: [],
|
|
|
// 控制表格查询时
|
|
|
- loading:false,
|
|
|
+ loading: false,
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
|
tableheight() {
|
|
|
- return client().height - 230 ;
|
|
|
+ return client().height - 230;
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
@@ -230,13 +234,13 @@ export default {
|
|
|
*/
|
|
|
getExpertPage() {
|
|
|
let params = {
|
|
|
- size : this.pagination.size,
|
|
|
- current : this.pagination.current
|
|
|
+ size: this.pagination.size,
|
|
|
+ current: this.pagination.current
|
|
|
};
|
|
|
- if(this.query.waterDataId != "")
|
|
|
- Object.assign(params,{waterworksId:this.query.waterDataId});
|
|
|
- if(this.query.storeName != "")
|
|
|
- Object.assign(params,{storeName:this.query.storeName});
|
|
|
+ if (this.query.waterDataId != "")
|
|
|
+ Object.assign(params, { waterworksId: this.query.waterDataId });
|
|
|
+ if (this.query.storeName != "")
|
|
|
+ Object.assign(params, { storeName: this.query.storeName });
|
|
|
this.loading = true;
|
|
|
getInventoryManagePage(params).then(res => {
|
|
|
if (res.code == 1) {
|
|
@@ -248,22 +252,22 @@ export default {
|
|
|
// console.log("货架"+JSON.stringify(res));
|
|
|
this.list = this.list.map((item) => {
|
|
|
const storeFunctionName = this.warehouseTypes.find(el => { return el.id == item.storeFunction })?.cname;
|
|
|
- item['storeFunctionName'] = storeFunctionName || '--'
|
|
|
- return item
|
|
|
+ item['storeFunctionName'] = storeFunctionName || '--'
|
|
|
+ return item
|
|
|
})
|
|
|
}
|
|
|
- else{
|
|
|
+ else {
|
|
|
this.$message.error("查询失败!");
|
|
|
}
|
|
|
})
|
|
|
- .catch((ex) => {
|
|
|
+ .catch((ex) => {
|
|
|
this.$message.error("查询失败!");
|
|
|
})
|
|
|
.finally(() => {
|
|
|
this.loading = false;
|
|
|
});
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
doQuery() {
|
|
|
// this.pagination.current = 1;
|
|
|
this.getExpertPage();
|
|
@@ -272,7 +276,7 @@ export default {
|
|
|
/**
|
|
|
* 删除仓库
|
|
|
*/
|
|
|
- deleteShelf() {
|
|
|
+ deleteShelf() {
|
|
|
const ids = this.multipleSelection.map(item => { return item.id })
|
|
|
this.$confirm('确定删除仓库?', '提示', {
|
|
|
confirmButtonText: '确定',
|
|
@@ -300,11 +304,11 @@ export default {
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.form.clearValidate()
|
|
|
});
|
|
|
- this.form.storeManagerUserName = this.$store.state.user.realName;
|
|
|
+ this.form.storeManagerUserName = this.$store.state.user.realName;
|
|
|
},
|
|
|
- /**
|
|
|
- * 新增
|
|
|
- */
|
|
|
+ /**
|
|
|
+ * 新增
|
|
|
+ */
|
|
|
addExpert() {
|
|
|
let store = {
|
|
|
storeEnable: this.form.storeEnable - 0,
|
|
@@ -313,7 +317,7 @@ export default {
|
|
|
storeName: this.form.storeName,
|
|
|
storeManagerUserId: this.$store.state.user.userId,
|
|
|
waterworksId: this.form.waterworksId,
|
|
|
- remark:this.form.remark,
|
|
|
+ remark: this.form.remark,
|
|
|
};
|
|
|
addInventoryManage(store).then(res => {
|
|
|
if (res.code == 1) {
|
|
@@ -348,15 +352,15 @@ export default {
|
|
|
putExpert() {
|
|
|
// const data = JSON.parse(JSON.stringify(this.form));
|
|
|
let shelves = {
|
|
|
- id : this.form.id,
|
|
|
- storeEnable : this.form.storeEnable - 0,
|
|
|
- storeFunction : this.form.storeFunction,
|
|
|
- storeManagerUserName : this.form.storeManagerUserName,
|
|
|
- storeName : this.form.storeName,
|
|
|
+ id: this.form.id,
|
|
|
+ storeEnable: this.form.storeEnable - 0,
|
|
|
+ storeFunction: this.form.storeFunction,
|
|
|
+ storeManagerUserName: this.form.storeManagerUserName,
|
|
|
+ storeName: this.form.storeName,
|
|
|
// waterworksName : this.form.waterworksName,
|
|
|
- waterworksId : this.multipleSelection[0].waterworksId,
|
|
|
- storeManagerUserId:this.$store.state.user.userId,
|
|
|
- remark:this.form.remark,
|
|
|
+ waterworksId: this.multipleSelection[0].waterworksId,
|
|
|
+ storeManagerUserId: this.$store.state.user.userId,
|
|
|
+ remark: this.form.remark,
|
|
|
};
|
|
|
editInventoryManage(shelves).then(res => {
|
|
|
if (res.code == 1) {
|
|
@@ -393,12 +397,12 @@ export default {
|
|
|
// console.log("选中行"+JSON.stringify(val));
|
|
|
this.dialogTitle = '仓库详情信息';
|
|
|
this.nameEditState = true;
|
|
|
- this.form = {...val};
|
|
|
+ this.form = { ...val };
|
|
|
this.form.waterworksId = val.waterworksName;
|
|
|
this.form.storeFunction = val.storeFunctionName;
|
|
|
- if(val.storeEnable == 0){
|
|
|
+ if (val.storeEnable == 0) {
|
|
|
this.form.storeEnable = false;
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
this.form.storeEnable = true;
|
|
|
};
|
|
|
this.dialogVisible = true;
|
|
@@ -406,7 +410,7 @@ export default {
|
|
|
},
|
|
|
|
|
|
// 改变switch的值
|
|
|
- changeStatus(val){
|
|
|
+ changeStatus(val) {
|
|
|
// console.log("状态值"+JSON.stringify(val));
|
|
|
this.form.storeEnable = val;
|
|
|
},
|
|
@@ -431,41 +435,50 @@ export default {
|
|
|
<style lang="scss" scoped>
|
|
|
#register {
|
|
|
padding: 20px 30px;
|
|
|
+
|
|
|
.head {
|
|
|
margin-bottom: 10px;
|
|
|
}
|
|
|
+
|
|
|
.dialog_style {
|
|
|
margin-top: 20px;
|
|
|
width: 100%;
|
|
|
overflow: hidden;
|
|
|
+
|
|
|
/deep/ .el-table {
|
|
|
text-align: center;
|
|
|
vertical-align: middle;
|
|
|
}
|
|
|
}
|
|
|
- /deep/ .dialog > div > div:nth-child(2) {
|
|
|
+
|
|
|
+ /deep/ .dialog>div>div:nth-child(2) {
|
|
|
padding: 10px 20px;
|
|
|
}
|
|
|
+
|
|
|
.delete {
|
|
|
display: flex;
|
|
|
flex-direction: column;
|
|
|
justify-content: center;
|
|
|
align-items: center;
|
|
|
+
|
|
|
:nth-child(1) {
|
|
|
font-size: 50px;
|
|
|
color: red;
|
|
|
margin-bottom: 10px;
|
|
|
}
|
|
|
+
|
|
|
p {
|
|
|
font-size: 20px;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.flexs {
|
|
|
display: flex;
|
|
|
justify-content: center;
|
|
|
align-items: center;
|
|
|
}
|
|
|
+
|
|
|
.inputTitle {
|
|
|
display: block;
|
|
|
height: 40px;
|