保养标准可以上传图片和文件

src/views/check/checkstandard/modules/BaseForm.vue

@@ -153,7 +153,6 @@
             </a-select>
           </a-form-item>
         </row-item>
-
       </row-list>
       <row-list :col="1">
         <row-item>
@@ -179,6 +178,44 @@
           </a-form-item>
         </row-item>
       </row-list>
+      <row-list :col="2">
+        <row-item>
+          <a-form-item
+            label="图片"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-upload
+              :action="uploadUrl"
+              :multiple="false"
+              list-type="picture"
+              accept="image/*"
+              :file-list="this.defaultCheckImgList"
+              @change="handleCheckImgChange"
+              :headers="headers"
+            >
+              <a-button> <a-icon type="upload" /> 选择上传图片 </a-button>
+            </a-upload>
+          </a-form-item>
+        </row-item>
+        <row-item>
+          <a-form-item
+            label="文件"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-upload
+              :action="uploadUrl"
+              :multiple="true"
+              :file-list="this.defaultCheckFileList"
+              @change="handleCheckFileChange"
+              :headers="headers"
+            >
+              <a-button> <a-icon type="upload" /> 选择上传文件 </a-button>
+            </a-upload>
+          </a-form-item>
+        </row-item>
+      </row-list>
     </a-form>
 <!--    <a-tabs type="card" default-active-key="1">
       <a-tab-pane key="1" tab="点检标准参数">
@@ -356,7 +393,10 @@ import { STable, Ellipsis } from '@/components'
 import { addCheckStandard, updateCheckStandard } from '@/api/check/checkstandard'
 import BaseTool from '../../../../utils/tool'
 import { queryUser } from '@/api/upms/user'
+import { uploadUrl } from '@/api/upms/file'
 import PartInfoSelectModal from '@/views/part/info/modules/PartInfoSelectModal'
