xiaozhiyong/refinery-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
xiaozhiyong
2023-02-17 16:15:01 +08:00
parent 9c58fb5f1f
commit 686ca1220d
8 changed files with 336 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/components/autocomplete/index.vue Normal file
View File

@@ -0,0 +1,55 @@
<template>
<el-autocomplete
v-model="text"
:fetch-suggestions="querySearchAsync"
:value-key="config.valueKey"
:placeholder="config.placeholder"
clearable
@select="selectAutocomplete"
@clear="params[config.querykey] = ''"
></el-autocomplete>
</template>
<script>
export default {
props: {
params: Object,
config: Object,
// config: {
// serveTarget: {}, // 接口
// autocomplateKey: "", //远程搜索接口参数名
// querykey: "", //查询接口参数名
// },
},
data() {
return {
text: "",
};
},
created() {
console.log("params", this.params);
},
methods: {
// 远程搜索
querySearchAsync(queryString, cb) {
if (queryString) {
let params = {};
params[this.config.autocompleteKey] = queryString;
this.config.serveTarget(params).then((res) => {
let timeInstance = setTimeout(() => {
clearTimeout(timeInstance);
if (res.data.length) {
cb(res.data);
} else cb([]);
}, 1000 * Math.random());
});
} else cb([]);
},
selectAutocomplete(item) {
this.params[this.config.querykey] = item.id;
},
},
};
</script>
<style lang="scss" scoped></style>

70
src/views/product/components/add.vue
View File

