Browse Source

2024-11-07

master
qiezi 1 year ago
parent
commit
0c00ea2779
  1. 30
      src/views/modules/customer/customerInformationManagement.vue
  2. 80
      src/views/modules/proofing/requestForProofing.vue
  3. 16
      src/views/modules/test/requestForTest.vue
  4. 4
      src/views/modules/test/testSoBom/testTable.vue

30
src/views/modules/customer/customerInformationManagement.vue

@ -45,7 +45,6 @@
:row-style="rowStyle"
@row-click="customerClickRow"
@selection-change="selectionCustomer"
@current-change="changeCurrentRow"
style="width: 100%;">
<el-table-column
type="selection"
@ -97,9 +96,6 @@
<el-dialog :title="modalData.title" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules"
style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="客户代码" prop="customerNo" :rules="rules.customerNo">
<el-input v-model="modalData.customerNo" :disabled="modalDisableFlag" style="width: 222px"></el-input>
</el-form-item>
<el-form-item label="客户名称" prop="customerDesc" :rules="rules.customerDesc">
<el-input v-model="modalData.customerDesc" :readonly="detailModalFlag" style="width: 222px"></el-input>
</el-form-item>
@ -779,6 +775,11 @@ export default {
this.modalData.customerGroupName2 = ''
}
}
},
customerCurrentRow(newVal,oldVal){
if (newVal){
this.refreshCurrentTabTable();
}
}
},
data() {
@ -1989,13 +1990,9 @@ export default {
* 刷新页签的table数据
*/
refreshCurrentTabTable() {
if (this.activeTable === 'customer_contact') {
this.getCustomerContactList()
} else if (this.activeTable === 'customer_address') {
this.getCustomerAddressList()
} else if (this.activeTable === 'project_information') {
this.getProjectInformationList()
}
},
// ======== ========
@ -2012,11 +2009,8 @@ export default {
this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount
//
if (this.totalPage > 0) {
//
this.$refs.customerTable.setCurrentRow(this.dataList[0])
// table
this.refreshCurrentTabTable()
if (this.dataList.length > 0) {
this.customerCurrentRow = {...this.dataList[0]}
}
}
})
@ -2663,10 +2657,6 @@ export default {
* 客户信息新增/编辑
*/
saveData() {
if (this.modalData.customerNo === '' || this.modalData.customerNo == null) {
this.$message.warning('请输入客户代码!')
return
}
if (this.modalData.customerDesc === '' || this.modalData.customerDesc == null) {
this.$message.warning('请输入客户名称!')
return
@ -2908,7 +2898,7 @@ export default {
* @param row
*/
customerClickRow(row) {
this.customerCurrentRow = JSON.parse(JSON.stringify(row))
this.customerCurrentRow = {...row}
},
/**
* 单机选中客户联系人
@ -3264,8 +3254,8 @@ export default {
}
},
rowStyle({row}) {
if (this.customerCurrentRow.customerNo === row.customerNo) {
return {'background-color': '#E8F7F6', cursor: 'pointer'};
if (this.customerCurrentRow.customerNo === row.customerNo && this.customerCurrentRow.site === row.site) {
return {'background-color': '#E8F7F6'};
}
},
}

80
src/views/modules/proofing/requestForProofing.vue

@ -1547,8 +1547,8 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 102001,
serialNumber: '102001Table3TestPartNo',
tableId: '102001Table3',
serialNumber: '103001Table4TestPartNo',
tableId: '103001Table4',
tableName: '项目物料表',
columnProp: 'testPartNo',
headerAlign: 'center',
@ -1565,8 +1565,8 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 102001,
serialNumber: '102001Table3PartDesc',
tableId: '102001Table3',
serialNumber: '103001Table4PartDesc',
tableId: '103001Table4',
tableName: '项目物料表',
columnProp: 'partDesc',
headerAlign: 'center',
@ -1579,33 +1579,17 @@ export default {
status: true,
fixed: '',
columnWidth: 120
}, {
userId: this.$store.state.user.name,
functionId: 102001,
serialNumber: '102001Table3PartSpec',
tableId: '102001Table3',
tableName: '项目物料表',
columnProp: 'partSpec',
headerAlign: 'center',
align: 'center',
columnLabel: '产品规格',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
}, {
},
{
userId: this.$store.state.user.name,
functionId: 102001,
serialNumber: '102001Table3PartTypeDesc',
tableId: '102001Table3',
serialNumber: '103001Table4CustomerPartNo',
tableId: '103001Table4',
tableName: '项目物料表',
columnProp: 'partTypeDesc',
columnProp: 'customerPartNo',
headerAlign: 'center',
align: 'center',
columnLabel: '产品类型',
columnLabel: '客户料号',
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -1617,13 +1601,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 102001,
serialNumber: '102001Table3Type',
tableId: '102001Table3',
serialNumber: '103001Table4PartSpec',
tableId: '103001Table4',
tableName: '项目物料表',
columnProp: 'type',
columnProp: 'partSpec',
headerAlign: 'center',
align: 'center',
columnLabel: '制造类型',
columnLabel: '产品规格',
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -1631,35 +1615,34 @@ export default {
status: true,
fixed: '',
columnWidth: 120
},
{
}, {
userId: this.$store.state.user.name,
functionId: 102001,
serialNumber: '102001Table3UmId',
tableId: '102001Table3',
serialNumber: '103001Table4PartTypeDesc',
tableId: '103001Table4',
tableName: '项目物料表',
columnProp: 'umId',
columnProp: 'partTypeDesc',
headerAlign: 'center',
align: 'center',
columnLabel: '单位',
columnLabel: '产品类型',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
columnWidth: 120
},
{
userId: this.$store.state.user.name,
functionId: 102001,
serialNumber: '102001Table3CodeNo',
tableId: '102001Table3',
serialNumber: '103001Table4Type',
tableId: '103001Table4',
tableName: '项目物料表',
columnProp: 'codeNo',
columnProp: 'type',
headerAlign: 'center',
align: 'center',
columnLabel: '模板编码',
columnLabel: '制造类型',
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -1667,24 +1650,25 @@ export default {
status: true,
fixed: '',
columnWidth: 120
}, {
},
{
userId: this.$store.state.user.name,
functionId: 102001,
serialNumber: '102001Table3CodeDesc',
tableId: '102001Table3',
serialNumber: '103001Table4UmId',
tableId: '103001Table4',
tableName: '项目物料表',
columnProp: 'codeDesc',
columnProp: 'umId',
headerAlign: 'center',
align: 'center',
columnLabel: '模板名称',
columnLabel: '单位',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
}
columnWidth: 100
},
],
columnAddressList: [
{

16
src/views/modules/test/requestForTest.vue

@ -1999,22 +1999,6 @@
fixed: '',
columnWidth: 100,
},
// {
// userId: this.$store.state.user.name,
// functionId: 103001,
// serialNumber: '103001Table2ValueChooseFlag',
// tableId: "103001Table2",
// tableName: "",
// columnProp: 'numValue',
// headerAlign: "center",
// align: "center",
// columnLabel: '',
// columnHidden: false,
// columnImage: false,
// status: true,
// fixed: '',
// columnWidth: 70,
// },
],
rejectVisible:false,
rejectOpinion:"",

4
src/views/modules/test/testSoBom/testTable.vue

@ -674,10 +674,6 @@ export default {
<el-input-number @input="computeTotalCost" :disabled="testSoBom.status === 'N'" style="width: 100%;margin-top: -5px;" :min="0" v-model="testSoBom.unitCost" :controls="false"></el-input-number>
</el-form-item>
</el-col>
<!-- <el-col :span="8">-->
<!-- <el-form-item label=" ">-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="8">
<el-form-item label="总价" prop="totalCost">
<el-input-number disabled style="width: 100%;margin-top: -5px;" :min="0" v-model="testSoBom.totalCost" :controls="false"></el-input-number>

Loading…
Cancel
Save