diff --git a/src/api/mes/reportWorks.js b/src/api/mes/reportWorks.js index adf968b..2d2fb70 100644 --- a/src/api/mes/reportWorks.js +++ b/src/api/mes/reportWorks.js @@ -7,3 +7,11 @@ export function listReportWorks(query) { params: query }); } + +export function getProductTraceList(query) { + return request({ + url: '/mes/reportWorks/getProductTrace', + method: 'get', + params: query + }); +} \ No newline at end of file diff --git a/src/api/quality/income.js b/src/api/quality/income.js index 6b98800..c79debc 100644 --- a/src/api/quality/income.js +++ b/src/api/quality/income.js @@ -252,3 +252,16 @@ export function getClassInfoListByCheckType(query) { params: query }); } + +//状态修改 +export function submitCheckPics(recordId,fileList) { + const data = { + recordId, + fileList + } + return request({ + url: '/quality/qcIncome/submitCheckPics', + method: 'put', + data: data + }) +} \ No newline at end of file diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index b974304..288daf7 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -314,14 +314,14 @@ export default { this.poolNameList = JSON.parse(localStorage.getItem("POOL_NAME_LIST")); this.poolName = localStorage.getItem("USER_POOL_NAME_CURRENT"); - //先执行一次 - this.getUnReadList(); - // 实现轮询 - this.timer = setInterval(() => { - setTimeout(this.getUnReadList(), 30000); - }, 30000); - - + if(process.env.VUE_APP_BASE_API !='/dev-api'){ + //先执行一次 + this.getUnReadList(); + // 实现轮询 + this.timer = setInterval(() => { + setTimeout(this.getUnReadList(), 30000); + }, 30000); + } }, components: { Breadcrumb, diff --git a/src/views/mes/productTrace/index.vue b/src/views/mes/productTrace/index.vue new file mode 100644 index 0000000..9cd8c10 --- /dev/null +++ b/src/views/mes/productTrace/index.vue @@ -0,0 +1,284 @@ + + + diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue index c45a128..896c6fe 100644 --- a/src/views/plan/workorder/index.vue +++ b/src/views/plan/workorder/index.vue @@ -1033,7 +1033,6 @@ export default { }, // 派发-工单派发按钮操作 handleUpdateDown(row) { - var statusesArray = this.statuses; for (var i = 0; i < statusesArray.length; i++) { if (statusesArray[i] != 'w0') {//已经下达的不允许操作 diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue index 672cea7..c20e284 100644 --- a/src/views/quality/qcIncome/checkProjectType.vue +++ b/src/views/quality/qcIncome/checkProjectType.vue @@ -259,7 +259,7 @@ :on-success="handleUploadSuccess" list-type="picture-card" :file-list="fileList" - :auto-upload="false"> + >
import { getCkeckProjectList,changeCheckDetailStatus,getIncome,commitActualValue, - commitCheckResult,getDefectInfoList,getWeightValue,getnoOkVals,getAutoJudge,getClassInfoListByCheckType + commitCheckResult,getDefectInfoList,getWeightValue,getnoOkVals,getAutoJudge,getClassInfoListByCheckType, + submitCheckPics } from "@/api/quality/income"; import { getDefectValue, commitDefectValue, updateDefectValue} from "@/api/quality/checkTaskDefect"; import { getToken } from "@/utils/auth"; @@ -745,22 +746,30 @@ export default { window.location.href = file.url }, handleUploadSuccess(res, file) { - debugger if (res.code === 200) { this.uploadList.push({ name: res.data.name, url: res.data.url }); - this.uploadedSuccessfully(); } else { this.number--; this.$modal.closeLoading(); this.$modal.msgError(res.msg); this.$refs.fileUpload.handleRemove(file); - this.uploadedSuccessfully(); } }, submitPicForm() { - var picValues = null; - this.uploadList.map(item => picValues=picValues+item.url+','); - console.log(picValues) + var picValues = ''; + if(this.uploadList.length>0){ + this.uploadList.map(item => picValues=picValues+item.url+','); + }; + if(this.fileList.length>0){ + this.fileList.map(item => picValues=picValues+item.url+','); + }; + + submitCheckPics(this.recordId,picValues).then(response => { + this.$modal.msgSuccess("提交成功"); + this.picValueOpen = false; + this.getList(); + }); + }, } };