diff --git a/supervise-crm-ui/src/api/project/project.js b/supervise-crm-ui/src/api/project/project.js index 241a3501..2c1f6b86 100644 --- a/supervise-crm-ui/src/api/project/project.js +++ b/supervise-crm-ui/src/api/project/project.js @@ -105,8 +105,8 @@ export default { }, selectStoreHouseSid: function(sid) { return request({ - url: '/crm/v1/projectinformation/selectStoreHouse/'+ sid, - method: 'get' + url: '/crm/v1/storehouseproject/selectStoreBySid/'+ sid, + method: 'post' }) }, diff --git a/supervise-crm-ui/src/views/project/projectAdd.vue b/supervise-crm-ui/src/views/project/projectAdd.vue index 241da592..108c8440 100644 --- a/supervise-crm-ui/src/views/project/projectAdd.vue +++ b/supervise-crm-ui/src/views/project/projectAdd.vue @@ -541,18 +541,28 @@ }, delSid(delSid){ let newVarImg=[] + let newImgss=[] this.ImgSid.forEach(function check(value) { - if(value.sid != delSid.sid) { + if(value.shSid != delSid.shSid ) { newVarImg.push(value); } + if(value.sid != delSid.sid){ + newImgss.push(value); + } }) - this.ImgSid=newVarImg - console.log(this.ImgSid); + let newImg=newVarImg.concat(newImgss); + this.ImgSid=[...new Set(newImg)]; var ARRSid=[] + var aRRsid=[] if(this.ImgSid.length>0){ for(var i=0;i0){ let newArr =this.getImgsid.concat(oldArr); let newImg=this.ImgSid.concat(this.ValSid); this.ImgSid=[...new Set(newImg)]; @@ -663,6 +672,7 @@ this.ImgSid=[...new Set(this.ValSid )] this.formobj.storeHouseProjectDto.shSids=oldArr } + console.log(this.ImgSid) this.drawer=false this.$refs.multipleTable.clearSelection(); }, diff --git a/supervise-crm-ui/src/views/project/projectInfo.vue b/supervise-crm-ui/src/views/project/projectInfo.vue index a786711b..e0888156 100644 --- a/supervise-crm-ui/src/views/project/projectInfo.vue +++ b/supervise-crm-ui/src/views/project/projectInfo.vue @@ -233,7 +233,7 @@ this.$emit('doback') }) - req.getStorehouseBySid(sid).then((res) => { + req.selectStoreHouseSid(sid).then((res) => { if (res.success) { this.temps=res.data } diff --git a/supervise-crm-ui/src/views/projectStaff/index.vue b/supervise-crm-ui/src/views/projectStaff/index.vue index 0b07475e..ed13d396 100644 --- a/supervise-crm-ui/src/views/projectStaff/index.vue +++ b/supervise-crm-ui/src/views/projectStaff/index.vue @@ -154,8 +154,8 @@ this.projectList.entryName=res.data[0].entryName this.projectList.bankName=res.data[0].bankName req.getUserProjectBySid(res.data[0].sid).then(res=>{ - this.DataLists=res.data.bankUsers - this.usersList=res.data.users + this.DataLists=res.data.users + this.usersList=res.data.bankUsers this.estimate() }) } @@ -191,8 +191,8 @@ this.projectList.bankName=this.checkList[0].bankName req.getUserProjectBySid(row.sid).then(res=>{ - this.DataLists=res.data.bankUsers - this.usersList=res.data.users + this.DataLists=res.data.Users + this.usersList=res.data.bankusers this.estimate() }) }, @@ -257,7 +257,7 @@ const { dataListOne,dataListTwo, DataLists,usersList } = this DataLists.forEach(key => { dataListOne.forEach(row => { - if (row.sid == key.sid) { + if (row.sid == key.userSid) { if(row.sid){ this.$refs.multipleTable.toggleRowSelection(row, true); } @@ -266,7 +266,7 @@ }) usersList.forEach(key => { dataListTwo.forEach(row => { - if (row.sid == key.sid) { + if (row.sid == key.userSid) { if(row.sid){ this.$refs.multipleTables.toggleRowSelection(row, true); }else{ diff --git a/supervise-enterprise-ui/src/views/NewList/needMoney.vue b/supervise-enterprise-ui/src/views/NewList/needMoney.vue index ba1562a1..273f4b3f 100644 --- a/supervise-enterprise-ui/src/views/NewList/needMoney.vue +++ b/supervise-enterprise-ui/src/views/NewList/needMoney.vue @@ -112,7 +112,7 @@ export default { /deep/ .el-input{ margin-top: -10px; } -/deep/ .el-input__suffix{ +/deep/ .production .el-input__suffix{ margin-top: -8px; } .topHouse h2{ diff --git a/supervise-enterprise-ui/src/views/NewList/returnedMoney.vue b/supervise-enterprise-ui/src/views/NewList/returnedMoney.vue index d44c77f8..9c0cdcba 100644 --- a/supervise-enterprise-ui/src/views/NewList/returnedMoney.vue +++ b/supervise-enterprise-ui/src/views/NewList/returnedMoney.vue @@ -1,62 +1,131 @@ - - - - - \ No newline at end of file + diff --git a/warehousing-system/project_web_ui/src/views/component/initial_value/add/storehouseAdd.vue b/warehousing-system/project_web_ui/src/views/component/initial_value/add/storehouseAdd.vue index 8335607b..f49bcd4c 100644 --- a/warehousing-system/project_web_ui/src/views/component/initial_value/add/storehouseAdd.vue +++ b/warehousing-system/project_web_ui/src/views/component/initial_value/add/storehouseAdd.vue @@ -446,13 +446,17 @@ export default { } }, async addStorehouse() { - const { data: result } = await this.$http.post( + if (this.form.name == "") { + this.$message.error('请至少填写仓库名称') + }else{ + const { data: result } = await this.$http.post( "/v1/shstorehouse/save", this.form ); if (result.code == 200) this.$message.success("成功添加仓库"); this.handleReturn('true') this.claerArrList() + } }, async updataStorehouse() { const { data: result } = await this.$http.post( diff --git a/warehousing-system/project_web_ui/src/views/component/initial_value/location.vue b/warehousing-system/project_web_ui/src/views/component/initial_value/location.vue index 156d7967..b6c87f2f 100644 --- a/warehousing-system/project_web_ui/src/views/component/initial_value/location.vue +++ b/warehousing-system/project_web_ui/src/views/component/initial_value/location.vue @@ -170,14 +170,6 @@ export default { this.queryInfo.query = '' this.dosearch() }, - handleSizeChange (val) { - this.queryInfo.pageSize = val - this.getLocationList() - }, - handleCurrentChange (val) { - this.queryInfo.pageNum = val - this.getLocationList() - }, async getLocationList () { const { data: result } = await this.$http.get('/location/list', { params: this.queryInfo }) if (result.status !== 200) return this.$message.error('获取列表失败') diff --git a/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue b/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue index 5d455b99..32884269 100644 --- a/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue +++ b/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue @@ -175,7 +175,7 @@ - + diff --git a/warehousing-system/project_web_ui/src/views/component/instorehouse/putIn.vue b/warehousing-system/project_web_ui/src/views/component/instorehouse/putIn.vue index e4753a2e..d37edf42 100644 --- a/warehousing-system/project_web_ui/src/views/component/instorehouse/putIn.vue +++ b/warehousing-system/project_web_ui/src/views/component/instorehouse/putIn.vue @@ -91,6 +91,7 @@ export default { createPerson: "", checkPerson: "", status: "", + locationName:'' }, queryInfos: { total: 0, diff --git a/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue index 49d75e36..bfeff89a 100644 --- a/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue +++ b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue @@ -142,7 +142,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -175,7 +175,7 @@ - + diff --git a/warehousing-system/project_web_ui/src/views/component/pictureList/pictureParticulars.vue b/warehousing-system/project_web_ui/src/views/component/pictureList/pictureParticulars.vue index d7cf7624..92d7a0a8 100644 --- a/warehousing-system/project_web_ui/src/views/component/pictureList/pictureParticulars.vue +++ b/warehousing-system/project_web_ui/src/views/component/pictureList/pictureParticulars.vue @@ -41,7 +41,7 @@
{{ temp.monthlyPrice }}元/月
- 用租金 + 月租金
区{{"\xa0\xa0\xa0"}}{{"\xa0\xa0\xa0"}}域：{{ temp.cityName }}-{{ temp.countyName }}
@@ -68,7 +68,7 @@
-

描{{"\xa0\xa0\xa0"}}述

+

仓库详细图片

  • @@ -128,7 +128,7 @@ }, clickMapInfo(jd,wd) { if (!jd) { - this.$message.error("请维护地址信息"); + this.$message.error("请输入经纬度信息"); return; } this.mapInfo = jd + "," + wd;