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

2025-07-25

master
fengyuan_yang 6 months ago
parent
273159105b
commit
d449c8c249
2 changed files with 96 additions and 158 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 205
      src/views/modules/sampleManagement/technicalSpecificationList.vue
  2. 39
      src/views/modules/test/requestForTest.vue

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

@ -678,70 +678,34 @@
fixed: '', fixed: '',
columnWidth: 80 columnWidth: 80
}, },
// {
// userId: this.$store.state.user.name,
// functionId: 103002,
// serialNumber: '103002Table1ProofingNo',
// tableId: "103002Table1",
// tableName: "技术参数卡列表",
// columnProp: "proofingNo",
// headerAlign: "center",
// align: "center",
// columnLabel: "打样单号",
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 100
// },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,
serialNumber: '103002Table1Status',
serialNumber: '103002Table1FinalPartNo',
tableId: "103002Table1", tableId: "103002Table1",
tableName: "技术参数卡列表", tableName: "技术参数卡列表",
columnProp: "statusDesc",
columnProp: "finalPartNo",
headerAlign: "center", headerAlign: "center",
align: "left", align: "left",
columnLabel: "状态",
columnLabel: "IFS物料编码",
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80
columnWidth: 100
}, },
// {
// userId: this.$store.state.user.name,
// functionId: 103002,
// serialNumber: '103002Table1NodeId',
// tableId: "103002Table1",
// tableName: "技术参数卡列表",
// columnProp: "nodeId",
// headerAlign: "center",
// align: "left",
// columnLabel: "当前节点",
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 70
// },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,
serialNumber: '103002Table1NodeName',
serialNumber: '103002Table1PartName',
tableId: "103002Table1", tableId: "103002Table1",
tableName: "技术参数卡列表", tableName: "技术参数卡列表",
columnProp: "nodeName",
columnProp: "partDesc",
headerAlign: "center", headerAlign: "center",
align: "left", align: "left",
columnLabel: "节点名称",
columnLabel: "物料名称",
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -749,52 +713,53 @@
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150 columnWidth: 150
},{
},
{
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,
serialNumber: '103002Table1SP',
serialNumber: '103002Table1LabelLength',
tableId: "103002Table1", tableId: "103002Table1",
tableName: "技术参数卡列表", tableName: "技术参数卡列表",
columnProp: "sp",
columnProp: "labelLength",
headerAlign: "center", headerAlign: "center",
align: "left",
columnLabel: "当前审批人",
align: "right",
columnLabel: "标签长度",
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80
columnWidth: 100
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,
serialNumber: '103002Table1TestPartNo',
serialNumber: '103002Table1LabelWidth',
tableId: "103002Table1", tableId: "103002Table1",
tableName: "技术参数卡列表", tableName: "技术参数卡列表",
columnProp: "testPartNo",
columnProp: "labelWidth",
headerAlign: "center", headerAlign: "center",
align: "center",
columnLabel: "PLM物料编码",
align: "right",
columnLabel: "标签宽度",
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 140
columnWidth: 100
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,
serialNumber: '103002Table1FinalPartNo',
serialNumber: '103002Table1Radius',
tableId: "103002Table1", tableId: "103002Table1",
tableName: "技术参数卡列表", tableName: "技术参数卡列表",
columnProp: "finalPartNo",
columnProp: "radius",
headerAlign: "center", headerAlign: "center",
align: "center",
columnLabel: "IFS物料编码",
align: "right",
columnLabel: "圆角",
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -803,110 +768,78 @@
fixed: '', fixed: '',
columnWidth: 100 columnWidth: 100
}, },
// {
// userId: this.$store.state.user.name,
// functionId: 103002,
// serialNumber: '103002Table1TestPartNo',
// tableId: "103002Table1",
// tableName: "技术参数卡列表",
// columnProp: "projectId",
// headerAlign: "center",
// align: "center",
// columnLabel: "项目号",
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 100
// },{
// userId: this.$store.state.user.name,
// functionId: 103002,
// serialNumber: '103002Table1TestPartNo',
// tableId: "103002Table1",
// tableName: "技术参数卡列表",
// columnProp: "buNo",
// headerAlign: "center",
// align: "center",
// columnLabel: "BU",
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 80
// },{
// userId: this.$store.state.user.name,
// functionId: 103002,
// serialNumber: '103002Table1TestPartNo',
// tableId: "103002Table1",
// tableName: "技术参数卡列表",
// columnProp: "buDesc",
// headerAlign: "center",
// align: "left",
// columnLabel: "BU名称",
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 80
// },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,
serialNumber: '103002Table1PartName',
serialNumber: '103002Table1Stage',
tableId: "103002Table1", tableId: "103002Table1",
tableName: "技术参数卡列表", tableName: "技术参数卡列表",
columnProp: "partDesc",
columnProp: "stage",
headerAlign: "center", headerAlign: "center",
align: "left", align: "left",
columnLabel: "物料名称",
columnLabel: "生产状态",
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150
},{
columnWidth: 110
},
{
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,
serialNumber: '103002Table1ECNFlag',
serialNumber: '103002Table1Status',
tableId: "103002Table1", tableId: "103002Table1",
tableName: "技术参数卡列表", tableName: "技术参数卡列表",
columnProp: "ecnFlag",
columnProp: "statusDesc",
headerAlign: "center", headerAlign: "center",
align: "center",
columnLabel: "ECN变更",
align: "left",
columnLabel: "状态",
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 65
},{
columnWidth: 80
},
{
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,
serialNumber: '103002Table1EcnNo',
serialNumber: '103002Table1NodeName',
tableId: "103002Table1", tableId: "103002Table1",
tableName: "技术参数卡列表", tableName: "技术参数卡列表",
columnProp: "ecnNo",
columnProp: "nodeName",
headerAlign: "center", headerAlign: "center",
align: "center",
columnLabel: "ECN单据号",
align: "left",
columnLabel: "节点名称",
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100
columnWidth: 150
},{ },{
userId: this.$store.state.user.name,
functionId: 103002,
serialNumber: '103002Table1SP',
tableId: "103002Table1",
tableName: "技术参数卡列表",
columnProp: "sp",
headerAlign: "center",
align: "left",
columnLabel: "当前审批人",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},
{
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,
serialNumber: '103002Table1CreateDate', serialNumber: '103002Table1CreateDate',
@ -923,7 +856,8 @@
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120 columnWidth: 120
},{
},
{
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,
serialNumber: '103002Table1CreateBy', serialNumber: '103002Table1CreateBy',
@ -940,7 +874,8 @@
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80 columnWidth: 80
},{
},
{
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,
serialNumber: '103002Table1UpdateDate', serialNumber: '103002Table1UpdateDate',
@ -957,7 +892,8 @@
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120 columnWidth: 120
},{
},
{
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,
serialNumber: '103002Table1UpdateBy', serialNumber: '103002Table1UpdateBy',
@ -974,23 +910,24 @@
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80 columnWidth: 80
},{
},
{
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,
serialNumber: '103002Table1ecnAddress',
serialNumber: '103002Table1TestPartNo',
tableId: "103002Table1", tableId: "103002Table1",
tableName: "技术参数卡列表", tableName: "技术参数卡列表",
columnProp: "ecnAddress",
columnProp: "testPartNo",
headerAlign: "center", headerAlign: "center",
align: "left", align: "left",
columnLabel: "ECN文档链接",
columnLabel: "PLM物料编码",
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 200
columnWidth: 140
}, },
], ],
fileColumnList: [ fileColumnList: [

39
src/views/modules/test/requestForTest.vue
View File

@ -359,13 +359,13 @@
</el-row> </el-row>
<el-row :gutter="15"> <el-row :gutter="15">
<el-col :span="24"> <el-col :span="24">
<el-form-item style="height: 90px">
<el-form-item style="height: 150px">
<template slot="label"> <template slot="label">
<el-button v-if="isAuth('107001:dataEntry')" style="margin-left: 2px;width: 115px;line-height: 1;font-size: 12px;" type="primary" @click="handleDataEntry">备注区：数据录入</el-button> <el-button v-if="isAuth('107001:dataEntry')" style="margin-left: 2px;width: 115px;line-height: 1;font-size: 12px;" type="primary" @click="handleDataEntry">备注区：数据录入</el-button>
</template> </template>
<el-input type="textarea" style="margin-top: 5px" <el-input type="textarea" style="margin-top: 5px"
:disabled="(testInformationFlag('technicalConsiderations') === 'N' && modalData.flag === '2') || detailFlag" :disabled="(testInformationFlag('technicalConsiderations') === 'N' && modalData.flag === '2') || detailFlag"
v-model="modalData.technicalConsiderations" :rows="3" resize='none' show-word-limit></el-input>
v-model="modalData.technicalConsiderations" :rows="6" resize='none' show-word-limit></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -373,13 +373,17 @@
<div class="rq"> <div class="rq">
<el-button v-if="!modalData.testNo" @click="saveData" plain type="primary" style="position:absolute;margin-top: 10px;margin-right: 10px;right: 0;z-index: 1">下一步</el-button> <el-button v-if="!modalData.testNo" @click="saveData" plain type="primary" style="position:absolute;margin-top: 10px;margin-right: 10px;right: 0;z-index: 1">下一步</el-button>
<el-tabs v-model="activeTab" @tab-click="dialogTabClick"> <el-tabs v-model="activeTab" @tab-click="dialogTabClick">
<el-tab-pane label="基本信息" :disabled="!activeTabList.includes('attribute')" name="attribute" v-if="modalData.testNo">
<template v-if="modalData.testNo">
<el-tab-pane v-if="isAuth('107001:tab1:query')" label="基本信息" :disabled="!activeTabList.includes('attribute')" name="attribute">
<test-properties :test-status="modalData.testStatus" v-if="modalFlag" :disabled="detailFlag" v-model:data-list="testPropertiesList" height="32vh" ref="dialogTestAttribute" :test-no="modalData.testNo"></test-properties> <test-properties :test-status="modalData.testStatus" v-if="modalFlag" :disabled="detailFlag" v-model:data-list="testPropertiesList" height="32vh" ref="dialogTestAttribute" :test-no="modalData.testNo"></test-properties>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="基本信息" :disabled="!activeTabList.includes('attribute')" name="attribute" v-else>
</template>
<template v-else>
<el-tab-pane v-if="isAuth('107001:tab1:query')" label="基本信息" :disabled="!activeTabList.includes('attribute')" name="attribute">
<test-properties :test-status="modalData.testStatus" v-if="modalFlag" :disabled="detailFlag" v-model:data-list="copyTestPropertiesList" height="32vh" ref="dialogTestAttribute" :test-no="modalData.testNo"></test-properties> <test-properties :test-status="modalData.testStatus" v-if="modalFlag" :disabled="detailFlag" v-model:data-list="copyTestPropertiesList" height="32vh" ref="dialogTestAttribute" :test-no="modalData.testNo"></test-properties>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="物料属性" :disabled="!activeTabList.includes('partAttribute')" name="partAttribute">
</template>
<el-tab-pane v-if="isAuth('107001:tab2:query')" label="物料属性" :disabled="!activeTabList.includes('partAttribute')" name="partAttribute">
<el-table <el-table
:data="partItemList1" :data="partItemList1"
height="35vh" height="35vh"
@ -407,16 +411,13 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="材料信息" :disabled="!activeTabList.includes('product')" name="product">
<el-tab-pane v-if="isAuth('107001:tab3:query')" label="材料信息" :disabled="!activeTabList.includes('product')" name="product">
<test-table v-if="clickTestRow" :disabled="detailFlag" :test-number="modalData.testNumber" height="32vh" ref="dialogSoBom" v-model:data-list="testSoBomList" :test-no="modalData.testNo"></test-table> <test-table v-if="clickTestRow" :disabled="detailFlag" :test-number="modalData.testNumber" height="32vh" ref="dialogSoBom" v-model:data-list="testSoBomList" :test-no="modalData.testNo"></test-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="制程信息" :disabled="!activeTabList.includes('process')" name="process">
<el-tab-pane v-if="isAuth('107001:tab4:query')" label="制程信息" :disabled="!activeTabList.includes('process')" name="process">
<test-routing-table v-if="clickTestRow" :disabled="detailFlag" ref="dialogSoRouting" height="32vh" v-model:data-list="testSoRoutingList" :test-no="modalData.testNo"></test-routing-table> <test-routing-table v-if="clickTestRow" :disabled="detailFlag" ref="dialogSoRouting" height="32vh" v-model:data-list="testSoRoutingList" :test-no="modalData.testNo"></test-routing-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="附件信息" :disabled="!activeTabList.includes('file')" name="file">
<!-- <oss-components ref="ossRef1" v-if="clickTestRow" :disabled="detailFlag" label="测试单号" height="32vh"-->
<!-- :columns="fileColumnList" :order-ref2="modalData.testNo"-->
<!-- :order-ref1="modalData.site"></oss-components>-->
<el-tab-pane v-if="isAuth('107001:tab5:query')" label="附件信息" :disabled="!activeTabList.includes('file')" name="file">
<oss-components ref="ossRef1" v-if="fileContentLoaded" :disabled="detailFlag" label="测试单号" height="32vh" :columns="fileColumnList" :order-ref2="modalData.testNo" :order-ref1="modalData.site"></oss-components> <oss-components ref="ossRef1" v-if="fileContentLoaded" :disabled="detailFlag" label="测试单号" height="32vh" :columns="fileColumnList" :order-ref2="modalData.testNo" :order-ref1="modalData.site"></oss-components>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -663,7 +664,7 @@
<!-- 页签 --> <!-- 页签 -->
<el-tabs v-model="activeTable" style="margin-top: 0px; width: 100%; min-height: 500px;" type="border-card" @tab-click="tabClick" class="customer-tab"> <el-tabs v-model="activeTable" style="margin-top: 0px; width: 100%; min-height: 500px;" type="border-card" @tab-click="tabClick" class="customer-tab">
<el-tab-pane label="基本信息" name="attribute">
<el-tab-pane v-if="isAuth('107001:tab1:query')" label="基本信息" name="attribute">
<test-properties <test-properties
ref="tabProperties" ref="tabProperties"
v-model:data-list="testPropertiesList" v-model:data-list="testPropertiesList"
@ -675,7 +676,7 @@
height="45vh"> height="45vh">
</test-properties> </test-properties>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="物料属性" name="test_attribute" style="padding: 5px">
<el-tab-pane v-if="isAuth('107001:tab2:query')" label="物料属性" name="test_attribute" style="padding: 5px">
<el-table <el-table
:data="partItemList2" :data="partItemList2"
:height="500" :height="500"
@ -704,16 +705,16 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="材料信息" name="test_so_bom" style="padding: 5px">
<el-tab-pane v-if="isAuth('107001:tab3:query')" label="材料信息" name="test_so_bom" style="padding: 5px">
<test-table ref="tabSoBom" :test-number="testCurrentRow.testNumber" <test-table ref="tabSoBom" :test-number="testCurrentRow.testNumber"
:disabled="testCurrentRow.testStatus === '已完成'" :test-no="testCurrentRow.testNo" height="45vh" :disabled="testCurrentRow.testStatus === '已完成'" :test-no="testCurrentRow.testNo" height="45vh"
v-model:data-list="testSoBomList"></test-table> v-model:data-list="testSoBomList"></test-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="制程信息" name="test_so_routing" style="padding: 5px">
<el-tab-pane v-if="isAuth('107001:tab4:query')" label="制程信息" name="test_so_routing" style="padding: 5px">
<test-routing-table ref="tabSoRouting" :test-no="testCurrentRow.testNo" v-model:data-list="testSoRoutingList" <test-routing-table ref="tabSoRouting" :test-no="testCurrentRow.testNo" v-model:data-list="testSoRoutingList"
:disabled="testCurrentRow.testStatus === '已完成'" height="45vh"></test-routing-table> :disabled="testCurrentRow.testStatus === '已完成'" height="45vh"></test-routing-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="附件信息" name="file">
<el-tab-pane v-if="isAuth('107001:tab5:query')" label="附件信息" name="file">
<oss-components style="margin-top: 5px" <oss-components style="margin-top: 5px"
ref="ossRef2" ref="ossRef2"
:save-visible="isAuth('107001:tab5:save')" :save-visible="isAuth('107001:tab5:save')"
@ -941,12 +942,12 @@
<el-dialog width="850px" top="25vh" title="数据录入" :close-on-click-modal="false" :visible.sync="dataEntryFlag" v-highlight-container> <el-dialog width="850px" top="25vh" title="数据录入" :close-on-click-modal="false" :visible.sync="dataEntryFlag" v-highlight-container>
<el-form label-position="top"> <el-form label-position="top">
<el-form-item label="备注" class="auto-form">
<el-input type="textarea" v-model="dataEntryForm.technicalConsiderations" :rows="3" resize='none'></el-input>
<el-form-item label="备注区" class="auto-form">
<el-input type="textarea" v-model="dataEntryForm.technicalConsiderations" :rows="6" resize='none'></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<div style="height:25px;margin-top: 45px">
<div style="height:25px;margin-top: 105px">
<el-button type="primary" @click="refresh1()">刷新</el-button> <el-button type="primary" @click="refresh1()">刷新</el-button>
<el-button type="primary" @click="submitDataEntry()">保存</el-button> <el-button type="primary" @click="submitDataEntry()">保存</el-button>
<el-button @click="dataEntryFlag = false" type="primary">取消</el-button> <el-button @click="dataEntryFlag = false" type="primary">取消</el-button>

Write Preview
Loading…
Cancel
Save