前端

src/views/warehouse/warehouseManagementAdd.vue

@@ -323,7 +323,14 @@
       },
 
       submit() {
+        
         if (this.radio == 1) {
+          this.deptBudgetList.warehousePrivate =
+                    CodeToText[this.selectedOptions[0]]
+                  this.deptBudgetList.warehouseCity =
+                    CodeToText[this.selectedOptions[1]]
+                  this.deptBudgetList.warehouseArea =
+                    CodeToText[this.selectedOptions[2]]
           if (!this.deptBudgetList.warehouseName) {
             this.$message({
               message: '仓库名称不能为空！',
@@ -372,6 +379,13 @@
             })
             return
           }
+          if (!this.deptBudgetList.warehousePrivate) {
+            this.$message({
+              message: '请选择仓库所在地！',
+              type: 'warning',
+            })
+            return
+          }
           if (!this.deptBudgetList.detailedAddress) {
             this.$message({
               message: '详细地址不能为空！',
@@ -528,12 +542,6 @@
                 if (valid) {
                   this.deptBudgetList.compId =
                     localStorage.getItem('ws-pf_compId')
-                  this.deptBudgetList.warehousePrivate =
-                    CodeToText[this.selectedOptions[0]]
-                  this.deptBudgetList.warehouseCity =
-                    CodeToText[this.selectedOptions[1]]
-                  this.deptBudgetList.warehouseArea =
-                    CodeToText[this.selectedOptions[2]]
                   this.deptBudgetList.warehousePositionInfoList =
                     this.freightspace
                   this.deptBudgetList.totalStorage = this.totalStorage

src/views/warehouse/warehouseManagementEdit.vue

@@ -98,13 +98,13 @@
           <el-button v-if="warehouseType == 1">上传附件</el-button>
         </el-upload>
         <div class="addressUrls" v-if="addressUrls != null">
-          <div class='addressUrls-item'>
             <div v-for="(item , index) in addressUrls" class="addressUrl" :key="index">
               <div @click='close(index)' class="iconfont icon-guanbi"></div>
-              <img v-if="addressUrls != null" width="100" height="100" :src="item" alt="" />
-            </div>
-
-
+              <el-image  v-if="addressUrls != null"
+                style="width: 100px; height: 100px"
+                :src="item" 
+                :preview-src-list="addressUrls">
+              </el-image>
           </div>
         </div>
         <div class="small-title">仓库定位</div>

src/views/warehouse/warehouseManagementLook.vue

@@ -132,7 +132,8 @@
           </ws-info-table>
         </div>
         <div class="small-title" v-show="warehouseType == '1'">仓库照片</div>
-        <div class="addressUrls">
+        <div>
+          <div class="addressUrls">
           <div v-for="(items, index) in addressUrls" class="addressUrl">
             <img
               v-show="addressUrls.length > 0"
@@ -143,6 +144,8 @@
             />
           </div>
         </div>
+        
+        </div>
       </ws-form>
     </div>
     <div style="text-align: right; padding: 10px">
@@ -157,6 +160,11 @@
   </div>
 </template>
 <script>
+import {
+    regionData,
+    CodeToText,
+    TextToCode
+  } from 'element-china-area-data'
 import { xiala, billoperatehis, getLook } from '@/model/warehouse/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -307,6 +315,7 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          
           this.packtypeList = response
         })
     },
@@ -342,9 +351,12 @@ export default {
   margin-top: 100px;
   top: 30px;
   width: 90%;
-  height: 500px;
+  // height: 500px;
   margin: 0 auto;
 }
+.container{
+  overflow:scroll;
+}
 .container .bg-left {
   padding-left: 40px;
 }