|
|
|
@ -3,16 +3,16 @@ |
|
|
|
|
|
|
|
<!-- 查询条件 --> |
|
|
|
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()"> |
|
|
|
<!-- <el-form-item :label="'BU'">--> |
|
|
|
<!-- <el-select v-model="searchData.buNo" placeholder="请选择" clearable style="width: 130px">--> |
|
|
|
<!-- <el-option--> |
|
|
|
<!-- v-for = "i in buList"--> |
|
|
|
<!-- :key = "i.buNo"--> |
|
|
|
<!-- :label = "i.buNo"--> |
|
|
|
<!-- :value = "i.buNo">--> |
|
|
|
<!-- </el-option>--> |
|
|
|
<!-- </el-select>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<el-form-item :label="'BU'"> |
|
|
|
<el-select v-model="searchData.buNo" placeholder="请选择" clearable style="width: 130px"> |
|
|
|
<el-option |
|
|
|
v-for = "i in buList" |
|
|
|
:key = "i.buNo" |
|
|
|
:label = "i.buNo" |
|
|
|
:value = "i.buNo"> |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'申请编码'"> |
|
|
|
<el-input v-model="searchData.changeNo" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
@ -210,10 +210,11 @@ |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<!-- </el-form>--> |
|
|
|
<el-form :inline="true" label-position="top" style="margin-top: 50px"> |
|
|
|
<el-button type="primary" @click="addChangeDetail">新增</el-button> |
|
|
|
<div class="rq"> |
|
|
|
<el-table |
|
|
|
:data="chooseDataList" |
|
|
|
height="348px" |
|
|
|
height="320px" |
|
|
|
border |
|
|
|
style="width:100%"> |
|
|
|
<el-table-column |
|
|
|
@ -519,7 +520,7 @@ |
|
|
|
min-width="50" |
|
|
|
label="操作"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-link v-if="scope.row.executeFlag !== 'Y'" style="cursor: pointer" @click="executeModal(scope.row)">执行</el-link> |
|
|
|
<el-link v-if="scope.row.executeFlag !== 'Y' && $store.state.user.name === scope.row.executor && modalData.changeStatus === '审批中'" style="cursor: pointer" @click="executeModal(scope.row)">执行</el-link> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
@ -560,22 +561,22 @@ |
|
|
|
<el-table-column |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
min-width="100" |
|
|
|
min-width="200" |
|
|
|
label="备注"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-input :disabled="changeCountersignatureItemFlag('itemRemark') === 'N'" v-model="scope.row.itemRemark" style="width:98%"></el-input> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
fixed="right" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
width="60" |
|
|
|
label="操作"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-link v-if="scope.row.executeFlag !== 'Y'" style="cursor: pointer" @click="executeCSModal(scope.row)">执行</el-link> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<!-- <el-table-column--> |
|
|
|
<!-- fixed="right"--> |
|
|
|
<!-- header-align="center"--> |
|
|
|
<!-- align="center"--> |
|
|
|
<!-- width="60"--> |
|
|
|
<!-- label="操作">--> |
|
|
|
<!-- <template slot-scope="scope">--> |
|
|
|
<!-- <el-link v-if="scope.row.executeFlag !== 'Y'" style="cursor: pointer" @click="executeCSModal(scope.row)">执行</el-link>--> |
|
|
|
<!-- </template>--> |
|
|
|
<!-- </el-table-column>--> |
|
|
|
</el-table> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
@ -610,6 +611,10 @@ |
|
|
|
:min-width="item.columnWidth" |
|
|
|
:label="item.columnLabel"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<div v-if="item.columnProp === 'codeNo'"> |
|
|
|
<el-link style="cursor:pointer;" v-if="!item.columnHidden" @click="toMenu(scope.row.codeNo)"> {{ scope.row[item.columnProp] }}</el-link> |
|
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> |
|
|
|
</div> |
|
|
|
<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> |
|
|
|
</template> |
|
|
|
@ -716,7 +721,7 @@ |
|
|
|
<!-- ECN种类模态框 --> |
|
|
|
<el-dialog title="ECN种类" :close-on-click-modal="false" v-drag :visible.sync="ecnTypeModalFlag" width="900px"> |
|
|
|
<el-form ref="dataForm" label-position="right"> |
|
|
|
<el-row v-for="(item, index) in form" :key="index" style="margin-top: 10px"> |
|
|
|
<el-row v-for="(item, index) in form" :key="index" style="padding-top: 10px;" :style="{borderTop:index === 0?'':'1px solid #ccc'}"> |
|
|
|
<el-col :span="8"> |
|
|
|
<el-form-item :prop="'input.'+index+'.value'"> |
|
|
|
<el-checkbox v-model="item.flag" @change="(val)=>ecnTypeHeaderChange(val,index)" :indeterminate="item.list.filter(a => a.flag === 'Y').length !== 0 && item.list.filter(a => a.flag === 'Y').length !== item.list.length" true-label="Y">{{item.value}}</el-checkbox> |
|
|
|
@ -933,6 +938,71 @@ |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- 可选技术参数卡清单 --> |
|
|
|
<el-dialog title="技术参数卡清单" :close-on-click-modal="false" v-drag :visible.sync="addDetailModal" width="820px"> |
|
|
|
<div class="rq"> |
|
|
|
<el-form :inline="true" label-position="top" :model="searchData2"> |
|
|
|
<el-form-item :label="'BU'"> |
|
|
|
<el-select v-model="searchData2.buNo" disabled style="width: 80px"> |
|
|
|
<el-option |
|
|
|
v-for = "i in buList" |
|
|
|
:key = "i.buNo" |
|
|
|
:label = "i.buNo" |
|
|
|
:value = "i.buNo"> |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="技术参数卡编码"> |
|
|
|
<el-input v-model="searchData2.codeNo" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="正式物料编码"> |
|
|
|
<el-input v-model="searchData.partNo" clearable style="width: 120px"/> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="客户编码"> |
|
|
|
<el-input v-model="searchData.customerId" clearable style="width: 120px"/> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="项目编码"> |
|
|
|
<el-input v-model="searchData.projectId" clearable style="width: 120px"/> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="' '"> |
|
|
|
<el-button type="primary" @click="addChangeDetail()">查询</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-table |
|
|
|
:height="300" |
|
|
|
:data="dataList2" |
|
|
|
@selection-change="selectionData2" |
|
|
|
border |
|
|
|
style="width: 100%;"> |
|
|
|
<el-table-column |
|
|
|
type="selection" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
width="50"> |
|
|
|
</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"> |
|
|
|
<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> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
</div> |
|
|
|
<el-footer style="height:40px;margin-top: 20px;text-align:center"> |
|
|
|
<el-button type="primary" @click="addDetail">确认</el-button> |
|
|
|
<el-button type="primary" @click="addDetailModal = false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<ChooseList ref="baseList" @getBaseData="getBaseData"></ChooseList> |
|
|
|
|
|
|
|
<!-- 上传文件的modal --> |
|
|
|
@ -966,6 +1036,7 @@ |
|
|
|
getNodeAuthority, // 获取节点权限 |
|
|
|
getApprovalList, // 查询审批信息 |
|
|
|
getBuBySite, // 根据site查bu |
|
|
|
technicalSpecificationSearch2, // 获取技术参数卡列表 |
|
|
|
} from '@/api/changeManagement/changeManagement.js' |
|
|
|
import ChooseList from '@/views/modules/common/Chooselist' |
|
|
|
import {verifyData} from "@/api/chooselist/chooselist.js" |
|
|
|
@ -1136,6 +1207,17 @@ |
|
|
|
page: 1, |
|
|
|
limit: 10 |
|
|
|
}, |
|
|
|
searchData2: { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
partNo: '', |
|
|
|
partDesc: '', |
|
|
|
customerId: '', |
|
|
|
customerDesc: '', |
|
|
|
projectId: '', |
|
|
|
projectDesc: '', |
|
|
|
codeNo: '', |
|
|
|
buNo: '', |
|
|
|
}, |
|
|
|
// 初始页签 |
|
|
|
activeTable: 'basicInformation', |
|
|
|
activeName: 'basicInformation', |
|
|
|
@ -1193,7 +1275,8 @@ |
|
|
|
menuId: this.$route.meta.menuId, |
|
|
|
userName: this.$store.state.user.name, |
|
|
|
rejectOpinion: '', |
|
|
|
nodeId: '' |
|
|
|
nodeId: '', |
|
|
|
buNo: '' |
|
|
|
}, |
|
|
|
costImpactData: { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
@ -1271,6 +1354,7 @@ |
|
|
|
}, |
|
|
|
// ======== 数据列表 ======== |
|
|
|
dataList: [], |
|
|
|
dataList2: [], |
|
|
|
detailList: [], |
|
|
|
fileList: [], |
|
|
|
chooseItemList: [], |
|
|
|
@ -1288,6 +1372,22 @@ |
|
|
|
approvalList: [], |
|
|
|
// ======== 列表表头 ======== |
|
|
|
columnList: [ |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 108002, |
|
|
|
serialNumber: '108002Table1BuNo', |
|
|
|
tableId: '108002Table1', |
|
|
|
tableName: '工程变更记录表', |
|
|
|
columnProp: 'buNo', |
|
|
|
headerAlign: 'center', |
|
|
|
align: 'center', |
|
|
|
columnLabel: 'BU', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 100 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 108002, |
|
|
|
@ -1481,6 +1581,118 @@ |
|
|
|
columnWidth: 100 |
|
|
|
}, |
|
|
|
], |
|
|
|
columnList2: [ |
|
|
|
{ |
|
|
|
columnProp: 'buNo', |
|
|
|
headerAlign: 'center', |
|
|
|
align: 'center', |
|
|
|
columnLabel: 'BU', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 80 |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'partNo', |
|
|
|
headerAlign: 'center', |
|
|
|
align: 'center', |
|
|
|
columnLabel: '正式物料编码', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 120 |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'partDesc', |
|
|
|
headerAlign: 'center', |
|
|
|
align: 'left', |
|
|
|
columnLabel: '物料名称', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 180 |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'projectId', |
|
|
|
headerAlign: 'center', |
|
|
|
align: 'center', |
|
|
|
columnLabel: '项目编码', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 120 |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'projectDesc', |
|
|
|
headerAlign: 'center', |
|
|
|
align: 'left', |
|
|
|
columnLabel: '项目名称', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 180 |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'customerId', |
|
|
|
headerAlign: 'center', |
|
|
|
align: 'center', |
|
|
|
columnLabel: '客户编码', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 120 |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'customerDesc', |
|
|
|
headerAlign: 'center', |
|
|
|
align: 'left', |
|
|
|
columnLabel: '客户名称', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 180 |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'codeNo', |
|
|
|
headerAlign: 'center', |
|
|
|
align: 'center', |
|
|
|
columnLabel: '技术参数卡', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 120 |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'ecnFlag', |
|
|
|
headerAlign: 'center', |
|
|
|
align: 'center', |
|
|
|
columnLabel: '状态', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 100 |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'revNo', |
|
|
|
headerAlign: 'center', |
|
|
|
align: 'center', |
|
|
|
columnLabel: '版本号', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 80 |
|
|
|
}, |
|
|
|
], |
|
|
|
detailColumnList: [ |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
@ -1920,13 +2132,13 @@ |
|
|
|
tableName: '执行属性表', |
|
|
|
columnProp: 'itemNo', |
|
|
|
headerAlign: 'center', |
|
|
|
align: 'center', |
|
|
|
align: 'left', |
|
|
|
columnLabel: '属性编码', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 80 |
|
|
|
columnWidth: 100 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
@ -1936,61 +2148,61 @@ |
|
|
|
tableName: '执行属性表', |
|
|
|
columnProp: 'itemDesc', |
|
|
|
headerAlign: 'center', |
|
|
|
align: 'center', |
|
|
|
align: 'left', |
|
|
|
columnLabel: '属性名称', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 150 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 108002, |
|
|
|
serialNumber: '108002Table7ExecuteFlag', |
|
|
|
tableId: '108002Table7', |
|
|
|
tableName: '执行属性表', |
|
|
|
columnProp: 'executeFlag', |
|
|
|
headerAlign: 'center', |
|
|
|
align: 'center', |
|
|
|
columnLabel: '是否执行', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 80 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 108002, |
|
|
|
serialNumber: '108002Table7Executor', |
|
|
|
tableId: '108002Table7', |
|
|
|
tableName: '执行属性表', |
|
|
|
columnProp: 'executor', |
|
|
|
headerAlign: 'center', |
|
|
|
align: 'center', |
|
|
|
columnLabel: '执行人', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 100 |
|
|
|
},{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 108002, |
|
|
|
serialNumber: '108002Table7ExecuteDate', |
|
|
|
tableId: '108002Table7', |
|
|
|
tableName: '执行属性表', |
|
|
|
columnProp: 'itemExecutionDate', |
|
|
|
headerAlign: 'center', |
|
|
|
align: 'center', |
|
|
|
columnLabel: '执行时间', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 150 |
|
|
|
columnWidth: 200 |
|
|
|
}, |
|
|
|
// { |
|
|
|
// userId: this.$store.state.user.name, |
|
|
|
// functionId: 108002, |
|
|
|
// serialNumber: '108002Table7ExecuteFlag', |
|
|
|
// tableId: '108002Table7', |
|
|
|
// tableName: '执行属性表', |
|
|
|
// columnProp: 'executeFlag', |
|
|
|
// headerAlign: 'center', |
|
|
|
// align: 'center', |
|
|
|
// columnLabel: '是否执行', |
|
|
|
// columnHidden: false, |
|
|
|
// columnImage: false, |
|
|
|
// status: true, |
|
|
|
// fixed: '', |
|
|
|
// columnWidth: 80 |
|
|
|
// }, |
|
|
|
// { |
|
|
|
// userId: this.$store.state.user.name, |
|
|
|
// functionId: 108002, |
|
|
|
// serialNumber: '108002Table7Executor', |
|
|
|
// tableId: '108002Table7', |
|
|
|
// tableName: '执行属性表', |
|
|
|
// columnProp: 'executor', |
|
|
|
// headerAlign: 'center', |
|
|
|
// align: 'center', |
|
|
|
// columnLabel: '执行人', |
|
|
|
// columnHidden: false, |
|
|
|
// columnImage: false, |
|
|
|
// status: true, |
|
|
|
// fixed: '', |
|
|
|
// columnWidth: 100 |
|
|
|
// },{ |
|
|
|
// userId: this.$store.state.user.name, |
|
|
|
// functionId: 108002, |
|
|
|
// serialNumber: '108002Table7ExecuteDate', |
|
|
|
// tableId: '108002Table7', |
|
|
|
// tableName: '执行属性表', |
|
|
|
// columnProp: 'itemExecutionDate', |
|
|
|
// headerAlign: 'center', |
|
|
|
// align: 'center', |
|
|
|
// columnLabel: '执行时间', |
|
|
|
// columnHidden: false, |
|
|
|
// columnImage: false, |
|
|
|
// status: true, |
|
|
|
// fixed: '', |
|
|
|
// columnWidth: 150 |
|
|
|
// }, |
|
|
|
], |
|
|
|
approvalColumnList: [ |
|
|
|
{ |
|
|
|
@ -2254,6 +2466,7 @@ |
|
|
|
// ======== 复选数据集 ======== |
|
|
|
fileSelections: [], |
|
|
|
itemSelections: [], |
|
|
|
dataSelections2: [], |
|
|
|
// ======== 选中的当前行数据 ======== |
|
|
|
currentRow: {}, |
|
|
|
currentCostImpactData: {}, |
|
|
|
@ -2265,7 +2478,8 @@ |
|
|
|
chooseModelFlag2: false, |
|
|
|
chooseCSModelFlag: false, |
|
|
|
uploadDialog: false, |
|
|
|
submitModalFlag: false |
|
|
|
submitModalFlag: false, |
|
|
|
addDetailModal: false |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
@ -2551,7 +2765,7 @@ |
|
|
|
}, |
|
|
|
|
|
|
|
executorInput (row, val) { |
|
|
|
row.executor = val.toUpperCase() |
|
|
|
//row.executor = val.toUpperCase() |
|
|
|
}, |
|
|
|
|
|
|
|
choosePartNo (row) { |
|
|
|
@ -2934,7 +3148,8 @@ |
|
|
|
isReject: row.isReject, |
|
|
|
menuId: this.$route.meta.menuId, |
|
|
|
userName: this.$store.state.user.name, |
|
|
|
nodeId: row.nodeId |
|
|
|
nodeId: row.nodeId, |
|
|
|
buNo: row.buNo |
|
|
|
} |
|
|
|
this.changeTitle = '变更申请-' + this.modalData.changeNo |
|
|
|
// 查选择的ECN种类 |
|
|
|
@ -3067,6 +3282,12 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (this.chooseDataList.length === 0) { |
|
|
|
this.$message.warning('请添加需要变更的技术参数卡！') |
|
|
|
return |
|
|
|
} |
|
|
|
|
|
|
|
this.costImpactData.changeTotalCost = this.totalCost |
|
|
|
this.executionInfoData.chooseItemList = this.chooseItemList |
|
|
|
this.executionInfoData.chooseItemList2 = this.chooseItemList2 |
|
|
|
@ -3294,10 +3515,10 @@ |
|
|
|
this.$message.warning('请选择印刷方式！') |
|
|
|
return |
|
|
|
} |
|
|
|
if ((this.modalData.cqcOperatorId === '' || this.modalData.cqcOperatorId == null) && (this.modalData.faiOperatorId === '' || this.modalData.faiOperatorId == null)) { |
|
|
|
this.$message.warning('请选择CQC或者FAI人员！') |
|
|
|
return |
|
|
|
} |
|
|
|
// if ((this.modalData.cqcOperatorId === '' || this.modalData.cqcOperatorId == null) && (this.modalData.faiOperatorId === '' || this.modalData.faiOperatorId == null)) { |
|
|
|
// this.$message.warning('请选择CQC或者FAI人员！') |
|
|
|
// return |
|
|
|
// } |
|
|
|
|
|
|
|
|
|
|
|
if (this.costImpactData.productionProductFlag === 'Y') { // 在生产品 |
|
|
|
@ -3399,6 +3620,10 @@ |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
|
if (this.chooseDataList.length === 0) { |
|
|
|
this.$message.warning('请添加需要变更的技术参数卡！') |
|
|
|
return |
|
|
|
} |
|
|
|
this.costImpactData.changeTotalCost = this.totalCost |
|
|
|
this.executionInfoData.chooseItemList = this.chooseItemList |
|
|
|
this.executionInfoData.chooseItemList2 = this.chooseItemList2 |
|
|
|
@ -3518,6 +3743,10 @@ |
|
|
|
row.executeFlag = 'Y' |
|
|
|
row.itemExecutionDate = new Date(+ new Date() + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '') |
|
|
|
// row.executor = this.$store.state.user.name |
|
|
|
// 执行时调用同意提交方法 |
|
|
|
if (this.modalData.changeStatus === '审批中') { |
|
|
|
this.agreeSubmit() |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
// 执行所选属性 |
|
|
|
@ -3601,6 +3830,46 @@ |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 新增技术参数卡 |
|
|
|
addChangeDetail () { |
|
|
|
this.searchData2.buNo = this.modalData.buNo |
|
|
|
technicalSpecificationSearch2(this.searchData2).then(({data}) => { |
|
|
|
if (data.code === 0) { |
|
|
|
this.dataList2 = data.rows |
|
|
|
const shouldExclude = (item) => { |
|
|
|
return this.chooseDataList.some(cdItem => |
|
|
|
cdItem.site === item.site && cdItem.codeNo === item.codeNo |
|
|
|
) |
|
|
|
} |
|
|
|
this.dataList2 = this.dataList2.filter(item => !shouldExclude(item)) |
|
|
|
this.addDetailModal = true |
|
|
|
} else { |
|
|
|
this.dataList2 = [] |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 复选物料信息 |
|
|
|
selectionData2 (val) { |
|
|
|
this.dataSelections2 = val |
|
|
|
}, |
|
|
|
|
|
|
|
// 确认选择技术参数卡 |
|
|
|
addDetail () { |
|
|
|
if (this.dataSelections2.length === 0) { |
|
|
|
this.$message.warning("请勾选技术参数卡!") |
|
|
|
return |
|
|
|
} |
|
|
|
this.dataSelections2.forEach(item => { |
|
|
|
// 确保没有重复的元素 |
|
|
|
if (!this.chooseDataList.some(cdItem => cdItem.site === item.site && cdItem.codeNo === item.codeNo)) { |
|
|
|
this.chooseDataList.push(item) |
|
|
|
} |
|
|
|
}) |
|
|
|
this.addDetailModal = false |
|
|
|
this.dataSelections2 = [] |
|
|
|
}, |
|
|
|
|
|
|
|
// 回车换行 |
|
|
|
focusNextInput (index, type) { |
|
|
|
let aaa = '' |
|
|
|
@ -3859,6 +4128,14 @@ |
|
|
|
this.modalData.faiOperatorName = '' |
|
|
|
}, |
|
|
|
|
|
|
|
toMenu (codeNo) { |
|
|
|
if (this.$router.resolve(`/sampleManagement-technicalSpecificationList`).resolved.name === '404') { |
|
|
|
this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',}) |
|
|
|
} else { |
|
|
|
this.$router.push({name:`sampleManagement-technicalSpecificationList`,params:{codeNo:codeNo},}) |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
// ======== 导出相关方法 ======== |
|
|
|
/** |
|
|
|
* 导出excel |
|
|
|
|
fengyuan_yang
2 years ago