Browse Source

2025/7/15

master
Aoi_Tori 6 months ago
parent
commit
91671d2be8
  1. 10
      src/views/modules/demoComponents/orderProperties.vue
  2. 10
      src/views/modules/oss/ossComponents.vue
  3. 2
      src/views/modules/part/bomManagement.vue
  4. 4
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingFlexo.vue
  5. 4
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingIndigo.vue
  6. 13
      src/views/modules/test/requestForTest.vue
  7. 380
      src/views/modules/tooling/searchToolApply.vue

10
src/views/modules/demoComponents/orderProperties.vue

@ -3,17 +3,17 @@
<div style="margin-top: 5px">
<template v-if="isAuth('103001:tab1:save')">
<template v-if="proofingStatus === '草稿' || superAdmin || (approvalUsername && approvalUsername.split(';').includes(sp) && proofingStatus === '审批中')">
<el-button type="primary" @click="clickSaveBtn" v-if="orderNo && !disabled">新增</el-button>
<el-button type="primary" @click="clickSaveBtn" v-if="orderNo && !disabled && !readonly">新增</el-button>
</template>
</template>
<template v-if="isAuth('103001:tab1:update')">
<template v-if="proofingStatus === '草稿' || superAdmin || (approvalUsername && approvalUsername.split(';').includes(sp) && proofingStatus === '审批中')">
<el-button type="primary" :loading="loading" v-if="orderNo && !disabled" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button>
<el-button type="primary" :loading="loading" v-if="orderNo && !disabled && !readonly" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button>
</template>
</template>
<template v-if="isAuth('103001:tab1:save')">
<template v-if="proofingStatus === '草稿' || superAdmin || (approvalUsername && approvalUsername.split(';').includes(sp) && proofingStatus === '审批中')">
<el-button type="primary" v-if="attributeDialog && orderNo && !disabled" @click="refreshPropertiesModal">刷新属性模板</el-button>
<el-button type="primary" v-if="attributeDialog && orderNo && !disabled &!readonly" @click="refreshPropertiesModal">刷新属性模板</el-button>
</template>
</template>
</div>
@ -136,6 +136,10 @@ export default {
type:Boolean,
default:false,
},
readonly: {
type:Boolean,
default:false,
},
superAdmin: {
type: Boolean,
default: false

10
src/views/modules/oss/ossComponents.vue

@ -55,6 +55,10 @@ export default {
visibleFlag: {
type: Boolean,
default: true
},
readonly: {
type: Boolean,
default: false
}
},
data(){
@ -280,10 +284,10 @@ export default {
<template>
<div>
<template v-if="saveVisible&&effectiveVisibleFlag">
<template v-if="saveVisible&&effectiveVisibleFlag&&!readonly">
<el-button type="primary" v-if="this.orderRef1 && this.orderRef2 && !disabled" @click="handleUpload">上传附件</el-button>
</template>
<template v-if="downloadVisible">
<template v-if="downloadVisible&&!readonly">
<el-button type="primary" @click="handleDownload">下载</el-button>
</template>
<el-table
@ -318,7 +322,7 @@ export default {
label="操作" v-if="removeVisible || previewVisible">
<template slot-scope="{row,$index}">
<template v-if="removeVisible&&effectiveVisibleFlag">
<el-link style="cursor:pointer;" v-if="!disabled" @click="handleRemove(row)">删除</el-link>
<el-link style="cursor:pointer;" v-if="!disabled&&!readonly" @click="handleRemove(row)">删除</el-link>
</template>
<template v-if="previewVisible">
<el-link style="cursor:pointer;" @click="previewFile(row)">预览</el-link>

2
src/views/modules/part/bomManagement.vue

@ -563,7 +563,7 @@
<!-- 子物料页签 -->
<el-tabs v-model="componentTable" style="width: 100%;height: 300px" type="border-card" @tab-click="tabClick" class="sub_detail-tab">
<!-- 子物料BOM -->
<el-tab-pane label="BOM" name="component_part_bom">
<el-tab-pane label="产品BOM" name="component_part_bom">
<el-table
:data="componentPartBomList"
height="250px"

4
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingFlexo.vue

@ -413,8 +413,8 @@
}
let number = 1
for (let i = 0; i <this.colorTable.length ; i++) {
if (number <= this.colorTable[i].showOrder) {
number = Number(this.colorTable[i].showOrder) + 1
if (number <= this.colorTable[i].order) {
number = Number(this.colorTable[i].order) + 1
}
}
this.colorData = {

4
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingIndigo.vue

@ -333,8 +333,8 @@
}
let number = 1
for (let i = 0; i < this.colorTable.length; i++) {
if (number <= this.colorTable[i].showOrder) {
number = Number(this.colorTable[i].showOrder) + 1
if (number <= this.colorTable[i].order) {
number = Number(this.colorTable[i].order) + 1
}
}
this.colorData = {

13
src/views/modules/test/requestForTest.vue

@ -269,12 +269,18 @@
v-model="modalData.productName"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="4">
<el-form-item label="So Number" prop="soNumber">
<el-input :disabled="(testInformationFlag('soNumber') === 'N' && modalData.flag === '2') || detailFlag"
v-model="modalData.soNumber"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="申请人" prop="createBy">
<el-input :disabled="(testInformationFlag('createBy') === 'N' && modalData.flag === '2') || detailFlag"
v-model="modalData.createBy"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="15">
<el-col :span="8">
@ -1727,7 +1733,7 @@ export default {
columnProp: 'createDate',
headerAlign: 'center',
align: 'center',
columnLabel: '创建时间',
columnLabel: '申请时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -1745,7 +1751,7 @@ export default {
columnProp: 'createBy',
headerAlign: 'center',
align: 'center',
columnLabel: '创建人',
columnLabel: '申请人',
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -2754,6 +2760,7 @@ export default {
nodeId: row.nodeId,
approvalUsername: row.approvalUsername,
soNumber: row.soNumber,
createBy: row.createBy,
}
this.activeTabList = ['product', 'process', 'attribute', 'partAttribute', 'file']
// this.$refs.dialogSoBom.clearTable();

380
src/views/modules/tooling/searchToolApply.vue

@ -89,6 +89,9 @@
<template v-if="isAuth('106002:approval')">
<a type="text" size="small" v-if="scope.row.status==='审批中'" @click="editModal(scope.row)">审批</a>
</template>
<template v-if="isAuth('106002:detail')">
<a type="text" size="small" @click="detail(scope.row)">详情</a>
</template>
<template v-if="isAuth('106002:remove')">
<a type="text" size="small" v-if="scope.row.status==='草稿'" @click="cancelApply(scope.row)">删除</a>
</template>
@ -390,7 +393,7 @@
</el-form>
</el-tab-pane>
<el-tab-pane label="附件信息" name="down">
<oss-components height="25vh" :visibleFlag="dataForm.status === '草稿' || (dataForm.status === '审批中' && operatorFlag)" :dataList="fileList" label="附件" :columns="ossColumns" :order-ref1="currentRow.site" :order-ref2="currentRow.applyNo"></oss-components>
<oss-components ref="oss1" height="25vh" :visibleFlag="dataForm.status === '草稿' || (dataForm.status === '审批中' && operatorFlag)" :dataList="fileList" label="附件" :columns="ossColumns" :order-ref1="currentRow.site" :order-ref2="currentRow.applyNo"></oss-components>
</el-tab-pane>
</el-tabs>
<el-footer style="height:35px;margin-top:15px;text-align:center">
@ -549,7 +552,7 @@
</el-form>
</el-tab-pane>
<el-tab-pane label="附件信息" name="down">
<oss-components height="25vh" :dataList="fileList" :visibleFlag="dataForm.status === '草稿' || (dataForm.status === '审批中' && operatorFlag)" label="附件" :columns="ossColumns" :order-ref1="currentRow.site" :order-ref2="currentRow.applyNo"></oss-components>
<oss-components ref="oss2" height="25vh" :dataList="fileList" :visibleFlag="dataForm.status === '草稿' || (dataForm.status === '审批中' && operatorFlag)" label="附件" :columns="ossColumns" :order-ref1="currentRow.site" :order-ref2="currentRow.applyNo"></oss-components>
</el-tab-pane>
</el-tabs>
<el-footer style="height:35px;margin-top:15px;text-align:center">
@ -631,7 +634,7 @@
</el-footer>
</el-dialog>
<el-dialog title="新增工具明细" top="30vh" :close-on-click-modal="false" v-drag :visible.sync="toolDetailFlag">
<el-dialog title="新增工具明细" top="25vh" width="1000px" :close-on-click-modal="false" v-drag :visible.sync="toolDetailFlag">
<div class="rq">
<el-form :inline="true" label-position="top" :model="toolDetailSearchData">
<el-form-item label="项目号">
@ -694,6 +697,15 @@
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="sizeChangeHandle1"
@current-change="currentChangeHandle1"
:current-page="pageIndex1"
:page-sizes="[20, 50, 100, 1000]"
:page-size="pageSize1"
:total="totalPage1"
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
</div>
<el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="applyDetail">应用</el-button>
@ -702,6 +714,166 @@
</el-footer>
</el-dialog>
<el-dialog width="950px" v-drag :title="'刀模申请详情'" :close-on-click-modal="false" :visible.sync="visibleD">
<el-form :inline="true" label-position="top" label-width="100px">
<el-form-item :label="'申请编号'">
<el-input v-model="dataForm.applyNo" readonly style="width: 130px" disabled></el-input>
</el-form-item>
<el-form-item :label="'申请总数'">
<el-input v-model="dataForm.applySumQty" readonly style="width: 130px" disabled></el-input>
</el-form-item>
<el-form-item :label="'总成本'">
<el-input v-if="accessField('10601001')" v-model="dataForm.totalCost" style="width: 130px" readonly disabled></el-input>
<el-input v-if="!accessField('10601001')" v-model="valueNull" style="width: 130px" readonly disabled></el-input>
</el-form-item>
<el-form-item :label="'申请人'">
<el-input v-model="dataForm.applyBy" style="width: 130px" readonly disabled></el-input>
</el-form-item>
<el-form-item :label="'申请日期'">
<el-date-picker
value-format="yyyy-MM-dd"
style="width: 100%"
v-model="dataForm.applyDate"
type="date"
disabled
readonly
placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="部门">
<dict-data-select :site="$store.state.user.site" readonly v-model="dataForm.department" dict-type="tool_application_department" disabled style="width: 130px"></dict-data-select>
</el-form-item>
<el-form-item>
<span slot="label" style="">报价员</span>
<el-input v-model="dataForm.quoterName" ref="quoterName" placeholder="请选择人员" readonly style="width: 130px"></el-input>
</el-form-item>
<el-form-item>
<span slot="label" style="">TP</span>
<el-input v-model="dataForm.tpName" ref="tpName" placeholder="请选择人员" readonly style="width: 130px"></el-input>
</el-form-item>
<el-form-item>
<span slot="label" style="">采购员</span>
<el-input v-model="dataForm.purchaserName" ref="purchaserName" placeholder="请选择人员" readonly style="width: 130px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px">
<el-form-item :label="'申请原因'">
<el-input type="textarea" readonly style="width: 930px" resize="none" :autosize="{minRows: 3, maxRows: 3}" v-model="dataForm.applyReason"/>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 45px">
<el-form-item :label="'备注'">
<el-input type="textarea" style="width: 930px" readonly resize="none" :autosize="{minRows: 3, maxRows: 3}" v-model="dataForm.remark"/>
</el-form-item>
</el-form>
<el-tabs style="font-size: 12px;min-height: 330px;margin-top: 60px" class="customer-tab" v-model="activeModelName" type="border-card">
<el-tab-pane label="基本信息" name="attribute">
<order-attribute
:disabled="currentRow.status === '已完成'"
:readonly="visibleD"
:order-no="currentRow.applyNo"
:approval-username="currentRow.sp"
:proofing-status="currentRow.status"
:super-admin="superAdmin"
:code-no="'toolApply'"
:function-type="'TL_Receipt'">
</order-attribute>
</el-tab-pane>
<el-tab-pane label="工具明细" name="detail">
<div class="rq">
<el-table
height="278"
:data="toolData"
border
@selection-change="selectionChangeHandle"
ref="toolTable"
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
type="selection"
align="center"
width="55">
</el-table-column>
<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==''?false:item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<div v-if="(item.columnProp !== 'applyQty')&& (item.columnProp !== 'standardCost')">
<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>
</div>
<div v-else-if=" (item.columnProp === 'standardCost')">
<el-input readonly v-if="accessField('10601001')" v-model="scope.row.standardCost" type="number" @change="changeSum(scope.row)" placeholder="请输入成本" style="width:98%"></el-input>
</div>
<div v-else>
<el-input readonly v-model="scope.row.applyQty" type="number" @change="changeSum(scope.row)" :disabled="changeApplyDetailFlag('applyQty') === 'N'" placeholder="请输入数量" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" style="width:98%"></el-input>
</div>
</template>
</el-table-column>
</el-table>
</div>
</el-tab-pane>
<el-tab-pane label="TP处理结果" name="tp">
<el-form label-position="top">
<el-row :gutter="15">
<el-col :span="6">
<el-form-item label="IFS PR编号">
<el-input readonly v-model="modelData.prNo" :disabled="$store.state.user.name !== dataForm.tp&&!superAdmin"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" style="height: 240px">
<el-input readonly type="textarea" v-model="modelData.remark1" :rows="3" :disabled="$store.state.user.name !== dataForm.tp&&!superAdmin"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-tab-pane>
<el-tab-pane label="采购处理结果" name="caigou">
<el-form label-position="top">
<el-row :gutter="15">
<el-col :span="6">
<el-form-item label="采购订单号">
<el-input readonly v-model="modelData.poNo" :disabled="$store.state.user.name !== dataForm.purchaser&&!superAdmin"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="厂商名称">
<el-input readonly v-model="modelData.supplierName" :disabled="$store.state.user.name !== dataForm.purchaser&&!superAdmin"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="总成本(元)">
<el-input readonly v-if="accessField('10601001')" v-model="modelData.allCost" type="number" :disabled="$store.state.user.name!==dataForm.purchaser&&!superAdmin"></el-input>
<el-input readonly v-if="!accessField('10601001')" v-model="valueNull" style="width: 130px" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="15">
<el-col :span="24">
<el-form-item label="备注" style="height: 240px">
<el-input readonly type="textarea" v-model="modelData.remark2" :rows="3" :disabled="$store.state.user.name!==dataForm.purchaser&&!superAdmin"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-tab-pane>
<el-tab-pane label="附件信息" name="down">
<oss-components ref="oss3" height="25vh" :readonly="visibleD" :dataList="fileList" label="附件" :columns="ossColumns" :order-ref1="currentRow.site" :order-ref2="currentRow.applyNo"></oss-components>
</el-tab-pane>
</el-tabs>
<el-footer style="height:35px;margin-top:15px;text-align:center">
<el-button type="primary" @click="visibleD = false" class="bigButton">{{ '关闭' }}</el-button>
</el-footer>
</el-dialog>
<!-- 上传文件的modal -->
<projectUploadFile ref="projectUploadFile" @refreshPageTables="getFileContentData()" v-drag></projectUploadFile>
@ -819,6 +991,8 @@ export default {
dataSelections: [],
chooseDataList: [],
visibleU: false,
visibleD: false,
isInitialized: false,
plmChangeApplyHeaderArr: [],
plmChangeApplyDetailArr: [],
dataForm: {
@ -901,6 +1075,9 @@ export default {
pageIndex: 1,
pageSize: 100,
totalPage: 0,
pageIndex1: 1,
pageSize1: 100,
totalPage1: 0,
ossColumns: [
{
userId: this.$store.state.user.name,
@ -1070,38 +1247,20 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 106002,
serialNumber: '106002Table1Status',
tableId: "106002Table1",
tableName: "刀具申请主表",
columnProp: "status",
headerAlign: "center",
align: "left",
columnLabel: "状态",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 60
},
{
userId: this.$store.state.user.name,
functionId: 106002,
serialNumber: '106002Table1NodeId',
serialNumber: '106002Table1ApplyDate',
tableId: "106002Table1",
tableName: "刀具申请主表",
columnProp: "nodeId",
columnProp: "applyDate",
headerAlign: "center",
align: "left",
columnLabel: "当前节点",
columnLabel: "申请日期",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 60
columnWidth: 80
},
{
userId: this.$store.state.user.name,
@ -1112,7 +1271,7 @@ export default {
columnProp: "sp",
headerAlign: "center",
align: "left",
columnLabel: "当前节点审批人",
columnLabel: "当前审批人",
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -1130,7 +1289,7 @@ export default {
columnProp: "nodeName",
headerAlign: "center",
align: "left",
columnLabel: "节点名称",
columnLabel: "当前节点",
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -1232,56 +1391,74 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 106002,
serialNumber: '106002Table1ApplyDate',
serialNumber: '106002Table1ApplyReason',
tableId: "106002Table1",
tableName: "刀具申请主表",
columnProp: "applyDate",
columnProp: "applyReason",
headerAlign: "center",
align: "left",
columnLabel: "申请日期",
columnLabel: "申请原因",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
columnWidth: 150
},
{
userId: this.$store.state.user.name,
functionId: 106002,
serialNumber: '106002Table1ApplyReason',
serialNumber: '106002Table1Remark',
tableId: "106002Table1",
tableName: "刀具申请主表",
columnProp: "applyReason",
columnProp: "remark",
headerAlign: "center",
align: "left",
columnLabel: "申请原因",
columnLabel: "申请备注",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150
columnWidth: 200
},
{
userId: this.$store.state.user.name,
functionId: 106002,
serialNumber: '106002Table1Remark',
serialNumber: '106002Table1Status',
tableId: "106002Table1",
tableName: "刀具申请主表",
columnProp: "remark",
columnProp: "status",
headerAlign: "center",
align: "left",
columnLabel: "申请备注",
columnLabel: "状态",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 200
columnWidth: 60
},
{
userId: this.$store.state.user.name,
functionId: 106002,
serialNumber: '106002Table1NodeId',
tableId: "106002Table1",
tableName: "刀具申请主表",
columnProp: "nodeId",
headerAlign: "center",
align: "left",
columnLabel: "当前节点",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 60
},
],
columnList2: [
@ -1773,13 +1950,63 @@ export default {
// }
// }
visibleU (newV, oldV) {
this.$refs.oss.handleQuery()
this.$refs.dialogAttribute.getProperties()
if (newV === true){
const tryCall = () => {
if (this.$refs.oss1) {
this.$refs.oss1.handleQuery()
this.$refs.dialogAttribute.getProperties()
} else {
//
setTimeout(tryCall, 50)
}
}
if (this.isInitialized) {
tryCall()
} else {
// mounted
this.$once('hook:mounted', tryCall)
}
}
},
visible(newV, oldV){
this.$refs.oss.handleQuery()
this.$refs.dialogAttribute.getProperties()
if (newV === true){
const tryCall = () => {
if (this.$refs.oss2) {
this.$refs.oss2.handleQuery()
this.$refs.dialogAttribute.getProperties()
} else {
//
setTimeout(tryCall, 50)
}
}
if (this.isInitialized) {
tryCall()
} else {
// mounted
this.$once('hook:mounted', tryCall)
}
}
},
visibleD(newV, oldV){
if (newV === true){
const tryCall = () => {
if (this.$refs.oss3) {
this.$refs.oss3.handleQuery()
this.$refs.dialogAttribute.getProperties()
} else {
//
setTimeout(tryCall, 50)
}
}
if (this.isInitialized) {
tryCall()
} else {
// mounted
this.$once('hook:mounted', tryCall)
}
}
},
toolDetailFlag(newV, oldV){
@ -1804,6 +2031,7 @@ export default {
mounted() {
this.$nextTick(() => {
//this.height = window.innerHeight - 520;
this.isInitialized = true
this.height = window.innerHeight / 2 - 30
this.fieldColumn()
})
@ -2123,6 +2351,47 @@ export default {
})
this.visible = true
},
detail(row) {
this.getNodeAuthority(row)
this.checkSuperAdmin()
this.dataForm = {
site: row.site,
applyNo: row.applyNo,
applyBy: row.applyBy,
applyDate: row.applyDate,
applySumQty: row.applySumQty,
applyReason: row.applyReason,
remark: row.remark,
createBy: row.createBy,
department: row.department,
detailList: [],
status: row.status,
rejectOpinion: '',
nodeConclusion: '',
quoter: row.quoter,
quoterName: row.quoterName,
tp: row.tp,
tpName: row.tpName,
purchaser: row.purchaser,
purchaserName: row.purchaserName,
totalCost: row.totalCost,
menuId: this.$route.meta.menuId,
userName: this.$store.state.user.name,
nodeId: row.nodeId,
sp: row.sp,
isReject: row.isReject
}
this.openModelMessage()
searchProjectToolApplyDetail({
site: row.site,
applyNo: row.applyNo,
}).then(({data}) => {
if (data.code == 0) {
this.toolData = data.rows
}
})
this.visibleD = true
},
editModalU(row) {
this.getNodeAuthority(row)
this.dataForm = {
@ -2286,6 +2555,15 @@ export default {
this.queryByAnyField(this.filterSearchData)
}
},
sizeChangeHandle1(val) {
this.pageSize1 = val
this.pageIndex1 = 1
this.addChangeDetail()
},
currentChangeHandle1(val) {
this.pageIndex1 = val
this.addChangeDetail()
},
openModelMessage() {
this.modelData = {
@ -2582,21 +2860,12 @@ export default {
addChangeDetail(){
this.toolDetailFlag = true
this.toolDetailSearchData.no = this.pageIndex1
this.toolDetailSearchData.size = this.pageSize1
queryProjectPartToolForApply(this.toolDetailSearchData).then(({data})=>{
if (data && data.code === 0){
this.dataList2 = data.rows
// this.dataList2 = data.rows.map(row => {
// const match = this.toolData.some(toolItem =>
// toolItem.site === row.site &&
// toolItem.applyNo === row.applyNo &&
// toolItem.seqNo === row.seqNo
// );
// return {
// ...row,
// added: match
// };
// });
this.total = data.total
this.totalPage1 = data.total
}else {
this.$message.error(data.msg)
}
@ -2758,7 +3027,6 @@ export default {
}
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
// console.log(this.searchData)
searchProjectToolApplyHeader(this.searchData).then(({data}) => {
if (data.code == 0) {
this.dataList1 = data.page.list

Loading…
Cancel
Save