Browse Source

8.29

master
fengdong777 2 years ago
parent
commit
0f710f244b
  1. 21
      supervise-enterprise-ui/src/views/NewList/needMoney.vue
  2. 2
      supervise-organizational-ui/.env.development
  3. 11
      supervise-organizational-ui/src/api/system/departments/departments.js
  4. 16
      supervise-organizational-ui/src/layout/components/Sidebar/index.vue
  5. 4
      supervise-organizational-ui/src/main.js
  6. 2
      supervise-organizational-ui/src/store/getters.js
  7. 13
      supervise-organizational-ui/src/views/organizational/zzgl.vue
  8. 104
      warehousing-system/project_web_ui/src/layout/components/Sidebar/index.vue
  9. 42
      warehousing-system/project_web_ui/src/views/component/initial_value/add/productAdd.vue
  10. 8
      warehousing-system/project_web_ui/src/views/component/initial_value/add/supplierAdd.vue
  11. 6
      warehousing-system/project_web_ui/src/views/component/initial_value/storehouse.vue
  12. 33
      warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue
  13. 16
      warehousing-system/project_web_ui/src/views/component/instorehouse/putInManagement.vue
  14. 31
      warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue
  15. 2
      warehousing-system/project_web_ui/src/views/component/stockManagement/stockList.vue

21
supervise-enterprise-ui/src/views/NewList/needMoney.vue

@ -34,7 +34,12 @@
</el-radio-group>
</div>
<div style="margin-top: 25px;">
<span>用款金额{{"\xa0\xa0\xa0"}}</span>
<span>用款金额{{"\xa0\xa0\xa0"}}</span>
<button class="all" @click="AllList">全部使用</button>
</div>
<div style="margin-top: 50px;">
<span>回款凭证{{"\xa0\xa0\xa0"}}</span>
</div>
<div style="margin-top: 45px;margin-left: -10px;font-size: 14px;">
:客户发起发起申请首先监管审核再银行审核通过后客户在审核结果表里打印纸质申请表盖章并提交给监管银行各一份
@ -103,6 +108,9 @@ export default {
}
},
AllList(){
console.log(66);
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
@ -143,4 +151,15 @@ export default {
display: flex;
justify-content: space-between;
}
.all{
width: 100px;
height: 25px;
font-size: 14px;
background-color: #fff;
border: 1px solid #71717186;
border-radius: 8px;
}
.all:hover{
border: 1px solid #717171
}
</style>

2
supervise-organizational-ui/.env.development

@ -5,5 +5,5 @@ ENV = 'development'
VUE_APP_BASE_API = '/api'
## 配置测试和本地开发时的 接口地址
VUE_APP_URL = "http://192.168.3.173:8112"
VUE_APP_URL = "http://192.168.1.193:8112"
##VUE_APP_URL = "http://8.130.39.13:8112"

11
supervise-organizational-ui/src/api/system/departments/departments.js

@ -123,3 +123,14 @@ export function getQrCode(data) {
}
})
}
// 查看二维码
export function loginDetails() {
return request({
baseURL: '/api',
url: '/portal/v1/sysuser/loginDetails',
method: 'post',
headers: {
'Content-Type': 'application/json'
}
})
}

16
supervise-organizational-ui/src/layout/components/Sidebar/index.vue

