From 9170390fd14e8baa586ea6e7f8050b81e005c6ca Mon Sep 17 00:00:00 2001
From: zuowenwen <zuowenwen>
Date: Wed, 3 Nov 2021 11:38:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=80=E6=A8=A1=E7=94=B3=E8=AF=B7=EF=BC=8C?=
 =?UTF-8?q?=20=E5=B7=A5=E5=85=B7=E6=8E=A5=E6=94=B6=20=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/knifemold/receive.js                  |   3 +
 src/api/purchaseorder/procurementReview.js    |   3 +
 src/api/purchaseorder/purchaseRequisition.js  |   2 +
 src/views/modules/common/upload.vue           |  51 +++---
 src/views/modules/knifemold/receive.vue       | 151 +++++++++++++++++-
 .../purchaseorder/procurementReview.vue       | 147 ++++++++++++++++-
 .../purchaseorder/purchaseRequisition.vue     |  29 +++-
 7 files changed, 349 insertions(+), 37 deletions(-)

diff --git a/src/api/knifemold/receive.js b/src/api/knifemold/receive.js
index d0f4a42..2eb7a0f 100644
--- a/src/api/knifemold/receive.js
+++ b/src/api/knifemold/receive.js
@@ -18,5 +18,8 @@ export const saveToolDetail =  data =>  createAPI(`toolMan/saveToolDetail`,'POST
 // 获取库位信息
 export const exportList =  data =>  createAPI(`toolMan/getExportList`,'POST',data)
 
+//获取审批记录信息
+export const getFileList = data => createAPI(`sys/oss/getSysOssEntityList`,'POST' ,data)
+
 
 
diff --git a/src/api/purchaseorder/procurementReview.js b/src/api/purchaseorder/procurementReview.js
index d852ea6..11fb613 100644
--- a/src/api/purchaseorder/procurementReview.js
+++ b/src/api/purchaseorder/procurementReview.js
@@ -14,3 +14,6 @@ export const getExportList = data => createAPI(`PRHeader/getExportList`,'POST',d
 //获取审核步骤信息
 export const getReviewSteps = data => createAPI(`PRHeader/getReviewSteps`,'POST',data)
 
+//获取审批记录信息
+export const getFileList = data => createAPI(`sys/oss/getSysOssEntityList`,'POST' ,data)
+
diff --git a/src/api/purchaseorder/purchaseRequisition.js b/src/api/purchaseorder/purchaseRequisition.js
index 287cd3c..d16deb7 100644
--- a/src/api/purchaseorder/purchaseRequisition.js
+++ b/src/api/purchaseorder/purchaseRequisition.js
@@ -24,6 +24,8 @@ export const updatePRHeaderAuthorizeFlag = data => createAPI(`PRHeader/updatePRH
 //获取审批记录信息
 export const downFtpFile = data => createAPI(`ftp/file/downFtpFile?ossEntity=`+data.id,'GET')
 
+//获取审批记录信息
+export const getFileList = data => createAPI(`sys/oss/getSysOssEntityList`,'POST' ,data)
 
 
 
diff --git a/src/views/modules/common/upload.vue b/src/views/modules/common/upload.vue
index d166181..5f8473b 100644
--- a/src/views/modules/common/upload.vue
+++ b/src/views/modules/common/upload.vue
@@ -1,38 +1,38 @@
 <template>
-    <div>
-      <!-- 弹窗, 上传文件 -->
-      <el-upload
-        :action="url"
-        :before-upload="beforeUploadHandle"
-        :on-success="successHandle"
-        multiple
-        :show-file-list="false"
-        style="text-align: center;">
-        <el-button size="small" type="primary">点击上传</el-button>
+  <div>
+    <!-- 弹窗, 上传文件 -->
+    <el-upload
+      :action="url"
+      :before-upload="beforeUploadHandle"
+      :on-success="successHandle"
+      multiple
+      :show-file-list="false"
+      style="text-align: center;">
+      <el-button size="small" type="primary">点击上传</el-button>
 
-      </el-upload>
-    </div>
+    </el-upload>
+  </div>
 </template>
 
 <script>
   export default {
-    data () {
+    data() {
       return {
         url: '',
         num: 0,
         successNum: 0,
-        fileList: [],
+        fileList: {},
         folder: '系统文件'
       }
     },
     methods: {
-      init (id) {
-        this.url = this.$http.adornUrl(`/ftp/file/upload?token=${this.$cookie.get('token')}&folder=`+this.folder)
+      init(id) {
+        this.url = this.$http.adornUrl(`/ftp/file/upload?token=${this.$cookie.get('token')}&folder=` + this.folder)
         console.log(this.url)
         this.visible = true
       },
       // 上传之前
-      beforeUploadHandle (file) {
+      beforeUploadHandle(file) {
         // if (file.type !== 'image/jpg' && file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/gif') {
         //   this.$message.error('只支持jpg、png、gif格式的图片！')
         //   return false
@@ -40,18 +40,13 @@
         this.num++
       },
       // 上传成功
-      successHandle (response, file, fileList) {
-        this.fileList =   fileList.map(item => {
-          return item.response.ossEntity
-        })
-        this.successNum++
-        if (response && response.code === 0) {
-          this.childClick()
-        } else {
-          this.$message.error(response.msg)
-        }
+      successHandle(response, file, fileList) {
+
+        this.fileList = response.ossEntity
+        this.childClick()
+        return response.ossEntity
       },
-      childClick () {
+      childClick() {
         // childByValue是在父组件on监听的方法
         this.$emit('childByValue', this.fileList)
       }
diff --git a/src/views/modules/knifemold/receive.vue b/src/views/modules/knifemold/receive.vue
index f168f6d..b86abb0 100644
--- a/src/views/modules/knifemold/receive.vue
+++ b/src/views/modules/knifemold/receive.vue
@@ -64,10 +64,11 @@
         fixed="right"
         header-align="center"
         align="center"
-        width="50"
+        width="100"
         :label="buttons.operating">
         <template slot-scope="scope">
           <a @click="initBannersFlag(scope.row)">{{buttons.receive}}</a>
+          <a @click="initFileModel(scope.row)">{{buttons.appendixInfo}}</a>
         </template>
       </el-table-column>
     </el-table>
@@ -75,7 +76,7 @@
       @size-change="sizeChangeHandle"
       @current-change="currentChangeHandle"
       :current-page="pageIndex"
-      :page-sizes="[10, 50, 200, 500]"
+      :page-sizes="[100, 200, 500]"
       :page-size="pageSize"
       :total="totalPage"
       layout="total, sizes, prev, pager, next, jumper">
@@ -153,6 +154,44 @@
       </el-form>
     </el-dialog>
 
+    <el-dialog title="附件信息" :visible.sync="setUp.fileFlag" width="672px" :close-on-click-modal="false"
+               :close-on-press-escape="false" v-drag>
+      <el-form :inline="true" label-position="top">
+        <el-table
+          height="170"
+          :data="fileList"
+          border
+          v-loading="dataListLoading"
+          @selection-change="selectionChangeHandle"
+          style="width: 100%;">
+          <el-table-column
+            v-for="(item,index) in columnList2" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed"
+            :width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                 style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            width="50"
+            :label="buttons.operating">
+            <template slot-scope="scope">
+              <a @click="fileDownload(scope.row)">{{ buttons.fileDownload }}</a>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 
@@ -181,6 +220,7 @@
     saveToolDetail,
     updateIfsTool,
     exportList,
+    getFileList,
   } from "@/api/knifemold/receive.js"
 
   export default {
@@ -189,6 +229,11 @@
     },
     data() {
       return {
+        fileList : [],
+        //设置
+        setUp: {
+          fileFlag : false,
+        },
         height: 0,
         //搜索名称
         inputSearch1 : "工具编码",
@@ -572,6 +617,59 @@
           //   fixed: false,
           // }
         ],
+        // 展示列集
+        columnList2: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 2102,
+            tableId: "fileDetail2102",
+            tableName: "fileDetailTable",
+            columnProp: "fileName",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "文件名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 2102,
+            tableId: "fileDetail2102",
+            tableName: "fileDetailTable",
+            columnProp: "createDate",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "创建时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 135,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 2102,
+            tableId: "fileDetail2102",
+            tableName: "fileDetailTable",
+            columnProp: "createdBy",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "创建人",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 70,
+          },
+        ],
         // 数据集
         dataList: [],
         currSelectList : [],
@@ -595,6 +693,8 @@
           defaultTable: '设置默认配置',
           generate : "生成",
           print : '打印',
+          appendixInfo: '附件信息',
+          fileDownload: '下载',
         },
         // 导出 start
         exportData: [],
@@ -688,7 +788,7 @@
         },
         // 分页
         pageIndex: 1,
-        pageSize: 10,
+        pageSize: 100,
         totalPage: 0,
         dataListLoading: false,
         dataListSelections: [],
@@ -719,6 +819,51 @@
       }
     },
     methods: {
+      // 文件下载
+      fileDownload(row) {
+        this.$http({
+          url: this.$http.adornUrl('ftp/file/downFtpFile'),
+          method: 'post',
+          data: JSON.stringify(row),
+          responseType: 'blob',
+          headers: {
+            'Content-Type': 'application/json'
+          }
+        }).then(({data}) => {
+          // 不限制文件下载类型
+          const blob = new Blob([data], {type: "application/octet-stream"})
+          // 下载文件名称
+          const fileName = row.fileName
+          // a标签下载
+          const linkNode = document.createElement('a')
+          linkNode.download = fileName // a标签的download属性规定下载文件的名称
+          linkNode.style.display = 'none'
+          linkNode.href = URL.createObjectURL(blob) // 生成一个Blob URL
+          document.body.appendChild(linkNode)
+          linkNode.click() // 模拟在按钮上的一次鼠标单击
+          URL.revokeObjectURL(linkNode.href) // 释放URL 对象
+          document.body.removeChild(linkNode)
+        })
+      },
+      //初始化文件信息模态框
+      initFileModel(row){
+        this.getFileList(row)
+        this.setUp.fileFlag = true
+      },
+      //获取申请单号文件信息
+      getFileList(row){
+        let jsonData = {
+          site : row.site,
+          type : 'PRFile',
+          associatedField1 : row.transactionId
+        }
+        this.fileList = []
+        getFileList(jsonData).then(({data}) =>{
+          if(data.code == 0){
+            this.fileList = data.row
+          }
+        })
+      },
       getCurrSelectList(row){
         this.currSelectList = row
       },
diff --git a/src/views/modules/purchaseorder/procurementReview.vue b/src/views/modules/purchaseorder/procurementReview.vue
index 3fd1e47..fe86ffa 100644
--- a/src/views/modules/purchaseorder/procurementReview.vue
+++ b/src/views/modules/purchaseorder/procurementReview.vue
@@ -98,6 +98,7 @@
         <template slot-scope="scope">
           <a v-if="scope.row.strCanAuthFlag == 'Y'" @click="initReview(scope.row)">{{buttons.audit}}</a>
           <span v-else>{{buttons.audit}}</span>
+          <a @click="initFileModel(scope.row)">{{buttons.appendixInfo}}</a>
         </template>
       </el-table-column>
     </el-table>
@@ -144,6 +145,45 @@
       <el-button type="primary" @click="naxtStep('x')">下一步</el-button>-->
     </span>
     </el-dialog>
+
+    <el-dialog title="附件信息" :visible.sync="setUp.fileFlag" width="672px" :close-on-click-modal="false"
+               :close-on-press-escape="false" v-drag>
+      <el-form :inline="true" label-position="top">
+        <el-table
+          height="170"
+          :data="fileList"
+          border
+          v-loading="dataListLoading"
+          @selection-change="selectionChangeHandle"
+          style="width: 100%;">
+          <el-table-column
+            v-for="(item,index) in columnList2" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed"
+            :width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                 style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            width="50"
+            :label="buttons.operating">
+            <template slot-scope="scope">
+              <a @click="fileDownload(scope.row)">{{ buttons.fileDownload }}</a>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 
@@ -175,6 +215,7 @@
     getTblBaseDataList,
     getExportList,
     getReviewSteps,
+    getFileList,
   } from '@/api/purchaseorder/procurementReview.js'
 
   export default {
@@ -183,6 +224,7 @@
     },
     data() {
       return {
+        fileList: [],
         active: 0,
         currentReviewStepData :{},
         reviewStepList: [],
@@ -219,6 +261,7 @@
         inputSearch5: '审核意见',
         inputSearch6: '审核人',
         inputSearch7: '审核时间',
+        inputSearch8: '附件信息',
         // table高度
         height: 450,
         // 是否收藏
@@ -233,6 +276,7 @@
         setUp: {
           reviewFlag: false,
           saveButton: false,
+          fileFlag : false,
         },
         mainQueryData: {
           requisitionno: '',
@@ -507,6 +551,59 @@
           //   fixed: false,
           // }
         ],
+        // 展示列集
+        columnList2: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 2102,
+            tableId: "fileDetail2102",
+            tableName: "fileDetailTable",
+            columnProp: "fileName",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "文件名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 2102,
+            tableId: "fileDetail2102",
+            tableName: "fileDetailTable",
+            columnProp: "createDate",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "创建时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 135,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 2102,
+            tableId: "fileDetail2102",
+            tableName: "fileDetailTable",
+            columnProp: "createdBy",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "创建人",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 70,
+          },
+        ],
         // 数据集
         dataList: [],
         queryButton: {
@@ -522,7 +619,9 @@
           defaultTable: '设置默认配置',
           operating: '操作',
           audit: '审批',
-          reviewDetails: '审批详情'
+          reviewDetails: '审批详情',
+          appendixInfo: '附件信息',
+          fileDownload: '下载',
         },
         // 导出 start
         exportData: [],
@@ -625,7 +724,7 @@
     },
     mounted() {
       this.$nextTick(() => {
-        this.height = window.innerHeight - 220;
+        this.height = window.innerHeight - 240;
       })
     },
     activated() {
@@ -636,6 +735,36 @@
       // zufoeav
     },
     methods: {
+      // 文件下载
+      fileDownload(row) {
+        this.$http({
+          url: this.$http.adornUrl('ftp/file/downFtpFile'),
+          method: 'post',
+          data: JSON.stringify(row),
+          responseType: 'blob',
+          headers: {
+            'Content-Type': 'application/json'
+          }
+        }).then(({data}) => {
+          // 不限制文件下载类型
+          const blob = new Blob([data], {type: "application/octet-stream"})
+          // 下载文件名称
+          const fileName = row.fileName
+          // a标签下载
+          const linkNode = document.createElement('a')
+          linkNode.download = fileName // a标签的download属性规定下载文件的名称
+          linkNode.style.display = 'none'
+          linkNode.href = URL.createObjectURL(blob) // 生成一个Blob URL
+          document.body.appendChild(linkNode)
+          linkNode.click() // 模拟在按钮上的一次鼠标单击
+          URL.revokeObjectURL(linkNode.href) // 释放URL 对象
+          document.body.removeChild(linkNode)
+        })
+      },
+      initFileModel(row){
+        this.getFileList(row)
+        this.setUp.fileFlag = true
+      },
       /*naxtStep(val){
           if (val == 's' && this.active != 0){
             this.active -= 1
@@ -645,6 +774,20 @@
           }
 
       },*/
+      //获取申请单号文件信息
+      getFileList(row){
+        let jsonData = {
+          site : row.site,
+          type : 'PRFile',
+          associatedField1 : row.requisitionno
+        }
+        this.fileList = []
+        getFileList(jsonData).then(({data}) =>{
+          if(data.code == 0){
+            this.fileList = data.row
+          }
+        })
+      },
       getReviewStepList(orderRef1) {
         this.reviewStepList = []
         let queryData = {
diff --git a/src/views/modules/purchaseorder/purchaseRequisition.vue b/src/views/modules/purchaseorder/purchaseRequisition.vue
index 3389cea..707c462 100644
--- a/src/views/modules/purchaseorder/purchaseRequisition.vue
+++ b/src/views/modules/purchaseorder/purchaseRequisition.vue
@@ -219,11 +219,11 @@
                     v-model="currentPRDetailData.totalPrice"
                     :disabled="true"></el-input>
         </el-form-item>
-        <el-form-item style="margin-top: 10px">
+        <el-form-item style="margin-top: 30px">
           <upload v-on:childByValue="childByValue"></upload>
         </el-form-item>
         <el-table
-          height="120"
+          height="170"
           :data="fileList"
           border
           v-loading="dataListLoading"
@@ -246,7 +246,6 @@
             </template>
           </el-table-column>
           <el-table-column
-            fixed="right"
             header-align="center"
             align="center"
             width="50"
@@ -323,6 +322,7 @@ import {
   authorizationHistList,
   updatePRHeaderAuthorizeFlag,
   downFtpFile,
+  getFileList,
 } from '@/api/purchaseorder/purchaseRequisition.js'
 import upload from "../common/upload";
 
@@ -330,6 +330,7 @@ export default {
   components: {upload},
   data() {
     return {
+      insertFileList : [],
       fileList: [],
       // table 高度
       height: 0,
@@ -368,6 +369,7 @@ export default {
         additionalCose: 0,
         orderref1: '',
         orderref2: '',
+        sysOssEntityList : [],
       },
       mainQueryData: {
         requisitionno: '',
@@ -998,6 +1000,20 @@ export default {
   },
 
   methods: {
+    //获取申请单号文件信息
+    getFileList(row){
+      let jsonData = {
+        site : row.site,
+        type : 'PRFile',
+        associatedField1 : row.requisitionno
+      }
+      this.fileList = []
+      getFileList(jsonData).then(({data}) =>{
+        if(data.code == 0){
+          this.fileList = data.row
+        }
+      })
+    },
     // 文件下载
     fileDownload(row) {
       this.$http({
@@ -1026,7 +1042,8 @@ export default {
     },
     childByValue(childValue) {
       // childValue就是子组件传过来的值
-      this.fileList = childValue
+      this.fileList.push( childValue )
+      this.insertFileList.push( childValue )
     },
     updateAuthorizeFlag(row) {
       let saveData = {
@@ -1123,6 +1140,8 @@ export default {
       this.currentPRDetailData.suppliername = filter[0].suppliername
       this.currentPRDetailData.currency = filter[0].currency
       this.currentPRDetailData.taxcode = filter[0].taxcode
+      this.currentPRDetailData.fileType = 'PRFile'
+      this.currentPRDetailData.sysOssEntityList = this.insertFileList
       savePRDetail(this.currentPRDetailData).then(({data}) => {
         this.bannersBut = false
         if (data.code == 0) {
@@ -1164,6 +1183,7 @@ export default {
     },
     initAddModel(row, val) {
       this.fileList = []
+      this.insertFileList = []
       if (row == null) {
         this.currentPRDetailData.requisitionno = ''
         this.currentPRDetailData.itemno = ''
@@ -1188,6 +1208,7 @@ export default {
         this.currentPRDetailData.status = ''
         this.currentPRDetailData.taxCode = row.taxCode
         this.currentPRDetailData.partDesc = row.partdesc
+        this.getFileList(row)
       }
       if (val != 'Y') {
         this.currentPRDetailData.orderref1 = null