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

2024-10-24

master
qiezi 1 year ago
parent
f5f3d75fd8
commit
ff3e59b874
4 changed files with 43 additions and 304 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. 192
      src/views/modules/project/projectInfo/com_project_info_part.vue
  2. 93
      src/views/modules/project/projectInfo/projectInfo.vue
  3. 25
      src/views/modules/proofing/requestForProofing.vue
  4. 37
      src/views/modules/quotation/requestForQuote.vue

192
src/views/modules/project/projectInfo/com_project_info_part.vue
View File

@ -897,102 +897,6 @@
fixed: '',
columnWidth: 100
},
// {
// userId: this.$store.state.user.name,
// functionId: 101002001,
// serialNumber: '101002001Table4GroupName',
// tableId: "101002001Table4",
// tableName: "项目物料",
// columnProp: "groupId",
// headerAlign: "center",
// align: "center",
// columnLabel: "产品代码编码",
// columnHidden: false,
// columnImage: false,
// status: true,
// fixed: '',
// columnWidth: 100
// },
// {
// userId: this.$store.state.user.name,
// functionId: 101002001,
// serialNumber: '101002001Table4GroupName',
// tableId: "101002001Table4",
// tableName: "项目物料",
// columnProp: "groupName",
// headerAlign: "center",
// align: "left",
// columnLabel: "产品代码名称",
// columnHidden: false,
// columnImage: false,
// status: true,
// fixed: '',
// columnWidth: 200
// },
// {
// userId: this.$store.state.user.name,
// functionId: 101002001,
// serialNumber: '101002001Table4PartTypeDesc',
// tableId: "101002001Table4",
// tableName: "项目物料",
// columnProp: "partType",
// headerAlign: "center",
// align: "center",
// columnLabel: "产品大类编码",
// columnHidden: false,
// columnImage: false,
// status: true,
// fixed: '',
// columnWidth: 100
// },
// {
// userId: this.$store.state.user.name,
// functionId: 101002001,
// serialNumber: '101002001Table4PartTypeDesc',
// tableId: "101002001Table4",
// tableName: "项目物料",
// columnProp: "partTypeDesc",
// headerAlign: "center",
// align: "left",
// columnLabel: "产品大类名称",
// columnHidden: false,
// columnImage: false,
// status: true,
// fixed: '',
// columnWidth: 200
// },
// {
// userId: this.$store.state.user.name,
// functionId: 101002001,
// serialNumber: '101002001Table4CodeNo',
// tableId: "101002001Table4",
// tableName: "项目物料",
// columnProp: "codeNo",
// headerAlign: "center",
// align: "center",
// columnLabel: "属性模板编码",
// columnHidden: false,
// columnImage: false,
// status: true,
// fixed: '',
// columnWidth: 100
// },
// {
// userId: this.$store.state.user.name,
// functionId: 101002001,
// serialNumber: '101002001Table4CodeDesc',
// tableId: "101002001Table4",
// tableName: "项目物料",
// columnProp: "codeDesc",
// headerAlign: "center",
// align: "left",
// columnLabel: "属性模板名称",
// columnHidden: false,
// columnImage: false,
// status: true,
// fixed: '',
// columnWidth: 200
// },
{
userId: this.$store.state.user.name,
functionId: 101002001,
@ -1009,70 +913,6 @@
fixed: '',
columnWidth: 100
},
// {
// userId: this.$store.state.user.name,
// functionId: 101002001,
// serialNumber: '101002001Table4UnitPrice',
// tableId: "101002001Table4",
// tableName: "项目物料",
// columnProp: "unitPrice",
// headerAlign: "center",
// align: "right",
// columnLabel: "未税单价",
// columnHidden: false,
// columnImage: false,
// status: true,
// fixed: '',
// columnWidth: 100
// },
// {
// userId: this.$store.state.user.name,
// functionId: 101002001,
// serialNumber: '101002001Table4TaxUnitPrice',
// tableId: "101002001Table4",
// tableName: "项目物料",
// columnProp: "taxUnitPrice",
// headerAlign: "center",
// align: "right",
// columnLabel: "含税单价",
// columnHidden: false,
// columnImage: false,
// status: true,
// fixed: '',
// columnWidth: 100
// },
// {
// userId: this.$store.state.user.name,
// functionId: 101002001,
// serialNumber: '101002001Table4Remark',
// tableId: "101002001Table4",
// tableName: "项目物料",
// columnProp: "remark",
// headerAlign: "center",
// align: "left",
// columnLabel: "备注",
// columnHidden: false,
// columnImage: false,
// status: true,
// fixed: '',
// columnWidth: 200
// },
// {
// userId: this.$store.state.user.name,
// functionId: 101002001,
// serialNumber: '101002001Table4PlmPartNo',
// tableId: "101002001Table4",
// tableName: "项目物料",
// columnProp: "plmPartNo",
// headerAlign: "center",
// align: "center",
// columnLabel: "PLM料号",
// columnHidden: false,
// columnImage: false,
// status: true,
// fixed: '',
// columnWidth: 120
// },
{
userId: this.$store.state.user.name,
functionId: 101002001,
@ -1089,22 +929,6 @@
fixed: '',
columnWidth: 170
},
// {
// userId: this.$store.state.user.name,
// functionId: 101002001,
// serialNumber: '101002001Table4CreateBy',
// tableId: "101002001Table4",
// tableName: "项目物料",
// columnProp: "createBy",
// headerAlign: "center",
// align: "left",
// columnLabel: "创建人",
// columnHidden: false,
// columnImage: false,
// status: true,
// fixed: '',
// columnWidth: 100
// },
{
userId: this.$store.state.user.name,
functionId: 101002001,
@ -1121,22 +945,6 @@
fixed: '',
columnWidth: 170
},
// {
// userId: this.$store.state.user.name,
// functionId: 101002001,
// serialNumber: '101002001Table4UpdateBy',
// tableId: "101002001Table4",
// tableName: "项目物料",
// columnProp: "updateBy",
// headerAlign: "center",
// align: "left",
// columnLabel: "修改人",
// columnHidden: false,
// columnImage: false,
// status: true,
// fixed: '',
// columnWidth: 100
// },
],
dataForm: {
id:'',

93
src/views/modules/project/projectInfo/projectInfo.vue
View File

@ -162,98 +162,6 @@
</el-tab-pane>
<el-tab-pane label="客户信息" name="customer">
<!-- <el-divider content-position="left">直接客户</el-divider>-->
<!-- <el-form label-position="top" label-width="100px" >-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="4"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'客户代码'">-->
<!-- <el-input v-model="customerData.customerNo" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- <el-col :span="8"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'客户名称'">-->
<!-- <el-input v-model="customerData.customerDesc" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- <el-col :span="4"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'客户币种'">-->
<!-- <el-input v-model="customerData.customerCurrency" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- <el-col :span="4"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'年营业额'">-->
<!-- <el-input v-model="customerData.turnoverOfYear" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- <el-col :span="4"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'年潜在投入'">-->
<!-- <el-input v-model="customerData.potentialRevenueOfYear" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- </el-row>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="4"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'重要程度'">-->
<!-- <el-input v-model="customerData.importantCustomer" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- <el-col :span="4"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'客户状态'">-->
<!-- <el-input v-model="customerData.customerStatus" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- <el-col :span="16"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'客户描述'">-->
<!-- <el-input v-model="customerData.customerDescription" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- </el-row>-->
<!-- <el-divider content-position="left">终端客户</el-divider>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="4"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'终端客户代码'">-->
<!-- <el-input v-model="finalCustomerData.customerNo" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- <el-col :span="8"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'终端客户名称'">-->
<!-- <el-input v-model="finalCustomerData.customerDesc" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- <el-col :span="4"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'客户币种'">-->
<!-- <el-input v-model="finalCustomerData.customerCurrency" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- <el-col :span="4"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'年营业额'">-->
<!-- <el-input v-model="finalCustomerData.turnoverOfYear" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- <el-col :span="4"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'年潜在投入'">-->
<!-- <el-input v-model="finalCustomerData.potentialRevenueOfYear" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- </el-row>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="4"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'重要程度'">-->
<!-- <el-input v-model="finalCustomerData.importantCustomer" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- <el-col :span="4"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'客户状态'">-->
<!-- <el-input v-model="finalCustomerData.customerStatus" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- <el-col :span="16"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'客户描述'">-->
<!-- <el-input v-model="finalCustomerData.customerDescription" readonly ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- </el-row>-->
<!-- </el-form>-->
<customer-info :project="currentRow"></customer-info>
</el-tab-pane>
<el-tab-pane label="项目联系人" name="customer_contact">
@ -302,7 +210,6 @@
</el-tab-pane>
<el-tab-pane label="附件信息" name="down">
<oss-components height="25vh" label="项目编码" :columns="ossColumns" :order-ref1="currentRow.site" :order-ref2="currentRow.projectId"></oss-components>
</el-tab-pane>
<el-tab-pane label="项目物料" name="part">
<projectPart ref="projectPart"></projectPart>

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

@ -267,7 +267,7 @@
</el-row>
</el-form>
<div class="rq">
<el-form :inline="true" label-position="top" :model="projectPartData">
<el-form :inline="true" label-position="top" :model="projectPartData" v-if="modalData.flag === '1'">
<el-form-item label="物料编码">
<el-input v-model="projectPartData.testPartNo" clearable style="width: 120px"></el-input>
</el-form-item>
@ -307,8 +307,13 @@
: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 v-if="item.columnProp === 'testPartNo'">
<a @click="handleRouter(scope.row)">{{ scope.row[item.columnProp] }}</a>
</template>
<template v-else>
<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>
</template>
</el-table-column>
</el-table>
@ -2384,6 +2389,11 @@ export default {
if (this.modalData.proofingNo) {
this.searchDelegateAccess();
}
if (this.modalData.flag !== '1'){
this.projectPartData.testPartNo = this.modalData.testPartNo;
}else {
this.projectPartData.testPartNo = '';
}
this.getProjectPartList();
},
getProjectPartList() {
@ -3272,6 +3282,7 @@ export default {
nodeId: ''
};
this.selectionDelegateAccess = [];
this.projectPartList = [];
this.activeName = 'part'
Object.keys(this.proofingDelegateAccess).forEach(key => {
this.proofingDelegateAccess[key] = '';
@ -3536,6 +3547,14 @@ export default {
}
})
},
handleRouter(row){
this.modalFlag = false
if (this.$router.resolve(`/part-partInformation`).resolved.name === '404') {
this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',})
} else {
this.$router.push({name:`part-partInformation`,params:{partNo:row.testPartNo},})
}
}
}
}
</script>

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