@@ -27,14 +27,16 @@
</el-select>
</el-form-item>
<el-form-item label="炼厂名称" prop="refineryId">
<el-select v-model="form.refineryId" placeholder="请选择炼厂">
<el-option
v-for="(item, index) in refineryList"
:key="index"
:label="item.refineryName"
:value="item.id"
></el-option>
</el-select>
<!-- <el-autocomplete
label
v-model="form.refineryId"
:fetch-suggestions="querySearchAsync"
value-key="refineryName"
value="id"
placeholder="请选择炼厂"
></el-autocomplete> -->
<autocomplete :params="form" :config="configAutocomplete" />
</el-form-item>
<el-form-item label="所属炼厂库名" prop="belongLibrary">
<el-input
@@ -88,15 +90,31 @@
<script>
import serve from "api/product.js";
import refineryServe from "api/refineryInfo.js";
import refineryInfoServe from "api/refineryInfo.js";
import autocomplete from "components/autocomplete/index.vue";
export default {
components: {
autocomplete,
},
props: {
controlWindows: Object,
},
data() {
let validatorRefineryId = (rule, value, callback) => {
if (this.form.refineryId) callback();
else callback("请选择炼厂");
};
return {
form: {},
refineryList: [],
configAutocomplete: {
serveTarget: refineryInfoServe.findByEntity,
autocomplateKey: "refineryName",
valueKey: "refineryName",
placeholder: "炼厂名称",
querykey: "refineryId",
},
productTypeList: [
{
label: "0#柴",
@@ -123,7 +141,7 @@ export default {
{ required: true, message: "请选择产品类型", trigger: "change" },
],
refineryId: [
{ required: true, message: "请选择炼厂", trigger: "change" },
{ required: true, validator: validatorRefineryId, trigger: "change" },
],
belongLibrary: [
{ required: true, message: "请输入所属炼厂库名", trigger: "blur" },
@@ -146,9 +164,6 @@ export default {
},
};
},
created() {
this.findByEntity();
},
methods: {
openDrawer() {
let { id } = this.controlWindows.addInfo;
@@ -159,6 +174,7 @@ export default {
}
},
submit() {
console.log("this.form", this.form);
this.$refs["form"].validate((valid) => {
if (valid) {
this.judgeInterface(this.form).then((res) => {
@@ -176,11 +192,26 @@ export default {
else return serve.save(form);
},
//炼厂list
findByEntity() {
refineryServe.findByEntity().then((res) => {
this.refineryList = res.data;
});
},
// findByEntity() {
// refineryServe.findByEntity().then((res) => {
// this.refineryList = res.data;
// });
// },
// 远程搜索
// querySearchAsync(queryString, cb) {
// if (queryString) {
// refineryServe
// .findByEntity({ refineryName: queryString })
// .then((res) => {
// let timeInstance = setTimeout(() => {
// clearTimeout(timeInstance);
// if (res.data.length) {
// cb(res.data);
// } else cb([]);
// }, 1000 * Math.random());
// });
// } else cb([]);
// },
closeWindow() {
this.$emit("closeWindow");
this.form = {};
@@ -199,7 +230,8 @@ export default {
padding: 20px;
.el-input,
.el-select,
.el-textarea {
.el-textarea,
.el-autocomplete {
width: 300px;
}
}

69
src/views/product/components/create.vue
View File

@@ -17,14 +17,16 @@
></el-input>
</el-form-item>
<el-form-item label="炼厂名称" prop="refineryId">
<el-select v-model="form.refineryId" placeholder="请选择炼厂">
<el-option
v-for="(item, index) in refineryList"
:key="index"
:label="item.refineryName"
:value="item.id"
></el-option>
</el-select>
<!-- <el-autocomplete
label
v-model="form.refineryId"
:fetch-suggestions="querySearchAsync"
value-key="refineryName"
value="id"
placeholder="炼厂名称"
></el-autocomplete> -->
<autocomplete :params="form" :config="configAutocomplete" />
</el-form-item>
<el-form-item label="产品类型" prop="productType">
<el-select v-model="form.productType" placeholder="请选择产品类型">
@@ -70,16 +72,32 @@
<script>
import serve from "api/product.js";
import refineryServe from "api/refineryInfo.js";
import refineryInfoServe from "api/refineryInfo.js";
import autocomplete from "components/autocomplete/index.vue";
export default {
components: {
autocomplete,
},
props: {
controlWindows: Object,
// refineryTypeEnum: Array,
},
data() {
let validatorRefineryId = (rule, value, callback) => {
if (this.form.refineryId) callback();
else callback("请选择炼厂");
};
return {
form: {},
refineryList: [],
configAutocomplete: {
serveTarget: refineryInfoServe.findByEntity,
autocomplateKey: "refineryName",
valueKey: "refineryName",
placeholder: "炼厂名称",
querykey: "refineryId",
},
productTypeList: [
{
label: "0#柴",
@@ -103,7 +121,7 @@ export default {
{ required: true, message: "请输入产品名称", trigger: "blur" },
],
refineryId: [
{ required: true, message: "请选择炼厂", trigger: "change" },
{ required: true, validator: validatorRefineryId, trigger: "change" },
],
enableMark: [
{ required: true, message: "请选择启用状态", trigger: "change" },
@@ -114,9 +132,6 @@ export default {
},
};
},
created() {
this.findByEntity();
},
methods: {
openDrawer() {},
submit() {
@@ -137,11 +152,26 @@ export default {
else return serve.save(form);
},
//炼厂list
findByEntity() {
refineryServe.findByEntity().then((res) => {
this.refineryList = res.data;
});
},
// findByEntity() {
// refineryServe.findByEntity().then((res) => {
// this.refineryList = res.data;
// });
// },
// 远程搜索
// querySearchAsync(queryString, cb) {
// if (queryString) {
// refineryServe
// .findByEntity({ refineryName: queryString })
// .then((res) => {
// let timeInstance = setTimeout(() => {
// clearTimeout(timeInstance);
// if (res.data.length) {
// cb(res.data);
// } else cb([]);
// }, 1000 * Math.random());
// });
// } else cb([]);
// },
closeWindow() {
this.$emit("closeWindow");
this.form = {};
@@ -157,7 +187,8 @@ export default {
padding: 20px;
.el-input,
.el-select,
.el-textarea {
.el-textarea,
.el-autocomplete {
width: 300px;
}
}

66
src/views/product/index.vue
View File

@@ -7,19 +7,19 @@
placeholder="产品名称"
clearable
></el-input>
<el-select
v-model="parameter.params.refineryId"
<autocomplete :params="parameter.params" :config="configAutocomplete" />
<!-- <el-autocomplete
v-model="parameter.params.refineryName"
:fetch-suggestions="querySearchAsync"
@select="selectAutocomplete"
value-key="refineryName"
placeholder="炼厂名称"
clearable
>
<el-option
v-for="item in refineryList"
:key="item.id"
:label="item.refineryName"
:value="item.id"
>
</el-option>
</el-select>
@clear="parameter.params.refineryId = ''"
></el-autocomplete> -->
<el-input
v-model="parameter.params.belongLibrary"
placeholder="所处炼厂库"
@@ -198,7 +198,7 @@
<script>
import serve from "api/product.js";
import refineryServe from "api/refineryInfo.js";
import refineryInfoServe from "api/refineryInfo.js";
import add from "./components/add.vue";
import create from "./components/create.vue";
@@ -206,6 +206,7 @@ import record from "./components/record.vue";
import batch from "./components/batch.vue";
import adjust from "./components/adjust.vue";
import autocomplete from "components/autocomplete/index.vue";
import pagination from "components/pagination/index.vue";
import generalDetails from "components/generalDetails/index.vue";
@@ -221,6 +222,13 @@ export default {
batch: false,
adjust: false,
},
configAutocomplete: {
serveTarget: refineryInfoServe.findByEntity,
autocomplateKey: "refineryName",
valueKey: "refineryName",
placeholder: "炼厂名称",
querykey: "refineryId",
},
refineryList: [],
multipleRowList: [],
tableHeight: 0,
@@ -263,6 +271,7 @@ export default {
adjust,
pagination,
autocomplete,
generalDetails,
},
mounted() {
@@ -275,7 +284,6 @@ export default {
);
},
created() {
this.findByEntity();
this.getByPage();
},
methods: {
@@ -294,12 +302,25 @@ export default {
this.parameter.total = res.data.totalCount;
});
},
//炼厂list
findByEntity() {
refineryServe.findByEntity().then((res) => {
this.refineryList = res.data;
});
},
// 远程搜索
// querySearchAsync(queryString, cb) {
// if (queryString) {
// refineryServe
// .findByEntity({ refineryName: queryString })
// .then((res) => {
// let timeInstance = setTimeout(() => {
// clearTimeout(timeInstance);
// if (res.data.length) {
// console.log(res.data);
// cb(res.data);
// } else cb([]);
// }, 1000 * Math.random());
// });
// } else cb([]);
// },
// selectAutocomplete(item) {
// this.parameter.params.refineryId = item.id;
// },
//新增
addition() {
this.controlWindows.addInfo.title = "产品新增";
@@ -399,6 +420,9 @@ export default {
width: 183px;
height: 40px;
}
.el-autocomplete + .el-input,
.el-input + .el-autocomplete,
.el-autocomplete + .el-select,
.el-input + .el-input,
.el-input + .el-select,
.el-select + .el-select,
@@ -435,10 +459,6 @@ export default {
margin-bottom: 20px;
border-radius: 10px 10px 0px 0px;
}
// .el-link,
// .el-dropdown {
// margin-right: 10px;
// }
.el-dropdown-link {
margin-right: 10px;

80
src/views/refineryAccount/components/add.vue
View File

@@ -27,20 +27,16 @@
</el-select>
</el-form-item>
<el-form-item label="炼厂名称" prop="refineryId">
<el-select
class="mr20"
<!-- <el-autocomplete
label
v-model="form.refineryId"
:fetch-suggestions="querySearchAsync"
value-key="refineryName"
value="id"
placeholder="请选择炼厂"
clearable
>
<el-option
v-for="item in refineryList"
:key="item.id"
:label="item.refineryName"
:value="item.id"
>
</el-option>
</el-select>
></el-autocomplete> -->
<autocomplete :params="form" :config="configAutocomplete" />
</el-form-item>
</el-form>
</div>
@@ -54,15 +50,31 @@
<script>
import refineryInfoServe from "api/refineryInfo.js";
import serve from "api/refineryAccount.js";
import autocomplete from "components/autocomplete/index.vue";
export default {
components: {
autocomplete,
},
props: {
controlWindows: Object,
refineryAccountTypeEnum: Array,
},
data() {
let validatorRefineryId = (rule, value, callback) => {
if (this.form.refineryId) callback();
else callback("请选择炼厂");
};
return {
form: {},
refineryList: [],
configAutocomplete: {
serveTarget: refineryInfoServe.findByEntity,
autocomplateKey: "refineryName",
valueKey: "refineryName",
placeholder: "炼厂名称",
querykey: "refineryId",
},
rules: {
accountName: [
{ required: true, message: "请输入账户名称", trigger: "blur" },
@@ -71,15 +83,13 @@ export default {
{ required: true, message: "请输入账户名称", trigger: "blur" },
],
refineryId: [
{ required: true, message: "请选择炼厂", trigger: "change" },
{ required: true, validator: validatorRefineryId, trigger: "change" },
],
},
};
},
methods: {
openDrawer() {
this.findByEntity();
},
openDrawer() {},
submit() {
this.$refs["form"].validate((valid) => {
if (valid) {
@@ -97,16 +107,31 @@ export default {
if (id) return serve.update(form);
else return serve.save(form);
},
//炼厂list
findByEntity() {
refineryInfoServe.findByEntity().then((res) => {
this.refineryList = res.data;
let { id } = this.controlWindows.addInfo;
if (id) {
this.form = JSON.parse(JSON.stringify(this.controlWindows.addInfo));
}
});
},
// //炼厂list
// findByEntity() {
// refineryInfoServe.findByEntity().then((res) => {
// this.refineryList = res.data;
// let { id } = this.controlWindows.addInfo;
// if (id) {
// this.form = JSON.parse(JSON.stringify(this.controlWindows.addInfo));
// }
// });
// },
//远程搜索
// querySearchAsync(queryString, cb) {
// if (queryString) {
// refineryInfoServe
// .findByEntity({ refineryName: queryString })
// .then((res) => {
// let timeInstance = setTimeout(() => {
// clearTimeout(timeInstance);
// if (res.data.length) {
// cb(res.data);
// } else cb([]);
// }, 1000 * Math.random());
// });
// } else cb([]);
// },
closeWindow() {
this.$emit("closeWindow");
this.form = {};
@@ -125,7 +150,8 @@ export default {
padding: 20px;
.el-input,
.el-select,
.el-textarea {
.el-textarea,
.el-autocomplete {
width: 300px;
}
}

67
src/views/refineryAccount/index.vue
View File

@@ -1,20 +1,18 @@
<template>
<div class="order">
<div class="frame">
<el-select
<!-- <el-autocomplete
class="mr20"
label
v-model="parameter.params.id"
:fetch-suggestions="querySearchAsync"
value-key="refineryName"
value="id"
placeholder="炼厂名称"
clearable
>
<el-option
v-for="item in refineryList"
:key="item.id"
:label="item.refineryName"
:value="item.id"
>
</el-option>
</el-select>
></el-autocomplete> -->
<autocomplete :params="parameter.params" :config="configAutocomplete" />
<el-select
v-model="parameter.params.refineryType"
placeholder="炼厂类型"
@@ -141,11 +139,18 @@ import serve from "api/refineryAccount.js";
import add from "./components/add.vue";
import pagination from "components/pagination/index.vue";
import autocomplete from "components/autocomplete/index.vue";
import generalDetails from "components/generalDetails/index.vue";
import { refineryTypeEnum, refineryAccountTypeEnum } from "utils/dataType.js";
export default {
components: {
add,
pagination,
autocomplete,
generalDetails,
},
data() {
return {
refineryTypeEnum: refineryTypeEnum,
@@ -155,6 +160,13 @@ export default {
addInfo: {},
detail: false,
},
configAutocomplete: {
serveTarget: refineryInfoServe.findByEntity,
autocomplateKey: "refineryName",
valueKey: "refineryName",
placeholder: "炼厂名称",
querykey: "refineryId",
},
refineryList: [],
tableHeight: 0,
tableData: [],
@@ -183,11 +195,7 @@ export default {
],
};
},
components: {
add,
pagination,
generalDetails,
},
mounted() {
this.$nextTick(() => {
this.heightHandle();
@@ -198,7 +206,6 @@ export default {
);
},
created() {
this.findByEntity();
this.getByPage();
},
methods: {
@@ -214,11 +221,26 @@ export default {
});
},
//炼厂list
findByEntity() {
refineryInfoServe.findByEntity().then((res) => {
this.refineryList = res.data;
});
},
// findByEntity() {
// refineryInfoServe.findByEntity().then((res) => {
// this.refineryList = res.data;
// });
// },
//远程搜索
// querySearchAsync(queryString, cb) {
// if (queryString) {
// refineryInfoServe
// .findByEntity({ refineryName: queryString })
// .then((res) => {
// let timeInstance = setTimeout(() => {
// clearTimeout(timeInstance);
// if (res.data.length) {
// cb(res.data);
// } else cb([]);
// }, 1000 * Math.random());
// });
// } else cb([]);
// },
//新增
addition() {
this.controlWindows.addInfo.title = "账户新增";
@@ -276,6 +298,7 @@ export default {
width: 183px;
height: 40px;
}
.el-autocomplete + .el-select,
.el-input + .el-input,
.el-input + .el-select,
.el-select + .el-select,

62
src/views/refineryInfo/index.vue
View File

@@ -1,20 +1,18 @@
<template>
<div class="order">
<div class="frame">
<el-select
<!-- <el-autocomplete
class="mr20"
label
v-model="parameter.params.id"
:fetch-suggestions="querySearchAsync"
value-key="refineryName"
value="id"
placeholder="炼厂名称"
clearable
>
<el-option
v-for="item in refineryList"
:key="item.id"
:label="item.refineryName"
:value="item.id"
>
</el-option>
</el-select>
></el-autocomplete> -->
<autocomplete :params="parameter.params" :config="configAutocomplete" />
<el-select
v-model="parameter.params.refineryType"
placeholder="炼厂类型"
@@ -169,11 +167,18 @@ import serve from "api/refineryInfo.js";
import add from "./components/add.vue";
import pagination from "components/pagination/index.vue";
import autocomplete from "components/autocomplete/index.vue";
import generalDetails from "components/generalDetails/index.vue";
import { refineryTypeEnum } from "utils/dataType.js";
export default {
components: {
add,
pagination,
autocomplete,
generalDetails,
},
data() {
return {
refineryTypeEnum: refineryTypeEnum,
@@ -182,7 +187,13 @@ export default {
addInfo: {},
detail: false,
},
configAutocomplete: {
serveTarget: serve.findByEntity,
autocomplateKey: "refineryName",
valueKey: "refineryName",
placeholder: "炼厂名称",
querykey: "refineryId",
},
refineryList: [],
tableHeight: 0,
tableData: [],
@@ -212,11 +223,7 @@ export default {
],
};
},
components: {
add,
pagination,
generalDetails,
},
mounted() {
this.$nextTick(() => {
this.heightHandle();
@@ -227,7 +234,6 @@ export default {
);
},
created() {
this.findByEntity();
this.getByPage();
},
methods: {
@@ -242,12 +248,19 @@ export default {
this.parameter.total = res.data.totalCount;
});
},
//炼厂list
findByEntity() {
serve.findByEntity().then((res) => {
this.refineryList = res.data;
});
},
//远程搜索
// querySearchAsync(queryString, cb) {
// if (queryString) {
// serve.findByEntity({ refineryName: queryString }).then((res) => {
// let timeInstance = setTimeout(() => {
// clearTimeout(timeInstance);
// if (res.data.length) {
// cb(res.data);
// } else cb([]);
// }, 1000 * Math.random());
// });
// } else cb([]);
// },
//新增
addition() {
this.controlWindows.addInfo.title = "炼厂入驻";
@@ -328,6 +341,7 @@ export default {
width: 183px;
height: 40px;
}
.el-autocomplete + .el-select,
.el-input + .el-input,
.el-input + .el-select,
.el-select + .el-select,

2
vue.config.js
View File

@@ -29,7 +29,7 @@ module.exports = {
[process.env.VUE_APP_BASE_API]: {
// target: `https://3816t6291y.oicp.vip`,
// target: 'https://6l438d1757.zicp.fun',
target: "http://192.168.110.10:38080",
target: "http://192.168.110.230:38080",
changeOrigin: true,
pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "",