wilson
/
ccl_plm-vue
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2025-05-31 

Dead状态时和已完成的状态保持一致，不允许编辑单据信息 - 修改按钮
将业务表的step_id改为NULL
提交、驳回时需校验单据的状态必须是审批中（Dead之后还能够提交）
菜单：Inventory part 、Bom 、Routing
详情按钮需要按照角色授权，相关信息全部置灰
master
fengyuan_yang 11 months ago
parent
20627b21a8
commit
e9dccfcecc
9 changed files with 229 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 47
      src/views/modules/part/bomManagement.vue
  2. 128
      src/views/modules/part/partInformation.vue
  3. 103
      src/views/modules/part/routingManagement.vue
  4. 2
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
  5. 3
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
  6. 4
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
  7. 2
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
  8. 8
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
  9. 6
      src/views/modules/sampleManagement/technicalSpecificationList.vue

47
src/views/modules/part/bomManagement.vue
View File

@ -24,8 +24,8 @@
</el-form-item>
<el-form-item :label="' '">
<el-button :loading="queryLoading" @click="getDataList()">查询</el-button>
<el-button type="primary" @click="addModal()">新增</el-button>
<el-button type="primary" @click="delModal()">删除</el-button>
<el-button v-if="isAuth('104002001:save')" type="primary" @click="addModal()">新增</el-button>
<el-button v-if="isAuth('104002001:delete')" type="primary" @click="delModal()">删除</el-button>
<download-excel
:fields="fields()"
:data="exportData"
@ -81,10 +81,11 @@
fixed="right"
header-align="center"
align="center"
width="120"
width="150"
label="操作">
<template slot-scope="scope">
<el-link style="cursor: pointer" @click="updateModal(scope.row)">编辑</el-link>
<el-link v-if="isAuth('104002001:details')" style="cursor: pointer" @click="detailsModal(scope.row)">详情</el-link>
<el-link v-if="isAuth('104002001:update')" style="cursor: pointer" @click="updateModal(scope.row)">编辑</el-link>
<el-link style="cursor: pointer" @click="checkOutToRouting(scope.row.plmPartNo)">切换Routing</el-link>
</template>
</el-table-column>
@ -174,7 +175,8 @@
<!-- BOM明细信息页签 -->
<el-tab-pane label="Product Structure" name="bom_detail">
<el-form label-position="top" style="margin-top: -10px">
<el-form-item>
<el-form-item v-if="modalData.flag === '3'"></el-form-item>
<el-form-item v-else>
<el-button type="primary" @click="saveBomDetail" style="margin-left: 7px">新增</el-button>
<el-button type="primary" @click="deleteBomDetail">删除</el-button>
<el-button type="primary" @click="updateBomDetail">编辑</el-button>
@ -217,7 +219,8 @@
<!-- BOM子明细信息页签 -->
<el-tab-pane label="Components" name="bom_sub_detail">
<el-form label-position="top" style="margin-top: 5px">
<el-form-item>
<el-form-item v-if="modalData.flag === '3'"></el-form-item>
<el-form-item v-else>
<el-button type="primary" @click="saveComponentModal" style="margin-left: 7px">新增</el-button>
<el-button type="primary" @click="deleteComponentPart">删除</el-button>
</el-form-item>
@ -248,6 +251,7 @@
</template>
</el-table-column>
<el-table-column
v-if="modalData.flag !== '3'"
fixed="right"
header-align="center"
align="center"
@ -263,7 +267,8 @@
<!-- BOM副产品信息页签 -->
<el-tab-pane label="By-Products" name="by_products">
<el-form label-position="top" style="margin-top: 5px">
<el-form-item>
<el-form-item v-if="modalData.flag === '3'"></el-form-item>
<el-form-item v-else>
<el-button type="primary" @click="saveByProductModal" style="margin-left: 7px">新增</el-button>
<el-button type="primary" @click="deleteByProduct">删除</el-button>
</el-form-item>
@ -293,6 +298,7 @@
</template>
</el-table-column>
<el-table-column
v-if="modalData.flag !== '3'"
fixed="right"
header-align="center"
align="center"
@ -328,6 +334,7 @@
</template>
</el-table-column>
<el-table-column
v-if="modalData.flag !== '3'"
fixed="right"
header-align="center"
align="center"
@ -366,7 +373,7 @@
</el-tab-pane>
</el-tabs>
<el-footer style="height:30px;margin-top:20px;text-align:center">
<el-button :loading="saveAllLoading" type="primary" @click="saveData()">保存</el-button>
<el-button v-if="modalData.flag !== '3'" :loading="saveAllLoading" type="primary" @click="saveData()">保存</el-button>
<el-button type="primary" @click="closeModal()">关闭</el-button>
</el-footer>
</el-dialog>
@ -2948,6 +2955,30 @@ export default {
})
},
// 详情
async detailsModal (row) {
this.modalData = {
...row,
flag: '3',
updateBy: this.$store.state.user.name,
}
this.subDetailTable = 'bom_sub_detail'
// 查bom明细
queryBomDetail(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.detailDataList = data.rows.detailList
this.subDetailList = data.rows.componentList
this.detailData = data.rows.detailData
this.modalDisableFlag = true
this.modalFlag = true
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
},
// 替代新增模态框
saveBomDetail () {
if (this.modalData.partNo === '' || this.modalData.partNo == null) {

128
src/views/modules/part/partInformation.vue
View File

@ -112,9 +112,10 @@
fixed="right"
header-align="center"
align="center"
width="100"
width="120"
label="操作">
<template slot-scope="scope">
<el-link v-if="isAuth('104001001:details')" style="cursor: pointer" @click="detailsModal(scope.row)">详情</el-link>
<el-link v-if="isAuth('104001001:update')" style="cursor: pointer" @click="updateModal(scope.row)">编辑</el-link>
<el-dropdown trigger="click">
<el-link style="cursor: pointer;font-size: 12px">
@ -510,11 +511,12 @@
<el-tab-pane label="Characteristics" style="margin-top: -15px" name="Characteristics">
<el-form label-position="top" style="margin-left: 2px;">
<el-form-item>
<span style="cursor: pointer" slot="label" @click="getBaseList(20)"><a herf="#">属性模板</a></span>
<el-input v-model="modalData.codeNo" @change="codeNoBlur(20)" style="width: 128px"></el-input>
<span v-if="modalData.flag === '4'" slot="label">属性模板</span>
<span v-else style="cursor: pointer" slot="label" @click="getBaseList(20)"><a herf="#">属性模板</a></span>
<el-input v-model="modalData.codeNo" :disabled="modalData.flag === '4'" @change="codeNoBlur(20)" style="width: 128px"></el-input>
<el-input v-model="modalData.codeDesc" disabled style="width: 330px"></el-input>
</el-form-item>
<el-form-item label=" ">
<el-form-item v-if="modalData.flag !== '4'" label=" ">
<el-button type="primary" @click="savePartItemModal">新增</el-button>
<el-button type="primary" @click="deletePartItemModal">删除</el-button>
</el-form-item>
@ -563,7 +565,7 @@
</el-tab-pane>
<el-tab-pane v-if="modalDisableFlag" style="margin-top: -10px" label="Revisions" name="Revisions">
<el-button type="primary" @click="savePartRevisionModal">新增</el-button>
<el-button v-if="modalData.flag !== '4'" type="primary" @click="savePartRevisionModal">新增</el-button>
<el-table
:data="revisionList"
height="355px"
@ -591,7 +593,7 @@
align="center"
width="100"
label="操作">
<template slot-scope="scope">
<template v-if="modalData.flag !== '4'" slot-scope="scope">
<el-link style="cursor: pointer" @click="updateRevisionModal(scope.row)">编辑</el-link>
<el-link style="cursor: pointer" @click="deleteRevisionModal(scope.row)">删除</el-link>
</template>
@ -668,7 +670,7 @@
</el-form>
<el-footer style="height:35px;margin-top: 20px;text-align:center">
<el-button v-if="modalData.flag === '3'" type="primary" :loading="saveLoading" @click="saveData">同步</el-button>
<el-button v-else type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
<el-button v-if="modalData.flag === '1' || modalData.flag === '2'" type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
<el-button type="primary" @click="modalFlag = false" :loading="saveLoading">关闭</el-button>
</el-footer>
</el-dialog>
@ -4318,6 +4320,118 @@
this.modalFlag = true
},
// 详情
detailsModal (row) {
this.modalData = {
flag: '4',
title: '物料详情',
site: row.site,
partNo: row.partNo,
partDesc: row.partDesc,
spec: row.spec,
partTypeDb: row.partTypeDb,
oldPartType: row.partType,
partType: row.partType,
familyId: row.familyId,
familyName: row.familyName,
groupId: row.groupId,
groupName: row.groupName,
umId: row.umId,
umName: row.umName,
weightNet: row.weightNet,
uomForWeightNet: row.uomForWeightNet,
volumeNet: row.volumeNet,
uomForVolumeNet: row.uomForVolumeNet,
lotTrackingCode: row.lotTrackingCode,
active: row.active,
remark: row.remark,
supplierId: row.supplierId,
supplierName: row.supplierName,
productGroupId1: row.productGroupId1,
productGroupName1: row.productGroupName1,
productGroupId2: row.productGroupId2,
productGroupName2: row.productGroupName2,
productGroupId3: row.productGroupId3,
productGroupName3: row.productGroupName3,
productGroupId4: row.productGroupId4,
productGroupName4: row.productGroupName4,
erpPartNo: row.erpPartNo,
codeNo: row.codeNo,
codeDesc: row.codeDesc,
manufacturerId: row.manufacturerId,
manufacturerName: row.manufacturerName,
agentId: row.agentId,
agentName: row.agentName,
updateBy: this.$store.state.user.name,
typeDesignation: row.typeDesignation,
hazardCode: row.hazardCode,
hazardDesc: row.hazardDesc,
assetClass: row.assetClass,
assetClassDesc: row.assetClassDesc,
dimQuality: row.dimQuality,
abcClass: row.abcClass,
abcClassDesc: row.abcClassDesc,
frequencyClass: row.frequencyClass,
lifecycleStage: row.lifecycleStage,
countryOfOrigin: row.countryOfOrigin,
countryOfOriginDesc: row.countryOfOriginDesc,
manufacturingLeadTime: row.manufacturingLeadTime,
expectedLeadTime: row.expectedLeadTime,
regionOfOrigin: row.regionOfOrigin,
regionOfOriginDesc: row.regionOfOriginDesc,
durabilityWeek: '',
customsStatNo: row.customsStatNo,
customsStatDesc: row.customsStatDesc,
durabilityDay: row.durabilityDay,
intrastatConvFactor: row.intrastatConvFactor,
umDesc: row.umDesc,
status: row.status,
partStatus: row.partStatus,
partStatusDesc: row.partStatusDesc,
configurationId: row.configurationId,
estimatedMaterialCost: row.estimatedMaterialCost,
inventoryValuationMethod: row.inventoryValuationMethod,
partCostGroupId: row.partCostGroupId,
partCostGroupDesc: row.partCostGroupDesc,
inventoryPartCostLevel: row.inventoryPartCostLevel,
invoiceConsideration: row.invoiceConsideration,
zeroCostFlag: row.zeroCostFlag,
planningMethod: row.planningMethod,
planningMethodDesc: row.planningMethodDesc,
safetyStock: row.safetyStock,
minOrderQty: row.minOrderQty,
maxOrderQty: row.maxOrderQty,
mulOrderQty: row.mulOrderQty,
safetyLeadTime: row.safetyLeadTime,
shrinkageFac: row.shrinkageFac,
stdOrderQty: row.stdOrderQty,
cumLeadTime: row.cumLeadTime,
backFlushPart: row.backFlushPart,
byProdAsSupplyInMrpDb: row.byProdAsSupplyInMrpDb,
unprotectedLeadTime: row.unprotectedLeadTime,
issueType: row.issueType,
mrpControlFlagDb: row.mrpControlFlagDb,
fixedLeadTimeDay: row.fixedLeadTimeDay,
overReporting: row.overReporting,
useTheoreticalDensityDb: row.useTheoreticalDensityDb,
variableLeadTimeDay: row.variableLeadTimeDay,
overReportTolerance: row.overReportTolerance,
fixedLeadTimeHour: row.fixedLeadTimeHour,
density: row.density,
variableLeadTimeHour: row.variableLeadTimeHour,
createDate: row.createDate,
partItemList: [],
plmPartNo: row.plmPartNo,
ifsPartNo: row.ifsPartNo,
showInQueryFlag: row.showInQueryFlag,
temporaryPartFlag: row.temporaryPartFlag,
}
this.getPartCharacteristicList()
this.inventoryPartTable = 'General'
this.modalDisableFlag = true
this.modalFlag = true
},
// 转正式物料
toBecomeOfficialPartModal (row) {
this.modalData = {

103
src/views/modules/part/routingManagement.vue
View File

@ -23,8 +23,8 @@
</el-form-item>
<el-form-item :label="' '">
<el-button :loading="queryLoading" @click="getDataList()">查询</el-button>
<el-button type="primary" @click="addModal()">新增</el-button>
<el-button type="primary" @click="delModal()">删除</el-button>
<el-button v-if="isAuth('104003001:save')" type="primary" @click="addModal()">新增</el-button>
<el-button v-if="isAuth('104003001:delete')" type="primary" @click="delModal()">删除</el-button>
<download-excel
:fields="fields()"
:data="exportData"
@ -70,13 +70,11 @@
<el-link style="cursor:pointer;" v-if="!item.columnHidden" @click="toPartMenu(scope.row.ifsPartNo)">
{{ scope.row[item.columnProp] }}
</el-link>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</div>
<div v-else>
<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>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</div>
</template>
</el-table-column>
@ -84,10 +82,11 @@
fixed="right"
header-align="center"
align="center"
width="120"
width="135"
label="操作">
<template slot-scope="scope">
<el-link style="cursor: pointer" @click="updateModal(scope.row)">编辑</el-link>
<el-link v-if="isAuth('104003001:details')" style="cursor: pointer" @click="detailsModal(scope.row)">详情</el-link>
<el-link v-if="isAuth('104003001:update')" style="cursor: pointer" @click="updateModal(scope.row)">编辑</el-link>
<el-link style="cursor: pointer" @click="checkOutToBom(scope.row.plmPartNo)">切换BOM</el-link>
</template>
</el-table-column>
@ -108,14 +107,12 @@
</el-pagination>
<!-- routing新增/编辑模态框 -->
<el-dialog :close-on-click-modal="false" top="8vh" v-drag :before-close="closeModalX" :visible.sync="modalFlag"
width="1110px">
<el-dialog :close-on-click-modal="false" top="8vh" v-drag :before-close="closeModalX" :visible.sync="modalFlag" width="1110px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 5px">
<el-form-item prop="partNo" :rules="rules.partNo">
<span v-if="!modalDisableFlag" slot="label" @click="queryPartList"><a herf="#">物料编码</a></span>
<span v-else slot="label">物料编码</span>
<el-input v-model="modalData.partNo" :disabled="modalDisableFlag" @blur="partNoBlur"
style="width: 221px"></el-input>
<el-input v-model="modalData.partNo" :disabled="modalDisableFlag" @blur="partNoBlur" style="width: 221px"></el-input>
</el-form-item>
<el-form-item :label="'物料名称'" prop="partDesc" :rules="rules.partDesc">
<el-input v-model="modalData.partDesc" disabled style="width: 221px"></el-input>
@ -124,16 +121,14 @@
<el-input v-model="modalData.printUnit" disabled style="width: 221px"></el-input>
</el-form-item>
<el-form-item :label="'工艺类型'" prop="routingType" :rules="rules.routingType">
<el-select v-model="modalData.routingType" @change="routingTypeChange" :disabled="modalDisableFlag"
style="width: 120px">
<el-select v-model="modalData.routingType" @change="routingTypeChange" :disabled="modalDisableFlag" style="width: 120px">
<el-option label="Manufacturing" value="Manufacturing"></el-option>
<el-option label="Repair" value="Repair"></el-option>
<el-option label="Prototype" value="Prototype"></el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules"
style="margin-left: 7px;margin-top: -5px;">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="生效日期" prop="phaseInDate" :rules="rules.phaseInDate">
<el-date-picker
style="width: 221px"
@ -158,39 +153,34 @@
<el-input v-model="modalData.routingRevision" type="number" disabled style="width: 221px"></el-input>
</el-form-item>
<el-form-item>
<el-button v-if="modalData.flag === '1' && headerSaveFlag" :loading="saveHeaderLoading" type="primary"
@click="saveRoutingHeader" style="margin-top: 23px;width: 120px">保存
<el-button v-if="modalData.flag === '1' && headerSaveFlag" :loading="saveHeaderLoading" type="primary" @click="saveRoutingHeader" style="margin-top: 23px;width: 120px">保存
</el-button>
<el-button v-else-if="modalData.flag === '2'" type="primary" @click="copyRoutingRevision"
style="margin-top: 23px;width: 120px">Copy
<el-button v-else-if="modalData.flag === '2'" type="primary" @click="copyRoutingRevision" style="margin-top: 23px;width: 120px">Copy
</el-button>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="备注">
<el-input type="textarea" v-model="modalData.noteText" :rows="3" resize='none' show-word-limit
style="width: 1082px;height: 20px"></el-input>
<el-input type="textarea" v-model="modalData.noteText" :rows="3" resize='none' show-word-limit style="width: 1082px;height: 20px"></el-input>
</el-form-item>
</el-form>
<el-tabs v-model="detailTable" style="margin-top: 50px; width: 100%" type="border-card"
@tab-click="tabDetailClick" class="detail-tab">
<el-tabs v-model="detailTable" style="margin-top: 50px; width: 100%" type="border-card" @tab-click="tabDetailClick" class="detail-tab">
<!-- Routing明细信息页签 -->
<el-tab-pane label="Routings" name="routing_detail">
<el-form label-position="top" style="margin-top: -10px">
<el-form-item>
<el-form-item v-if="modalData.flag === '3'"></el-form-item>
<el-form-item v-else>
<el-button type="primary" @click="saveRoutingDetail" style="margin-left: 7px">新增</el-button>
<el-button type="primary" @click="deleteRoutingDetail">删除</el-button>
<el-button type="primary" @click="updateRoutingDetail">编辑</el-button>
<el-button v-if="modalData.flag === '2'" type="primary" @click="copyRoutingAlternative">Copy</el-button>
<el-button v-if="detailData.status === 'Tentative' || detailData.status === 'Obsolete'" type="primary"
@click="updateStatusToBuildable">Build
<el-button v-if="detailData.status === 'Tentative' || detailData.status === 'Obsolete'" type="primary" @click="updateStatusToBuildable">Build
</el-button>
<el-button
v-if="detailData.status === 'Buildable' && (modalData.effPhaseOutDate == null || modalData.effPhaseOutDate === '')"
type="primary" @click="updateStatusToObsolete">Retire
</el-button>
<el-button v-if="modalData.flag === '2' && detailData.officialFlag !== 'Y'" type="primary"
@click="toBecomeOfficialRouting" :loading="toBecomeOfficialLoading">转正式Routing
<el-button v-if="modalData.flag === '2' && detailData.officialFlag !== 'Y'" type="primary" @click="toBecomeOfficialRouting" :loading="toBecomeOfficialLoading">转正式Routing
</el-button>
</el-form-item>
</el-form>
@ -214,15 +204,15 @@
</el-form>
<el-form :inline="true" label-position="top" :model="detailData" style="margin-left: 7px">
<el-form-item label="备注">
<el-input type="textarea" v-model="detailData.detailNoteText" :rows="3" resize='none' show-word-limit
readonly style="width: 1073px;height: 20px"></el-input>
<el-input type="textarea" v-model="detailData.detailNoteText" :rows="3" resize='none' show-word-limit readonly style="width: 1073px;height: 20px"></el-input>
</el-form-item>
</el-form>
</el-tab-pane>
<!-- Routing工具页签 -->
<el-tab-pane label="Routing Tools" name="routing_tool">
<el-form label-position="top" style="margin-top: -10px">
<el-form-item>
<el-form-item v-if="modalData.flag === '3'"></el-form-item>
<el-form-item v-else>
<el-button type="primary" @click="saveRoutingTool" style="margin-left: 7px">新增</el-button>
<el-button type="primary" @click="deleteRoutingTool">删除</el-button>
</el-form-item>
@ -248,11 +238,11 @@
: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>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
<el-table-column
v-if="modalData.flag !== '3'"
fixed="right"
header-align="center"
align="center"
@ -265,12 +255,12 @@
</el-table>
</el-tab-pane>
</el-tabs>
<el-tabs v-show="detailTable === 'routing_detail'" v-model="subDetailTable" style="width: 100%; min-height: 330px"
type="border-card" @tab-click="tabSubDetailClick" class="sub_detail-tab">
<el-tabs v-show="detailTable === 'routing_detail'" v-model="subDetailTable" style="width: 100%; min-height: 330px" type="border-card" @tab-click="tabSubDetailClick" class="sub_detail-tab">
<!-- Routing子明细信息页签 -->
<el-tab-pane label="Operations" name="routing_sub_detail">
<el-form label-position="top" style="margin-top: 5px">
<el-form-item>
<el-form-item v-if="modalData.flag === '3'"></el-form-item>
<el-form-item v-else>
<el-button type="primary" @click="saveComponentModal" style="margin-left: 7px">新增</el-button>
<el-button type="primary" @click="deleteComponentPart">删除</el-button>
</el-form-item>
@ -297,11 +287,11 @@
: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>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
<el-table-column
v-if="modalData.flag !== '3'"
fixed="right"
header-align="center"
align="center"
@ -316,17 +306,15 @@
</el-tab-pane>
</el-tabs>
<el-footer style="height:30px;margin-top:20px;text-align:center">
<el-button :loading="saveAllLoading" type="primary" @click="saveData()">保存</el-button>
<el-button v-if="modalData.flag !== '3'" :loading="saveAllLoading" type="primary" @click="saveData()">保存</el-button>
<el-button type="primary" @click="closeModal">关闭</el-button>
</el-footer>
</el-dialog>
<!-- 明细新增模态框 -->
<el-dialog title="替代" :close-on-click-modal="false" v-drag :visible.sync="saveDetailModalFlag" width="730px">
<el-form :inline="true" label-position="top" :model="saveDetailData" :rules="detailRules"
style="margin-left: 5px">
<el-form-item :label="'替代编码'" prop="alternativeNo" :disabled="saveDetailModalDisable"
:rules="detailRules.alternativeNo">
<el-form :inline="true" label-position="top" :model="saveDetailData" :rules="detailRules" style="margin-left: 5px">
<el-form-item :label="'替代编码'" prop="alternativeNo" :disabled="saveDetailModalDisable" :rules="detailRules.alternativeNo">
<el-input v-model="saveDetailData.alternativeNo" style="width: 221px"></el-input>
</el-form-item>
<el-form-item :label="'替代名称'" prop="alternativeDescription" :rules="detailRules.alternativeDescription">
@ -338,8 +326,7 @@
</el-form>
<el-form :inline="true" label-position="top" :model="saveDetailData" style="margin-left: 5px">
<el-form-item label="备注">
<el-input type="textarea" v-model="saveDetailData.detailNoteText" :rows="3" resize='none' show-word-limit
style="width: 690px;height: 20px"></el-input>
<el-input type="textarea" v-model="saveDetailData.detailNoteText" :rows="3" resize='none' show-word-limit style="width: 690px;height: 20px"></el-input>
</el-form-item>
</el-form>
<el-footer style="height:35px;margin-top:65px;text-align:center">
@ -3421,6 +3408,30 @@ export default {
})
},
// 详情
async detailsModal (row) {
this.modalData = {
...row,
flag: '3',
updateBy: this.$store.state.user.name
}
// 查routing明细
queryRoutingDetail(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.detailDataList = data.rows.detailList
this.subDetailList = data.rows.componentList
this.detailData = data.rows.detailData
this.detailTable = 'routing_detail'
this.modalDisableFlag = true
this.modalFlag = true
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
},
// 新增替代模态框
saveRoutingDetail() {
if (this.modalData.partNo === '' || this.modalData.partNo == null) {

2
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
View File

@ -567,7 +567,7 @@
this.ifDisableFlag = false
return false
}
if (data.status === '已完成' || data.status === '已升版') {
if (data.status === '已完成' || data.status === '已升版' || data.status === 'Dead') {
this.ifDisableFlag = true
return false
}

3
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
View File

@ -500,7 +500,7 @@
this.ifDisableFlag = false
return false
}
if (data.status === '已完成' || data.status === '已升版') {
if (data.status === '已完成' || data.status === '已升版' || data.status === 'Dead') {
this.ifDisableFlag = true
return false
}
@ -595,7 +595,6 @@
},
submitData (tempData) {
updateBMcustomerInfo(this.dataForm).then(({data}) => {
if (data && data.code === 0) {
submitChange(tempData).then(({data}) => {

4
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
View File

@ -325,11 +325,11 @@
this.ifDisableFlag = false
return false
}
if (data.status === '已完成' || data.status === '已升版') {
if (data.status === '已完成' || data.status === '已升版' || data.status === 'Dead') {
this.ifDisableFlag = true
return false
}
if(data.status === '审批中') {
if (data.status === '审批中') {
let tempData = {
site: row.site,
stepId: row.stepId,

2
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
View File

@ -1514,7 +1514,7 @@
this.ifDisableFlag = false
return false
}
if (data.status === '已完成' || data.status === '已升版') {
if (data.status === '已完成' || data.status === '已升版' || data.status === 'Dead') {
this.ifDisableFlag = true
return false
}

8
src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
View File

@ -947,16 +947,16 @@
// 获取流程的配置权限
getNodeAuthority (row) {
getBMStatusDesc(this.searchData).then(({data}) => {
this.superAdmin=data.superAdmin
if(data.superAdmin){
this.superAdmin = data.superAdmin
if (data.superAdmin) {
this.ifDisableFlag = false
return false
}
if (data.status === '已完成' || data.status === '已升版') {
if (data.status === '已完成' || data.status === '已升版' || data.status === 'Dead') {
this.ifDisableFlag = true
return false
}
if(data.status === '审批中') {
if (data.status === '审批中') {
let tempData = {
site: row.site,
stepId: row.stepId,

6
src/views/modules/sampleManagement/technicalSpecificationList.vue
View File

@ -88,12 +88,12 @@
label="操作">
<template slot-scope="scope">
<!-- <a type="text" size="small" @click="addRevModel(scope.row)" v-if="scope.row.statusDesc!=='已完成'">升版</a>-->
<a type="text" size="small" v-if="scope.row.statusDesc==='已完成'||scope.row.statusDesc==='已升版'" @click="jumpDetail(scope.row)">详情</a>
<a type="text" size="small" v-if="scope.row.statusDesc!=='已完成'&&scope.row.statusDesc!=='已升版'" @click="jumpDetail(scope.row)">修改</a>
<a type="text" size="small" v-if="scope.row.statusDesc === '已完成' || scope.row.statusDesc === '已升版' || scope.row.statusDesc === 'Dead'" @click="jumpDetail(scope.row)">详情</a>
<a type="text" size="small" v-if="scope.row.statusDesc !== '已完成' && scope.row.statusDesc !== '已升版' && scope.row.statusDesc !== 'Dead'" @click="jumpDetail(scope.row)">修改</a>
<!-- <a type="text" size="small" @click="addOrUpdateHandle(scope.row.id)" v-if="scope.row.statusDesc!=='已完成'">修改</a>-->
<a type="text" size="small" @click="deleteData(scope.row)" v-if="scope.row.statusDesc!=='已完成'&&scope.row.statusDesc!=='已升版'">删除</a>
<a type="text" size="small" v-if="scope.row.status === 'cg'" @click="issueModal(scope.row)">下达</a>
<a type="text" size="small" v-if="scope.row.statusDesc!=='已升版'" @click="copyBM(scope.row)">拷贝</a>
<a type="text" size="small" v-if="scope.row.statusDesc!=='已升版'" @click="copyBM(scope.row)">拷贝</a>
<el-dropdown trigger="click">
<el-link style="cursor: pointer;font-size: 12px">
更多

Write Preview
Loading…
Cancel
Save