diff --git a/supervise-crm-ui/src/views/project/projectAdd.vue b/supervise-crm-ui/src/views/project/projectAdd.vue index 60b6f6ba..a1d1eef4 100644 --- a/supervise-crm-ui/src/views/project/projectAdd.vue +++ b/supervise-crm-ui/src/views/project/projectAdd.vue @@ -225,9 +225,16 @@ -
+
+ + +

{{ item.name }}

+
+ @@ -280,6 +287,7 @@ bManagerList: [], enterpriseAllList: [], enterpriseList: [], + temps: [], } }, created() { @@ -505,7 +513,7 @@ }, showEdit(row) { this.title= "【修改】项目信息", - req.fetchBySid(row.sid) + req.fetchBySid(row.sid) .then(resp => { if (resp.success) { this.formobj = resp.data @@ -515,6 +523,12 @@ .catch(e => { this.formobj = row }) + + req.getStorehouseBySid(row.sid).then((res) => { + if (res.success) { + this.temps=res.data + } + }) }, } @@ -555,6 +569,7 @@ width: 150px; height: 100px; margin: 10px 10px 30px 10px; + float: left; } .Images img{ width: 100px; @@ -571,4 +586,25 @@ .Images:hover p{ color: #b8b8b8b0; } + + + + .Image{ + width: 150px; + height: 100px; + float: left; + margin: 10px 20px 40px 10px; + } + .Image img{ + width: 100%; + height: 100%; + } + .Image p{ + color: #000; + text-align: center; + margin-top: -15px; + } + .Image p .Atext{ + text-decoration: none; + } diff --git a/supervise-crm-ui/src/views/project/projectInfo.vue b/supervise-crm-ui/src/views/project/projectInfo.vue index b79fdb24..a786711b 100644 --- a/supervise-crm-ui/src/views/project/projectInfo.vue +++ b/supervise-crm-ui/src/views/project/projectInfo.vue @@ -190,7 +190,7 @@
- +

{{ item.name }}

diff --git a/warehousing-system/project_web_ui/src/main.js b/warehousing-system/project_web_ui/src/main.js index df7ddab7..245c1114 100644 --- a/warehousing-system/project_web_ui/src/main.js +++ b/warehousing-system/project_web_ui/src/main.js @@ -24,8 +24,8 @@ Vue.use(ElementUI) import axios from 'axios' /* 设定axios的请求根目录 */ -axios.defaults.baseURL = 'http://192.168.1.193:9050/' -// axios.defaults.baseURL = 'http://jianguan.yyundong.com/warehouseapi/' +// axios.defaults.baseURL = 'http://192.168.1.193:9050/' +axios.defaults.baseURL = 'http://jianguan.yyundong.com/warehouseapi/' // import '@/permission' //权限控制 Vue.prototype.$http = axios Vue.prototype.$userInfo = null // 用户信息 diff --git a/warehousing-system/project_web_ui/src/views/component/pictureList/pictureList.vue b/warehousing-system/project_web_ui/src/views/component/pictureList/pictureList.vue index 0d61a783..e82b4609 100644 --- a/warehousing-system/project_web_ui/src/views/component/pictureList/pictureList.vue +++ b/warehousing-system/project_web_ui/src/views/component/pictureList/pictureList.vue @@ -103,6 +103,7 @@ export default { if(str.charAt(str.length - 1)!="t"){ var id= window.location.href.split("?")[1].split("=")[1]; this.sid=id + console.log(this.sid) } // if(window.location.href){ @@ -125,8 +126,11 @@ export default { } }, async LookStorehousedialog(sid) { - this.sid=sid + if(sid!=undefined){ + this.sid=sid + } const _this = this; + console.log(this.sid) const { data: result } = await this.$http.get( `/v1/shstorehouse/fetchDetailsBySid/${this.sid}` );