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

2025-03-28

master
qiezi 11 months ago
parent
cc79fdd153
commit
7a9e32179e
6 changed files with 169 additions and 76 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. 5
      src/views/modules/oss/ossComponents.vue
  2. 64
      src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
  3. 168
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
  4. 2
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
  5. 2
      src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
  6. 4
      src/views/modules/sampleManagement/technicalSpecificationList.vue

5
src/views/modules/oss/ossComponents.vue
View File

@ -120,7 +120,6 @@ export default {
formData.append('orderRef1', this.orderRef1); formData.append('orderRef1', this.orderRef1);
formData.append('orderRef2', this.ossForm.orderRef2); formData.append('orderRef2', this.ossForm.orderRef2);
formData.append('orderRef3', this.orderRef3); formData.append('orderRef3', this.orderRef3);
formData.append('createBy', this.$store.state.user.name);
formData.append('fileRemark', this.ossForm.remark); formData.append('fileRemark', this.ossForm.remark);
this.uploadLoading = true; this.uploadLoading = true;
ossUpload(formData).then(({data})=>{ ossUpload(formData).then(({data})=>{
@ -298,7 +297,7 @@ export default {
header-align="center" header-align="center"
align="center" align="center"
width="120" width="120"
label="操作">
label="操作" v-if="removeVisible || previewVisible">
<template slot-scope="{row,$index}"> <template slot-scope="{row,$index}">
<template v-if="removeVisible"> <template v-if="removeVisible">
<el-link style="cursor:pointer;" v-if="!disabled" @click="handleRemove(row)">删除</el-link> <el-link style="cursor:pointer;" v-if="!disabled" @click="handleRemove(row)">删除</el-link>
@ -350,6 +349,6 @@ export default {
<style scoped> <style scoped>
.auto /deep/ .el-form-item__content{ .auto /deep/ .el-form-item__content{
height: auto; height: auto;
line-height: 1.5;
line-height: 1;
} }
</style> </style>

64
src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
View File

@ -578,38 +578,38 @@
username:this.userRoleForm.username, username:this.userRoleForm.username,
userDisplay:this.userRoleForm.userDisplay, userDisplay:this.userRoleForm.userDisplay,
} }
this.userRoleList = []
searchUserRoll(inData3).then(({data}) => { searchUserRoll(inData3).then(({data}) => {
this.userRoleList=data.rows; this.userRoleList=data.rows;
for (let j = 0; j <this.userRoleList.length?this.userRoleList.length:-1 ; j++) {
let checkData=this.dataForm.userRoleList.filter(item => item.username === this.userRoleList[j].username)
if(checkData.length>0){
this.userRoleList[j].deleteCheck=checkData[0].deleteCheck
this.userRoleList[j].deleteFlag=checkData[0].deleteFlag
this.userRoleList[j].downCheck=checkData[0].downCheck
this.userRoleList[j].downFlag=checkData[0].downFlag
this.userRoleList[j].searchCheck=checkData[0].searchCheck
this.userRoleList[j].searchFlag=checkData[0].searchFlag
this.userRoleList[j].updateCheck=checkData[0].updateCheck
this.userRoleList[j].checkAll=checkData[0].checkAll
}else {
this.userRoleList[j].deleteCheck=false
this.userRoleList[j].deleteFlag='N'
this.userRoleList[j].downCheck=false
this.userRoleList[j].downFlag='N'
this.userRoleList[j].searchCheck=false
this.userRoleList[j].searchFlag='N'
this.userRoleList[j].updateCheck=false
this.userRoleList[j].checkAll=false
}
}
for (let i = 0; i <this.userRoleList.length ; i++) {
if(this.userRoleList[i].username===this.$store.state.user.name){
this.userRoleList[i].checkAll=true;
// this.changeAll(this.userRoleList[i])
}
}
// for (let j = 0; j <this.userRoleList.length?this.userRoleList.length:-1 ; j++) {
// let checkData=this.dataForm.userRoleList.filter(item => item.username === this.userRoleList[j].username)
// if(checkData.length>0){
// this.userRoleList[j].deleteCheck=checkData[0].deleteCheck
// this.userRoleList[j].deleteFlag=checkData[0].deleteFlag
// this.userRoleList[j].downCheck=checkData[0].downCheck
// this.userRoleList[j].downFlag=checkData[0].downFlag
// this.userRoleList[j].searchCheck=checkData[0].searchCheck
// this.userRoleList[j].searchFlag=checkData[0].searchFlag
// this.userRoleList[j].updateCheck=checkData[0].updateCheck
// this.userRoleList[j].checkAll=checkData[0].checkAll
// }else {
// this.userRoleList[j].deleteCheck=false
// this.userRoleList[j].deleteFlag='N'
// this.userRoleList[j].downCheck=false
// this.userRoleList[j].downFlag='N'
// this.userRoleList[j].searchCheck=false
// this.userRoleList[j].searchFlag='N'
// this.userRoleList[j].updateCheck=false
// this.userRoleList[j].checkAll=false
// }
//
// }
// for (let i = 0; i <this.userRoleList.length ; i++) {
// if(this.userRoleList[i].username===this.$store.state.user.name){
// this.userRoleList[i].checkAll=true;
// // this.changeAll(this.userRoleList[i])
// }
// }
// this.userRollModal(); // this.userRollModal();
}) })
}, },
@ -722,9 +722,7 @@
userRollModal(){ userRollModal(){
// this.userRoleList=JSON.parse(JSON.stringify(this.dataForm.userRoleList)); // this.userRoleList=JSON.parse(JSON.stringify(this.dataForm.userRoleList));
this.searchUserRoll() this.searchUserRoll()
this.userRoleFlag=true
this.userRoleFlag=true
}, },
saveUserList(){ saveUserList(){

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

@ -137,43 +137,59 @@
</div></el-col> </div></el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"><div class="grid-content bg-purple">
<el-form-item :label="'客户图纸变更说明/Attach Customer Drawing'">
<span slot="label" style="" @click="openNewPage(dataForm.customerPictureChangeRemark)">
<a herf="#">客户图纸变更说明/Attach Customer Drawing</a>
</span>
<el-input
type="textarea"
v-model="dataForm.customerPictureChangeRemark "
:rows="3"
resize='none'
maxlength="120"
show-word-limit
style="height: 60px" :disabled="ifDisableFlag">
</el-input>
</el-form-item>
</div></el-col>
</el-row>
<el-row :gutter="20" style="margin-top: 60px">
<el-col :span="24"><div class="grid-content bg-purple">
<el-form-item :label="'转量产附档说明/MP Comments'">
<span slot="label" style="" @click="openNewPage(dataForm.productionFileComments)">
<a herf="#">转量产附档说明/MP Comments</a>
</span>
<el-input
type="textarea"
v-model="dataForm.productionFileComments "
:rows="3"
resize='none'
maxlength="120"
show-word-limit
style="height: 60px" :disabled="ifDisableFlag">
</el-input>
</el-form-item>
</div></el-col>
<el-col :span="24">
<div class="grid-content bg-purple">
<el-form-item :label="'客户图纸变更说明/Attach Customer Drawing'" class="auto">
<!-- <el-input-->
<!-- type="textarea"-->
<!-- v-model="dataForm.customerPictureChangeRemark "-->
<!-- :rows="3"-->
<!-- resize='none'-->
<!-- maxlength="120"-->
<!-- show-word-limit-->
<!-- style="height: 60px" :disabled="ifDisableFlag">-->
<!-- </el-input>-->
<oss-components
label="参数卡编码"
height="150px"
style="margin-top: 5px"
:columns="ossColumns"
:order-ref1="dataForm.site?dataForm.site:''"
:order-ref2="dataForm.codeNo?dataForm.codeNo:''"
order-ref3="customerPictureChangeRemark">
</oss-components>
</el-form-item>
</div>
</el-col>
</el-row> </el-row>
<el-row :gutter="20">
<el-col :span="24">
<div class="grid-content bg-purple">
<el-form-item :label="'转量产附档说明/MP Comments'" class="auto">
<!-- <el-input-->
<!-- type="textarea"-->
<!-- v-model="dataForm.productionFileComments "-->
<!-- :rows="3"-->
<!-- resize='none'-->
<!-- maxlength="120"-->
<!-- show-word-limit-->
<!-- style="height: 60px" :disabled="ifDisableFlag">-->
<!-- </el-input>-->
<el-row :gutter="20" style="margin-top: 60px">
<oss-components
label="参数卡编码"
height="150px"
style="margin-top: 5px"
:columns="ossColumns"
:order-ref1="dataForm.site?dataForm.site:''"
:order-ref2="dataForm.codeNo?dataForm.codeNo:''"
order-ref3="productionFileComments">
</oss-components>
</el-form-item>
</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24"><div class="grid-content bg-purple"> <el-col :span="24"><div class="grid-content bg-purple">
<el-form-item :label="'备注/Comments'"> <el-form-item :label="'备注/Comments'">
<el-input <el-input
@ -223,8 +239,10 @@
} from '@/api/changeManagement/changeManagement.js' } from '@/api/changeManagement/changeManagement.js'
import Chooselist from '@/views/modules/common/Chooselist' import Chooselist from '@/views/modules/common/Chooselist'
import DictDataSelect from "../../sys/dict-data-select.vue"; import DictDataSelect from "../../sys/dict-data-select.vue";
import OssComponents from "../../oss/ossComponents.vue";
export default { export default {
components: { components: {
OssComponents,
DictDataSelect, DictDataSelect,
Chooselist Chooselist
}, },
@ -286,6 +304,81 @@
}, },
rejectOpinion: '', rejectOpinion: '',
submitModalFlag: false, submitModalFlag: false,
ossColumns:[
{
userId: this.$store.state.user.name,
functionId: 5011,
serialNumber: '5011Table2FileName',
tableId: '5011Table2',
tableName: '文件信息表',
columnProp: 'fileName',
headerAlign: 'center',
align: 'left',
columnLabel: '文件名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 140
},
{
userId: this.$store.state.user.name,
functionId: 5011,
serialNumber: '5011Table2FileRemark',
tableId: '5011Table2',
tableName: '文件信息表',
columnProp: 'fileRemark',
headerAlign: 'center',
align: 'left',
columnLabel: '备注',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 240
},
{
userId: this.$store.state.user.name,
functionId: 5011,
serialNumber: '5011Table2CreateDate',
tableId: '5011Table2',
tableName: '文件信息表',
columnProp: 'createDate',
headerAlign: 'center',
align: 'center',
columnLabel: '上传时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 140
},
{
userId: this.$store.state.user.name,
functionId: 5011,
serialNumber: '5011Table2CreatedBy',
tableId: '5011Table2',
tableName: '文件信息表',
columnProp: 'createBy',
headerAlign: 'center',
align: 'center',
columnLabel: '上传人',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 140
}
],
} }
}, },
methods: { methods: {
@ -523,5 +616,8 @@
</script> </script>
<style scoped> <style scoped>
.auto-form /deep/ .el-form-item__content {
height: auto;
line-height: 1.5;
}
</style> </style>

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

@ -22,7 +22,7 @@
</div> </div>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
<el-form-item label="BU">
<el-form-item label="工艺">
<el-input v-model="dataForm.buNo" disabled></el-input> <el-input v-model="dataForm.buNo" disabled></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>

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

@ -1,6 +1,6 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-tabs class="tabs" tab-position="left" style="height: 200px;" type="border-card" v-model="activeName" @tab-click="refreshCurrentTabTable">
<el-tabs class="tabs" tab-position="left" style="height: 100vh;" type="border-card" v-model="activeName" @tab-click="refreshCurrentTabTable">
<el-tab-pane label="基本信息" name="baseInfo" > <el-tab-pane label="基本信息" name="baseInfo" >
<basicInformation ref="basicInformation" ></basicInformation> <basicInformation ref="basicInformation" ></basicInformation>
</el-tab-pane> </el-tab-pane>

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

@ -1,7 +1,7 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;"> <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
<el-form-item label="BU">
<el-form-item label="工艺">
<bu-select v-model="searchData.buNo" style="width: 120px"></bu-select> <bu-select v-model="searchData.buNo" style="width: 120px"></bu-select>
</el-form-item> </el-form-item>
<el-form-item :label="'参数卡编码'"> <el-form-item :label="'参数卡编码'">
@ -513,7 +513,7 @@
columnProp: "buNo", columnProp: "buNo",
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: "BU",
columnLabel: "工艺",
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,

Write Preview
Loading…
Cancel
Save