diff --git a/src/components/RichTextEditor/src/RichTextEditor.vue b/src/components/RichTextEditor/src/RichTextEditor.vue
index 87e11fc..bb09850 100644
--- a/src/components/RichTextEditor/src/RichTextEditor.vue
+++ b/src/components/RichTextEditor/src/RichTextEditor.vue
@@ -41,6 +41,7 @@
''
);
res.forEach((x) => {
+ x.fileUrl = '/api' + x.fileUrl
instance?.cmd.do('insertHTML', '
');
});
} catch (error) {
diff --git a/src/components/common/correlationApproList.vue b/src/components/common/correlationApproList.vue
index 8d47b25..caab4ed 100644
--- a/src/components/common/correlationApproList.vue
+++ b/src/components/common/correlationApproList.vue
@@ -119,8 +119,6 @@
() => props.disabled,
(val) => {
if (val) {
- let idx2 = columns.value.findIndex(v =>v.dataIndex == 'operation')
- idx2>-1 && columns.value.splice(idx2, 1)
}
},
{
diff --git a/src/components/common/correlationContractFactList.vue b/src/components/common/correlationContractFactList.vue
index 4aeb5f9..1ea6c90 100644
--- a/src/components/common/correlationContractFactList.vue
+++ b/src/components/common/correlationContractFactList.vue
@@ -121,8 +121,6 @@
() => props.disabled,
(val) => {
if (val) {
- let idx2 = columns.value.findIndex(v =>v.dataIndex == 'operation')
- idx2>-1 && columns.value.splice(idx2, 1)
}
},
{
diff --git a/src/views/approve/Appro/components/createForm.vue b/src/views/approve/Appro/components/createForm.vue
index cc49b29..753b70c 100644
--- a/src/views/approve/Appro/components/createForm.vue
+++ b/src/views/approve/Appro/components/createForm.vue
@@ -1,6 +1,6 @@
-
+
@@ -140,6 +140,7 @@
const formId = ref(currentRoute.value?.params?.id);
const pageType = ref(currentRoute.value.query?.type);
const pageId = ref(currentRoute.value.query?.id)
+ const isViewForm = currentRoute.value.path.includes('viewForm')
const spinning = ref(false);
const curIdx = ref(null)
@@ -318,5 +319,7 @@
margin-bottom: 12px;
border-bottom: 1px solid #eee;
}
-
+ .pdcss {
+ padding: 6px 12px !important;
+ }
diff --git a/src/views/contract/ContractFact/components/createForm.vue b/src/views/contract/ContractFact/components/createForm.vue
index 94de3e6..06a15f8 100644
--- a/src/views/contract/ContractFact/components/createForm.vue
+++ b/src/views/contract/ContractFact/components/createForm.vue
@@ -1,6 +1,6 @@
-
+
@@ -280,6 +280,7 @@
const formId = ref(currentRoute.value?.params?.id);
const pageType = ref(currentRoute.value.query?.type);
const pageId = ref(currentRoute.value.query?.id)
+ const isViewForm = currentRoute.value.path.includes('viewForm')
const spinning = ref(false);
const curIdx = ref(null)
@@ -330,17 +331,6 @@
{ title: t('备注'), dataIndex: 'note', sorter: true, width: 200},
{ title: t('操作'), dataIndex: 'operation', width: 120, fixed: 'right',align: 'center'},
]);
- const columnsAppro= ref([
- { title: t('序号'), dataIndex: 'index', key: 'index', sorter: true, customRender: (column) => `${column.index + 1}` ,width: 100},
- { title: t('标题'), dataIndex: 'title', sorter: true, width:100},
- { title: t('编号'), dataIndex: 'code', sorter: true},
- { title: t('签报类型'), dataIndex: 'typeName', sorter: true, width: 140},
- { title: t('拟稿人'), dataIndex: 'empName', sorter: true, width: 140},
- { title: t('拟稿人所属部门'), dataIndex: 'bDeptName', sorter: true, width: 140},
- { title: t('拟稿时间'), dataIndex: 'dateAppro', sorter: true, width: 140},
- { title: t('附件'), dataIndex: 'file', sorter: true, width: 140},
- { title: t('操作'), dataIndex: 'operation', width: 120, fixed: 'right',align: 'center'},
- ]);
const dataList = ref([])
const dataFile = ref([]);
const dataListAppro = ref([])
@@ -379,6 +369,11 @@
getOption()
if (pageId.value) {
getInfo(pageId.value)
+ if (currentRoute.value.query?.disabled) {
+ isDisable.value = true
+ let idx = columns.value.findIndex(v =>v.dataIndex == 'operation')
+ idx>-1 && columns.value.splice(idx, 1)
+ }
} else {
formState.empName = userInfo.name
formState.empId = userInfo.id
@@ -625,6 +620,9 @@
min-height: 44px;
margin-bottom: 12px;
border-bottom: 1px solid #eee;
- }
+ }
+ .pdcss {
+ padding: 6px 12px !important;
+ }
diff --git a/src/views/contract/ContractPurPng/components/config.ts b/src/views/contract/ContractPurPng/components/config.ts
index 1a4fcd4..135e4d3 100644
--- a/src/views/contract/ContractPurPng/components/config.ts
+++ b/src/views/contract/ContractPurPng/components/config.ts
@@ -8,7 +8,7 @@ export const formConfig = {
export const searchFormSchema: FormSchema[] = [
{
- field: 'kNo',
+ field: 'kName',
label: '合同号/名称',
component: 'Input',
},
@@ -54,6 +54,7 @@ export const columns: BasicColumn[] = [
align: 'left',
sorter: true,
+ width: 120
},
{
@@ -63,19 +64,20 @@ export const columns: BasicColumn[] = [
align: 'left',
sorter: true,
+ width: 120
},
{
- dataIndex: 'approCode',
+ dataIndex: 'approName',
title: '状态',
componentType: 'input',
align: 'left',
-
+ width: 100,
sorter: true,
},
{
- dataIndex: 'cpTableName',
+ dataIndex: 'pointUpName',
title: '上载点',
componentType: 'input',
align: 'left',
@@ -84,16 +86,16 @@ export const columns: BasicColumn[] = [
},
{
- dataIndex: 'onlineSign',
+ dataIndex: 'transName',
title: '是否托运',
componentType: 'input',
align: 'left',
-
+ width: 100,
sorter: true,
},
{
- dataIndex: 'comId',
+ dataIndex: 'comName',
title: '合同主体',
componentType: 'input',
align: 'left',
diff --git a/src/views/contract/ContractPurPng/components/createForm.vue b/src/views/contract/ContractPurPng/components/createForm.vue
index bdfae3c..4b210d2 100644
--- a/src/views/contract/ContractPurPng/components/createForm.vue
+++ b/src/views/contract/ContractPurPng/components/createForm.vue
@@ -110,7 +110,7 @@
上载点
新增
删除
-
+
@@ -303,10 +303,7 @@
() => props.disabled,
(val) => {
isDisable.value = val
- if (val) {
- let idx = columns.value.findIndex(v =>v.dataIndex == 'operation')
- idx>-1 && columns.value.splice(idx, 1)
- }
+
},
{
immediate: true
@@ -352,10 +349,8 @@
v.dateFrom = v.dateFrom ? dayjs(v.dateFrom) : null
v.dateTo = v.dateTo ? dayjs(v.dateTo) : null
});
-
- dataListPoint.value.forEach(v => {
- let a = (v.lngContractPurPngPointSalesList || []).map(i =>i.pointDelyName)
- v.pointDelyName = a.join(',')
+ dataListAppro.value.forEach(v => {
+ v.approId = v.id
})
} catch (error) {
@@ -530,7 +525,7 @@
await formRef.value.validateFields();
let arr = contractQty.value.getQtyList()
for(let i=0; i
diff --git a/src/views/contract/ContractSales/components/config.ts b/src/views/contract/ContractSales/components/config.ts
index 8da6947..e575e07 100644
--- a/src/views/contract/ContractSales/components/config.ts
+++ b/src/views/contract/ContractSales/components/config.ts
@@ -52,7 +52,7 @@ export const columns: BasicColumn[] = [
title: '有效期开始',
componentType: 'input',
align: 'left',
-
+ width: 120,
sorter: true,
},
@@ -61,7 +61,7 @@ export const columns: BasicColumn[] = [
title: '有效期结束',
componentType: 'input',
align: 'left',
-
+ width: 120,
sorter: true,
},
@@ -70,7 +70,7 @@ export const columns: BasicColumn[] = [
title: '状态',
componentType: 'input',
align: 'left',
-
+ width: 100,
sorter: true,
},
@@ -84,11 +84,11 @@ export const columns: BasicColumn[] = [
},
{
- dataIndex: 'transSignName',
+ dataIndex: 'transName',
title: '是否托运',
componentType: 'input',
align: 'left',
-
+ width: 120,
sorter: true,
},
diff --git a/src/views/contract/ContractSales/components/createForm.vue b/src/views/contract/ContractSales/components/createForm.vue
index be096d0..5844d39 100644
--- a/src/views/contract/ContractSales/components/createForm.vue
+++ b/src/views/contract/ContractSales/components/createForm.vue
@@ -265,22 +265,6 @@
labelCol: { span: 8 },
wrapperCol: { span: 16 },
}
- const columns= ref([
- { title: t('序号'), dataIndex: 'index', key: 'index', sorter: true, customRender: (column) => `${column.index + 1}` ,width: 80},
- { title: t('开始日期'), dataIndex: 'dateFrom', sorter: true, width:150},
- { title: t('结束日期'), dataIndex: 'dateTo', sorter: true, width: 150},
- { title: t('基础量/增量'), dataIndex: 'baseInc', sorter: true, width: 130},
- { title: t('优先级'), dataIndex: 'sort', sorter: true, width: 100},
- { title: t('比值(方/吉焦)'), dataIndex: 'rateM3Gj', sorter: true, width: 150},
- { title: t('月气量(吉焦)'), dataIndex: 'qtyGjMonth', sorter: true, width: 150},
- { title: t('月气量(万方)'), dataIndex: 'qtyM3Month', sorter: true, width: 150},
- { title: t('日气量(吉焦)'), dataIndex: 'qtyGjDay', sorter: true, width: 120},
- { title: t('日气量(万方)'), dataIndex: 'qtyM3Day', sorter: true, width: 120},
- { title: t('照付不议类型'), dataIndex: 'zfbyTypeCode', sorter: true, width: 120},
- { title: t('照付不议比例%/量数值'), dataIndex: 'zfbyValue', sorter: true, width: 120},
- { title: t('备注'), dataIndex: 'note', sorter: true, width: 200},
- { title: t('操作'), dataIndex: 'operation', width: 80, fixed: 'right',align: 'center'},
- ]);
const columnsUp = ref([
{ title: t('序号'), dataIndex: 'index', key: 'index', sorter: true, customRender: (column) => `${column.index + 1}` ,width: 80},
{ title: t('交割点'), dataIndex: 'pointDelyName', sorter: true, width:150},
@@ -339,10 +323,6 @@
() => props.disabled,
(val) => {
isDisable.value = val
- if (val) {
- let idx = columns.value.findIndex(v =>v.dataIndex == 'operation')
- idx>-1 && columns.value.splice(idx, 1)
- }
},
{
immediate: true
@@ -566,7 +546,7 @@
await formRef.value.validateFields();
let arr = contractQty.value.getQtyList()
for(let i=0; i