录入调整。定制修改密码。样式属性调整

src/views/jyfkgl/ywsjlr/edit.vue

 <template>
-  <RelDialog  @getForm='getForm'  width="50%" :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
+  <RelDialog :changeAddParams='changeAddParams'  :changeEditParams='changeEditParams'  @getForm='getForm'  width="50%" :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
     <el-form slot="form" ref="form" :model="form" label-width="120px" :rules="rules">
       <el-row :gutter="20" :app="this">
         <EditColItem :required="item.required||false" :readonly="item.readonly?true:false "
@@ -10,7 +10,7 @@
         <el-form-item label="异物图片">
           <el-upload ref="upload" :headers='{
                         Gtoken
-                      }' :action="`${baseurl}/ywxxgl/uywsjlr/attachment/upload`" list-type="picture-card"
+                      }' :action="`${baseurl}/attachment/upload/tmp`" list-type="picture-card"
             :on-preview="handlePictureCardPreview" :on-success='success' :on-remove="handleRemove" :data="{
                           groupid:'',
                           folder:'uywsjlr'
@@ -54,6 +54,7 @@
     mixins: [editMixin],
     data() {
       return {
+        attachmentList:[],
         showList:[],
         baseurl: baseurl,
         Gtoken: Gtoken,
@@ -131,15 +132,40 @@
       }
     },
     methods: {
+      changeEditParams(params){
+        let attachments=[]
+        this.attachmentList.forEach(item=>{
+          attachments.push({
+            id:item
+          })
+        })
+        this.showList.forEach(item=>{
+          attachments.push({
+            id:item.id
+          })
+        })
+        params.attachments=attachments
+
+      },
+      changeAddParams(params){
+        let attachments=[]
+        this.attachmentList.forEach(item=>{
+          attachments.push({
+            id:item
+          })
+        })
+        params.attachments=attachments
+
+      },
       handleRemove(file, fileList) {
         let attachmentList = []
         fileList.forEach(item => {
           if (item.status == 'success') {
-            attachmentList.push(item.response.data.id)
+            attachmentList.push(item.response.data.records.id)
           }
         })
-        this.form.attachmentList = attachmentList
-        console.log(this.form.attachmentList)
+        this.attachmentList = attachmentList
+        console.log(this.attachmentList)
 
       },
       handlePictureCardPreview(file) {
@@ -153,11 +179,11 @@
           let attachmentList = []
           fileList.forEach(item => {
             if (item.status == 'success') {
-              attachmentList.push(item.response.data.id)
+              attachmentList.push(item.response.data.records.id)
             }
           })
 
-          this.form.attachmentList = attachmentList
+          this.attachmentList = attachmentList
 
         } else {
           const delIndex = fileList.findIndex(item => item.uid === file.uid);
@@ -173,16 +199,7 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(res => {
-          this.$post('ywxxgl/uywsjlr/attachment/delete', {
-
-            id: [id]
-
-          }).then(res => {
-            if (res.success) {
-              this.showList.splice(index, 1)
-              this.$success('操作成功')
-            }
-          })
+           this.showList.splice(index, 1)
 
         })
       },

src/views/jyfkgl/ywsjlr/index.vue

@@ -12,7 +12,7 @@
       <!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
     </template>
     <template #toolbar="ctx">
-      <AttachFileShow :app='ctx.basePage'></AttachFileShow>
+      <!-- <AttachFileShow :app='ctx.basePage'></AttachFileShow> -->
       <!-- 嵌入默认页面工具栏的插槽 ctx.pagePage来操作默认页面 -->
       <!-- <el-button @click="demo(ctx.basePage)" size='mini'  type="primary">示例按钮</el-button> -->
     </template>

src/views/sbjxgl/sbjxxx/edit.vue

@@ -54,14 +54,12 @@
                           }' :data="{
                                   groupid:'',
                                   folder:'usbjx'
-                                }" class="upload-demo" :action="`${baseurl}/jxgl/usbjx/attachment/upload`"
+                                }" class="upload-demo" :action="`${baseurl}/attachment/upload/tmp`"
                 :on-success='success' :on-remove="handleRemove" :file-list="fileList">
                 <el-button size="small" type="primary">点击上传</el-button>
               </el-upload>
-
             </div>
           </div>
-
           <div v-if="type!='add'">
             <span style="line-height: 40px;font-size: 12px;font-weight: 700;color: #666;">附件列表</span>
             <div class="download padding-10">
@@ -93,7 +91,7 @@
                   {{item.name}}
                 </div>
                 <div class="size">
