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

2024-04-17

master
zelian_wu 2 years ago
parent
0892b0d799
commit
71eea53ca2
8 changed files with 243 additions and 138 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. 33
      src/assets/scss/global.scss
  2. 2
      src/views/modules/proofing/requestForProofing.vue
  3. 103
      src/views/modules/quotation/priceCheckProperties.vue
  4. 44
      src/views/modules/quotation/requestForQuote.vue
  5. 58
      src/views/modules/quotation/sellForQuotation.vue
  6. 36
      src/views/modules/test/file/testFile.vue
  7. 2
      src/views/modules/test/requestForTest.vue
  8. 103
      src/views/modules/test/testAttribute/testProperties.vue

33
src/assets/scss/global.scss
View File

@ -314,6 +314,39 @@ input.el-input__inner{
line-height: 20px;
}
.el-input-number{
width: 100%;
}
.el-input-number .el-input__inner {
text-align: right;
padding-right: 15px !important;
padding-left: 0 !important;
}
.el-input-number--medium .el-input-number__decrease, .el-input-number--medium .el-input-number__increase{
width: 18px;
height: 18px;
font-size: 14px;
line-height: 1.5;
}
.el-input-number--mini{
line-height: 20px
}
.el-input-number--mini .el-input-number__decrease, .el-input-number--mini .el-input-number__increase{
width: 18px;
height: 18px;
font-size: 14px;
line-height: 1.5;
}
.el-input .el-input--medium{
line-height: 20px;
}
.el-input-number .el-input--medium{
line-height: 20px;
}
// sxm 模态框 2021-12-22
.el-dialog__header {

2
src/views/modules/proofing/requestForProofing.vue
View File

@ -192,7 +192,7 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="优先等级" prop="priorityLevel">
<el-form-item label="优先等级">
<dict-data-select v-if="modalFlag" v-model="modalData.priorityLevel" dict-type="priority_Level"></dict-data-select>
</el-form-item>
</el-col>

103
src/views/modules/quotation/priceCheckProperties.vue
View File

@ -90,41 +90,42 @@ export default {
status: true,
fixed: '',
columnWidth:80,
},{
userId: this.$store.state.user.name,
functionId: 100002001,
serialNumber: '100002001TableMinValue',
tableId: "100002001Table",
tableName: "属性表",
columnProp: 'minValue',
headerAlign: "center",
align: "center",
columnLabel: '最小值',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth:80,
},{
userId: this.$store.state.user.name,
functionId: 100002001,
serialNumber: '100002001TableMaxValue',
tableId: "100002001Table",
tableName: "属性表",
columnProp: 'maxValue',
headerAlign: "center",
align: "center",
columnLabel: '最大值',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth:80,
},
// {
// userId: this.$store.state.user.name,
// functionId: 100002001,
// serialNumber: '100002001TableMinValue',
// tableId: "100002001Table",
// tableName: "属性表",
// columnProp: 'minValue',
// headerAlign: "center",
// align: "center",
// columnLabel: '最小值',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth:80,
// },{
// userId: this.$store.state.user.name,
// functionId: 100002001,
// serialNumber: '100002001TableMaxValue',
// tableId: "100002001Table",
// tableName: "属性表",
// columnProp: 'maxValue',
// headerAlign: "center",
// align: "center",
// columnLabel: '最大值',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth:80,
// },
{
userId: this.$store.state.user.name,
functionId: 100002001,
@ -161,23 +162,23 @@ export default {
// fixed: '',
// columnWidth:120,
// },
{
userId: this.$store.state.user.name,
functionId: 100002001,
serialNumber: '100002001TableDefaultValue',
tableId: "100002001Table",
tableName: "属性表",
columnProp: 'defaultValue',
headerAlign: "center",
align: "right",
columnLabel: '参照值',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
// {
// userId: this.$store.state.user.name,
// functionId: 100002001,
// serialNumber: '100002001TableDefaultValue',
// tableId: "100002001Table",
// tableName: "属性表",
// columnProp: 'defaultValue',
// headerAlign: "center",
// align: "right",
// columnLabel: '参照值',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// },
],
searchDataList:[],
}

44
src/views/modules/quotation/requestForQuote.vue
View File

@ -11,7 +11,7 @@
<el-form-item :label="'客户名称'">
<el-input v-model="searchData.customerDesc" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'跟单员'">
<el-form-item :label="'采购专员'">
<el-input v-model="searchData.trackerName" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'产品编码'">
@ -211,7 +211,7 @@
</el-col>
<el-col :span="4">
<el-form-item prop="trackerName">
<span style="cursor: pointer" slot="label" @click="getBaseList(2000)"><a herf="#">跟单员</a></span>
<span style="cursor: pointer" slot="label" @click="getBaseList(2000)"><a herf="#">采购专员</a></span>
<el-input v-model="modalData.trackerName"></el-input>
</el-form-item>
</el-col>
@ -239,13 +239,13 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="Quote Type" prop="quoteType">
<el-form-item label="Quote Type">
<dict-data-select v-if="modalFlag" v-model="modalData.quoteType" clearable dict-type="quote_type"
:use-default-value="modalData.flag === '1'"></dict-data-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="优先等级" prop="priorityLevel">
<el-form-item label="优先等级" >
<dict-data-select v-if="modalFlag" v-model="modalData.priorityLevel"
dict-type="priority_Level"></dict-data-select>
</el-form-item>
@ -257,6 +257,25 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="终端客户编码">
<el-row :gutter="10">
<el-col :span="8">
<el-input disabled v-model="modalData.finalCustomerId"></el-input>
</el-col>
<el-col :span="16">
<el-input disabled v-model="modalData.finalCustomerName"></el-input>
</el-col>
</el-row>
</el-form-item>
</el-col>
<el-col :span="4" v-if="modalData.flag !== '1'">
<el-form-item label="询价金额">
<el-input-number :controls="false" v-model="modalData.quotationAmount"></el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" v-if="false">
<el-col :span="24">
<el-form-item label="备注" style="display: block;min-height: 90px">
@ -458,6 +477,8 @@
@row-dblclick="projectClickRow">
<el-table-column label="项目编码" prop="projectId"/>
<el-table-column label="项目名称" prop="projectName"/>
<el-table-column label="终端客户编码" prop="finalCustomerId"/>
<el-table-column label="终端客户名称" prop="finalCustomerName"/>
</el-table>
</el-form>
</el-dialog>
@ -1524,7 +1545,7 @@ export default {
columnProp: 'trackerName',
headerAlign: 'center',
align: 'left',
columnLabel: '跟单员',
columnLabel: '采购专员',
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -2322,6 +2343,8 @@ export default {
quoteType: '',
projectId: '',
projectName: '',
finalCustomerId: '',
finalCustomerName: '',
tracker: '',
trackerName: '',
quoter: '',
@ -2367,6 +2390,8 @@ export default {
customerDesc: row.customerDesc,
projectId: row.projectId,
projectName: row.projectName,
finalCustomerId: row.finalCustomerId,
finalCustomerName: row.finalCustomerName,
tracker: row.tracker,
trackerName: row.trackerName,
quoter: row.quoter,
@ -2391,7 +2416,8 @@ export default {
confirmBy: row.confirmBy,
confirmInformation: row.confirmInformation,
quotationResultStatus: row.quotationResultStatus,
updateBy: this.$store.state.user.name
updateBy: this.$store.state.user.name,
quotationAmount:row.quotationAmount
}
this.priceCheckDetail = row.priceCheckDetail
this.modalDisableFlag = true
@ -2466,11 +2492,11 @@ export default {
return
}
if (this.modalData.tracker === '' || this.modalData.tracker == null) {
this.$message.warning('请选择跟单员编码！')
this.$message.warning('请选择采购专员编码！')
return
}
if (this.modalData.trackerName === '' || this.modalData.trackerName == null) {
this.$message.warning('请选择跟单员名称！')
this.$message.warning('请选择采购专员名称！')
return
}
if (this.modalData.projectId === '' || this.modalData.projectId == null) {
@ -3292,6 +3318,8 @@ export default {
projectClickRow(row) {
this.modalData.projectId = row.projectId
this.modalData.projectName = row.projectName
this.modalData.finalCustomerId = row.finalCustomerId
this.modalData.finalCustomerName = row.finalCustomerName
this.getProjectPartList()
this.chooseProjectListFlag = false
},

58
src/views/modules/quotation/sellForQuotation.vue
View File

@ -7,7 +7,7 @@
<el-form-item label="客户名称">
<el-input v-model="searchData.customerName" clearable/>
</el-form-item>
<el-form-item label="跟单员">
<el-form-item label="采购专员">
<el-input v-model="searchData.trackerName" clearable/>
</el-form-item>
<el-form-item label="报价单号">
@ -135,7 +135,7 @@
<!-- 新增弹框 -->
<el-dialog
:title="insertData.quotationHeaderId?`编辑销售报价-${insertData.quotationNo}-${insertData.versionCode}`:`新增销售报价`"
@close="closeInsertDialog" :close-on-click-modal="false" v-drag :visible.sync="insertDiaLogFlag" width="30vw">
@close="closeInsertDialog" :close-on-click-modal="false" v-drag :visible.sync="insertDiaLogFlag" width="32vw">
<el-form :rules="rules" label-position="top" ref="insertQuotationForm" :model="insertData"
label-width="120px">
<el-row :gutter="10">
@ -182,6 +182,18 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="终端客户编码">
<el-input disabled v-model="insertData.finalCustomerId"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="终端客户名称">
<el-input disabled v-model="insertData.finalCustomerName"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="货币" prop="currency">
@ -212,10 +224,10 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="跟单员" prop="trackerName">
<!-- <el-form-item prop="tracker" label="跟单员">-->
<el-form-item label="采购专员" prop="trackerName">
<!-- <el-form-item prop="tracker" label="采购专员">-->
<span slot="label" style="" v-if="insertData.internalInquiryBatchNo ===''" @click="getBaseList(2000)"><a
herf="#">跟单员</a></span>
herf="#">采购专员</a></span>
<el-input v-model="insertData.trackerName" :disabled="insertData.internalInquiryBatchNo !==''"
@clear="clearTracker" clearable/>
</el-form-item>
@ -281,13 +293,15 @@
</el-col>
</el-row>
</el-form>
<el-table :data="quotationNoData" height="300" stripe border @cell-dblclick="dblclickQuotationNo">
<el-table :data="quotationNoData" height="300" stripe border @row-dblclick="dblclickQuotationNo">
<el-table-column prop="quotationNo" header-align="center" label="询价单号"/>
<el-table-column prop="quotationBatchNo" header-align="center" label="询价批次号"/>
<el-table-column width="60" align="center" header-align="center" prop="quotationItemNo" label="询价序号"/>
<el-table-column prop="projectName" header-align="center" label="项目名称"/>
<el-table-column width="180" prop="testPartNo" header-align="center" label="物料编码"/>
<el-table-column prop="partName" header-align="center" label="物料名称"/>
<el-table-column label="终端客户编码" header-align="center" prop="finalCustomerId"/>
<el-table-column label="终端客户名称" header-align="center" prop="finalCustomerName"/>
</el-table>
<el-footer style="height:30px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="quotationNoDialogFlag = false">关闭</el-button>
@ -323,6 +337,8 @@
@row-click="projectClickRow">
<el-table-column label="项目编码" prop="projectId"/>
<el-table-column label="项目名称" prop="projectName"/>
<el-table-column label="终端客户编码" prop="finalCustomerId"/>
<el-table-column label="终端客户名称" prop="finalCustomerName"/>
</el-table>
</el-form>
</el-dialog>
@ -365,7 +381,7 @@ export default {
site: this.$store.state.user.site,// 工厂编号
customerNo: "", // 客户编码
customer: "", // 客户名称
tracker: "", // 跟单员
tracker: "", // 采购专员
quotationStatus: "", //状态
projectId: "", // 项目编码
projectName: "", // 项目名称
@ -517,7 +533,7 @@ export default {
columnProp: 'trackerName',
headerAlign: 'center',
align: 'left',
columnLabel: '跟单员',
columnLabel: '采购专员',
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -621,10 +637,10 @@ export default {
versionCode: "001",
projectId: "",//项目编码
projectName: "",//项目名称
tracker: "",//跟单员
tracker: "",//采购专员
quoter: "",//销售编号
quoterName: "",//报价专员
trackerName: "",//跟单员
trackerName: "",//采购专员
currency: "",//货币
quotationStatus: "草稿",//状态
remark: "",//备注
@ -645,7 +661,7 @@ export default {
{label: "projectId", value: "项目编码"},
{label: "projectName", value: "项目名称"},
{label: "quoterName", value: "报价专员"},
{label: "trackerName", value: "跟单员"},
{label: "trackerName", value: "采购专员"},
{label: "currency", value: "货币"},
{label: "quotationStatus", value: "状态"},
{label: "remark", value: "备注"},
@ -731,6 +747,8 @@ export default {
projectClickRow(row) {
this.insertData.projectId = row.projectId
this.insertData.projectName = row.projectName
this.insertData.finalCustomerId = row.finalCustomerId
this.insertData.finalCustomerName = row.finalCustomerName
this.chooseProjectListFlag = false
},
// 查询
@ -865,10 +883,10 @@ export default {
versionCode: "001",
projectId: "",//项目编码
projectName: "",//项目名称
tracker: "",//跟单员
tracker: "",//采购专员
quoter: "",//销售编号
quoterName: "",//报价专员
trackerName: "",//跟单员
trackerName: "",//采购专员
currency: "",//货币
quotationStatus: "草稿",//状态
remark: "",//备注
@ -885,7 +903,7 @@ export default {
this.insertData.quoter = "";
this.insertData.quoterName = "";
},
// 跟单员输入框清除事件
// 采购专员输入框清除事件
clearTracker() {
this.insertData.tracker = "";
this.insertData.trackerName = "";
@ -903,10 +921,10 @@ export default {
versionCode: "001",
projectId: "",//项目编码
projectName: "",//项目名称
tracker: "",//跟单员
tracker: "",//采购专员
quoter: "",//销售编号
quoterName: "",//报价专员
trackerName: "",//跟单员
trackerName: "",//采购专员
currency: "",//货币
quotationStatus: "草稿",//状态
remark: "",//备注
@ -1035,7 +1053,9 @@ export default {
this.insertData.customerName = row.customerDesc;//客户名称
this.insertData.projectId = row.projectId;//项目编码
this.insertData.projectName = row.projectName;//项目名称
this.insertData.tracker = row.tracker;//跟单员
this.insertData.finalCustomerId = row.finalCustomerId;
this.insertData.finalCustomerName = row.finalCustomerName;
this.insertData.tracker = row.tracker;//采购专员
this.insertData.trackerName = row.trackerName;
this.insertData.quoter = row.quoter;//销售编号
this.insertData.quoterName = row.quoterName;//销售编号
@ -1103,10 +1123,10 @@ export default {
versionCode: "001",
projectId: "",//项目编码
projectName: "",//项目名称
tracker: "",//跟单员
tracker: "",//采购专员
quoter: "",//销售编号
quoterName: "",//报价专员
trackerName: "",//跟单员
trackerName: "",//采购专员
currency: "",//货币
quotationStatus: "草稿",//状态
remark: "",//备注

36
src/views/modules/test/file/testFile.vue
View File

@ -1,6 +1,6 @@
<script>
import UploadFileList from "../../common/uploadFileList.vue";
import {getFileContentList, removeFile} from "../../../../api/test/testInformation";
import {downloadFileList, getFileContentList, removeFile} from "../../../../api/test/testInformation";
import {deleteQuotationFile, downLoadQuotationFile} from "../../../../api/quotation/quotationInformation";
export default {
@ -89,19 +89,38 @@ export default {
previewFile(row){
// 预览文件
let image = ['jpg', 'jpeg', 'png', 'gif', 'bmp']
let type = ''
if (image.includes(row.fileType.toLowerCase())){
return
type = 'image/'+row.fileType
}
let office = ['doc', 'docx', 'ppt', 'pptx', 'xls', 'xlsx']
if (office.includes(row.fileType.toLowerCase())){
return;
// type = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
return
}
let pdf = ['pdf']
if (pdf.includes(row.fileType.toLowerCase())){
type = 'application/pdf'
}
downLoadQuotationFile(row).then(({data}) => {
const blob = new Blob([data], { type: type });
// 创建URL来生成预览
const fileURL = URL.createObjectURL(blob);
// 在新标签页中打开文件预览
const newTab = window.open(fileURL, '_blank');
})
},
downloadBtn(){
if (this.selectionFile.length < 1){
this.$message.warning('请选择需要下载的文件')
return
}
for (let i = 0; i < this.selectionFile.length; i++) {
this.downloadFile(this.selectionFile[i])
}
},
handleSelectionChange(val){
this.selectionFile = val
}
},
watch:{
@ -118,12 +137,15 @@ export default {
<div>
<div style="margin: 5px 0px">
<el-button type="primary" @click="uploadDialog = true">上传文件</el-button>
<el-button type="primary" @click="downloadBtn" >下载</el-button>
</div>
<el-table
:height="height"
:data="dataList"
border
@selection-change="handleSelectionChange"
style="width: 100%">
<el-table-column type="selection" label="序号" align="center"/>
<el-table-column
v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable"
@ -146,7 +168,7 @@ export default {
width="120"
label="操作">
<template slot-scope="{row,$index}">
<el-link style="cursor:pointer;" @click="downloadFile(row)">下载</el-link>
<!-- <el-link style="cursor:pointer;" @click="downloadFile(row)">下载</el-link>-->
<el-link style="cursor:pointer;" @click="removeFile(row)">删除</el-link>
<el-link style="cursor:pointer;" @click="previewFile(row)">预览</el-link>
</template>

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

@ -189,7 +189,7 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="优先等级" prop="priorityLevel">
<el-form-item label="优先等级" >
<dict-data-select v-if="modalFlag" v-model="modalData.priorityLevel" dict-type="priority_Level"></dict-data-select>
</el-form-item>
</el-col>

103
src/views/modules/test/testAttribute/testProperties.vue
View File

@ -94,41 +94,42 @@ export default {
status: true,
fixed: '',
columnWidth:80,
},{
userId: this.$store.state.user.name,
functionId: 100002001,
serialNumber: '100002001TableMinValue',
tableId: "100002001Table",
tableName: "属性表",
columnProp: 'minValue',
headerAlign: "center",
align: "center",
columnLabel: '最小值',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth:80,
},{
userId: this.$store.state.user.name,
functionId: 100002001,
serialNumber: '100002001TableMaxValue',
tableId: "100002001Table",
tableName: "属性表",
columnProp: 'maxValue',
headerAlign: "center",
align: "center",
columnLabel: '最大值',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth:80,
},
// {
// userId: this.$store.state.user.name,
// functionId: 100002001,
// serialNumber: '100002001TableMinValue',
// tableId: "100002001Table",
// tableName: "属性表",
// columnProp: 'minValue',
// headerAlign: "center",
// align: "center",
// columnLabel: '最小值',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth:80,
// },{
// userId: this.$store.state.user.name,
// functionId: 100002001,
// serialNumber: '100002001TableMaxValue',
// tableId: "100002001Table",
// tableName: "属性表",
// columnProp: 'maxValue',
// headerAlign: "center",
// align: "center",
// columnLabel: '最大值',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth:80,
// },
{
userId: this.$store.state.user.name,
functionId: 100002001,
@ -165,23 +166,23 @@ export default {
// fixed: '',
// columnWidth:120,
// },
{
userId: this.$store.state.user.name,
functionId: 100002001,
serialNumber: '100002001TableDefaultValue',
tableId: "100002001Table",
tableName: "属性表",
columnProp: 'defaultValue',
headerAlign: "center",
align: "right",
columnLabel: '参照值',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
// {
// userId: this.$store.state.user.name,
// functionId: 100002001,
// serialNumber: '100002001TableDefaultValue',
// tableId: "100002001Table",
// tableName: "属性表",
// columnProp: 'defaultValue',
// headerAlign: "center",
// align: "right",
// columnLabel: '参照值',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// },
],
searchDataList:[],
}

Write Preview
Loading…
Cancel
Save