|
|
|
@ -206,7 +206,7 @@
|
|
|
|
|
size="small"
|
|
|
|
|
style="margin-right: 12px"
|
|
|
|
|
type="text"
|
|
|
|
|
@click="SOP(scope.row)"
|
|
|
|
|
@click="handleViewSOP(scope.row)"
|
|
|
|
|
>
|
|
|
|
|
SOP预览
|
|
|
|
|
</el-button>
|
|
|
|
@ -411,67 +411,6 @@
|
|
|
|
|
</el-form>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-dialog
|
|
|
|
|
:visible.sync="SOPModel"
|
|
|
|
|
title="上传图纸"
|
|
|
|
|
width="30%"
|
|
|
|
|
@before-close="blueprintModel = false">
|
|
|
|
|
<el-upload
|
|
|
|
|
ref="drawingUpload"
|
|
|
|
|
:auto-upload="true"
|
|
|
|
|
:file-list="fileList"
|
|
|
|
|
:headers="headers"
|
|
|
|
|
:limit="0"
|
|
|
|
|
action="uploadImgUrl"
|
|
|
|
|
list-type="picture-card"
|
|
|
|
|
single
|
|
|
|
|
>
|
|
|
|
|
<i slot="default" class="el-icon-plus"></i>
|
|
|
|
|
<div slot="file" slot-scope="{file}">
|
|
|
|
|
<img
|
|
|
|
|
v-if="isAssetTypeAnImage(file.name)"
|
|
|
|
|
:alt="file.name"
|
|
|
|
|
:src="file.url" class="el-upload-list__item-thumbnail"
|
|
|
|
|
>
|
|
|
|
|
<span v-else>{{ file.name }}</span>
|
|
|
|
|
<span class="el-upload-list__item-actions">
|
|
|
|
|
<span
|
|
|
|
|
v-if="isAssetTypeAnImage(file.name)"
|
|
|
|
|
class="el-upload-list__item-preview"
|
|
|
|
|
@click="handlePictureCardPreview(file)"
|
|
|
|
|
>
|
|
|
|
|
<i class="el-icon-zoom-in"></i>
|
|
|
|
|
</span>
|
|
|
|
|
<span
|
|
|
|
|
class="el-upload-list__item-delete"
|
|
|
|
|
@click="handleDownload(file)"
|
|
|
|
|
>
|
|
|
|
|
<i class="el-icon-download"></i>
|
|
|
|
|
</span>
|
|
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
</el-upload>
|
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
|
|
<el-button @click="SOPModel = false">关 闭</el-button>
|
|
|
|
|
</div>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-dialog
|
|
|
|
|
:visible.sync="pictureDetailModel"
|
|
|
|
|
append-to-body
|
|
|
|
|
title="图纸预览"
|
|
|
|
|
width="800"
|
|
|
|
|
>
|
|
|
|
|
<img
|
|
|
|
|
:src="dialogImageUrl"
|
|
|
|
|
style="display: block; max-width: 100%; margin: 0 auto"
|
|
|
|
|
/>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-dialog
|
|
|
|
|
:visible.sync="continueRawInstockVisible"
|
|
|
|
|
title="继续入库"
|
|
|
|
@ -492,6 +431,9 @@
|
|
|
|
|
<WorkshopNotice :visible.sync="showTableDialog" :noticeListData="noticeListData"></WorkshopNotice>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<div id="viewFile">
|
|
|
|
|
<ViewFile :showFileDialog.sync="showFileDialog" :fileListData="fileListData" :thisTitle="thisTitle"></ViewFile>
|
|
|
|
|
</div>
|
|
|
|
|
<!-- <el-dialog :visible.sync="assignModel" title="工位选择" width="80%">-->
|
|
|
|
|
|
|
|
|
|
<!-- <el-table :data="stationData" highlight-current-row-->
|
|
|
|
@ -547,6 +489,8 @@ import {
|
|
|
|
|
import applyRawOutstock from '@//views/board/common/applyRawOutstock.vue';
|
|
|
|
|
import WorkshopNotice from "@/components/workshopNotice/index.vue";
|
|
|
|
|
import {noticeData} from "@/utils/notice"
|
|
|
|
|
import ViewFile from "@/components/viewFile/index.vue";
|
|
|
|
|
import {getDispatchSOPAttachList} from "@/api/mes/productplan";
|
|
|
|
|
|
|
|
|
|
const setState = (e) => {
|
|
|
|
|
if (e === '1') {
|
|
|
|
@ -566,7 +510,8 @@ export default {
|
|
|
|
|
'apply-raw-outstock': applyRawOutstock,
|
|
|
|
|
Chart,
|
|
|
|
|
PrintPage,
|
|
|
|
|
WorkshopNotice
|
|
|
|
|
WorkshopNotice,
|
|
|
|
|
ViewFile
|
|
|
|
|
},
|
|
|
|
|
dicts: ['wms_raw_return_task_type', 'mes_safe_flag'],
|
|
|
|
|
provide(){
|
|
|
|
@ -717,7 +662,12 @@ export default {
|
|
|
|
|
{required: true, message: "物料条码不能为空", trigger: "blur"}
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
//显示预览文件
|
|
|
|
|
showFileDialog: false,
|
|
|
|
|
//显示预览文件标题
|
|
|
|
|
thisTitle: "查看SOP附件",
|
|
|
|
|
//预览文件数据列表
|
|
|
|
|
fileListData: [],
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
async mounted() {
|
|
|
|
@ -1639,70 +1589,26 @@ export default {
|
|
|
|
|
this.resetContinueRawInstock();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
async SOP(e) {
|
|
|
|
|
this.fileList = []
|
|
|
|
|
|
|
|
|
|
console.log(e)
|
|
|
|
|
// const data = await fun()
|
|
|
|
|
// this.fileList = data.map(v=>v)
|
|
|
|
|
|
|
|
|
|
this.fileList = [
|
|
|
|
|
{
|
|
|
|
|
name: 'Snipaste_2023-09-04_08-16-59.png',
|
|
|
|
|
url: 'http://175.27.215.92:9665/statics/2024/04/17/Snipaste_2023-09-04_08-16-59_20240417142903A013.png'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: '会议纪要 0825_20240417143926A014.docx',
|
|
|
|
|
url: 'http://175.27.215.92:9665/statics/2024/04/17/会议纪要 0825_20240417143926A014.docx'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: '会议纪要 0825_20240417143926A014.docx',
|
|
|
|
|
url: 'http://175.27.215.92:9665/statics/2024/04/17/会议纪要 0825_20240417143926A014.docx'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: '会议纪要 0825_20240417143926A014.docx',
|
|
|
|
|
url: 'http://175.27.215.92:9665/statics/2024/04/17/会议纪要 0825_20240417143926A014.docx'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: 'Snipaste_2023-09-04_08-16-59.png',
|
|
|
|
|
url: 'http://175.27.215.92:9665/statics/2024/04/17/Snipaste_2023-09-04_08-16-59_20240417142903A013.png'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: 'Snipaste_2023-09-04_08-16-59.png',
|
|
|
|
|
url: 'http://175.27.215.92:9665/statics/2024/04/17/Snipaste_2023-09-04_08-16-59_20240417142903A013.png'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: 'Snipaste_2023-09-04_08-16-59.png',
|
|
|
|
|
url: 'http://175.27.215.92:9665/statics/2024/04/17/Snipaste_2023-09-04_08-16-59_20240417142903A013.png'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: 'Snipaste_2023-09-04_08-16-59.png',
|
|
|
|
|
url: 'http://175.27.215.92:9665/statics/2024/04/17/Snipaste_2023-09-04_08-16-59_20240417142903A013.png'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: 'Snipaste_2023-09-04_08-16-59.png',
|
|
|
|
|
url: 'http://175.27.215.92:9665/statics/2024/04/17/Snipaste_2023-09-04_08-16-59_20240417142903A013.png'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: '会议纪要 0825_20240417143926A014.docx',
|
|
|
|
|
url: 'http://175.27.215.92:9665/statics/2024/04/17/会议纪要 0825_20240417143926A014.docx'
|
|
|
|
|
},
|
|
|
|
|
]
|
|
|
|
|
this.SOPModel = true;
|
|
|
|
|
},
|
|
|
|
|
//查看图纸预览
|
|
|
|
|
handlePictureCardPreview(file) {
|
|
|
|
|
this.dialogImageUrl = file.url;
|
|
|
|
|
this.pictureDetailModel = true;
|
|
|
|
|
},
|
|
|
|
|
//图纸下载
|
|
|
|
|
async handleDownload(file) {
|
|
|
|
|
this.fileDownload(file)
|
|
|
|
|
},
|
|
|
|
|
isAssetTypeAnImage(ext) {
|
|
|
|
|
let suffix = ext.lastIndexOf(".");
|
|
|
|
|
let name = ext.substr(suffix + 1);
|
|
|
|
|
return ['png', 'jpg', 'jpeg'].includes(name.toLowerCase())
|
|
|
|
|
/** SOP预览*/
|
|
|
|
|
handleViewSOP(e){
|
|
|
|
|
this.fileListData = [];
|
|
|
|
|
getDispatchSOPAttachList(e.dispatchCode, e.processId).then(res => {
|
|
|
|
|
let attachList = res.data;
|
|
|
|
|
let thisFileList = [];
|
|
|
|
|
attachList.forEach(e => {
|
|
|
|
|
let previewFile = {};
|
|
|
|
|
previewFile.url = e.attachPath;
|
|
|
|
|
previewFile.name = e.attachName;
|
|
|
|
|
thisFileList.push(previewFile);
|
|
|
|
|
})
|
|
|
|
|
console.log("thisFileList:", thisFileList)
|
|
|
|
|
if (thisFileList.length > 0){
|
|
|
|
|
this.fileListData = thisFileList;
|
|
|
|
|
this.showFileDialog = true;
|
|
|
|
|
} else {
|
|
|
|
|
this.$modal.msgWarning("此派工派工单号无SOP附件!");
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
completeCollectMaterials() {
|
|
|
|
|