@ -77,12 +77,12 @@
methods: {
//
postHuoquyonghu() {
var token = getStorage()
loginDetails(token).then((response) => {
console.log('resss', response)
if (response.code === '200') {
this.YongHuid = response.data
this.params.userSid = this.YongHuid.sid
// var token = getStorage()
// loginDetails(token).then((response) => {
// console.log('resss', response)
// if (response.code === '200') {
// this.YongHuid = response.data
// this.params.userSid = this.YongHuid.sid
getrolemenus(this.params).then((res) => {
const userRoles = this.resRouter(res.data)
userRoles.push({
@ -92,8 +92,8 @@
})
return userRoles
})
}
})
// }
// })
},
resRouter(menus) {
//

4
supervise-organizational-ui/src/main.js

@ -23,12 +23,12 @@ Vue.use(ElementUI)
// import '@/permission' //权限控制
Vue.prototype.$userInfo = null // 用户信息
Vue.prototype.$ = null // 用户信息
Vue.component('Pagination', Pagination)
Vue.component('tab-search', tabsearch)
Vue.component('eimage', eimage)
Vue.prototype.moment = moment
Vue.filter('dateFormat', function(dateStr, pattern = 'YYYY-MM-DD') {
Vue.filter('dateFormat', function (dateStr, pattern = 'YYYY-MM-DD') {
return moment(dateStr).format(pattern)
})
Vue.use(Print) // 注册

2
supervise-organizational-ui/src/store/getters.js

@ -1,4 +1,4 @@
const getters = {
orgSid: state => state.user.orgSid
orgSid: state => state.user
}
export default getters

13
supervise-organizational-ui/src/views/organizational/zzgl.vue

@ -290,10 +290,12 @@ import {
pageList,
postOrgtree,
putOrgtree,
selectBySid
selectBySid,
loginDetails
} from '@/api/system/departments/departments.js'
import { typeValues } from '@/api/system/roleAdminister/index'
import Position from '@/components/amap/amap.vue'
import store from '@/store'
export default {
components: { Position },
@ -363,6 +365,7 @@ export default {
mounted() {
this.getOrgTree()
this.init()
window.sessionStorage.setItem('userSid', "427a2fb0-60c5-409f-bea4-4eb441041ae6");
},
methods: {
init() {
@ -408,8 +411,10 @@ export default {
this.getPageList(this.page)
},
handleNodeClick(data) {
// console.log(this.$store.getters);
var datas = sessionStorage.getItem('userSid');
this.isshow = 'table'
this.page.params.organizationSid = this.$store.getters.userInfo.orgSid
this.page.params.organizationSid = datas
this.page.params.psid = data.sid || 0
this.getPageList(this.page)
@ -433,7 +438,7 @@ export default {
this.form.fgStaffName = ''
this.form.fgStaffSid = ''
}
this.form.organizationSid = this.$store.getters.userInfo.orgSid
this.form.organizationSid = this.page.params.organizationSid
// this.form.dlxx = typeof(this.form.dlxx) == 'string' ? this.form.dlxx : this.form.dlxx.join()
if (this.form.sid) {
// console.log(this.form)
@ -469,7 +474,7 @@ export default {
this.fgStaffSid = []
this.form = Object.assign({}, this.formBackup)
this.form.psid = data.sid || 0
this.form.organizationSid = this.$store.getters.userInfo.orgSid
this.form.organizationSid = this.page.params.organizationSid
this.form.address = data.orgAddress || data.address
this.form.dlxx = data.gisInfo || data.dlxx
this.getStaff(data.sid)

104
warehousing-system/project_web_ui/src/layout/components/Sidebar/index.vue

@ -160,59 +160,59 @@
]
},
{
alwaysShow: true,
component: "storehouseManage",
meta: {
icon: "el-icon-menu",
title: "库内管理",
},
name: "/storehouseManage",
path: "/storehouseManage",
children: [
{
alwaysShow: true,
component: "shelves",
meta: {
icon: "el-icon-help",
title: "上架",
},
name: "/storehouseManage/shelves",
path: "/storehouseManage/shelves",
},
{
alwaysShow: true,
component: "shelvesManage",
meta: {
icon: "el-icon-help",
title: "上架管理",
},
name: "/storehouseManage/shelvesManage",
path: "/storehouseManage/shelvesManage",
},
{
alwaysShow: true,
component: "remove",
meta: {
icon: "el-icon-help",
title: "移库",
},
name: "/storehouseManage/remove",
path: "/storehouseManage/remove",
},
{
alwaysShow: true,
component: "removeManagement",
meta: {
icon: "el-icon-help",
title: "移库管理",
},
name: "/storehouseManage/removeManagement",
path: "/storehouseManage/removeManagement",
},
]
// {
// alwaysShow: true,
// component: "storehouseManage",
// meta: {
// icon: "el-icon-menu",
// title: "",
// },
// name: "/storehouseManage",
// path: "/storehouseManage",
// children: [
// {
// alwaysShow: true,
// component: "shelves",
// meta: {
// icon: "el-icon-help",
// title: "",
// },
// name: "/storehouseManage/shelves",
// path: "/storehouseManage/shelves",
// },
// {
// alwaysShow: true,
// component: "shelvesManage",
// meta: {
// icon: "el-icon-help",
// title: "",
// },
// name: "/storehouseManage/shelvesManage",
// path: "/storehouseManage/shelvesManage",
// },
// {
// alwaysShow: true,
// component: "remove",
// meta: {
// icon: "el-icon-help",
// title: "",
// },
// name: "/storehouseManage/remove",
// path: "/storehouseManage/remove",
// },
// {
// alwaysShow: true,
// component: "removeManagement",
// meta: {
// icon: "el-icon-help",
// title: "",
// },
// name: "/storehouseManage/removeManagement",
// path: "/storehouseManage/removeManagement",
// },
// ]
},
// },
{
alwaysShow: true,
component: "stockList",

42
warehousing-system/project_web_ui/src/views/component/initial_value/add/productAdd.vue

@ -18,7 +18,7 @@
<div class="item">
<span class="item_text">条码</span>
<el-input v-model="locationForm.barCode" :disabled="disabledCode" placeholder="" class="item_inputs" clearable />
<el-button type="primary" size="small" @click="createBarCode" :disabled="disabledCode">自动</el-button>
<el-button type="primary" size="small" @click="createBarCode" :disabled="disabledCode">随机</el-button>
</div>
<div class="item">
<span class="item_text">商品名</span>
@ -30,19 +30,19 @@
</div>
<div class="item">
<span class="item_text">价值</span>
<el-input v-model="locationForm.value" class="item_input" clearable></el-input>
<el-input v-model="locationForm.value" class="item_input" @input="limitInput1($event)" clearable></el-input>
</div>
<div class="item">
<span class="item_text">净重</span>
<el-input v-model="locationForm.netWeight" class="item_input" clearable></el-input>
<el-input v-model="locationForm.netWeight" class="item_input" @input="limitInput2($event)" clearable></el-input>
</div>
<div class="item">
<span class="item_text">毛重</span>
<el-input v-model="locationForm.roughWeight" class="item_input" clearable></el-input>
<el-input v-model="locationForm.roughWeight" class="item_input" @input="limitInput3($event)" clearable></el-input>
</div>
<div class="item">
<span class="item_text">有效天数</span>
<el-input v-model="locationForm.effectiveDays" class="item_input" clearable></el-input>
<el-input v-model="locationForm.effectiveDays" class="item_input" @input="limitInput4($event)" clearable></el-input>
</div>
<div class="item">
<span class="item_text">备注</span>
@ -133,6 +133,38 @@
var nowstr = now.getTime()
this.locationForm.barCode = 'P' + now.getTime()
},
limitInput1(value, index) {
this.locationForm.value =
("" + value) //
.replace(/[^\d^\.]+/g, "") //
.replace(/^0+(\d)/, "$1") // 00
.replace(/^\./, "0.") // 0.
.match(/^\d*(\.?\d{0,4})/g)[0] || ""; // 02
},
limitInput2(value, index) {
this.locationForm.netWeight =
("" + value) //
.replace(/[^\d^\.]+/g, "") //
.replace(/^0+(\d)/, "$1") // 00
.replace(/^\./, "0.") // 0.
.match(/^\d*(\.?\d{0,4})/g)[0] || ""; // 02
},
limitInput3(value, index) {
this.locationForm.roughWeight =
("" + value) //
.replace(/[^\d^\.]+/g, "") //
.replace(/^0+(\d)/, "$1") // 00
.replace(/^\./, "0.") // 0.
.match(/^\d*(\.?\d{0,4})/g)[0] || ""; // 02
},
limitInput4(value, index) {
this.locationForm.effectiveDays =
("" + value) //
.replace(/[^\d^\.]+/g, "") //
.replace(/^0+(\d)/, "$1") // 00
.replace(/^\./, "0.") // 0.
.match(/^\d*(\d{0,0})/g)[0] || ""; // 02
},
}
}
</script>

8
warehousing-system/project_web_ui/src/views/component/initial_value/add/supplierAdd.vue

@ -90,11 +90,15 @@
this.handleReturn('true')
},
async addProduct () {
const { data: result } = await this.$http.post('/supplier/addSupplier', this.locationForm)
if(this.locationForm.name!=''){
const { data: result } = await this.$http.post('/supplier/addSupplier', this.locationForm)
if (result.status !== 200) return this.$message.error('添加供应商失败')
this.$message.success('成功添加供应商')
this.handleReturn('true')
},
}else{
this.$message.error('供应商名称不能为空')
}
}
}
}
</script>

6
warehousing-system/project_web_ui/src/views/component/initial_value/storehouse.vue

@ -8,7 +8,7 @@
<div v-show="isSearchShow" class="search">
<el-form ref="queryInfo" :inline="true" :model="queryInfo" class="tab-header">
<el-form-item label="仓库名">
<el-input v-model="queryInfo.params.simpleName" placeholder="请输入仓库名" clearable />
<el-input v-model="queryInfo.params.name" placeholder="请输入仓库名" clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
@ -125,7 +125,7 @@ export default {
size: 10,
current: 1,
params: {
simpleName:''
name:''
},
},
btnList: [
@ -172,7 +172,7 @@ export default {
size: 10,
current: 1,
params: {
simpleName:''
name:''
},
}
this.getStorehouseList()

33
warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue

@ -12,7 +12,7 @@
</div>
</div>
<div class="listconadd">
<el-form ref="dataForm" :model="purchaseForm" label-position="top" label-width="190px" class="formadd">
<el-form ref="dataForm" :rules="rules" :model="purchaseForm" 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>
@ -33,7 +33,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-form-item class="trightb_item" prop="purchaseDate">
<!-- <span>{{temp.bankName}}</span> -->
<el-date-picker v-model="purchaseForm.purchaseDate" type="date" style="width: 100%;"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择" />
@ -65,7 +65,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-form-item class="trightb_item" prop="custId">
<el-select v-model="purchaseForm.custId" placeholder="请选择" @change="setCustername(purchaseForm.custId)" style="width: 100%;" >
<el-option
v-for="(custName,i) in custList"
@ -82,7 +82,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-form-item class="trightb_item" prop="purchasePerson">
<el-input v-model="purchaseForm.purchasePerson" placeholder="采购申请人" clearable />
</el-form-item>
</el-col>
@ -113,7 +113,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-form-item class="trightb_item" prop="storehouseId">
<el-select v-model="purchaseForm.storehouseId" placeholder="请选择" style="width: 100%;" >
<el-option
v-for="(storehouse,i) in storehouseList"
@ -137,8 +137,8 @@
<template slot-scope="scope">
<el-select v-model="scope.row.proId" placeholder="请选择" @change="selectPro(scope.row)" >
<el-option
v-for="product in productList"
:key="product.name"
v-for="(product,i) in productList"
:key="i"
:label="product.name"
:value="product.barCode">
</el-option>
@ -225,17 +225,20 @@
selectPurchaseList: [],
activeNames: ['1'],
rules: {
product: [
{ required: true, message: '请输入商品名', trigger: 'blur' }
purchaseDate: [
{ required: true, message: '请选择订单日期', trigger: 'blur' }
],
custId: [
{ required: true, message: '请选择供货单位', trigger: 'blur' }
],
supplier: [
{ required: true, message: '请输入供应商', trigger: 'blur' }
purchasePerson: [
{ required: true, message: '请输入采购申请人', trigger: 'blur' }
],
count: [
{ required: true, message: '请输入商品数量', trigger: 'blur' }
storehouseId: [
{ required: true, message: '请选择入库单位', trigger: 'blur' }
],
storehouse: [
{ required: true, message: '请输入所属仓库', trigger: 'blur' }
proName: [
{ required: true, message: '请选择质物品名称', trigger: 'blur' }
]
}
};

16
warehousing-system/project_web_ui/src/views/component/instorehouse/putInManagement.vue

@ -8,8 +8,8 @@
<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="queryInfo" :inline="true" :model="queryInfo" class="tab-header">
<el-form-item label="入库号">
<el-input v-model="queryInfo.params.no" placeholder="请输入入库号" clearable />
<el-form-item label="入库号">
<el-input v-model="queryInfo.params.no" placeholder="请输入入库号" clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
@ -22,20 +22,20 @@
style="width: 100%" border>
<el-table-column label="序号" type="index" width="60" :index="indexMethod" align="center" />
<el-table-column
prop="createTime"
label="入库日期"
prop="no"
label="入库编号"
align="center"
width="180">
</el-table-column>
<el-table-column
prop="custerName"
label="客户名称"
prop="createTime"
label="入库日期"
align="center"
width="180">
</el-table-column>
<el-table-column
prop="no"
label="订单编号"
prop="custerName"
label="客户名称"
align="center"
width="180">
</el-table-column>

31
warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue

@ -12,7 +12,7 @@
</div>
</div>
<div class="listconadd">
<el-form ref="dataForm" :model="purchaseForm" label-position="top" label-width="190px" class="formadd">
<el-form ref="dataForm" :rules="rules" :model="purchaseForm" 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>
@ -34,7 +34,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-form-item class="trightb_item" prop="applicationDate">
<!-- <span>{{temp.bankName}}</span> -->
<el-date-picker v-model="purchaseForm.applicationDate" type="date" style="width: 100%;"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择" />
@ -49,7 +49,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="supplier" class="trightb_item">
<el-form-item prop="custerSid" class="trightb_item">
<el-select v-model="purchaseForm.custerSid" placeholder="请选择" style="width: 100%;">
<el-option
v-for="(custName,i) in custList"
@ -66,7 +66,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-form-item class="trightb_item" prop="creatorName">
<el-input v-model="purchaseForm.creatorName" placeholder="采购申请人" clearable />
</el-form-item>
</el-col>
@ -79,7 +79,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-form-item class="trightb_item" prop="storeHouseSid">
<el-select v-model="purchaseForm.storeHouseSid" @change="selectstorehouse(purchaseForm)" placeholder="请选择" style="width: 100%;">
<el-option
v-for="(storehouse,i) in storehouseList"
@ -96,7 +96,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-form-item class="trightb_item" prop="outDate">
<el-date-picker v-model="purchaseForm.outDate" type="date" style="width: 100%;"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择" />
</el-form-item>
@ -223,17 +223,20 @@
selectPurchaseList: [],
activeNames: ['1'],
rules: {
product: [
{ required: true, message: '请输入商品名', trigger: 'blur' }
applicationDate: [
{ required: true, message: '请选择订单日期', trigger: 'blur' }
],
custerSid: [
{ required: true, message: '请选择供货单位', trigger: 'blur' }
],
supplier: [
{ required: true, message: '请输入供应商', trigger: 'blur' }
creatorName: [
{ required: true, message: '请输入采购申请人', trigger: 'blur' }
],
count: [
{ required: true, message: '请输入商品数量', trigger: 'blur' }
storeHouseSid: [
{ required: true, message: '请选择出库仓库', trigger: 'blur' }
],
storehouse: [
{ required: true, message: '请输入所属仓库', trigger: 'blur' }
outDate: [
{ required: true, message: '请选择出库日期', trigger: 'blur' }
]
},
f1Value:{

2
warehousing-system/project_web_ui/src/views/component/stockManagement/stockList.vue

@ -212,6 +212,8 @@ export default {
const { data: result } = await this.$http.get('/purchase/getProductList')
if (result.status !== 200) return this.$message.error('获取商品列表失败')
this.productList = result.data
console.log(this.productList);
console.log(this.queryInfo);
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)

Loading…
Cancel
Save