Merge remote-tracking branch 'origin/demo_' into demo_

src/views/idle-assets/modules/BaseForm.vue

@@ -57,7 +57,7 @@
           <a @click="handleDelete(record)">删除</a>
           <operation-button
             @click="handleUpLoad(record)"
-          >上传图片</operation-button>
+          > {{ record.sbFileList.length>0?'查看图片':'上传图片' }} </operation-button>
         </span>
       </a-table>
     </a-card>
@@ -186,7 +186,7 @@ export default {
     },
     save () {
       const { form: { validateFieldsAndScroll } } = this
-      // this.confirmLoading = true
+      this.confirmLoading = true
       validateFieldsAndScroll((errors, values) => {
         if (errors) {
           Object.values(errors).map(item => {
@@ -213,6 +213,7 @@ export default {
     handleCancel (values) {
       this.visible = false
       this.modal = {}
+      this.confirmLoading = false
       this.sbInfoDTOS = []
       this.form.resetFields()
       this.$emit('ok', values)

src/views/idle-assets/modules/UpLoad.vue

@@ -48,10 +48,7 @@ export default {
         record.sbFileList = []
         return
       }
-      this.defaultApplicationFileList = this.BaseTool.UPLOAD.transImg(record.sbFileList.map((item, i) => {
-        item.id = i
-        return item
-      }))
+      this.defaultApplicationFileList = this.BaseTool.UPLOAD.transImg(record.sbFileList)
     },
     getBase64 (file) {
       return new Promise((resolve, reject) => {