+import Vue from 'vue'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
 
 export default {
   name: 'BaseCheckStandard',
@@ -377,8 +417,16 @@ export default {
       paramTypeMap: {},
       enableMap: {},
       periodTypeMap: {},
+      checkImgList: [], // 图片
+      checkFileList: [], // 文档
+      defaultCheckImgList: [],
+      defaultCheckFileList: [],
+      uploadUrl: uploadUrl,
       userList: {},
       editingKey: '',
+      headers: {
+        Authorization: 'Bearer ' + Vue.ls.get(ACCESS_TOKEN)
+      },
       rowSelection: {
         onChange: (selectedRowKeys, selectedRows) => {
           this.selectedRowKeys = selectedRowKeys
@@ -488,8 +536,11 @@ export default {
       if (this.BaseTool.Object.isBlank(record.id)) {
         this.modalTitle = '复制'
       }
+      this.checkImgList = record.checkImgList
+      this.checkFileList = record.checkFileList
+      this.defaultCheckImgList = this.BaseTool.UPLOAD.transImg(this.checkImgList)
+      this.defaultCheckFileList = this.BaseTool.UPLOAD.transImg(this.checkFileList)
       const { form: { setFieldsValue } } = this
-
       // 日期处理
       this.$nextTick(() => {
         setFieldsValue(Object.assign(pick(record, [
@@ -522,6 +573,9 @@ export default {
           return
         }
         values.paramList = this.data
+        // 上传文件
+        values.checkImgList = this.checkImgList
+        values.checkFileList = this.checkFileList
         if (this.BaseTool.String.isBlank(values.id)) {
           addCheckStandard(values)
             .then(() => {
@@ -658,6 +712,26 @@ export default {
           'partName': row.name
         }))
       })
+    },
+    handleCheckImgChange (info) {
+      this.defaultCheckImgList = info.fileList
+      this.checkImgList = this.setFileList(info, 1)
+    },
+    handleCheckFileChange (info) {
+      this.defaultCheckFileList = info.fileList
+      this.checkFileList = this.setFileList(info, 2)
+    },
+    setFileList (info, type) {
+      const file = info.file
+      const fileList = info.fileList
+      if (file.status === 'done') {
+        return this.BaseTool.UPLOAD.getUploadFileDTO(fileList, type)
+      } else if (file.status === 'removed') {
+        return this.BaseTool.UPLOAD.getUploadFileDTO(fileList, type)
+      } else if (file.status === 'error') {
+        this.$message.error('上传失败')
+        return null
+      }
     }
   }
 }

src/views/check/checkstandard/modules/Detail.vue

@@ -12,17 +12,31 @@
       <detail-list-item term="检查类型">{{ BaseTool.Object.getField(typeMap,model.type) }}</detail-list-item>
       <detail-list-item term="计划周期">{{ model.period }}{{ BaseTool.Object.getField(periodTypeMap,model.periodType) }}</detail-list-item>
       <detail-list-item term="动作类型">{{ BaseTool.Object.getField(actionTypeMap,model.actionType) }}</detail-list-item>
-      <detail-list-item term="部位">{{ model.part }}</detail-list-item>
+      <detail-list-item term="部位">{{ model.partName }}</detail-list-item>
       <detail-list-item term="是否启用"><badge :status="DictCache.COLOR.YES_NO[model.enable]" :text="enableMap[model.enable]"></badge></detail-list-item>
       <detail-list-item term="创建人">{{ model.createdUserName }}</detail-list-item>
-      <detail-list-item term="更新人">{{ model.updateUserName }}</detail-list-item>
+<!--      <detail-list-item term="更新人">{{ model.updateUserName }}</detail-list-item>
       <detail-list-item term="创建时间">{{ model.updateTime }}</detail-list-item>
-      <detail-list-item term="更新时间">{{ model.updateTime }}</detail-list-item>
+      <detail-list-item term="更新时间">{{ model.updateTime }}</detail-list-item>-->
     </detail-list>
     <detail-list title="" :col="1">
       <detail-list-item term="要求">{{ model.requirement }}</detail-list-item>
       <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
     </detail-list>
+    <detail-list title="图片" :col="8">
+      <detail-list-item v-for="item in model.checkImgList" term="">
+        <img :src="BaseTool.Constant.FILE_URL + item.url" width="200px" height="200px"/>
+      </detail-list-item>
+    </detail-list>
+    <detail-list title="" :col="8">
+      <detail-list-item term="文件">
+        <a-upload
+          :multiple="true"
+          :fileList="BaseTool.UPLOAD.transImg(model.checkFileList)"
+        >
+        </a-upload>
+      </detail-list-item>
+    </detail-list>
 <!--    <a-tabs type="card" default-active-key="1">
       <a-tab-pane key="1" tab="点检标准参数">
         <a-table

src/views/check/checkstandard/modules/DetailSbCheck.vue

@@ -29,6 +29,8 @@
       rowKey="id">
       <span slot="action" slot-scope="record">
         <template>
+          <a v-if="$auth('sb-infos-edit')" @click="handleView(record)">查看</a>
+          <a-divider type="vertical" />
           <a v-if="$auth('sb-infos-edit')" @click="handleEdit(record)">修改</a>
           <a-divider type="vertical" />
           <a-popconfirm v-if="$auth('sb-infos-del')" title="是否要删除该条数据？" @confirm="batchDelete(record.id)">
@@ -164,9 +166,18 @@ export default {
       const modal = this.$refs.baseModal
       modal.base(null, this.model.id)
     },
+    handleView (record) {
+      fetchCheckStandard({ id: record.id }).then(res => {
+        const modal = this.$refs.detailModal
+        res.data.partName = record.partName
+        modal.base(res.data)
+      })
+    },
     handleEdit (record) {
-      const modal = this.$refs.baseModal
-      modal.base(record)
+      fetchCheckStandard({ id: record.id }).then(res => {
+        const modal = this.$refs.baseModal
+        modal.base(res.data)
+      })
     },
     handleCopy (record) {
       const modal = this.$refs.baseModal
@@ -200,12 +211,6 @@ export default {
         this.handleOk()
       })
     },
-    handleView (record) {
-      fetchCheckStandard({ id: record.id }).then(res => {
-        const modal = this.$refs.detailModal
-        modal.base(res.data)
-      })
-    },
     doExport () {
       const parameter = {
         ...this.queryParam

src/views/sb/info/modules/BaseForm.vue

@@ -630,10 +630,10 @@ export default {
       this.modalTitle = '编辑'
       this.qrcodesrc = record.qrCode
       this.repairFileList = record.repairFileList
-      this.defaultRepairFileList = this.BaseTool.UPLOAD.transImg(this.repairFileList)
       this.useFileList = record.useFileList
       this.recheckFileList = record.recheckFileList
       this.sbFileList = record.sbFileList
+      this.defaultRepairFileList = this.BaseTool.UPLOAD.transImg(this.repairFileList)
       this.defaultUseFileList = this.BaseTool.UPLOAD.transImg(this.useFileList)
       this.defaultRecheckFileList = this.BaseTool.UPLOAD.transImg(this.recheckFileList)
       this.defaultSbFileList = this.BaseTool.UPLOAD.transImg(this.sbFileList)