Browse Source

2024.9.5 生产订单-生产通知单(第二版)

master
yuejiayang 1 year ago
parent
commit
79695a729e
  1. 15
      src/views/modules/base/workCenter.vue
  2. 33
      src/views/modules/shopOrder/shopOrder/shopNotice.vue

15
src/views/modules/base/workCenter.vue

@ -1551,18 +1551,21 @@ export default {
sopFileListSearch(inData).then(({data}) => { sopFileListSearch(inData).then(({data}) => {
// data // data
for (let i = 0; i < data.rows.length; i++) { for (let i = 0; i < data.rows.length; i++) {
if (data.rows[i].expiryDate != null) {
if (data.rows[i].expiryDate < this.dayjs().format('YYYY-MM-DD')) {
data.rows[i].status = '失效'
if (i + 1 !== data.rows.length){
data.rows[i].status = '失效'
} else {
if (data.rows[i].expiryDate != null) {
if (data.rows[i].expiryDate < this.dayjs().format('YYYY-MM-DD')) {
data.rows[i].status = '失效'
} else {
data.rows[i].status = '有效'
}
} else { } else {
data.rows[i].status = '有效' data.rows[i].status = '有效'
} }
} else {
data.rows[i].status = '有效'
} }
this.sopFileList.push(data.rows[i]); this.sopFileList.push(data.rows[i]);
this.sopFileList[i].versionNumber = data.rows[i].orderRef4 this.sopFileList[i].versionNumber = data.rows[i].orderRef4
} }
// this.sopFileListversionNumberversionNumberversionNumber A + +1 // this.sopFileListversionNumberversionNumberversionNumber A + +1
if (this.sopFileList.length > 0) { if (this.sopFileList.length > 0) {

33
src/views/modules/shopOrder/shopOrder/shopNotice.vue

@ -263,13 +263,13 @@
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
width="100">
width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<a type="primary" @click="openDialog(scope.row)">查看</a> <a type="primary" @click="openDialog(scope.row)">查看</a>
<!-- <a-->
<!-- type="text" size="small"-->
<!-- @click="viewSopFile(scope.row)"-->
<!-- >查看附件</a>-->
<a
type="text" size="small"
@click="viewSopFile(scope.row)"
>查看附件</a>
<a type="text" size="small" @click="downloadFile(scope.row)">下载</a> <a type="text" size="small" @click="downloadFile(scope.row)">下载</a>
</template> </template>
</el-table-column> </el-table-column>
@ -811,22 +811,29 @@ export default {
} }
this.dataList = data.rows2 this.dataList = data.rows2
// sopFileListorderRef4versionNumber // sopFileListorderRef4versionNumber
data.rows3.forEach((item) => {
data.rows3.forEach((item,index) => {
const finalIndex = data.rows3.length - 1
item.fileType = item.fileSuffix item.fileType = item.fileSuffix
item.versionNumber = item.orderRef4 item.versionNumber = item.orderRef4
item.resourceInfo = item.orderRef3 + '(' + item.resourceDesc + ')' item.resourceInfo = item.orderRef3 + '(' + item.resourceDesc + ')'
if (item.expiryDate !== null) {
if (new Date(item.expiryDate) < new Date()) {
item.status = '失效'
console.log(index)
if (index !== 0){
if(item.orderRef3 !== data.rows3[index - 1].orderRef3){
data.rows3[index - 1].status = '有效'
} else {
data.rows3[index - 1].status = '无效'
if (index === finalIndex){
item.status = '有效'
}
} }
else {
if (index + 1 === data.rows3.length){
item.status = '有效' item.status = '有效'
} }
} else {
item.status = '有效'
} }
})
data.rows3.forEach((item) =>{
if (this.searchData.status === '有效'){ if (this.searchData.status === '有效'){
if (item.status !== '失效'){
if (item.status === '有效'){
this.sopFileList.push(item) this.sopFileList.push(item)
} }
} else { } else {

Loading…
Cancel
Save