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

2024-09-23 

优化
master
fengyuan_yang 1 year ago
parent
0e2db104cd
commit
9d307142b3
4 changed files with 105 additions and 84 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. 4
      src/views/common/login-token.vue
  2. 91
      src/views/modules/changeManagement/changeRecord.vue
  3. 92
      src/views/modules/part/partInformation.vue

4
src/views/common/login-token.vue
View File

@ -107,7 +107,7 @@
this.$router.replace({
name: this.urlParam.path,
params: {
site: this.urlParam.site,
site: data.site,
docNo: this.urlParam.docNo,
type: "tokenLogin"
}
@ -116,7 +116,7 @@
localStorage.setItem('locale', data.language)
localStorage.setItem('refresh', "0")
localStorage.setItem('userName', data.userName)
localStorage.setItem('accessSite', this.urlParam.site)
localStorage.setItem('accessSite', data.site)
this.getConfigParams()
} else {
this.$message.error(data.msg)

91
src/views/modules/changeManagement/changeRecord.vue
View File

@ -609,50 +609,51 @@
<!-- 附件信息页签 -->
<el-tab-pane label="附件信息" name="fileInformation">
<el-form :inline="true" label-position="top" style="margin-top: 5px">
<el-button type="primary" @click="uploadFileModal">新增</el-button>
<el-button type="primary" @click="deleteChangeFile">删除</el-button>
</el-form>
<el-table
:data="fileList"
:height="secondHeight - 25"
border
ref="fileTable"
@selection-change="selectionFile"
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 fileColumnList" :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-column
fixed="right"
header-align="center"
align="center"
width="100"
label="操作">
<template slot-scope="scope">
<el-link style="cursor: pointer" @click="previewFile(scope.row)">预览</el-link>
<el-link style="cursor: pointer" @click="downloadFile(scope.row)">下载</el-link>
</template>
</el-table-column>
</el-table>
<oss-components label="变更单号" :height="secondHeight - 25" style="margin-top: 2px" :columns="fileColumnList" :order-ref2="currentRow.changeNo" :order-ref1="currentRow.site"></oss-components>
<!-- <el-form :inline="true" label-position="top" style="margin-top: 5px">-->
<!-- <el-button type="primary" @click="uploadFileModal">新增</el-button>-->
<!-- <el-button type="primary" @click="deleteChangeFile">删除</el-button>-->
<!-- </el-form>-->
<!-- <el-table-->
<!-- :data="fileList"-->
<!-- :height="secondHeight - 25"-->
<!-- border-->
<!-- ref="fileTable"-->
<!-- @selection-change="selectionFile"-->
<!-- 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 fileColumnList" :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-column-->
<!-- fixed="right"-->
<!-- header-align="center"-->
<!-- align="center"-->
<!-- width="100"-->
<!-- label="操作">-->
<!-- <template slot-scope="scope">-->
<!-- <el-link style="cursor: pointer" @click="previewFile(scope.row)">预览</el-link>-->
<!-- <el-link style="cursor: pointer" @click="downloadFile(scope.row)">下载</el-link>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
</el-tab-pane>
<!-- 库存成本影响页签 -->
@ -1029,8 +1030,10 @@
import DictDataSelect from "../sys/dict-data-select.vue"
import UploadFileList from "../common/uploadFileList.vue"
import ApprovalInformation from "./approvalInformation.vue";
import OssComponents from "../oss/ossComponents.vue";
export default {
components: {
OssComponents,
ApprovalInformation,
UploadFileList,
DictDataSelect,

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

@ -763,42 +763,43 @@
</el-tab-pane>
<!-- 文档页签 -->
<el-tab-pane label="附件信息" name="part_file">
<el-form label-position="top" style="margin-top: 2px; margin-left: 2px;">
<el-button type="primary" @click="uploadFile">上传文件</el-button>
</el-form>
<el-table
:data="fileContentList"
:height="secondHeight - 60"
border
style="width: 100%; ">
<el-table-column
v-for="(item,index) in columnFileList" :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-column
fixed="right"
header-align="center"
align="center"
width="100"
label="操作">
<template slot-scope="scope">
<el-link style="cursor: pointer" @click="previewFile(scope.row)">预览</el-link>
<el-link style="cursor: pointer" @click="downloadFile(scope.row)">下载</el-link>
<el-link style="cursor: pointer" @click="deleteFile(scope.row)">删除</el-link>
</template>
</el-table-column>
</el-table>
<oss-components label="物料编码" :height="secondHeight - 60" style="margin-top: 2px" :columns="columnFileList" :order-ref2="partCurrentRow.partNo" :order-ref1="partCurrentRow.site"></oss-components>
<!-- <el-form label-position="top" style="margin-top: 2px; margin-left: 2px;">-->
<!-- <el-button type="primary" @click="uploadFile">上传文件</el-button>-->
<!-- </el-form>-->
<!-- <el-table-->
<!-- :data="fileContentList"-->
<!-- :height="secondHeight - 60"-->
<!-- border-->
<!-- style="width: 100%; ">-->
<!-- <el-table-column-->
<!-- v-for="(item,index) in columnFileList" :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-column-->
<!-- fixed="right"-->
<!-- header-align="center"-->
<!-- align="center"-->
<!-- width="100"-->
<!-- label="操作">-->
<!-- <template slot-scope="scope">-->
<!-- <el-link style="cursor: pointer" @click="previewFile(scope.row)">预览</el-link>-->
<!-- <el-link style="cursor: pointer" @click="downloadFile(scope.row)">下载</el-link>-->
<!-- <el-link style="cursor: pointer" @click="deleteFile(scope.row)">删除</el-link>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
</el-tab-pane>
</el-tabs>
@ -1415,8 +1416,10 @@
import partUploadFile from "./part_upload_file"
import DictDataSelect from '../sys/dict-data-select.vue'
import UploadFileList from "../common/uploadFileList.vue";
import OssComponents from "../oss/ossComponents.vue";
export default {
components: {
OssComponents,
UploadFileList,
DictDataSelect,
Chooselist,
@ -3401,6 +3404,7 @@
selectionItem2 (val) {
this.itemSelections2 = val
},
// 物料项目新增
addItem () {
if (this.itemSelections1 == null || this.itemSelections1.length === 0) {
@ -3423,6 +3427,12 @@
})
this.getPartItem()
this.itemSelections1 = []
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
@ -3430,6 +3440,7 @@
}
})
},
// 物料项目删除
deleteItem () {
if (this.itemSelections2 == null || this.itemSelections2.length === 0) {
@ -3454,6 +3465,12 @@
})
this.getPartItem()
this.itemSelections2 = []
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
@ -3461,6 +3478,7 @@
}
})
},
// 查询物料项目
queryPartItem () {
this.itemData.partNo = this.partCurrentRow.partNo
@ -3656,7 +3674,7 @@
this.partCurrentRow = {}
}
// 加载当前的页签的table
this.refreshCurrentTabTable()
//this.refreshCurrentTabTable()
}
})
},

Write Preview
Loading…
Cancel
Save