@ -210,7 +210,7 @@
<el-col :span="12">
<el-form-item prop="projectId" label="项目编码">
<span slot="label" v-if="modalData.customerNo && modalData.flag === '1'" style=""
@click="chooseProjectListFlag = true"><a herf="#">项目编码</a></span>
@click="chooseProjectListFlag = true"><a>项目编码</a></span>
<el-row :gutter="10">
<el-col :span="8">
<el-input :disabled="!modalData.customerNo || modalData.flag !== '1'"
@ -228,17 +228,6 @@
clearable dict-type="quote_type" :use-default-value="modalData.flag === '1'"></dict-data-select>
</el-form-item>
</el-col>
<el-col :span="4" v-if="false">
<el-form-item>
<span slot="label" @click="getCustomerContactList"><a>客户负责人</a></span>
<el-input v-model="modalData.customerResponsiblePerson"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-if="false">
<el-form-item label="客户负责人联系方式">
<el-input v-model="modalData.customerResponsiblePersonPhone"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="客户询价单号" prop="customerQuoteNo">
<el-input :disabled="quotationInformationFlag('customerQuoteNo') === 'N' && modalData.flag === '2'" v-model="modalData.customerQuoteNo"></el-input>
@ -307,7 +296,7 @@
<el-tabs v-model="activeTab">
<el-tab-pane label="物料信息" name="part">
<div class="rq">
<el-form :inline="true" label-position="top" :model="projectPartData">
<el-form :inline="true" label-position="top" :model="projectPartData" v-if="modalData.flag === '1'">
<el-form-item label="物料编码">
<el-input v-model="projectPartData.testPartNo" clearable style="width: 120px"></el-input>
</el-form-item>
@ -347,9 +336,13 @@
: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 v-if="item.columnProp === 'testPartNo'">
<a @click="handleRouter(scope.row)">{{ scope.row[item.columnProp] }}</a>
</template>
<template v-else>
<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>
</template>
</el-table-column>
</el-table>
@ -2294,6 +2287,9 @@ export default {
isReject: row.isReject,
nodeId: row.nodeId
}
if (this.modalData.flag !== '1'){
this.projectPartData.testPartNo = this.modalData.testPartNo
}
this.priceCheckDetail = row.priceCheckDetail
this.modalDisableFlag = true
this.modalFlag = true
@ -3133,6 +3129,7 @@ export default {
this.priceCheckDetail = JSON.parse(JSON.stringify(this.copyPriceCheckDetail))
if (this.modalData.flag === '1'){
this.$refs.saveDetailForm.resetFields();
this.projectPartDetailList = []
}
},
// 保存弹框打开事件
@ -3369,6 +3366,14 @@ export default {
}
})
},
handleRouter(row){
this.modalFlag = false
if (this.$router.resolve(`/part-partInformation`).resolved.name === '404') {
this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',})
} else {
this.$router.push({name:`part-partInformation`,params:{partNo:row.testPartNo},})
}
}
}
}
</script>

Write Preview
Loading…
Cancel
Save