-                  {{item.size}}
+                  {{ sizeFormatter(item.size) }}
                 </div>
                 <div class="down">
                   <el-button  @click="download(item)"   size="mini" type="success">下载文件</el-button>
@@ -164,21 +162,11 @@
     },
     data() {
       return {
-        form: {
-          attachmentList: []
-        },
+        attachmentList:[],
         Gtoken: Gtoken,
         baseurl: baseurl,
         fileList: [],
-        downList: [{
-            name: '测试1',
-            size: '200kb',
-          },
-          {
-            name: '测试2',
-            size: '2030kb',
-
-          }
+        downList: [
         ],
         showDialog: false,
         DialogWidth: '40vw',
@@ -323,6 +311,14 @@
       }
     },
     methods: {
+      	sizeFormatter(bytes){
+      							 if (bytes === 0) return '0 B';
+      							    var k = 1000, // or 1024
+      							        sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],
+      							        i = Math.floor(Math.log(bytes) / Math.log(k));
+
+      							   return (bytes / Math.pow(k, i)).toPrecision(3) + ' ' + sizes[i];
+      						},
       download(item){
         let url=`jxgl/usbjx/attachment/download/${item.id}`
         this.$cDownload(url, {},item.name)
@@ -333,24 +329,17 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          this.$post('jxgl/usbjx/attachment/delete', {
-            id: [id]
-          }).then(res => {
-            if (res.success) {
-              this.downList.splice(index, 1)
-              this.$success('操作成功')
-            }
-          })
+           this.downList.splice(index, 1)
         })
       },
       handleRemove(file, fileList) {
         let attachmentList = []
         fileList.forEach(item => {
           if (item.status == 'success') {
-            attachmentList.push(item.response.data.id)
+            attachmentList.push(item.response.data.records.id)
           }
         })
-        this.form.attachmentList = attachmentList
+        this.attachmentList = attachmentList
 
       },
       success(res, file, fileList) {
@@ -362,10 +351,10 @@
           let attachmentList = []
           fileList.forEach(item => {
             if (item.status == 'success') {
-              attachmentList.push(item.response.data.id)
+              attachmentList.push(item.response.data.records.id)
             }
           })
-          this.form.attachmentList = attachmentList
+           this.attachmentList = attachmentList
         } else {
           const delIndex = fileList.findIndex(item => item.uid === file.uid);
           if (delIndex !== -1) {
@@ -380,18 +369,19 @@
           groupid: form.id,
         }).then(res => {
           res.data.records.forEach(item => {
-            autoAttachDownload({}, 'jxgl/usbjx', item.id).then(res => {
-              let blob = new Blob([res], {
-                type: 'application/' + item.type + ';charset=UTF-8',
-              });
-              let url = URL.createObjectURL(blob)
-              let uitem = {
-                url,
-                id: item.id
-              }
-              this.downList.push(uitem)
+            this.downList.push(item)
+            // autoAttachDownload({}, 'jxgl/usbjx', item.id).then(res => {
+            //   let blob = new Blob([res], {
+            //     type: 'application/' + item.type + ';charset=UTF-8',
+            //   });
+            //   let url = URL.createObjectURL(blob)
+            //   let uitem = {
+            //     url,
+            //     id: item.id
+            //   }
+            //   this.downList.push(uitem)
 
-            })
+            // })
 
 
 
@@ -427,7 +417,14 @@
         this.$refs['form'].validate((valid) => {
           if (valid) {
             if (this.type == 'add') {
+              let attachments=[]
+              this.attachmentList.forEach(item=>{
+                attachments.push({
+                  id:item
+                })
+              })
               let params = {
+                attachments,
                 details: [{
                     id: 'U_JXGJ',
                     records: [...this.editTableData1] || []
@@ -448,6 +445,7 @@
                   this.$success('添加成功')
                   this.$refs.reldialog.closeAll()
                  let newData = this.form
+                 newData.id=res.data.id
                  this.app.$refs.TablePager.tableData.unshift(newData)
                  	/* 总数据＋+ */
                  this.app.$refs.TablePager.total+=1
@@ -458,8 +456,25 @@
                 }
               })
             }else if(this.type=='edit'){
+              /* 修改的时候先拿去加载的文件list
+              和上传的list 混合然后上传
+              */
+
+             let attachments=[]
+             this.attachmentList.forEach(item=>{
+               attachments.push({
+                 id:item
+               })
+             })
+             this.downList.forEach(item=>{
+               attachments.push({
+                 id:item
+               })
+             })
+
 
               let params = {
+                attachments,
                 details: [{
                     id: 'U_JXGJ',
                     records: [...this.editTableData1] || []