bug修改

src/pages/system/caseManager/caseAreaManager/index.vue

@@ -57,8 +57,10 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="CaseName"
-          label="案场">
+          label="案场" >
+          <template slot-scope="scope">
+            <span>{{getCaseName(scope.row.CaseId)}}</span>
+          </template>
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
@@ -117,7 +119,7 @@ export default {
       set (val) {
         this.postData.caseid = val
       }
-    }
+    },
   },
   methods: {
     search () { // 搜索
@@ -125,14 +127,17 @@ export default {
       this.currentList = []
       this.getList()
     },
+    getCaseName (caseid) {
+      return (this.cases.filter(x => x.CaseId === caseid)[0] || {}).CaseName
+    },
     getList () { // 获取列表
       this.$ajax(this.$api.caseManager.getCaseAreaList.url, {
         method: this.$api.caseManager.getCaseAreaList.method,
         queryData: { ...this.postData, caseid: this.CaseId }
       }).then(res => {
-        for (var n = 0; n < res.list.length; n++) {
-          res.list[n].CaseName = this.cases.filter(x => x.CaseId === res.list[n].CaseId)[0].CaseName
-        }
+        // for (var n = 0; n < res.list.length; n++) {
+        //   res.list[n].CaseName = this.cases.filter(x => x.CaseId === res.list[n].CaseId)[0].CaseName
+        // }
         this.currentList = res.list
         this.postData.page = res.page
         this.total = res.pagenum

src/pages/system/caseManager/caseInfo/addCase/index.vue

@@ -16,7 +16,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>案场地址：</span>
+          <span>案场地址：<em>*</em></span>
           <div class="flex-item">
             <div>
               <el-input
@@ -57,7 +57,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>案场头像：</span>
+          <span>案场头像：<em>*</em></span>
           <div class="flex-item">
             <div>
               <!-- <a class="formImg">
@@ -176,14 +176,28 @@ export default {
       if (this.postData.CaseName === '') {
         this.$message({
           type: 'error',
-          message: '案场名称不能为空'
+          message: '请填写案场名称！'
+        })
+        return false
+      }
+      if (this.postData.CaseAddress === '') {
+        this.$message({
+          type: 'error',
+          message: '请填写案场地址！'
+        })
+        return false
+      }
+      if (this.postData.CaseIcon === '') {
+        this.$message({
+          type: 'error',
+          message: '请上传案场图片！'
         })
         return false
       }
       if (this.postData.Coordinate === '') {
         this.$message({
           type: 'error',
-          message: '案场经纬度不能为空'
+          message: '案场在地图上的位置不明确，请在地图上抓取地址获取经纬度！'
         })
         return false
       }

src/pages/system/caseManager/caseInfo/editCase/index.vue

@@ -15,7 +15,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>案场地址：</span>
+          <span>案场地址：<em>*</em></span>
           <div class="flex-item">
             <div>
               <el-input
@@ -53,7 +53,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>案场头像：</span>
+          <span>案场头像：<em>*</em></span>
           <div class="flex-item">
             <div>
               <!-- <a class="formImg">
@@ -183,14 +183,28 @@ export default {
       if (this.postData.CaseName === '') {
         this.$message({
           type: 'error',
-          message: '案场名称不能为空'
+          message: '请填写案场名称！'
+        })
+        return false
+      }
+      if (this.postData.CaseAddress === '') {
+        this.$message({
+          type: 'error',
+          message: '请填写案场地址！'
+        })
+        return false
+      }
+      if (this.postData.CaseIcon === '') {
+        this.$message({
+          type: 'error',
+          message: '请上传案场图片！'
         })
         return false
       }
       if (this.postData.Coordinate === '') {
         this.$message({
           type: 'error',
-          message: '案场经纬度不能为空'
+          message: '案场在地图上的位置不明确，请在地图上抓取地址获取经纬度！'
         })
         return false
       }

src/pages/system/caseManager/caseInfo/index.vue

@@ -48,6 +48,7 @@
 
 <script>
 import tableSearch from '@/components/tableSearch/index'
+import { mapActions } from 'vuex'
 
 export default {
   name: '',
@@ -71,6 +72,9 @@ export default {
     })
   },
   methods: {
+    ...mapActions([
+      'updateSystemInfo',
+    ]),
     pplConcerned (index, row) { // 相关人员
       this.$router.push({name: 'pplConcerned', query: {id: row.CaseId}})
     },

src/pages/system/caseManager/caseTableManager/add.vue

@@ -9,6 +9,7 @@
               <el-input
                 placeholder="请输入名称"
                 v-model="postData.TableNo"
+                maxlength="6"
                 clearable>
               </el-input>
             </div>

src/pages/system/caseManager/caseTableManager/edit.vue

@@ -9,6 +9,7 @@
               <el-input
                 placeholder="请输入名称"
                 v-model="postData.TableNo"
+                maxlength="6"
                 clearable>
               </el-input>
             </div>

src/pages/system/cmsManager/bannerManager/add.vue

@@ -77,7 +77,7 @@
         <li class="flex-h">
           <span>图片：</span>
           <div class="flex-item">
-            <el-upload
+            <!-- <el-upload
               :action="$api.file.image.url"
               :limit='limit'
               list-type="picture-card"
@@ -89,7 +89,15 @@
             </el-upload>
             <el-dialog :visible.sync="dialogVisible">
               <img width="100%" :src="imgs" alt="">
-            </el-dialog>
+            </el-dialog> -->
+            <el-upload
+              class="avatar-uploader"
+              :action='$api.file.image.url'
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess">
+              <img v-if="postData.ImageUrl" :src="postData.ImageUrl" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
           </div>
         </li>
         <!-- <li class="flex-h">
@@ -192,13 +200,13 @@ export default {
       }
       this.postData.OrgId = this.OrgId
       this.postData.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'
-      this.postData.ImageUrl = ''
-      for (let i = 0; i < this.imgsArr.length; i++) {
-        this.postData.ImageUrl += this.imgsArr[i].response.result.url + ','
-      }
-      if (this.postData.ImageUrl) {
-        this.postData.ImageUrl = this.postData.ImageUrl.substr(0, this.postData.ImageUrl.length - 1)
-      }
+      // this.postData.ImageUrl = ''
+      // for (let i = 0; i < this.imgsArr.length; i++) {
+      //   this.postData.ImageUrl += this.imgsArr[i].response.result.url + ','
+      // }
+      // if (this.postData.ImageUrl) {
+      //   this.postData.ImageUrl = this.postData.ImageUrl.substr(0, this.postData.ImageUrl.length - 1)
+      // }
       this.$ajax(this.$api.cms.addImage.url, {
         method: this.$api.cms.addImage.method,
         data: this.postData
@@ -218,21 +226,24 @@ export default {
     cancel () {
       this.$router.go(-1)
     },
-    handlePictureCardPreview (res, file, fileList) {
-      this.imgs = res.result.url
-      this.dialogVisible = false
-      this.imgsArr = fileList
-    },
-    handleRemove (file, fileList) {
-      this.imgsArr = fileList
+    // handlePictureCardPreview (res, file, fileList) {
+    //   this.imgs = res.result.url
+    //   this.dialogVisible = false
+    //   this.imgsArr = fileList
+    // },
+    // handleRemove (file, fileList) {
+    //   this.imgsArr = fileList
+    // },
+    // exceed () {
+    //   this.$message({
+    //     message: '超过可传的图片上限',
+    //     type: 'info',
+    //     duration: 1000
+    //   })
+    // }
+    handleAvatarSuccess (res, file) {
+      this.postData.ImageUrl = res.result.url
     },
-    exceed () {
-      this.$message({
-        message: '超过可传的图片上限',
-        type: 'info',
-        duration: 1000
-      })
-    }
   }
 }
 </script>

src/pages/system/cmsManager/bannerManager/edit.vue

@@ -77,7 +77,7 @@
         <li class="flex-h">
           <span>图片：</span>
           <div class="flex-item">
-            <el-upload
+            <!-- <el-upload
               :action="$api.file.image.url"
               :limit='limit'
               list-type="picture-card"
@@ -89,7 +89,15 @@
             </el-upload>
             <el-dialog :visible.sync="dialogVisible">
               <img width="100%" :src="imgs" alt="">
-            </el-dialog>
+            </el-dialog> -->
+            <el-upload
+              class="avatar-uploader"
+              :action='$api.file.image.url'
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess">
+              <img v-if="postData.ImageUrl" :src="postData.ImageUrl" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
           </div>
         </li>
         <!-- <li class="flex-h">
@@ -187,13 +195,13 @@ export default {
       this.postData.OrgId = this.OrgId
       this.postData.CaseId = this.CaseId
       this.postData.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'
-      this.postData.ImageUrl = ''
-      for (let i = 0; i < this.imgsArr.length; i++) {
-        this.postData.ImageUrl += this.imgsArr[i].response.result.url + ','
-      }
-      if (this.postData.ImageUrl) {
-        this.postData.ImageUrl = this.postData.ImageUrl.substr(0, this.postData.ImageUrl.length - 1)
-      }
+      // this.postData.ImageUrl = ''
+      // for (let i = 0; i < this.imgsArr.length; i++) {
+      //   this.postData.ImageUrl += this.imgsArr[i].response.result.url + ','
+      // }
+      // if (this.postData.ImageUrl) {
+      //   this.postData.ImageUrl = this.postData.ImageUrl.substr(0, this.postData.ImageUrl.length - 1)
+      // }
       this.$ajax(this.$api.cms.editImage.url, {
         method: this.$api.cms.editImage.method,
         data: this.postData,
@@ -226,37 +234,40 @@ export default {
         console.log(res)
         res.Status = res.Status + ''
         res.ForwardType === 'url' ? res.ForwardType = '1' : res.ForwardType = '0'
-        let imgsArr = []
-        let item = {
-          url: res.ImageUrl,
-          response: {
-            result: {
-              url: res.ImageUrl
-            }
-          }
-        }
-        imgsArr.push(item)
-        this.imgsArr = imgsArr
+        // let imgsArr = []
+        // let item = {
+        //   url: res.ImageUrl,
+        //   response: {
+        //     result: {
+        //       url: res.ImageUrl
+        //     }
+        //   }
+        // }
+        // imgsArr.push(item)
+        // this.imgsArr = imgsArr
         this.postData = res
       }).catch(msg => {
 
       })
     },
-    handlePictureCardPreview (res, file, fileList) {
-      this.imgs = res.result.url
-      this.dialogVisible = false
-      this.imgsArr = fileList
-    },
-    handleRemove (file, fileList) {
-      this.imgsArr = fileList
+    // handlePictureCardPreview (res, file, fileList) {
+    //   this.imgs = res.result.url
+    //   this.dialogVisible = false
+    //   this.imgsArr = fileList
+    // },
+    // handleRemove (file, fileList) {
+    //   this.imgsArr = fileList
+    // },
+    // exceed () {
+    //   this.$message({
+    //     message: '超过可传的图片上限',
+    //     type: 'info',
+    //     duration: 1000
+    //   })
+    // }
+    handleAvatarSuccess (res, file) {
+      this.postData.ImageUrl = res.result.url
     },
-    exceed () {
-      this.$message({
-        message: '超过可传的图片上限',
-        type: 'info',
-        duration: 1000
-      })
-    }
   }
 }
 </script>

src/pages/system/cmsManager/majorProjects/edit.vue

@@ -44,7 +44,7 @@
         <li class="flex-h">
           <span>图片：</span>
           <div class="flex-item">
-            <el-upload
+            <!-- <el-upload
               :action="$api.file.image.url"
               list-type="picture-card"
               :limit='limit'
@@ -53,13 +53,22 @@
               :on-remove="handleRemove"
               :on-exceed="exceed">
               <i class="el-icon-plus"></i>
+            </el-upload> -->
+            <!-- 单选 -->
+            <el-upload
+              class="avatar-uploader"
+              :action='$api.file.image.url'
+              :show-file-list="false"
+              :on-success="handleImgSuccess">
+              <img v-if="imgShow" :src="imgShow" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
             </el-upload>
           </div>
         </li>
         <li class="flex-h">
           <span>详细图片：</span>
           <div class="flex-item">
-            <el-upload
+            <!-- <el-upload
               :action='$api.file.image.url'
               list-type="picture-card"
               :limit='limit'
@@ -68,6 +77,15 @@
               :on-remove="handleRemoveDetail"
               :on-exceed="exceed">
               <i class="el-icon-plus"></i>
+            </el-upload> -->
+            <!-- 单选 -->
+            <el-upload
+              class="avatar-uploader"
+              :action='$api.file.image.url'
+              :show-file-list="false"
+              :on-success="handleDetailImgSuccess">
+              <img v-if="detailImgShow" :src="detailImgShow" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
             </el-upload>
           </div>
         </li>
@@ -200,8 +218,10 @@ export default {
     return {
       id: '',
       limit: 1,
-      imgs: null,
-      detailimgs: null,
+      // imgs: null,
+      // detailimgs: null,
+      img: '',
+      detailimg: '',
       selCourseVisible: false,
       selCourseList: [],
     }
@@ -228,40 +248,46 @@ export default {
         this.getCourse()
       }
     },
-    imgsArr: {
-      get () {
-        return this.imgs || (this.detail.CmsCaseImgs || []).filter(x => x.ImageType === 'cover').map(x => {
-          return {
-            url: x.CaseImageUrl,
-            response: {
-              result: {
-                url: x.CaseImageUrl
-              }
-            }
-          }
-        })
-      },
-      set (val) {
-        this.imgs = val
-      }
+    imgShow () {
+      return this.img || ((this.detail.CmsCaseImgs || []).filter(x => x.ImageType === 'cover')[0] || {}).CaseImageUrl
     },
-    detailimgsArr: {
-      get () {
-        return this.detailimgs || (this.detail.CmsCaseImgs || []).filter(x => x.ImageType === 'detail').map(x => {
-          return {
-            url: x.CaseImageUrl,
-            response: {
-              result: {
-                url: x.CaseImageUrl
-              }
-            }
-          }
-        })
-      },
-      set (val) {
-        this.detailimgs = val
-      }
+    detailImgShow () {
+      return this.detailimg || ((this.detail.CmsCaseImgs || []).filter(x => x.ImageType === 'detail')[0] || {}).CaseImageUrl
     },
+    // imgsArr: {
+    //   get () {
+    //     return this.imgs || (this.detail.CmsCaseImgs || []).filter(x => x.ImageType === 'cover').map(x => {
+    //       return {
+    //         url: x.CaseImageUrl,
+    //         response: {
+    //           result: {
+    //             url: x.CaseImageUrl
+    //           }
+    //         }
+    //       }
+    //     })
+    //   },
+    //   set (val) {
+    //     this.imgs = val
+    //   }
+    // },
+    // detailimgsArr: {
+    //   get () {
+    //     return this.detailimgs || (this.detail.CmsCaseImgs || []).filter(x => x.ImageType === 'detail').map(x => {
+    //       return {
+    //         url: x.CaseImageUrl,
+    //         response: {
+    //           result: {
+    //             url: x.CaseImageUrl
+    //           }
+    //         }
+    //       }
+    //     })
+    //   },
+    //   set (val) {
+    //     this.detailimgs = val
+    //   }
+    // },
     coursesList () {
       return (this.courses.list || []).map(x => {
         return {
@@ -284,16 +310,17 @@ export default {
       'GetCourseList',
     ]),
     submit () {
-      const imgs = this.imgsArr.map(x => x.response.result.url).join(',')
-      const detailimgs = this.detailimgsArr.map(x => x.response.result.url).join(',')
+      // const imgs = this.imgsArr.map(x => x.response.result.url).join(',')
+      // const detailimgs = this.detailimgsArr.map(x => x.response.result.url).join(',')
+
       const courseids = (this.detail.Courses || []).map(x => x.CourseId).join(',')
       if (this.id === '') {
         this.detail.OrgId = this.OrgId
-        this.AddCaseInfo({...this.detail, OrgId: this.OrgId, imgs, detailimgs, courseids}).then(res => {
+        this.AddCaseInfo({...this.detail, OrgId: this.OrgId, imgs: this.img, detailimgs: this.detailimg, courseids}).then(res => {
           this.afterSave()
         })
       } else {
-        this.AddCaseInfo({...this.detail, imgs, detailimgs, courseids}).then(res => {
+        this.AddCaseInfo({...this.detail, imgs: this.img, detailimgs: this.detailimg, courseids}).then(res => {
           this.afterSave()
         })
       }
@@ -311,18 +338,18 @@ export default {
     cancel () {
       this.$router.go(-1)
     },
-    handlePictureCardPreview (res, file, fileList) {
-      this.imgsArr = fileList
-    },
-    handleRemove (file, fileList) {
-      this.imgsArr = fileList
-    },
-    handlePictureCardPreviewDetail (res, file, fileList) {
-      this.detailimgsArr = fileList
-    },
-    handleRemoveDetail (file, fileList) {
-      this.detailimgsArr = fileList
-    },
+    // handlePictureCardPreview (res, file, fileList) {
+    //   this.imgsArr = fileList
+    // },
+    // handleRemove (file, fileList) {
+    //   this.imgsArr = fileList
+    // },
+    // handlePictureCardPreviewDetail (res, file, fileList) {
+    //   this.detailimgsArr = fileList
+    // },
+    // handleRemoveDetail (file, fileList) {
+    //   this.detailimgsArr = fileList
+    // },
     getDetail () {
       this.GetCaseInfo({id: this.id})
     },
@@ -338,13 +365,13 @@ export default {
         this.$refs.courseTable.clearSelection()
       }
     },
-    exceed () {
-      this.$message({
-        message: '超过可传的图片上限',
-        type: 'info',
-        duration: 1000
-      })
-    },
+    // exceed () {
+    //   this.$message({
+    //     message: '超过可传的图片上限',
+    //     type: 'info',
+    //     duration: 1000
+    //   })
+    // },
     addCourse () {
       this.GetCourseList({caseid: this.CaseId, page: 1, pagesize: 100, callback: this.coursesShow})
     },
@@ -365,7 +392,13 @@ export default {
     },
     deleteItem (row) {
       this.UpdateInfo({...this.detail, Courses: this.detail.Courses.filter(x => x.CourseId !== row.CourseId)})
-    }
+    },
+    handleImgSuccess (res, file) {
+      this.img = res.result.url
+    },
+    handleDetailImgSuccess (res, file) {
+      this.detailimg = res.result.url
+    },
   },
   mounted () {
     this.getCourse()

src/pages/system/cmsManager/newsManager/add.vue

@@ -62,7 +62,7 @@
         <li class="flex-h">
           <span>图片：</span>
           <div class="flex-item">
-            <el-upload
+            <!-- <el-upload
               :action="$api.file.image.url"
               :limit='limit'
               list-type="picture-card"
@@ -74,7 +74,16 @@
             </el-upload>
             <el-dialog :visible.sync="dialogVisible">
               <img width="100%" :src="imgs" alt="">
-            </el-dialog>
+            </el-dialog> -->
+            <!-- 单选 -->
+            <el-upload
+              class="avatar-uploader"
+              :action='$api.file.image.url'
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess">
+              <img v-if="postData.ImageUrl" :src="postData.ImageUrl" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
           </div>
         </li>
         <li style="text-align:center">
@@ -148,13 +157,13 @@ export default {
       }
       this.postData.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'
       this.postData.locationids = this.postData.LocationIds.join(',')
-      this.postData.ImageUrl = ''
-      for (let i = 0; i < this.imgsArr.length; i++) {
-        this.postData.ImageUrl += this.imgsArr[i].response.result.url + ','
-      }
-      if (this.postData.ImageUrl) {
-        this.postData.ImageUrl = this.postData.ImageUrl.substr(0, this.postData.ImageUrl.length - 1)
-      }
+      // this.postData.ImageUrl = ''
+      // for (let i = 0; i < this.imgsArr.length; i++) {
+      //   this.postData.ImageUrl += this.imgsArr[i].response.result.url + ','
+      // }
+      // if (this.postData.ImageUrl) {
+      //   this.postData.ImageUrl = this.postData.ImageUrl.substr(0, this.postData.ImageUrl.length - 1)
+      // }
       this.$ajax(this.$api.cms.addNews.url, {
         method: this.$api.cms.addNews.method,
         data: this.postData
@@ -174,21 +183,24 @@ export default {
     cancel () {
       this.$router.go(-1)
     },
-    handlePictureCardPreview (res, file, fileList) {
-      this.imgs = res.result.url
-      this.dialogVisible = false
-      this.imgsArr = fileList
-    },
-    handleRemove (file, fileList) {
-      this.imgsArr = fileList
+    // handlePictureCardPreview (res, file, fileList) {
+    //   this.imgs = res.result.url
+    //   this.dialogVisible = false
+    //   this.imgsArr = fileList
+    // },
+    // handleRemove (file, fileList) {
+    //   this.imgsArr = fileList
+    // },
+    // exceed () {
+    //   this.$message({
+    //     message: '超过可传的图片上限',
+    //     type: 'info',
+    //     duration: 1000
+    //   })
+    // }
+    handleAvatarSuccess (res, file) {
+      this.postData.ImageUrl = res.result.url
     },
-    exceed () {
-      this.$message({
-        message: '超过可传的图片上限',
-        type: 'info',
-        duration: 1000
-      })
-    }
   }
 }
 </script>

src/pages/system/cmsManager/newsManager/edit.vue

@@ -62,7 +62,7 @@
         <li class="flex-h">
           <span>图片：</span>
           <div class="flex-item">
-            <el-upload
+            <!-- <el-upload
               :action="$api.file.image.url"
               :limit='limit'
               list-type="picture-card"
@@ -74,7 +74,15 @@
             </el-upload>
             <el-dialog :visible.sync="dialogVisible">
               <img width="100%" :src="imgs" alt="">
-            </el-dialog>
+            </el-dialog> -->
+            <el-upload
+              class="avatar-uploader"
+              :action='$api.file.image.url'
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess">
+              <img v-if="postData.ImageUrl" :src="postData.ImageUrl" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
           </div>
         </li>
         <li style="text-align:center">
@@ -144,13 +152,13 @@ export default {
       }
       this.postData.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'
       this.postData.locationids = this.postData.LocationIds.join(',')
-      this.postData.ImageUrl = ''
-      for (let i = 0; i < this.imgsArr.length; i++) {
-        this.postData.ImageUrl += this.imgsArr[i].response.result.url + ','
-      }
-      if (this.postData.ImageUrl) {
-        this.postData.ImageUrl = this.postData.ImageUrl.substr(0, this.postData.ImageUrl.length - 1)
-      }
+      // this.postData.ImageUrl = ''
+      // for (let i = 0; i < this.imgsArr.length; i++) {
+      //   this.postData.ImageUrl += this.imgsArr[i].response.result.url + ','
+      // }
+      // if (this.postData.ImageUrl) {
+      //   this.postData.ImageUrl = this.postData.ImageUrl.substr(0, this.postData.ImageUrl.length - 1)
+      // }
       this.$ajax(this.$api.cms.editNews.url, {
         method: this.$api.cms.editNews.method,
         urlData: {
@@ -173,21 +181,21 @@ export default {
     cancel () {
       this.$router.go(-1)
     },
-    handlePictureCardPreview (res, file, fileList) {
-      this.imgs = res.result.url
-      this.dialogVisible = false
-      this.imgsArr = fileList
-    },
-    handleRemove (file, fileList) {
-      this.imgsArr = fileList
-    },
-    exceed () {
-      this.$message({
-        message: '超过可传的图片上限',
-        type: 'info',
-        duration: 1000
-      })
-    },
+    // handlePictureCardPreview (res, file, fileList) {
+    //   this.imgs = res.result.url
+    //   this.dialogVisible = false
+    //   this.imgsArr = fileList
+    // },
+    // handleRemove (file, fileList) {
+    //   this.imgsArr = fileList
+    // },
+    // exceed () {
+    //   this.$message({
+    //     message: '超过可传的图片上限',
+    //     type: 'info',
+    //     duration: 1000
+    //   })
+    // },
     getDetail () {
       this.$ajax(this.$api.cms.newsDetail.url, {
         method: this.$api.cms.newsDetail.method,
@@ -203,22 +211,25 @@ export default {
           return previousValue
         }, [])
         console.log(res.LocationIds)
-        let imgsArr = []
-        let item = {
-          url: res.ImageUrl,
-          response: {
-            result: {
-              url: res.ImageUrl
-            }
-          }
-        }
-        imgsArr.push(item)
-        this.imgsArr = imgsArr
+        // let imgsArr = []
+        // let item = {
+        //   url: res.ImageUrl,
+        //   response: {
+        //     result: {
+        //       url: res.ImageUrl
+        //     }
+        //   }
+        // }
+        // imgsArr.push(item)
+        // this.imgsArr = imgsArr
         this.postData = res
       }).catch(msg => {
 
       })
-    }
+    },
+    handleAvatarSuccess (res, file) {
+      this.postData.ImageUrl = res.result.url
+    },
   }
 }
 </script>

src/pages/system/courseManager/fiveA/edit.vue

@@ -149,13 +149,12 @@ export default {
           id: this.$route.query.id
         }
       }).then(res => {
-        console.log(res)
         let imgsArr = []
         let item = {
-          url: res.ImageUrl,
+          url: res.TypeImg,
           response: {
             result: {
-              url: res.ImageUrl
+              url: res.TypeImg
             }
           }
         }

src/pages/system/goodsManager/goodManager/edit.vue

@@ -33,7 +33,8 @@
           <span>商品图片：</span>
           <div class="flex-item">
             <div style="width:50%">
-              <el-upload
+              <!-- 多选 -->
+              <!-- <el-upload
                 :action="$api.file.image.url"
                 :limit='limit'
                 list-type="picture-card"
@@ -42,6 +43,15 @@
                 :on-remove="handleRemove"
                 :on-exceed="exceed">
                 <i class="el-icon-plus"></i>
+              </el-upload> -->
+              <!-- 单选 -->
+              <el-upload
+                class="avatar-uploader"
+                :action='$api.file.image.url'
+                :show-file-list="false"
+                :on-success="handleAvatarSuccess">
+                <img v-if="Image" :src="Image" class="avatar">
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </div>
           </div>
@@ -105,7 +115,7 @@ export default {
   name: '',
   data () {
     return {
-      limit: 2,
+      limit: 1,
       dialogVisible: false,
       infoSpecs: null,
     }
@@ -128,23 +138,28 @@ export default {
       },
       set (val) {
         this.UpdateInfo({...this.detail, CaseId: val})
+        this.detail.TypeId = ''
         this.GetGoodTypes({ pagesize: 1000, caseid: this.Case })
         this.GetGoodSpecs({ pagesize: 1000, caseid: this.Case })
       }
     },
     detailSpecs: {
       get () {
+        console.log(this.infoSpecs || (this.detail.Specs || []).map(x => x.SpecId))
         return this.infoSpecs || (this.detail.Specs || []).map(x => x.SpecId)
       },
       set (val) {
         this.infoSpecs = val
       },
     },
-    imgsArr () {
-      return (this.detail.Images || []).map(x => {
-        return {...x, url: x.url || x.ImgUrl}
-      })
-    },
+    // imgsArr () {
+    //   return (this.detail.Images || []).map(x => {
+    //     return {...x, url: x.url || x.ImgUrl}
+    //   })
+    // },
+    Image () {
+      return ((this.detail.Images || [])[0] || {}).ImgUrl
+    }
   },
   methods: {
     ...mapGoodsActions([
@@ -183,19 +198,22 @@ export default {
     cancel () {
       this.$router.go(-1)
     },
-    handlePictureCardPreview (res, file, fileList) {
-      this.detail.Images = fileList
+    // handlePictureCardPreview (res, file, fileList) {
+    //   this.detail.Images = fileList
+    // },
+    // handleRemove (file, fileList) {
+    //   this.detail.Images = fileList
+    // },
+    // exceed () {
+    //   this.$message({
+    //     message: '超过可传的图片上限',
+    //     type: 'info',
+    //     duration: 1000
+    //   })
+    // },
+    handleAvatarSuccess (res, file) {
+      this.UpdateInfo({...this.detail, Images: [{ImgUrl: res.result.url}]})
     },
-    handleRemove (file, fileList) {
-      this.detail.Images = fileList
-    },
-    exceed () {
-      this.$message({
-        message: '超过可传的图片上限',
-        type: 'info',
-        duration: 1000
-      })
-    }
   },
   created () {
     this.GetGoodTypes({ pagesize: 1000, caseid: this.Case })
@@ -203,8 +221,6 @@ export default {
     const { id } = this.$route.query
     if (id && id !== '') {
       this.GetGoodsByID({ id: id })
-    } else {
-      this.SetNull()
     }
   }
 }

src/pages/system/goodsManager/goodManager/index.vue

@@ -140,6 +140,7 @@ export default {
       'GetGoodsList',
       'GetGoodTypes',
       'DelGoods',
+      'SetNull',
     ]),
     getTypeName (typeid) {
       return (this.types.list.filter(x => x.TypeId === typeid)[0] || {}).TypeName
@@ -167,6 +168,7 @@ export default {
     },
     handleEdit (index, row) {
       // 编辑
+      this.SetNull()
       this.$router.push({ name: 'editGoods', query: { id: row.GoodsId } })
     },
     handleDelete (index, row) {
@@ -194,6 +196,7 @@ export default {
       this.getList()
     },
     addRole () {
+      this.SetNull()
       this.$router.push({ name: 'editGoods' })
     },
   },

src/pages/system/goodsManager/goodsTypeManager/index.vue

@@ -41,6 +41,9 @@
         <el-table-column
           prop="CaseName"
           label="所属案场">
+          <template slot-scope="scope">
+            <span>{{getCaseName(scope.row.CaseId)}}</span>
+          </template>
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
@@ -107,14 +110,17 @@ export default {
       this.currentList = []
       this.getList()
     },
+    getCaseName (caseid) {
+      return (this.cases.filter(x => x.CaseId === caseid)[0] || {}).CaseName
+    },
     getList () { // 获取列表
       this.$ajax(this.$api.goodsManager.getGoodsTypeList.url, {
         method: this.$api.goodsManager.getGoodsTypeList.method,
         queryData: { ...this.postData, caseid: this.CaseId }
       }).then(res => {
-        for (var n = 0; n < res.list.length; n++) {
-          res.list[n].CaseName = this.cases.filter(x => x.CaseId === res.list[n].CaseId)[0].CaseName
-        }
+        // for (var n = 0; n < res.list.length; n++) {
+        //   res.list[n].CaseName = this.cases.filter(x => x.CaseId === res.list[n].CaseId)[0].CaseName
+        // }
         this.currentList = res.list
         this.postData.page = res.page
         this.total = res.pagenum

src/pages/system/systemSet/userManager/add.vue

@@ -14,6 +14,14 @@
             </div>
           </div>
         </li>
+        <li class="flex-h" style="padding: 0;margin: 0;">
+          <span></span>
+          <div class="flex-item">
+            <div style="min-height: 0;">
+              <span style="font-size:10px;color:#bbb;">默认密码：123456</span>
+            </div>
+          </div>
+        </li>
         <li class="flex-h">
           <span>用户头像：</span>
           <div class="flex-item">
@@ -216,6 +224,25 @@ export default {
           message: '手机号不能为空'
         })
         return false
+      } else {
+        var myreg = /^[1][3,4,5,6,7,8][0-9]{9}$/
+        if (!myreg.test(this.postData.Phone)) {
+          this.$message({
+            type: 'error',
+            message: '请输入正确的手机号！'
+          })
+          return false
+        }
+      }
+      if (this.postData.Email !== '') {
+        var emailreg = new RegExp('^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$')
+        if (!emailreg.test(this.postData.Email)) {
+          this.$message({
+            type: 'error',
+            message: '邮箱格式不正确！'
+          })
+          return false
+        }
       }
       if (this.postData.BelongCaseId === '') this.postData.BelongCaseId = this.CaseId
       this.$ajax(this.$api.systemSet.addUser.url, {

src/pages/system/systemSet/userManager/edit.vue

@@ -14,6 +14,14 @@
             </div>
           </div>
         </li>
+        <li class="flex-h" style="padding: 0;margin: 0;">
+          <span></span>
+          <div class="flex-item">
+            <div style="min-height: 0;">
+              <span style="font-size:10px;color:#bbb;">默认密码：123456</span>
+            </div>
+          </div>
+        </li>
         <li class="flex-h">
           <span>用户头像：</span>
           <div class="flex-item">
@@ -234,6 +242,25 @@ export default {
           message: '手机号不能为空'
         })
         return false
+      } else {
+        var myreg = /^[1][3,4,5,6,7,8][0-9]{9}$/
+        if (!myreg.test(this.postData.Phone)) {
+          this.$message({
+            type: 'error',
+            message: '请输入正确的手机号！'
+          })
+          return false
+        }
+      }
+      if (this.postData.Email !== '') {
+        var emailreg = new RegExp('^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$')
+        if (!emailreg.test(this.postData.Email)) {
+          this.$message({
+            type: 'error',
+            message: '邮箱格式不正确！'
+          })
+          return false
+        }
       }
       if (this.postData.BelongCaseId === '') this.postData.BelongCaseId = this.BelongCaseId
       if (this.postData.TagIds === '') this.postData.TagIds = this.TagIds.join(',')

src/pages/system/systemSet/userManager/index.vue

@@ -76,12 +76,12 @@
         <el-table-column
           prop="WorkNo"
           label="工号"
-          width="200">
+          width="150">
         </el-table-column>
         <el-table-column
           prop="Phone"
           label="手机号"
-          width="150">
+          width="200">
         </el-table-column>
         <el-table-column
           prop="UserTypeNames"
@@ -231,7 +231,7 @@ export default {
       })
     },
     resetPasswd (index, row) { // 重置密码
-      this.$confirm('确认重置此用户密码?', '提示', {
+      this.$confirm('确认重置此用户密码为：123456?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'