fengdong777 2 years ago
parent
commit
a2a8feb2db
  1. 9
      supervise-risk-ui/src/api/Risk/riskIndex.js
  2. 178
      supervise-risk-ui/src/views/risk/RIskJkzb/riskDsts.vue
  3. 431
      warehousing-system/project_web/src/components/initial_value/storehouse.vue
  4. 40
      warehousing-system/project_web/src/components/instorehouse/purchase.vue
  5. 2
      warehousing-system/project_web/src/main.js

9
supervise-risk-ui/src/api/Risk/riskIndex.js

@ -57,5 +57,12 @@ export default {
method: 'get',
})
},
// 添加定时时间
scheduledSave: function(params) {
return request({
url: '/v1/scheduled/save',
method: 'post',
data: params
})
},
}

178
supervise-risk-ui/src/views/risk/RIskJkzb/riskDsts.vue

@ -1,15 +1,177 @@
<template>
<div>
定时推送设置
</div>
</template>
<div class="app-container">
<div class="search">
<el-form ref="queryParams" :inline="true" :model="dataTime" class="tab-header">
<el-form-item label="定时时间:" >
<el-date-picker
v-model="dataTime.time"
type="date"
clearable
value-format="yyyy-MM-dd"
placeholder="选择日期"
/>
</el-form-item>
<el-button
type="primary"
size="small"
icon="el-icon-refresh"
@click="captruedatas()"
>设置</el-button
>
</el-form>
</div>
<div class="listconadd" style="padding: 20px;">
<el-table :default-sort = "{prop: 'date', order: 'descending'}" :data="tableData" border style="width: 100%" >
<el-table-column label="序号" width="55px" :index="indexMethod" type="index" align="center"></el-table-column>
<el-table-column prop="enpName" label="厂家" width="100px" align="center">
</el-table-column>
<el-table-column prop="name" label="品牌" align="center" width="100px">
</el-table-column>
<el-table-column prop="storeName" label="门店" align="center" >
</el-table-column>
<el-table-column prop="dataDate" label="日期" sortable align="center" width="150px">
</el-table-column>
<el-table-column prop="salesAmount" label="销售额" align="center" width="100px">
</el-table-column>
</el-table>
<script>
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<!-- <pagination
:total="queryParams.total"
:page.sync="queryParams.current"
:limit.sync="queryParams.size"
@pagination="getPageList"
/> -->
</div>
</div>
<!-- 手动抓取数据 -->
<!-- <el-dialog
:title="dialogTitle + '数据'"
:visible.sync="captrue"
width="40%">
<el-form :model="ruleForm" ref="ruleForm" label-width="100px" class="demo-ruleForm">
<el-form-item label="抓取时间" required>
<el-col :span="11">
<el-form-item >
<el-date-picker type="date" placeholder="选择日期" value-format="yyyy-MM-dd" :picker-options="pickerOptions" v-model="ruleForm.time" style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
</el-form-item>
<el-form-item label="抓取内容" required>
<el-checkbox label="抓取实时金额" v-model="ruleForm.data.salesAmount"></el-checkbox>
<el-checkbox label="抓取采购信息" v-model="ruleForm.data.purchase"></el-checkbox>
<el-checkbox label="抓取菜品销量信息" v-model="ruleForm.data.salesDishes"></el-checkbox>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm()">立即抓取</el-button>
<el-button @click="resetForm()">重置</el-button>
</el-form-item>
</el-form>
</el-dialog> -->
</div>
</template>
<script>
import req from '@/api/Risk/riskIndex'
import Pagination from '@/components/pagination'
export default {
components: {
Pagination
},
data() {
return {
dataTime:{
time:''
},
tableData:[],
queryParams: {
current: 1,
size: 10,
total: 0,
params: {
},
},
pickerOptions:{
disabledDate(time){
return time.getTime()> Date.now()- 8.64e7;// -8.64e7
}
}
};
},
mounted() {
},
created() {
},
methods: {
resetSearch() {
//
this.queryParams = {
total: 0, //
current: 1, //
size: 10, //
params: {
},
};
this.getPageList();
},
// getPageList() {
// this.tableLoading = true
// const _this=this
// listPage(this.queryParams).then((res) => {
// this.tableLoading = false
// if (res.success) {
// this.queryParams.total = res.data.total
// _this.tableData=res.data.records
// console.log(res.data.records[0].proportion[0]);
// } else {
// // resp.code
// _this.tableData = []
// this.queryParams.total = 0
// }
// }).catch(() => {
// this.tableLoading = false
// })
// },
//
indexMethod(index) {
var pagestart = (this.queryParams.current - 1) * this.queryParams.size
var pageindex = index + 1 + pagestart
return pageindex
},
reset() {
this.form = {};
},
//
dosearch() {
this.getPageList();
},
}
//
captruedatas(){
req
.scheduledSave(this.dataTime)
.then(resp => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: resp.msg })
} else {
// resp.code
}
})
},
},
};
</script>
<style scoped="scoped" >
<style>
</style>
</style>

