Browse Source

报检单暂存

faster_develop
安虹睿 2 years ago
parent
commit
41ae78b5d5
  1. 10
      fe/PC/src/api/wms-api.js
  2. 2
      fe/PC/src/api/wms-job.js
  3. 4
      fe/PC/src/components/commonTabel-drawer/index.vue
  4. 1
      fe/PC/src/components/currenForm/index.vue
  5. 9
      fe/PC/src/components/pdf/index.vue
  6. 11
      fe/PC/src/components/umyTable/index.vue
  7. 2
      fe/PC/src/utils/request.js
  8. 2
      fe/PC/src/utils/summaryTableColumns/index.js
  9. 31
      fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue

10
fe/PC/src/api/wms-api.js

@ -603,6 +603,16 @@ export function getInterfaceCalendar(data) {
})
}
// 获取文件
export function getFilestore(data) {
return request({
url: baseURL + 'filestore/file',
method: 'get',
params:data
})
}
// 根据编号获取字典信息
// export function getDictByCode(code) {
// return request({

2
fe/PC/src/api/wms-job.js

@ -201,7 +201,7 @@ export function completeSummaryDetailStatus(params, data) {
return request({
url: baseURL + 'wms/store/inspect-job/complete-summary-detail-status/' + params.id,
method: 'post',
params: params,
params: {summaryDetailId:params.summaryDetailId},
data
})
}

4
fe/PC/src/components/commonTabel-drawer/index.vue

