1

supervise-crm-ui/src/views/project/projectAdd.vue

@@ -225,9 +225,16 @@
             </el-col>
             <el-col :span="20">
               <el-form-item class="trightb_item">
-                <div class="Images" @click="addImg()">
+                <div class="Image" v-for="(item,i) in temps"  :key="i" v-show="item.name">
+                    <img v-if="item.picUrl" :src="item.picUrl" alt="">
+                    <img v-else src="../../assets/images/notAvailable.jpg" alt="" />
+                    <p><u class="Atext">{{ item.name }}</u></p>
+                </div>
+                <div class="Images">
+                  <a href="http://jianguan.yyundong.com/warehouse/#/initial_value/storehouse" target="_blank">
                   <img src="../../assets//images//addImg.png" alt="">
                   <p>添 加 关 联 仓 库</p>
+                </a>
                 </div>
               </el-form-item>
             </el-col>
@@ -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;
+  }
 </style>

supervise-crm-ui/src/views/project/projectInfo.vue

@@ -190,7 +190,7 @@
             <el-col :span="20">
               <el-form-item class="trightb_item">
                 <div class="Images" v-for="(item,i) in temps"  :key="i" v-show="item.name">
-                    <a :href="'http://jianguan.yyundong.com/warehouse/#/pictureList/pictureList?id='+item.sid" target="_blank">
+                    <a :href="'http://jianguan.yyundong.com/warehouse/#/pictureList/pictureList?id='+item.shSid" target="_blank">
                     <img v-if="item.picUrl" :src="item.picUrl" alt="">
                     <img v-else src="../../assets/images/notAvailable.jpg" alt="" />
                     <p><u class="Atext">{{ item.name }}</u></p>

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://192.168.1.193:9050/'
-// axios.defaults.baseURL = 'http://jianguan.yyundong.com/warehouseapi/'
+axios.defaults.baseURL = 'http://jianguan.yyundong.com/warehouseapi/'
 // import '@/permission' //权限控制
 Vue.prototype.$http = axios
 Vue.prototype.$userInfo = null // 用户信息

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}`
       );