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

2024.7.1 产品文档收集优化

java8
yuejiayang 2 years ago
parent
3ffe73ea90
commit
0b19fde280
4 changed files with 58 additions and 28 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. 19
      src/views/modules/common/uploadFileList1.vue
  2. 22
      src/views/modules/eam/com_project_proof_record.vue
  3. 19
      src/views/modules/eam/eamBuDocumentListDefinition.vue
  4. 26
      src/views/modules/eam/eamProjectInfo.vue

19
src/views/modules/common/uploadFileList1.vue
View File

@ -252,13 +252,13 @@ export default {
<template> <template>
<div> <div>
<el-dialog :title="title" v-drag @close="closeFileUpdate" :visible="uploadDialog" width="35%" append-to-body>
<el-dialog :title="title" v-drag @close="closeFileUpdate" :visible="uploadDialog" width="705px" append-to-body>
<el-form :inline="true" label-position="top" label-width="80px" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" label-width="80px" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="项目编码"> <el-form-item label="项目编码">
<el-input v-model="projectId" readonly style="width: 110px;" class="red-text"></el-input>
<el-input v-model="projectId" readonly style="width: 113px;" class="red-text"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目名称"> <el-form-item label="项目名称">
<el-input v-model="projectDesc" readonly style="width: 170px;" class="red-text"></el-input>
<el-input v-model="projectDesc" readonly style="width: 173px;" class="red-text"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="客户编码"> <el-form-item label="客户编码">
<el-input v-model="customerNo" readonly style="width: 110px;" class="red-text"></el-input> <el-input v-model="customerNo" readonly style="width: 110px;" class="red-text"></el-input>
@ -269,10 +269,10 @@ export default {
</el-form> </el-form>
<el-form :inline="true" label-position="top" label-width="80px" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" label-width="80px" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="项目料号"> <el-form-item label="项目料号">
<el-input v-model="testPartNo" readonly style="width: 110px;" class="red-text"></el-input>
<el-input v-model="testPartNo" readonly style="width: 113px;" class="red-text"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="料号描述"> <el-form-item label="料号描述">
<el-input v-model="partDesc" readonly style="width: 170px;" class="red-text"></el-input>
<el-input v-model="partDesc" readonly style="width: 173px;" class="red-text"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="BU"> <el-form-item label="BU">
<el-input v-model="this.$props.site + '-' + this.$props.bu" readonly style="width: 110px;" class="red-text"></el-input> <el-input v-model="this.$props.site + '-' + this.$props.bu" readonly style="width: 110px;" class="red-text"></el-input>
@ -283,17 +283,17 @@ export default {
</el-form> </el-form>
<el-form :inline="true" label-position="top" label-width="80px" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" label-width="80px" style="margin-left: 7px;margin-top: -5px;">
<el-form-item :label="label" v-if="!isEditable"> <el-form-item :label="label" v-if="!isEditable">
<el-input v-model="no" :readonly="!isEditable" style="width: 110px" class="red-text"></el-input>
<el-input v-model="no" :readonly="!isEditable" style="width: 113px" class="red-text"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="文件类型" v-if="!isEditable"> <el-form-item label="文件类型" v-if="!isEditable">
<el-input v-model="noType" :readonly="!isEditable" style="width: 170px" class="red-text"></el-input>
<el-input v-model="noType" :readonly="!isEditable" style="width: 173px" class="red-text"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" label-width="80px" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" label-width="80px" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label=" "> <el-form-item label=" ">
<a href="javascript:void(0);" @click="triggerUpload">点击选择文件</a> <a href="javascript:void(0);" @click="triggerUpload">点击选择文件</a>
<tr></tr> <tr></tr>
<el-input v-model="fileName" readonly placeholder="文件名称" style="width: 200px"></el-input>
<el-input v-model="this.fileName" readonly placeholder="文件名称" style="width: 300px"></el-input>
<el-form-item :label="label" v-if="isEditable" style="margin-top: -18px;margin-left: 10px"> <el-form-item :label="label" v-if="isEditable" style="margin-top: -18px;margin-left: 10px">
<el-input v-model="no" :readonly="!isEditable" style="width: 110px"></el-input> <el-input v-model="no" :readonly="!isEditable" style="width: 110px"></el-input>
</el-form-item> </el-form-item>
@ -304,6 +304,7 @@ export default {
<el-upload drag :file-list="fileList" <el-upload drag :file-list="fileList"
ref="uploadFile" ref="uploadFile"
:on-remove="onRemove" :on-change="onChange" :on-remove="onRemove" :on-change="onChange"
:on-close="closeFileUpdate"
multiple :auto-upload="false" multiple :auto-upload="false"
:show-file-list="true" :show-file-list="true"
:limit="1" :limit="1"
@ -359,7 +360,7 @@ export default {
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="$emit('update:uploadDialog',false)">关闭</el-button>
<el-button type="primary" @click="$emit('update:uploadDialog',false);this.fileName = '';">关闭</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>

22
src/views/modules/eam/com_project_proof_record.vue
View File

@ -188,7 +188,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog title="文档清单定义" @close="documentListVisibleFalse" :visible.sync="documentListVisible" width="50%" style="margin-top: 10vh" :close-on-click-modal="false">
<el-dialog title="文档清单定义" @close="documentListVisibleFalse" :visible.sync="documentListVisible" width="561px" style="margin-top: 10vh" :close-on-click-modal="false">
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="项目编码" prop="projectId" class="red-label"> <el-form-item label="项目编码" prop="projectId" class="red-label">
<el-input v-model="modalData.projectId" readonly style="width: 110px;" class="red-text"></el-input> <el-input v-model="modalData.projectId" readonly style="width: 110px;" class="red-text"></el-input>
@ -196,12 +196,20 @@
<el-form-item label="项目名称" prop="projectDesc" > <el-form-item label="项目名称" prop="projectDesc" >
<el-input v-model="modalData.projectDesc" readonly style="width: 170px;" class="red-text"></el-input> <el-input v-model="modalData.projectDesc" readonly style="width: 170px;" class="red-text"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="BU" prop="bu">
<el-input v-model="modalData.bu" readonly style="width: 110px;" class="red-text"></el-input>
</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="客户编码" prop="customerNo" > <el-form-item label="客户编码" prop="customerNo" >
<el-input v-model="modalData.customerNo" readonly style="width: 110px;" class="red-text"></el-input> <el-input v-model="modalData.customerNo" readonly style="width: 110px;" class="red-text"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="客户名称" prop="customerDesc" > <el-form-item label="客户名称" prop="customerDesc" >
<el-input v-model="modalData.customerDesc" readonly style="width: 170px;" class="red-text"></el-input> <el-input v-model="modalData.customerDesc" readonly style="width: 170px;" class="red-text"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目分类" prop="cProjectTypeDb">
<el-input v-model="modalData.cProjectTypeDb" readonly style="width: 110px;" class="red-text"></el-input>
</el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="项目料号" prop="testPartNo" :rules="rules.testPartNo" > <el-form-item label="项目料号" prop="testPartNo" :rules="rules.testPartNo" >
@ -210,15 +218,8 @@
<el-form-item label="料号描述" prop="partDesc" > <el-form-item label="料号描述" prop="partDesc" >
<el-input v-model="modalData.partDesc" readonly style="width: 170px;" class="red-text"></el-input> <el-input v-model="modalData.partDesc" readonly style="width: 170px;" class="red-text"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="BU" prop="bu" >
<el-input v-model="modalData.bu" readonly style="width: 110px;" class="red-text"></el-input>
</el-form-item>
<el-form-item label="打样单号" prop="proofingNo"> <el-form-item label="打样单号" prop="proofingNo">
<el-input v-model="modalData.proofingNo" readonly style="width: 100px;" class="red-text"></el-input>
</el-form-item>
<el-form-item label="项目分类" prop="cProjectTypeDb">
<el-input v-model="modalData.cProjectTypeDb" readonly style="width: 100px;" class="red-text"></el-input>
<el-input v-model="modalData.proofingNo" readonly style="width: 110px;" class="red-text"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-button type="primary" icon="el-icon-upload" style="margin-top: -5px" @click="addDocumentTypeFlag = true">新增</el-button> <el-button type="primary" icon="el-icon-upload" style="margin-top: -5px" @click="addDocumentTypeFlag = true">新增</el-button>
@ -515,6 +516,7 @@
partDesc: '', partDesc: '',
bu: '', bu: '',
buNo: '', buNo: '',
buDesc: '',
cProjectTypeDb: '', cProjectTypeDb: '',
projectPhase: '', projectPhase: '',
proofingNo: '', proofingNo: '',
@ -800,7 +802,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
columnWidth: 80,
}, },
], ],
columnFileContentArray: [ columnFileContentArray: [

19
src/views/modules/eam/eamBuDocumentListDefinition.vue
View File

@ -123,7 +123,6 @@
:key = "i.buNo" :key = "i.buNo"
:label = "i.buNo" :label = "i.buNo"
:value = "i.buNo"> :value = "i.buNo">
<span style="float: left;width: 100px">{{ i.sitename }}</span>
<span style="float: right; color: #8492a6;white-space:nowrap;overflow:hidden;text-overflow:ellipsis; font-size: 11px;width: 60px"> <span style="float: right; color: #8492a6;white-space:nowrap;overflow:hidden;text-overflow:ellipsis; font-size: 11px;width: 60px">
{{ i.buDesc }} {{ i.buDesc }}
</span> </span>
@ -158,10 +157,13 @@
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> </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 prop="documentTypeId" :rules="rules.documentTypeIdType" >
<el-form-item prop="documentTypeId" :rules="rules.documentTypeIdType" v-if="!disableButton">
<span slot="label" style="" @click="getBaseList(1056)"><a herf="#">文档类型ID</a></span> <span slot="label" style="" @click="getBaseList(1056)"><a herf="#">文档类型ID</a></span>
<el-input v-model="modalData.documentTypeId" disabled style="width: 110px"></el-input> <el-input v-model="modalData.documentTypeId" disabled style="width: 110px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="文档类型ID" prop="documentTypeId" :rules="rules.documentTypeIdType" v-if="disableButton">
<el-input v-model="modalData.documentTypeId" disabled style="width: 110px"></el-input>
</el-form-item>
<!-- <el-form-item label="文档类型ID" prop="documentTypeId" :rules="rules.documentTypeIdType">--> <!-- <el-form-item label="文档类型ID" prop="documentTypeId" :rules="rules.documentTypeIdType">-->
<!-- <el-input v-model="modalData.documentTypeId" style="width: 230px"></el-input>--> <!-- <el-input v-model="modalData.documentTypeId" style="width: 230px"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
@ -177,7 +179,7 @@
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center"> <el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveData()">保存</el-button> <el-button type="primary" @click="saveData()">保存</el-button>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
<el-button type="primary" @click="modalFlag = false;disableButton = false">关闭</el-button>
</el-footer> </el-footer>
</el-dialog> </el-dialog>
@ -247,6 +249,7 @@
dataListSelections: [], dataListSelections: [],
modalFlag:false, modalFlag:false,
modalDisableFlag:false, modalDisableFlag:false,
disableButton: false,
modalData:{ modalData:{
flag:'', flag:'',
bu: '', bu: '',
@ -755,6 +758,7 @@
createBy: this.$store.state.user.name, createBy: this.$store.state.user.name,
updateBy: this.$store.state.user.name, updateBy: this.$store.state.user.name,
} }
this.disableButton = true
this.modalDisableFlag = true this.modalDisableFlag = true
this.modalFlag = true this.modalFlag = true
}, },
@ -819,6 +823,7 @@
if (data && data.code === '0') { if (data && data.code === '0') {
this.getDataList() this.getDataList()
this.modalFlag=false this.modalFlag=false
this.disableButton = false
this.$message({ this.$message({
message: '操作成功', message: '操作成功',
type: 'success', type: 'success',
@ -836,6 +841,7 @@
if (data && data.code === '0') { if (data && data.code === '0') {
this.getDataList() this.getDataList()
this.modalFlag=false this.modalFlag=false
this.disableButton = false
this.$message({ this.$message({
message: '操作成功', message: '操作成功',
type: 'success', type: 'success',
@ -926,3 +932,10 @@
} }
} }
</script> </script>
<style scoped>
.disabled-link {
pointer-events: none; /* 禁止点击 */
color: gray; /* 可选，改变颜色来显示不可点击状态 */
text-decoration: none; /* 可选，去掉链接的下划线 */
}
</style>

26
src/views/modules/eam/eamProjectInfo.vue
View File

@ -145,7 +145,6 @@
:key = "i.buNo" :key = "i.buNo"
:label = "i.buNo" :label = "i.buNo"
:value = "i.buNo"> :value = "i.buNo">
<span style="float: left;width: 120px">{{ i.sitename }}</span>
<span style="float: right; color: #8492a6;white-space:nowrap;overflow:hidden;text-overflow:ellipsis; font-size: 11px;width: 60px"> <span style="float: right; color: #8492a6;white-space:nowrap;overflow:hidden;text-overflow:ellipsis; font-size: 11px;width: 60px">
{{ i.buDesc }} {{ i.buDesc }}
</span> </span>
@ -723,9 +722,6 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="所有文档"> <el-tab-pane label="所有文档">
</el-tab-pane>
<el-tab-pane label="所有打样成本">
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="生产文档确认进度"> <el-tab-pane label="生产文档确认进度">
@ -935,6 +931,24 @@
// }, // },
// 展示列集 // 展示列集
columnList: [ columnList: [
{
userId: this.$store.state.user.name,
functionId: 101001013,
serialNumber: '101001013Table1BuDesc',
tableId: "101001013Table1",
tableName: "BU文档清单表",
columnProp: 'buDesc',
headerAlign: "center",
align: "center",
columnLabel: 'BU',
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: 101001014, functionId: 101001014,
@ -1868,8 +1882,8 @@
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getTestPartNo().then(({ data }) => { getTestPartNo().then(({ data }) => {
const stringData = String(data); // 显式转换为字符串 const stringData = String(data); // 显式转换为字符串
if (stringData === 'null') {
console.log('stringData',stringData)
if (stringData === 'null' || stringData === 'undefined' || stringData === '' || stringData === '0') {
resolve('P00001'); resolve('P00001');
} else { } else {
const lastPartNo = parseInt(stringData.substring(1)); const lastPartNo = parseInt(stringData.substring(1));

Write Preview
Loading…
Cancel
Save