diff --git a/src/components/common/priceInfoList.vue b/src/components/common/priceInfoList.vue index 3c8535e..15ee858 100644 --- a/src/components/common/priceInfoList.vue +++ b/src/components/common/priceInfoList.vue @@ -142,6 +142,9 @@ const emit = defineEmits(['change']); const numCount = (record, idx, k)=> { + if (k == 'priceCode') { + record.priceName = record.priceCode ? (props.optionSelect.baseIncList.find(i=>i.code == record.priceCode) ||{}).name : '' + } let uomCode = dataListPrice.value[idx].uomCode if (uomCode == 'GJ' && k == 'rateQtyGj') { record.rateQtyM3 = record.rateM3Gj ? (Number(record.rateQtyGj || 0)/ Number(record.rateM3Gj)).toFixed(4) : '' @@ -161,13 +164,13 @@ let uomCode = dataListPrice.value[idx].uomCode let priceDesc = '' dataListPrice.value[idx].lngPricePurPngAppSuDtlList.forEach(v=> { - let a = v.priceCode ? (props.optionSelect.baseIncList.find(i=>i.code == v.priceCode) ||{}).name : '' + // let a = v.priceCode ? (props.optionSelect.baseIncList.find(i=>i.code == v.priceCode) ||{}).name : '' let b = '' if (uomCode == 'GJ' ) { - b=a+(v.rateQtyGj || '')+dataListPrice.value[idx].uomName + ',单价'+(v.priceGj ||'')+';' + b=(v.priceName||'')+(v.rateQtyGj || '')+dataListPrice.value[idx].uomName + ',单价'+(v.priceGj ||'')+';' } if (uomCode == 'M3' ) { - b=a+(v.rateQtyM3 || '')+dataListPrice.value[idx].uomName + ',单价'+(v.priceM3 || '')+';' + b=(v.priceName||'')+(v.rateQtyM3 || '')+dataListPrice.value[idx].uomName + ',单价'+(v.priceM3 || '')+';' } priceDesc+=b }) diff --git a/src/views/approve/Appro/components/createForm.vue b/src/views/approve/Appro/components/createForm.vue index 3ed02ae..da23d19 100644 --- a/src/views/approve/Appro/components/createForm.vue +++ b/src/views/approve/Appro/components/createForm.vue @@ -71,12 +71,12 @@ - + - + diff --git a/src/views/contract/ContractFact/components/createForm.vue b/src/views/contract/ContractFact/components/createForm.vue index 48a2081..d66746d 100644 --- a/src/views/contract/ContractFact/components/createForm.vue +++ b/src/views/contract/ContractFact/components/createForm.vue @@ -99,7 +99,7 @@ - + @@ -187,12 +187,12 @@ - + - + diff --git a/src/views/contract/ContractSales/components/createForm.vue b/src/views/contract/ContractSales/components/createForm.vue index d993bca..fd51697 100644 --- a/src/views/contract/ContractSales/components/createForm.vue +++ b/src/views/contract/ContractSales/components/createForm.vue @@ -104,7 +104,7 @@ - + diff --git a/src/views/dayPlan/Demand/index.vue b/src/views/dayPlan/Demand/index.vue index 921706e..62f7be1 100644 --- a/src/views/dayPlan/Demand/index.vue +++ b/src/views/dayPlan/Demand/index.vue @@ -208,7 +208,7 @@ striped: false, actionColumn: { - width: 180, + width: 200, title: '操作', dataIndex: 'action', slots: { customRender: 'action' }, diff --git a/src/views/sales/ScoreCustomer/components/config.ts b/src/views/sales/ScoreCustomer/components/config.ts index 1fa2339..c2df375 100644 --- a/src/views/sales/ScoreCustomer/components/config.ts +++ b/src/views/sales/ScoreCustomer/components/config.ts @@ -51,7 +51,7 @@ export const columns: BasicColumn[] = [ title: '评价体系', componentType: 'select', align: 'left', - + width: 250, sorter: true, }, { diff --git a/src/views/ship/MeaPurInt/components/createForm.vue b/src/views/ship/MeaPurInt/components/createForm.vue index ac0a5b0..3ecb018 100644 --- a/src/views/ship/MeaPurInt/components/createForm.vue +++ b/src/views/ship/MeaPurInt/components/createForm.vue @@ -110,7 +110,7 @@ - + diff --git a/src/views/ship/ShipSchedule/index.vue b/src/views/ship/ShipSchedule/index.vue index b1d131c..3eba715 100644 --- a/src/views/ship/ShipSchedule/index.vue +++ b/src/views/ship/ShipSchedule/index.vue @@ -73,7 +73,7 @@ const tableRef = ref(); //所有按钮 - const buttons = ref([{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"船期发送","code":"send","icon":"ant-design:send-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true},{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"数据日志","code":"datalog","icon":"ant-design:profile-outlined","isDefault":true},{"isUse":true,"name":"采购执行","code":"opspur","icon":"ant-design:folder-view-outlined","isDefault":false},{"isUse":true,"name":"销售执行","code":"opssales","icon":"ant-design:fund-view-outlined","isDefault":false},{"isUse":true,"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true}]); + const buttons = ref([{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"船期发送","code":"send","icon":"ant-design:send-outlined","isDefault":true},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true},{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"数据日志","code":"datalog","icon":"ant-design:profile-outlined","isDefault":true},{"isUse":true,"name":"采购执行","code":"opspur","icon":"ant-design:folder-view-outlined","isDefault":false},{"isUse":true,"name":"销售执行","code":"opssales","icon":"ant-design:fund-view-outlined","isDefault":false},{"isUse":true,"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true}]); //展示在列表内的按钮 const actionButtons = ref(['view', 'edit','datalog', 'copyData', 'delete', 'startwork','flowRecord', 'opspur', 'opssales']); const buttonConfigs = computed(()=>{ diff --git a/src/views/supplier/ScoreSupplier/components/config.ts b/src/views/supplier/ScoreSupplier/components/config.ts index bb689f0..cb241b2 100644 --- a/src/views/supplier/ScoreSupplier/components/config.ts +++ b/src/views/supplier/ScoreSupplier/components/config.ts @@ -51,7 +51,7 @@ export const columns: BasicColumn[] = [ title: '评价体系', componentType: 'select', align: 'left', - + width: 250, sorter: true, },