yxt_group
/
supervise
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

8.31

master
fengdong777 2 years ago
parent
d514283503
commit
f1a69fd251
6 changed files with 127 additions and 92 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      supervise-organizational-ui/src/views/organizational/zzgl.vue
  2. 56
      warehousing-system/project_web_ui/src/views/component/initial_value/location.vue
  3. 61
      warehousing-system/project_web_ui/src/views/component/initial_value/product.vue
  4. 50
      warehousing-system/project_web_ui/src/views/component/initial_value/supplier.vue
  5. 18
      warehousing-system/project_web_ui/src/views/component/instorehouse/putIn.vue
  6. 32
      warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue

2
supervise-organizational-ui/src/views/organizational/zzgl.vue
View File

@ -414,7 +414,7 @@ export default {
// console.log(this.$store.getters); // console.log(this.$store.getters);
// var datas = sessionStorage.getItem('userSid'); // var datas = sessionStorage.getItem('userSid');
this.isshow = 'table' this.isshow = 'table'
// this.page.params.organizationSid = datas // this.page.params.organizationSid = datasb
this.page.params.psid = data.sid || 0 this.page.params.psid = data.sid || 0
this.getPageList(this.page) this.getPageList(this.page)

56
warehousing-system/project_web_ui/src/views/component/initial_value/location.vue
View File

@ -8,7 +8,7 @@
<div v-show="isSearchShow" class="search"> <div v-show="isSearchShow" class="search">
<el-form ref="queryInfo" :inline="true" :model="queryInfo" class="tab-header"> <el-form ref="queryInfo" :inline="true" :model="queryInfo" class="tab-header">
<el-form-item label="货位名"> <el-form-item label="货位名">
<el-input v-model="queryInfo.query" placeholder="请输入货位名" clearable /> <el-input v-model="queryInfo.params.name" placeholder="请输入货位名" clearable />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="btn" style="text-align: center;"> <div class="btn" style="text-align: center;">
@ -17,8 +17,7 @@
</div> </div>
</div> </div>
</div> </div>
<el-table :data="locationList.slice((queryInfo.pageNum-1)*queryInfo.pageSize,queryInfo.pageNum*queryInfo.pageSize)" <el-table :data="locationList" style="width: 100%"
style="width: 100%"
stripe border > stripe border >
<el-table-column <el-table-column
label="序号" label="序号"
@ -60,11 +59,11 @@
</el-table> </el-table>
<div class="pages"> <div class="pages">
<div class="tit" /> <div class="tit" />
<pagination <pagination
v-show="locationList.length > 0" v-show="locationList.length > 0"
:total="total" :total="queryInfo.total"
:page.sync="queryInfo.pageNum" :page.sync="queryInfo.current"
:limit.sync="queryInfo.pageSize" :limit.sync="queryInfo.size"
class="pagination" class="pagination"
@pagination="getLocationList" @pagination="getLocationList"
/> />
@ -94,9 +93,12 @@ export default {
btndisabled: false, btndisabled: false,
isSearchShow: false, isSearchShow: false,
queryInfo: { queryInfo: {
query: '', total: 0,
pageNum: 1, size: 10,
pageSize: 10 current: 1,
params: {
name:''
},
}, },
total: 0, total: 0,
locationList: [], locationList: [],
@ -162,26 +164,31 @@ export default {
} }
}, },
dosearch() { dosearch() {
this.queryInfo.pageNum = 1
this.total=0
this.getLocationList() this.getLocationList()
}, },
resetQuery() { resetQuery() {
this.queryInfo.query = '' this.queryInfo={
total: 0,
size: 10,
current: 1,
params: {
name:''
},
},
this.dosearch() this.dosearch()
}, },
async getLocationList () { async getLocationList () {
const { data: result } = await this.$http.get('/location/list', { params: this.queryInfo }) const { data: result } = await this.$http.post('/location/list', this.queryInfo)
if (result.status !== 200) return this.$message.error('获取列表失败') if (result.code == 200){
this.queryInfo.total = result.data.total
this.total = result.data.total this.locationList = result.data.records
this.locationList = result.data.rows }
}, },
closeLocationDialog () { closeLocationDialog () {
this.$refs.locationRuleForm.resetFields() this.$refs.locationRuleForm.resetFields()
}, },
indexMethod(index) { indexMethod(index) {
var pagestart = (this.queryInfo.pageNum - 1) * this.queryInfo.pageSize; var pagestart = (this.queryInfo.current - 1) * this.queryInfo.size;
var pageindex = index + 1 + pagestart; var pageindex = index + 1 + pagestart;
return pageindex; return pageindex;
}, },
@ -210,10 +217,13 @@ export default {
type: 'warning' type: 'warning'
}).catch(error => error) }).catch(error => error)
if (result !== 'confirm') return this.$message.info('用户取消操作') if (result !== 'confirm') return this.$message.info('用户取消操作')
const { data: resultDB } = await this.$http.delete(`/location/delete/${location.locationId}`) const { data: resultDB } = await this.$http.delete(`location/deleteById/${location.id}`)
if (resultDB.status !== 200) return this.$message.error('删除库位失败') if (resultDB.code == 200){
this.getLocationList() this.getLocationList()
this.$message.success('库位删除成功') this.$message.success('库位删除成功')
}else{
this.$message.error('删除库位失败')
}
}, },
async getStorehouse () { async getStorehouse () {
const { data: result } = await this.$http.get('/location/getStorehouse') const { data: result } = await this.$http.get('/location/getStorehouse')

61
warehousing-system/project_web_ui/src/views/component/initial_value/product.vue
View File

@ -8,7 +8,7 @@
<div v-show="isSearchShow" class="search"> <div v-show="isSearchShow" class="search">
<el-form ref="queryInfo" :inline="true" :model="queryInfo" class="tab-header"> <el-form ref="queryInfo" :inline="true" :model="queryInfo" class="tab-header">
<el-form-item label="商品名"> <el-form-item label="商品名">
<el-input v-model="queryInfo.query" placeholder="请输入商品名" clearable /> <el-input v-model="queryInfo.params.name" placeholder="请输入商品名" clearable />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="btn" style="text-align: center;"> <div class="btn" style="text-align: center;">
@ -17,7 +17,7 @@
</div> </div>
</div> </div>
</div> </div>
<el-table :data="productList.slice((queryInfo.pageNum-1)*queryInfo.pageSize,queryInfo.pageNum*queryInfo.pageSize)" <el-table :data="productList"
style="width: 100%" style="width: 100%"
border > border >
<el-table-column <el-table-column
@ -89,14 +89,14 @@
</el-table> </el-table>
<div class="pages"> <div class="pages">
<div class="tit" /> <div class="tit" />
<pagination <pagination
v-show="productList.length > 0" v-show="productList.length > 0"
:total="total" :total="queryInfo.total"
:page.sync="queryInfo.pageNum" :page.sync="queryInfo.current"
:limit.sync="queryInfo.pageSize" :limit.sync="queryInfo.size"
class="pagination" class="pagination"
@pagination="getProductList" @pagination="getProductList"
/> />
</div> </div>
</div> </div>
</div> </div>
@ -122,9 +122,12 @@ export default {
btndisabled: false, btndisabled: false,
isSearchShow: false, isSearchShow: false,
queryInfo: { queryInfo: {
query: '', total: 0,
pageNum: 1, size: 10,
pageSize: 10, current: 1,
params: {
name:''
},
}, },
total: 0, total: 0,
productList: [], productList: [],
@ -212,34 +215,30 @@ export default {
} }
}, },
indexMethod(index) { indexMethod(index) {
var pagestart = (this.queryInfo.pageNum - 1) * this.queryInfo.pageSize; var pagestart = (this.queryInfo.current - 1) * this.queryInfo.size;
var pageindex = index + 1 + pagestart; var pageindex = index + 1 + pagestart;
return pageindex; return pageindex;
}, },
dosearch() { dosearch() {
this.queryInfo.pageNum = 1
this.total =0
this.getProductList() this.getProductList()
}, },
resetQuery() { resetQuery() {
this.queryInfo.query = '' this.queryInfo={
total: 0,
size: 10,
current: 1,
params: {
name:''
},
},
this.dosearch() this.dosearch()
}, },
async getProductList () { async getProductList () {
const { data: result } = await this.$http.get('/product/list', { params: this.queryInfo }) const { data: result } = await this.$http.post('/product/list',this.queryInfo)
if (result.status !== 200) return this.$message.error('获取列表失败') if (result.code == 200){
this.queryInfo.total = result.data.total
this.total = result.data.total this.productList = result.data.records
this.productList = result.data.rows }
},
handleSizeChange (val) {
this.queryInfo.pageSize = val
this.getProductList()
},
handleCurrentChange (val) {
this.queryInfo.pageNum = val
this.getProductList()
}, },
open (row) { open (row) {
this.viewState = 3 this.viewState = 3

50
warehousing-system/project_web_ui/src/views/component/initial_value/supplier.vue
View File

@ -8,7 +8,7 @@
<div v-show="isSearchShow" class="search"> <div v-show="isSearchShow" class="search">
<el-form ref="queryInfo" :inline="true" :model="queryInfo" class="tab-header"> <el-form ref="queryInfo" :inline="true" :model="queryInfo" class="tab-header">
<el-form-item label="供应商名"> <el-form-item label="供应商名">
<el-input v-model="queryInfo.query" placeholder="请输入供应商名" clearable /> <el-input v-model="queryInfo.params.name" placeholder="请输入供应商名" clearable />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="btn" style="text-align: center;"> <div class="btn" style="text-align: center;">
@ -17,8 +17,7 @@
</div> </div>
</div> </div>
</div> </div>
<el-table :data="supplierList.slice((queryInfo.pageNum-1)*queryInfo.pageSize,queryInfo.pageNum*queryInfo.pageSize)" <el-table :data="supplierList" style="width: 100%" border>
style="width: 100%" border>
<el-table-column <el-table-column
label="序号" label="序号"
type="index" type="index"
@ -57,9 +56,9 @@
<div class="tit" /> <div class="tit" />
<pagination <pagination
v-show="supplierList.length > 0" v-show="supplierList.length > 0"
:total="total" :total="queryInfo.total"
:page.sync="queryInfo.pageNum" :page.sync="queryInfo.current"
:limit.sync="queryInfo.pageSize" :limit.sync="queryInfo.size"
class="pagination" class="pagination"
@pagination="getSupplierList" @pagination="getSupplierList"
/> />
@ -96,9 +95,12 @@ export default {
btndisabled: false, btndisabled: false,
isSearchShow: false, isSearchShow: false,
queryInfo: { queryInfo: {
query: '', total: 0,
pageNum: 1, size: 10,
pageSize: 10 current: 1,
params: {
name:''
},
}, },
total: 0, total: 0,
supplierList: [], supplierList: [],
@ -158,32 +160,30 @@ export default {
} }
}, },
dosearch() { dosearch() {
this.queryInfo.pageNum = 1
this.getSupplierList() this.getSupplierList()
}, },
resetQuery() { resetQuery() {
this.queryInfo.query = '' this.queryInfo={
total: 0,
size: 10,
current: 1,
params: {
name:''
},
},
this.dosearch() this.dosearch()
}, },
handleSizeChange (val) {
this.queryInfo.pageSize = val
this.getSupplierList()
},
handleCurrentChange (val) {
this.queryInfo.pageNum = val
this.getSupplierList()
},
indexMethod(index) { indexMethod(index) {
var pagestart = (this.queryInfo.pageNum - 1) * this.queryInfo.pageSize; var pagestart = (this.queryInfo.current - 1) * this.queryInfo.size;
var pageindex = index + 1 + pagestart; var pageindex = index + 1 + pagestart;
return pageindex; return pageindex;
}, },
async getSupplierList () { async getSupplierList () {
const { data: result } = await this.$http.get('/supplier/list', { params: this.queryInfo }) const { data: result } = await this.$http.post('/supplier/list', this.queryInfo)
if (result.status !== 200) return this.$message.error('获取列表失败') if (result.code == 200){
this.queryInfo.total = result.data.total
this.total = result.data.total this.supplierList = result.data.records
this.supplierList = result.data.rows }
}, },
updataSupplierdialog (row) { updataSupplierdialog (row) {
this.viewState = 3 this.viewState = 3

18
warehousing-system/project_web_ui/src/views/component/instorehouse/putIn.vue
View File

@ -148,7 +148,22 @@ export default {
this.dingdanId = result.data; this.dingdanId = result.data;
this.huoweiId = datas.data; this.huoweiId = datas.data;
}, },
clearList(){
this.inStorehouse={
inStorehouseId: "",
receivingId: "",
locationId: "",
locationNumber: "",
remarks: "",
no:'',
storeHouseSid:"",
storeHouseName:"",
createPerson: "",
checkPerson: "",
status: "",
locationName:''
}
},
addInStorehouse() { addInStorehouse() {
this.$refs.onPutInRuleForm.validate(async (validate) => { this.$refs.onPutInRuleForm.validate(async (validate) => {
if (!validate) return this.$message.error("请输入必填项"); if (!validate) return this.$message.error("请输入必填项");
@ -169,6 +184,7 @@ export default {
); );
if (result.code == 200){ if (result.code == 200){
this.$message.success('操作成功') this.$message.success('操作成功')
this.clearList()
this.getOptions(); this.getOptions();
this.$refs.onPutInRuleForm.resetFields(); this.$refs.onPutInRuleForm.resetFields();
return ; return ;

32
warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue
View File

@ -212,8 +212,9 @@
custerName:'', custerName:'',
custerSid:'', custerSid:'',
list:[], list:[],
outDate:"" // outDate:""
}, },
zhiwuName:"",
huoweiId:[], huoweiId:[],
supplierList: [], supplierList: [],
storehouseList: [], storehouseList: [],
@ -235,9 +236,9 @@
storeHouseSid: [ storeHouseSid: [
{ required: true, message: '请选择出库仓库', trigger: 'blur' } { required: true, message: '请选择出库仓库', trigger: 'blur' }
], ],
outDate: [ // outDate: [
{ required: true, message: '请选择出库日期', trigger: 'blur' } // { required: true, message: '请选择出库日期', trigger: 'blur' }
] // ]
}, },
f1Value:{ f1Value:{
proSid:'' proSid:''
@ -275,13 +276,12 @@
this.huoweiId = datas.data; this.huoweiId = datas.data;
}, },
selectPro(row){ selectPro(row){
console.log(row); this.zhiwuName=row.proSid
this.productList.forEach((e) => { this.productList.forEach((e) => {
if(e.barCode==row.proSid){ if(e.barCode==row.proSid){
row.proName=e.name row.proName=e.name
} }
}); });
console.log(row);
}, },
handleReturn(isreload) { handleReturn(isreload) {
if (isreload === "true") this.$emit("reloadlist"); if (isreload === "true") this.$emit("reloadlist");
@ -346,13 +346,23 @@
this.$refs.dataForm.validate(async validate => { this.$refs.dataForm.validate(async validate => {
if (!validate) return this.$message.error('请填写必填项') if (!validate) return this.$message.error('请填写必填项')
// this.purchaseForm.status = '待审核' // this.purchaseForm.status = '待审核'
if(this.zhiwuName){
const { data: result } = await this.$http.post('/output/addOutStorehouse', this.purchaseForm) const { data: result } = await this.$http.post('/output/addOutStorehouse', this.purchaseForm)
if (result.code == 200) { if (result.code == 200) {
this.$message({ type: 'success', message: result.msg, showClose: true }) this.$message({ type: 'success', message: result.msg, showClose: true })
this.handleReturn('true') this.handleReturn('true')
this.clearList() this.clearList()
}else if(result.code == 500){
this.$message.error(result.msg)
}
}else{
this.$message({
message: '请添加质物信息',
type: 'warning'
});
} }
})
})
}, },
async getSupplierList () { async getSupplierList () {
const { data: result } = await this.$http.get('/purchase/getSupplier') const { data: result } = await this.$http.get('/purchase/getSupplier')

Write Preview
Loading…
Cancel
Save