431
warehousing-system/project_web/src/components/initial_value/storehouse.vue

@ -22,25 +22,45 @@
>
</el-col>
</el-row>
<el-table
:data="storehouseList"
style="width: 100%"
border
height="500"
>
<el-table-column label="序号" type="index" width="60" :index="indexMethod" align="center" />
<el-table-column prop="custerName" label="客户名称" align="center"> </el-table-column>
<el-table-column prop="name" label="仓库名称" align="center"> </el-table-column>
<el-table-column prop="simpleName" label="仓库简称" width="100" align="center"> </el-table-column>
<el-table-column prop="code" label="仓库编码" align="center"> </el-table-column>
<el-table-column label="所属地(省 - 市 - 县)" width="200" align="center">
<template slot-scope="scope">
<span>{{ scope.row.provinceName }}</span>
<span>-{{ scope.row.cityName }}-</span>
<span>{{ scope.row.countyName }}</span>
</template>
<el-table :data="storehouseList" style="width: 100%" border height="500">
<el-table-column
label="序号"
type="index"
width="60"
:index="indexMethod"
align="center"
/>
<el-table-column prop="custerName" label="客户名称" align="center">
</el-table-column>
<el-table-column prop="name" label="仓库名称" align="center">
</el-table-column>
<el-table-column
prop="simpleName"
label="仓库简称"
width="100"
align="center"
>
</el-table-column>
<el-table-column prop="code" label="仓库编码" align="center">
</el-table-column>
<el-table-column
label="所属地(省 - 市 - 县)"
width="200"
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.provinceName }}</span>
<span>-{{ scope.row.cityName }}-</span>
<span>{{ scope.row.countyName }}</span>
</template>
</el-table-column>
<el-table-column fixed="right" prop="operate" label="操作" align="center" width="300">
<el-table-column
fixed="right"
prop="operate"
label="操作"
align="center"
width="300"
>
<template slot-scope="scope">
<el-button
type="primary"
@ -103,10 +123,10 @@
placeholder="请选择"
>
<el-option
v-for="custName in storehouseListss"
:key="custName.name"
:label="custName.name"
:value="custName.name"
v-for="(custName,i) in custList"
:key="i"
:label="custName.enterpriseName"
:value="custName.enterpriseName"
>
</el-option>
</el-select>
@ -118,20 +138,13 @@
</el-col>
<el-col :span="3" class="trightb">
<el-form-item prop="name">
<el-select
<el-input
size="small"
v-model="form.name"
placeholder="请选择"
@change="getSupplier"
>
<el-option
v-for="(storehouse, i) in storeList"
:key="i"
:label="storehouse.name"
:value="storehouse.name"
>
</el-option>
</el-select>
placeholder="仓库名称"
class="addinputw"
clearable
/>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
@ -223,7 +236,7 @@
<el-col :span="3.2" class="tleftb">
<span><span class="icon">*</span>详细地址</span>
</el-col>
<el-col :span="4" class="trightb">
<el-col :span="15" class="trightb">
<el-form-item prop="address"
><el-input
size="small"
@ -233,7 +246,9 @@
clearable
/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
</el-row>
<el-row>
<el-col :span="3.2" class="tleftb">
<span><span class="icon">*</span>库房面积</span>
</el-col>
<el-col :span="3" class="trightb">
@ -274,10 +289,7 @@
clearable
/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3.2" class="tleftb">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>库房性质名称</span>
</el-col>
<el-col :span="3" class="trightb">
@ -291,9 +303,12 @@
/>
</el-form-item>
</el-col>
</el-row>
<el-col :span="2" class="tleftb">
<span><span class="icon">*</span>房源</span>
<el-row>
<el-col :span="3.2" class="tleftb">
<span><span class="icon">*</span>房源信息</span>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item prop="housingResource"
@ -364,12 +379,29 @@
<el-button type="primary" @click="operationStorehouse"> </el-button>
</div>
</el-dialog>
<el-dialog title="仓库详细信息" :visible.sync="addPurchaseDialogVisible" width="75%">
<el-dialog
title="仓库详细信息"
:visible.sync="addPurchaseDialogVisible"
width="75%"
>
<div class="listconadd">
<el-form ref="dataForm" :model="temp" label-position="top" label-width="190px" class="formadd">
<div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
<div style="margin-left: 15px;">基本信息</div>
<el-form
ref="dataForm"
:model="temp"
label-position="top"
label-width="190px"
class="formadd"
>
<div
class="title"
style="
display: flex;
align-items: center;
justify-content: space-between;
height: 40px;
"
>
<div style="margin-left: 15px">基本信息</div>
</div>
<el-row>
<el-col :span="4" class="trightbs">
@ -379,7 +411,7 @@
</el-col>
<el-col :span="8">
<el-form-item class="trightbs_item">
<span>{{temp.custerName}}</span>
<span>{{ temp.custerName }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightbs">
@ -389,7 +421,7 @@
</el-col>
<el-col :span="8">
<el-form-item class="trightbs_item">
<span>{{temp.name}}</span>
<span>{{ temp.name }}</span>
</el-form-item>
</el-col>
</el-row>
@ -401,7 +433,7 @@
</el-col>
<el-col :span="8">
<el-form-item class="trightbs_item">
<span>{{temp.simpleName}}</span>
<span>{{ temp.simpleName }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightbs">
@ -411,7 +443,7 @@
</el-col>
<el-col :span="8">
<el-form-item class="trightbs_item">
<span>{{temp.code}}</span>
<span>{{ temp.code }}</span>
</el-form-item>
</el-col>
</el-row>
@ -423,7 +455,7 @@
</el-col>
<el-col :span="8">
<el-form-item class="trightbs_item">
<span>{{temp.linkerName}}</span>
<span>{{ temp.linkerName }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightbs">
@ -433,7 +465,7 @@
</el-col>
<el-col :span="8">
<el-form-item class="trightbs_item">
<span>{{temp.linkerPhone}}</span>
<span>{{ temp.linkerPhone }}</span>
</el-form-item>
</el-col>
</el-row>
@ -445,7 +477,10 @@
</el-col>
<el-col :span="8">
<el-form-item class="trightbs_item">
<span>{{temp.provinceName}} - {{temp.cityName}} - {{temp.countyName}}</span>
<span
>{{ temp.provinceName }} - {{ temp.cityName }} -
{{ temp.countyName }}</span
>
</el-form-item>
</el-col>
<el-col :span="4" class="trightbs">
@ -455,7 +490,7 @@
</el-col>
<el-col :span="8">
<el-form-item class="trightbs_item">
<span>{{temp.regionName}}</span>
<span>{{ temp.regionName }}</span>
</el-form-item>
</el-col>
</el-row>
@ -467,10 +502,9 @@
</el-col>
<el-col :span="20">
<el-form-item class="trightbs_item">
<span>{{temp.address}}</span>
<span>{{ temp.address }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
@ -481,7 +515,7 @@
</el-col>
<el-col :span="8">
<el-form-item class="trightbs_item">
<span>{{temp.housingResource}}</span>
<span>{{ temp.housingResource }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightbs">
@ -491,7 +525,7 @@
</el-col>
<el-col :span="8">
<el-form-item class="trightbs_item">
<span>{{temp.acreage}}</span>
<span>{{ temp.acreage }}</span>
</el-form-item>
</el-col>
</el-row>
@ -504,7 +538,7 @@
</el-col>
<el-col :span="8">
<el-form-item class="trightbs_item">
<span>{{temp.storeyHeight}}</span>
<span>{{ temp.storeyHeight }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightbs">
@ -514,7 +548,7 @@
</el-col>
<el-col :span="8">
<el-form-item class="trightbs_item">
<span>{{temp.monthlyPrice}}</span>
<span>{{ temp.monthlyPrice }}</span>
</el-form-item>
</el-col>
</el-row>
@ -527,7 +561,7 @@
</el-col>
<el-col :span="8">
<el-form-item class="trightbs_item">
<span>{{temp.attributeNames}}</span>
<span>{{ temp.attributeNames }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightbs">
@ -537,15 +571,16 @@
</el-col>
<el-col :span="8">
<el-form-item class="trightbs_item">
<el-button v-if="temp.picUrl" type="text" @click="toDownload()">下载仓库信息表</el-button>
<div v-else>没有信息表文件</div>
<el-button v-if="temp.picUrl" type="text" @click="toDownload()"
>下载仓库信息表</el-button
>
<div v-else>没有信息表文件</div>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</el-dialog>
</div>
</el-dialog>
</div>
</template>
@ -568,7 +603,8 @@ export default {
provinceList: [],
cityList: [],
countyList: [],
updateAction: "http://jianguan.yyundong.com/warehouseapi/v1/shstorehouse/upload",
updateAction:
"http://jianguan.yyundong.com/warehouseapi/v1/shstorehouse/upload",
storehouseDialogVisible: false,
addPurchaseDialogVisible: false,
// myHeaders: { Access-Control-Allow-Origin},
@ -584,7 +620,7 @@ export default {
simpleName: [
{ required: true, message: "请输入仓库简称", trigger: "blur" },
],
addr: [{ required: true, message: "请输入仓库地址", trigger: "blur" }],
address: [{ required: true, message: "请输入仓库地址", trigger: "blur" }],
},
tableData: [],
fileList: [],
@ -611,18 +647,19 @@ export default {
CITY: [],
XIAN: [],
temp: {},
custList: [],
mapApiKey: "map",
shouhuoArrive: {},
fullscreenloading: null,
};
},
methods: {
//
indexMethod(index) {
var pagestart = (this.queryInfo.current - 1) * this.queryInfo.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
indexMethod(index) {
var pagestart = (this.queryInfo.current - 1) * this.queryInfo.size;
var pageindex = index + 1 + pagestart;
return pageindex;
},
handleSizeChange(val) {
this.queryInfo.size = val;
this.getStorehouseList();
@ -631,8 +668,8 @@ export default {
this.queryInfo.current = val;
this.getStorehouseList();
},
clearList(){
this.form={
clearList() {
this.form = {
name: "",
custerName: "",
provinceName: "",
@ -650,41 +687,28 @@ export default {
linkerName: "",
linkerPhone: "",
picUrl: "",
}
};
},
async getStorehouseList() {
const { data: result } = await this.$http.post(
"/v1/shstorehouse/listPage",
{ params: this.queryInfo }
);
if (result.code == 200)
this.total = result.data.total;
if (result.code == 200) this.total = result.data.total;
this.storehouseList = result.data.records;
},
addStorehouseDialog() {
this.title = "新增仓库";
this.storehouseDialogVisible = true;
},
async getStorehouseLists() {
const { data: result } = await this.$http.get("/purchase/getStorehouse");
if (result.status !== 200) return this.$message.error("获取仓库列表失败");
this.storehouseLists = result.data;
this.storehouseListss = result.data;
for (var i = 0; i < this.storehouseLists.length; i++) {
let item = {
name: this.storehouseLists[i].name,
};
this.storeList.push(item);
async getcustListList () {
const { data: result } = await this.$http.get('/v1/shstorehouse/fetchEntList')
if (result.code == 200){
this.custList = result.data
}
},
getSupplier(value) {
const choose = this.storehouseLists.filter((item) => item.name === value);
this.form.simpleName = choose[0].simpleName;
this.form.code = choose[0].addr;
},
updataStorehousedialog(storehouse) {
this.form=storehouse
this.form = storehouse;
this.title = "修改仓库";
this.storehouseDialogVisible = true;
},
@ -693,19 +717,17 @@ export default {
"/v1/shstorehouse/save",
this.form
);
if (result.code == 200)
this.$message.success("成功添加仓库");
if (result.code == 200) this.$message.success("成功添加仓库");
this.getStorehouseList();
this.storehouseDialogVisible = false;
this.clearList()
this.clearList();
},
async updataStorehouse() {
const { data: result } = await this.$http.post(
"/v1/shstorehouse/save",
this.form
);
if (result.code == 200)
this.$message.success("更新成功");
if (result.code == 200) this.$message.success("更新成功");
this.getStorehouseList();
this.storehouseDialogVisible = false;
},
@ -716,8 +738,8 @@ export default {
}
},
async deleteStorehouse(storehouse) {
const sids = []
sids.push(storehouse.sid)
const sids = [];
sids.push(storehouse.sid);
const result = await this.$confirm(
"此操作将永久删除" + storehouse.name + ", 是否继续?",
"提示",
@ -729,10 +751,10 @@ export default {
).catch((error) => error);
if (result !== "confirm") return this.$message.info("用户取消操作");
const { data: resultDB } = await this.$http.post(
'/v1/shstorehouse/delBySids',sids
"/v1/shstorehouse/delBySids",
sids
);
if (resultDB.code == 200)
this.getStorehouseList();
if (resultDB.code == 200) this.getStorehouseList();
this.$message.success("仓库删除成功");
},
getMap() {
@ -747,6 +769,7 @@ export default {
},
}).then((res) => {
this.provinceList = res.data.districts[0].districts; /* 省*/
console.log(res);
/* 进行遍历赋值*/
/* 市区和县区*/
let newProvince = this.provinceList;
@ -825,51 +848,53 @@ export default {
}
},
handleSuccess(resp, file, fileList) {
console.log('222', resp)
const rdata = resp.data
const _this = this
_this.form.picUrl=rdata
if (this.fullscreenloading) this.fullscreenloading.close()
this.fullscreenloading = null
_this.$message({
showClose: true,
type: "success",
message: "导入成功",
});
console.log("222", resp);
const rdata = resp.data;
const _this = this;
_this.form.picUrl = rdata;
if (this.fullscreenloading) this.fullscreenloading.close();
this.fullscreenloading = null;
_this.$message({
showClose: true,
type: "success",
message: "导入成功",
});
},
handleProgress(event, file, fileList) {
const _this = this
this.fullscreenloading = this.$loading({
lock: true,
text: '文件正在上传',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
console.log('111', event.percent)
if (event.percent >= 100) {
_this.fullscreenloading.text = '上传完成,正在导入数据库'
}
const _this = this;
this.fullscreenloading = this.$loading({
lock: true,
text: "文件正在上传",
spinner: "el-icon-loading",
background: "rgba(0, 0, 0, 0.7)",
});
console.log("111", event.percent);
if (event.percent >= 100) {
_this.fullscreenloading.text = "上传完成,正在导入数据库";
}
},
beforeRemove(file, fileList) {
return this.$confirm(`确定移除 ${file.name}`);
},
async LookStorehousedialog(purchase){
this.addPurchaseDialogVisible=true
const _this = this
const { data: result } = await this.$http.get(`/v1/shstorehouse/fetchDetailsBySid/${purchase.sid}`)
if (result.code==200) {
_this.temp=result.data
async LookStorehousedialog(purchase) {
this.addPurchaseDialogVisible = true;
const _this = this;
const { data: result } = await this.$http.get(
`/v1/shstorehouse/fetchDetailsBySid/${purchase.sid}`
);
if (result.code == 200) {
_this.temp = result.data;
}
},
toDownload() {
if (this.temp.picUrl) {
window.open(this.temp.picUrl, "_blank");
}
},
toDownload() {
if (this.temp.picUrl) {
window.open(this.temp.picUrl, '_blank')
}
},
},
mounted() {
this.getStorehouseList();
this.getStorehouseLists();
this.getcustListList();
// this.getStoreList()
this.getMap();
},
@ -878,17 +903,17 @@ export default {
<style scoped>
/deep/ .el-collapse-item__header {
height: 40px;
font-weight: bold;
font-size: 16px;
text-align: left;
color: #ffffff;
background-color: #0294d7;
}
height: 40px;
font-weight: bold;
font-size: 16px;
text-align: left;
color: #ffffff;
background-color: #0294d7;
}
/deep/ .el-collapse-item__content {
padding-bottom: 0;
}
/deep/ .el-collapse-item__content {
padding-bottom: 0;
}
.tleftb {
text-align: right;
font-size: 14px;
@ -896,7 +921,7 @@ export default {
line-height: 40px !important;
}
.trightb {
text-align: right;
/* text-align: right; */
font-weight: bold;
color: #606266;
}
@ -910,57 +935,57 @@ export default {
color: rgba(255, 0, 0, 0.553);
margin-right: 3px;
}
.trightbs {
display: flex;
align-items: center;
text-align: center;
justify-content: center;
}
.trightbs {
display: flex;
align-items: center;
text-align: center;
justify-content: center;
}
.trightbs_item {
padding-top: 5px;
}
.trightbs_item {
padding-top: 5px;
}
.span {
margin-left: 50px;
font-size: 15px;
font-weight: 400;
}
.formadd {
padding: 10px 40px 0 40px;
font-size: 16px;
}
.formadd .title {
font-weight: bold;
font-size: 16px;
background-color: #0294d7;
text-align: left;
color: #ffffff;
}
.first_row{
border-top: 1px solid #e0e3eb;
}
.formadd .el-row {
display: flex;
flex-wrap: wrap;
border-left: 1px solid #e0e3eb;
}
.formadd .el-row .el-col {
border-right: 1px solid #e0e3eb;
border-bottom: 1px solid #e0e3eb;
padding: 0 15px;
min-height: 42px;
line-height: 1;
}
.formadd .el-row .el-col .el-form-item {
margin-bottom: 0;
line-height: 42px;
}
.addinputw {
width: 80%;
line-height: 42px;
}
.el-input__inner {
height: 36px;
}
.span {
margin-left: 50px;
font-size: 15px;
font-weight: 400;
}
.formadd {
padding: 10px 40px 0 40px;
font-size: 16px;
}
.formadd .title {
font-weight: bold;
font-size: 16px;
background-color: #0294d7;
text-align: left;
color: #ffffff;
}
.first_row {
border-top: 1px solid #e0e3eb;
}
.formadd .el-row {
display: flex;
flex-wrap: wrap;
border-left: 1px solid #e0e3eb;
}
.formadd .el-row .el-col {
border-right: 1px solid #e0e3eb;
border-bottom: 1px solid #e0e3eb;
padding: 0 15px;
min-height: 42px;
line-height: 1;
}
.formadd .el-row .el-col .el-form-item {
margin-bottom: 0;
line-height: 42px;
}
.addinputw {
width: 80%;
line-height: 42px;
}
.el-input__inner {
height: 36px;
}
</style>

40
warehousing-system/project_web/src/components/instorehouse/purchase.vue

@ -117,8 +117,8 @@
<el-form-item prop="supplier" class="trightb_item">
<el-select v-model="purchaseForm.supplierName" placeholder="请选择" >
<el-option
v-for="supplier in supplierList"
:key="supplier.name"
v-for="(supplier,i) in supplierList"
:key="i"
:label="supplier.name"
:value="supplier.name">
</el-option>
@ -165,8 +165,8 @@
<el-form-item class="trightb_item">
<el-select v-model="purchaseForm.storehouseName" placeholder="请选择" >
<el-option
v-for="storehouse in storehouseList"
:key="storehouse.name"
v-for="(storehouse,i) in storehouseList"
:key="i"
:label="storehouse.name"
:value="storehouse.name">
</el-option>
@ -206,18 +206,6 @@
<el-input v-model="scope.row.brandInfoName" placeholder="商品品牌" clearable></el-input>
</template>
</el-table-column>
<el-table-column label="仓库名称" prop="proName" width="120" align="center">
<template slot-scope="scope">
<el-select v-model="scope.row.storeHouseName" placeholder="请选择" >
<el-option
v-for="storehouse in storehouseList"
:key="storehouse.name"
:label="storehouse.name"
:value="storehouse.name">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="规格(型号)" width="150" prop="proModel" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.proModel" placeholder="" clearable></el-input>
@ -305,7 +293,12 @@ export default {
size: 10,
params: {
purchaseNo:''
}
}
},
queryInfoz: {
total: 0,
current: 1,
size: 100,
},
total: 0,
purchaseList: [],
@ -377,7 +370,7 @@ export default {
}
},
async getcustListList () {
const { data: result } = await this.$http.post('/v1/shstorehouse/fetchEntList')
const { data: result } = await this.$http.get('/v1/shstorehouse/fetchEntList')
if (result.code == 200){
this.custList = result.data
}
@ -410,7 +403,7 @@ export default {
storehouse: '',
status: '',
products:[]
}
},
async getProductList () {
@ -432,14 +425,15 @@ export default {
async getSupplierList () {
const { data: result } = await this.$http.get('/purchase/getSupplier')
if (result.status !== 200) return this.$message.error('获取供应商列表失败')
if (result.status !== 200) return this.$message.error('获取列表失败')
this.supplierList = result.data
},
async getStorehouseList () {
const { data: result } = await this.$http.get('/purchase/getStorehouse')
if (result.status !== 200) return this.$message.error('获取仓库列表失败')
this.storehouseList = result.data
const { data: result } = await this.$http.post("/v1/shstorehouse/listPage",{ params: this.queryInfoz })
if (result.code == 200){
this.storehouseList = result.data.records
}
},
closeUpdataPurchaseDialog () {

2
warehousing-system/project_web/src/main.js

@ -16,7 +16,7 @@ import 'quill/dist/quill.bubble.css' // for bubble theme
import axios from 'axios'
/* 设定axios的请求根目录 */
axios.defaults.baseURL = 'http://jianguan.yyundong.com/warehouseapi/'
axios.defaults.baseURL = 'http://8.130.39.13:9050'
//axios.defaults.baseURL = 'http://127.0.0.1:9050/'
// axios.defaults.baseURL = 'http://manage.jt.com/'
// axios.defaults.baseURL = 'http://yichuwh.com/'

Loading…
Cancel
Save