@ -377,8 +377,8 @@ export default {
alertoldSkipCountDetails (val) {
this.$emit('alertoldSkipCountDetails', val)
},
buttonClick(row) {
this.$emit("buttonClick", row);
buttonClick(row, index, label,item) {
this.$emit("buttonClick", row, index, label,item);
},
// tabs
handleClick (val) {

1
fe/PC/src/components/currenForm/index.vue

@ -811,6 +811,7 @@ export default {
} else {
this.searchData[item.prop].push(val);
}
this.$emit('changeUpload',val,item)
},
uploadListView() {
this.$emit('uploadListView')

9
fe/PC/src/components/pdf/index.vue

@ -1,13 +1,14 @@
<template>
<el-dialog
:title="title"
:v-loading="loadingPDF"
:visible.sync="isShowPDF"
:modal-append-to-body="false"
:visible="isShowPDF"
:modal-append-to-body="true"
:append-to-body="true"
:close-on-click-modal="true"
@close="close"
top="1vh"
>
<div>
<div v-loading="loadingPDF">
<el-button-group>
<el-button type="primary" icon="el-icon-arrow-left" size="mini" @click="prePage">上一页</el-button>
<el-button type="primary" size="mini" @click="nextPage">下一页<i class="el-icon-arrow-right el-icon--right"></i></el-button>

11
fe/PC/src/components/umyTable/index.vue

@ -248,13 +248,14 @@
</el-form-item>
<!-- table表添加按钮事件 v-show="scope.row.number == 'PRJ202210060001'" -->
<!-- <el-form-item v-if="item.type == 'button'" > -->
<!-- v-show="scope.row[item.prop]==undefined?true:false" -->
<div v-if="item.type == 'button'">
<el-button
v-show="scope.row[item.prop]==undefined?true:false"
v-show="(scope.row[item.prop]==undefined || scope.row[item.prop] == '' || !scope.row[item.prop])?false:true"
type="primary"
size="mini"
@click="buttonClick(scope.row, scope.$index, item.label)"
>{{item.label}}</el-button>
@click="buttonClick(scope.row, scope.$index, item.label,item)"
>{{item.buttonName || item.label}}</el-button>
</div>
<!-- </el-form-item> -->
@ -815,8 +816,8 @@ export default {
this.$emit("showJsonTable", row);
},
//
buttonClick(row, index, label) {
this.$emit("buttonClick", row, index, label);
buttonClick(row, index, label,item) {
this.$emit("buttonClick", row, index, label,item);
},
//table
buttonOperationClick(row, label) {

2
fe/PC/src/utils/request.js

@ -18,7 +18,6 @@ const service = axios.create({
// request interceptor
service.interceptors.request.use(
config => {
console.log(111111111,config)
// do something before request is sent
if (store.getters.token) {
@ -57,7 +56,6 @@ service.interceptors.response.use(
* You can also judge the status by HTTP Status Code
*/
response => {
console.log(222222222,response)
const res = response.data
if(response.headers['content-disposition']){
res.disposition = response.headers['content-disposition']

2
fe/PC/src/utils/summaryTableColumns/index.js

@ -35,7 +35,7 @@ export const InspectRequest = [
{ label: "样品率", prop: 'samplePercent' },
{ label: "破坏数量", prop: 'crackQty' },
{ label: "最终不合格数量", prop: 'notPassedQty' },
{ label: "检验报告", prop: 'inspectReport' },
{ label: "检验报告", fixed: "right",prop: 'inspectReport',type:'button',buttonName:'查看报告' },
{ label: "事务ID", prop: "tenantId" },
{ label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" },
{ label: "不合格原因代码", prop: 'failedReason' },

31
fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue

@ -49,6 +49,7 @@
:MaxResultCount="MaxResultCountDetails"
@alterResultCountDetails="alterResultCountDetails"
@alertoldSkipCountDetails="alertoldSkipCountDetails"
@buttonClick="currenDrawerButtonClick"
>
<template v-if="currentTagName == 'hz' ">
<!-- @buttonClick="buttonClick" -->
@ -213,6 +214,7 @@
<pdf
:urlPDF="urlPDF"
:title="titlePDF"
v-if="isShowPDF"
:isShowPDF="isShowPDF"
:loadingPDF="loadingPDF"
@closePDF="closePDF"
@ -221,7 +223,7 @@
</template>
<script>
import { getPageList, fileStorage, getListByItemcode, getDetailed } from "@/api/wms-api"
import { getPageList, fileStorage, getListByItemcode, getDetailed,getFilestore } from "@/api/wms-api"
import { completeSummaryDetailStatus, setDetailDefaultOkStatus, setDetailOkStatus, setDetailNookStatus } from "@/api/wms-job"
import { tableMixins } from "@/mixins/TableMixins"
import { LoadingMixins } from "@/mixins/LoadingMixins"
@ -519,6 +521,23 @@ export default {
this.paging();
},
methods: {
//
currenDrawerButtonClick(val,index, label,item){
if(item.prop == "inspectReport"){
//
let _file_id = JSON.parse(val.inspectReport)[0].FileKey
this.isShowPDF = true
if(this.loadingPDF)return
this.loadingPDF = true
getFilestore({blobName:_file_id}).then(res=>{
this.urlPDF = 'data:application/pdf;base64,'+res.bytes
this.titlePDF = res.fileName
this.loadingPDF = false
}).catch(res=>{
this.loadingPDF = false
})
}
},
query() {
let findRs = ''
if (this.inputPackingCode == '') {
@ -809,6 +828,7 @@ export default {
bytes: arrayBuffer.substring(arrayBuffer.lastIndexOf(',')+1,arrayBuffer.length)
}
)
console.log(830,{id: that.masterID, summaryDetailId: that.inspectNoticeDetailsFormData.id }, that.inspectNoticeDetailsFormData)
completeSummaryDetailStatus({id: that.masterID, summaryDetailId: that.inspectNoticeDetailsFormData.id }, that.inspectNoticeDetailsFormData).then(res => {
// ============================================================
that.inspectNoticeDetailsShow = false
@ -819,7 +839,8 @@ export default {
that.paging()
that.$message.success('成功完成检验!')
}).catch(err => {
this.loading = false
that.loading = false
that.$message.error('检验失败,请重试!')
console.log(err)
})
}
@ -834,7 +855,8 @@ export default {
that.paging()
that.$message.success('成功完成检验!')
}).catch(err => {
this.loading = false
that.loading = false
that.$message.error('检验失败,请重试!')
console.log(err)
})
}
@ -993,6 +1015,9 @@ export default {
},
closePDF(){
this.isShowPDF = false
this.urlPDF = ''
this.titlePDF = ''
this.loadingPDF = false
},
//
cellStyle({row, column, rowIndex, columnIndex}){

Loading…
Cancel
Save