Browse Source

5.29

master
fengdong777 2 years ago
parent
commit
32039b31d6
  1. 14
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/baseInfo/becomeoil/index.js
  2. 2
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/customermanagement/customermanagement.js
  3. 49
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/supervise/becomeOil/index.js
  4. 20
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue
  5. 18
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js
  6. 6
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/index.vue
  7. 4
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityBrand/commodity.vue
  8. 2
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/commodity.vue
  9. 4
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/index.vue
  10. 79
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/index.vue
  11. 287
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilBecome/index.vue
  12. 2
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTankInfo/index.vue
  13. 162
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/becomeOil/index.vue

14
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/baseInfo/becomeoil/index.js

@ -29,7 +29,7 @@ export default {
// 查询成品油库
listPage: function(params) {
return request({
url: '/cyf/inventory/listPage ',
url: '/cyf/invenRecord/listPage ',
method: 'post',
data: params,
headers: {
@ -45,4 +45,16 @@ export default {
method: 'get'
})
},
// 查询成品油库
listPages: function(params) {
return request({
url: '/cyf/inventory/listPage ',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json',
'token': tokens
}
})
},
}

2
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/customermanagement/customermanagement.js

@ -38,7 +38,7 @@ export function savePcCustomerInfo(data) {
}
// -- 修改 已改
export function updatePcCustomerInfo(data) {
export function PcCustomerInfo(data) {
return request({
url: '/crm/v1/crmcustomertemp/update/' + data.sid,
method: 'post',

49
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/supervise/becomeOil/index.js

@ -0,0 +1,49 @@
import request from '@/utils/request'
let tokens = window.sessionStorage.getItem('tokenValue')
export default {
// 查询分页列表
listPage: function(params) {
return request({
url: '/cyf/supplier/listPage',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json',
'token': tokens
}
})
},
// 增加成品库存
save: function(params) {
return request({
url: '/cyf/invenRecord/save',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json',
'token': tokens
}
})
},
// 查询产品
selectList: function(data) {
return request({
url: '/cyf/productInfo/selectList',
method: 'get',
data: data,
headers: {
'Content-Type': 'application/json',
'token': tokens
}
})
},
addInfo: function(data) {
return request({
url: '/cyf/supplier/save',
method: 'post',
data: data
});
},
}

20
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue

@ -157,6 +157,16 @@
name: "/supervise/OutRegister",
path: "/supervise/OutRegister",
},
{
alwaysShow: true,
component: "index",
meta: {
icon: "el-icon-help",
title: "成品库存登记",
},
name: "/supervise/becomeOil",
path: "/supervise/becomeOil",
},
],
},
{
@ -298,6 +308,16 @@
name: "/inventory/shopRecord",
path: "/inventory/shopRecord",
},
{
alwaysShow: true,
component: "index",
meta: {
icon: "el-icon-help",
title: "成品库存记录",
},
name: "/inventory/oilBecome",
path: "/inventory/oilBecome",
},
],
},
{

18
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js

@ -256,6 +256,15 @@ export const constantRoutes = [{
title: '成品出库登记'
}
},
{
path: '/supervise/becomeOil',
component: () =>
import('@/views/supervise/becomeOil/index.vue'),
name: 'index',
meta: {
title: '成品库存登记'
}
},
]
}, {
path: '/inventory',
@ -380,6 +389,15 @@ export const constantRoutes = [{
title: '商品盘库记录'
}
},
{
path: '/inventory/oilBecome',
component: () =>
import('@/views/inventory/oilBecome/index.vue'),
name: 'index',
meta: {
title: '成品库存记录'
}
},
]
},

6
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/index.vue

@ -66,7 +66,7 @@
:index="indexMethod"
align="center"
/>
<el-table-column label="操作" align="center" width="150px">
<!-- <el-table-column label="操作" align="center" width="150px">
<template slot-scope="scope">
<el-button
type="primary"
@ -76,7 +76,7 @@
编辑
</el-button>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="品牌名称" prop="name" align="center" />
<el-table-column label="品牌编号" prop="informationNumber" align="center" />
<el-table-column label="数量" prop="amount" align="center" />
@ -225,7 +225,7 @@ export default {
//
getList() {
this.listLoading = true;
req.listPage(this.listQuery).then((response) => {
req.listPages(this.listQuery).then((response) => {
this.listLoading = false;
if (response.success) {
this.list = response.data.records;

4
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityBrand/commodity.vue

@ -15,11 +15,11 @@
<el-card class="box-card">
<div class="item">
<span class="item_text">类型名称:</span>
<span class="item_text">品牌名称:</span>
<el-input v-model="formobj.name" placeholder="请输入名称" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">类型编码:</span>
<span class="item_text">品牌编号:</span>
<el-input v-model="formobj.number" placeholder="请输入编码" class="item_input" clearable />
</div>
</el-card>

2
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/commodity.vue

@ -39,7 +39,7 @@
<el-form ref="form" :inline="true" :model="form" label-width="80px">
<div v-for="(item, index) in form.typeList" :key="index">
<el-form-item
label="类别名称"
label="商品类别"
:prop="'typeList.' + index + '.name'"
for="inputID"
>

4
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/index.vue

@ -109,7 +109,7 @@
</td>
</tr>
<tr>
<td>商品名称</td>
<td>类别名称</td>
<td>
<el-input
v-model="shopsName"
@ -119,7 +119,7 @@
</td>
</tr>
<tr>
<td>类别名称</td>
<td>商品类别</td>
<td>
<el-input v-model="arry.name" style="width: 300px" placeholder="" />
</td>

79
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/index.vue

@ -1,51 +1,50 @@
<template>
<div class="imgDemo">
<!--<el-button type="primary" @click="getToken()">token</el-button>
<!--<el-button type="primary" @click="getToken()">token</el-button>
<div style="width: 200px;">{{token}}</div>-->
</div>
</template>
<script>
import {login1} from '@/api/system/user/login.js'
export default {
name: '',
data() {
return {
token1:'',
token2:''
}
},
created() {
this.token1 = window.sessionStorage.getItem('tokenName');
this.token2 = window.sessionStorage.getItem('tokenValue');
console.log("tokenName2222", this.token1)
console.log("tokenValue222222", this.token2)
},
methods:{
// getToken(){
// let params = {
// password: "329653",
// roleSid: "",
// token: "",
// userName: "15097329653",
// verifyCode: ""
// }
// login1(params).then(res => {
// this.token = res.data.token
// window.sessionStorage.setItem('token', res.data.token)
// })
// }
}
}
import { login1 } from "@/api/system/user/login.js";
export default {
name: "",
data() {
return {
token1: "",
token2: "",
};
},
created() {
this.token1 = window.sessionStorage.getItem("tokenName");
this.token2 = window.sessionStorage.getItem("tokenValue");
console.log("tokenName2222", this.token1);
console.log("tokenValue222222", this.token2);
},
methods: {
// getToken(){
// let params = {
// password: "329653",
// roleSid: "",
// token: "",
// userName: "15097329653",
// verifyCode: ""
// }
// login1(params).then(res => {
// this.token = res.data.token
// window.sessionStorage.setItem('token', res.data.token)
// })
// }
},
};
</script>
<style lang="scss" scoped>
.imgDemo {
width: 100%;
height: 100%;
background: radial-gradient(#fff,#f5f7f4, #fff);
}
canvas {
}
.imgDemo {
width: 100%;
height: 100%;
background: radial-gradient(#fff, #f5f7f4, #fff);
}
canvas {
}
</style>

287
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilBecome/index.vue

@ -0,0 +1,287 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<button-bar
ref="btnbar"
view-title="成品库存记录"
:btndisabled="btndisabled"
@btnhandle="btnHandle"
/>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">
{{ searchxianshitit }}
</el-button>
<div v-show="isSearchShow" class="search">
<el-form
ref="queryParams"
:model="jmdListQuery"
:inline="true"
class="tab-header"
>
<el-form-item label="油罐编号">
<el-input
v-model="jmdListQuery.number"
maxlength="20"
placeholder="请输入油罐编号"
class="addinputw"
clearable
/>
</el-form-item>
<el-form-item label="日期">
<el-date-picker
v-model="jmdListQuery.recordDate"
:picker-options="pickerOptions"
type="date"
clearable
value-format="yyyy-MM-dd"
placeholder="选择日期"
/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center">
<el-button
type="primary"
size="small"
icon="el-icon-search"
@click="dosearch"
>查询</el-button
>
<el-button
type="primary"
size="small"
icon="el-icon-refresh"
@click="resetQuery"
>重置</el-button
>
</div>
</div>
</div>
<div>
<el-table
v-loading="tableLoading1"
:data="logList"
border
style="width: 100%"
>
<el-table-column
fixed
width="100"
type="index"
label="序号"
:index="indexMethod"
align="center"
/>
<el-table-column
prop="name"
label="品牌名称"
align="center"
/>
<el-table-column
prop="number"
label="品牌编码"
align="center"
/>
<el-table-column
prop="inventoryQuantity"
label="库存记录"
align="center"
/>
<el-table-column
prop="recordDate"
label="登记日期"
align="center"
/>
<!-- <el-table-column label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button
type="primary"
size="mini"
@click="purchase(scope.row)"
>
查看详情
</el-button>
</template>
</el-table-column> -->
</el-table>
</div>
<div class="pages">
<!-- 翻页 -->
<pagination
v-show="logListTotal > 0"
:total="logListTotal"
:page.sync="logListQuery.current"
:limit.sync="logListQuery.size"
class="pagination"
@pagination="loadLogList"
/>
</div>
</div>
</div>
</div>
</template>
<script>
import req from "@/api/baseInfo/becomeoil/index.js";
import Pagination from "@/components/pagination";
import { parseTime } from "@/utils/index";
import ButtonBar from "@/components/ButtonBar";
export default {
components: {
ButtonBar,
Pagination,
},
data() {
return {
viewState: 1,
tabActiveName: "uplog",
index: "0",
isSearchShow: false,
searchxianshitit: "显示查询条件",
btndisabled: false,
tableLoading1: false,
tableLoading2: false,
btnList: [
{
type: "info",
size: "small",
icon: "cross",
btnKey: "doClose",
btnLabel: "关闭",
},
],
logList: [],
form: {},
SrcList:{},
logListQuery: {
current: 1,
size: 10,
},
logListTotal: 1,
jmdListQuery: {
recordDate: "",
number: "",
},
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now(); // -8.64e7
},
},
};
},
mounted() {
//
this.$refs["btnbar"].setButtonList(this.btnList);
},
created() {
//
this.init();
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow;
if (this.isSearchShow) {
this.searchxianshitit = "隐藏查询条件";
} else {
this.searchxianshitit = "显示查询条件";
}
},
dosearch() {
this.loadLogList();
},
resetQuery() {
this.jmdListQuery = {
recordDate: "",
number: "",
};
this.loadLogList();
},
//
btnHandle(btnKey) {
switch (btnKey) {
case "toAdd1": //
this.doAdd1();
break;
case "toAdd2": //
this.doAdd2();
break;
case "build": //
this.doBuild();
break;
case "doClose": //
this.doClose();
break;
default:
break;
}
},
init() {
this.loadLogList();
},
loadLogList() {
req.listPage({
current: this.logListQuery.current,
size: this.logListQuery.size,
params: this.jmdListQuery,
})
.then((response) => {
if (
response.code === "200" &&
response.data &&
response.data.total > 0
) {
this.logList = response.data.records;
this.logListTotal = response.data.total;
this.logListQuery.current = response.data.current;
this.logListQuery.size = response.data.size;
} else {
this.logList = [];
this.logListTotal = 0;
}
});
},
//
indexMethod(index) {
var pagestart = (this.logListQuery.current - 1) * this.logListQuery.size;
var pageindex = index + 1 + pagestart;
return pageindex;
},
doAdd1() {
this.viewState = 2;
},
doAdd2() {
this.viewState = 3;
},
resetState() {
this.viewState = 1;
},
doClose() {
this.$store.dispatch("tagsView/delView", this.$route);
this.$router.go(-1);
},
},
};
</script>
<style scoped>
.wenjiantit {
font-size: 16px;
font-weight: bold;
margin: 25px 0 10px 0;
}
span {
margin-left: 20px;
}
.forminfo {
margin: 0;
padding: 0;
}
.listcon {
height: calc(100vh - 250px);
overflow-y: auto;
overflow-x: hidden;
}
</style>

2
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTankInfo/index.vue

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div v-show="viewState ==1">
<button-bar view-title="油罐库存信息信息" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<button-bar view-title="油罐库存信息" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<div class="main-content">
<div class="listtop">
<div class="tit">油罐库存列表</div>

162
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/becomeOil/index.vue

@ -0,0 +1,162 @@
<template>
<div>
<div class="tab-header webtop">
<!-- 标题 -->
<div>成品库存登记</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-card class="box-card">
<div class="item">
<span class="item_text">库存记录</span>
<el-input v-model="formobj.inventoryQuantity" placeholder="" class="item_input"/>
</div>
<div class="item">
<span class="item_text">商品名称</span>
<el-select v-model="formobj.prodSid" filterable placeholder="请选择商品名称" class="item_input">
<el-option v-for="item in packagList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
</div>
</el-card>
</div>
</div>
</template>
<script>
import req from '@/api/supervise/becomeOil/index.js'
import upload from '@/components/uploadFile/upload_yanchejianchaTuBiao'
export default {
components: {
upload
},
data() {
return {
submitdisabled: false,
typeLists: [],
typeList: [],
packagList: [],
imgList: [],
formobj: {
inventoryQuantity: "",
prodSid: ""
}
}
},
created() {
this.last()
},
methods: {
last(){
req.selectList().then((response) => {
if (response.success) {
this.packagList = response.data
} else {
this.packagList = []
}
})
},
saveOrUpdate() {
req.save(this.formobj)
.then(resp => {
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: resp.msg
})
this.formobj = {
inventoryQuantity: "",
prodSid: ""
}
this.imgList = []
} else {
// resp.code
}
})
.catch(() => {})
},
handleReturn() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
}
}
</script>
<style lang="scss">
.box-card {
margin-left: 60px;
margin-right: 60px;
min-width: 70%;
margin-top: 20px;
padding-bottom: 50px;
.item {
display: flex;
flex-direction: row;
align-items: center;
margin-top: 15px;
height: 40px;
line-height: 40px;
.item_text {
flex: 0.8;
font-size: 18px;
text-align: right;
}
.item_input {
flex: 4;
font-size: 16px;
margin-left: 10px;
margin-right: 80px;
}
.item_left_input {
width: 20%;
}
.item_left_text {
height: 30px;
margin-left: 20px;
line-height: 30px;
color: #018AD2;
padding: 0px 15px;
border: 1.5px solid #018AD2;
border-radius: 5px;
}
.item_right {
flex: 1;
justify-items: center;
.item_right_list_text {
font-size: 16px;
}
.item_right_list_delect {
color: #5E94FF;
margin-left: 20px;
font-size: 16px;
text-decoration: underline;
}
}
}
}
</style>
Loading…
Cancel
Save