Merge remote-tracking branch 'origin/develop' into develop

src/views/changeSignature/changeSignatrue.data.ts

@@ -52,7 +52,7 @@ export const searchFormSchema: FormSchema[] = [
     label: '',
     component: 'DatePicker',
     componentProps: {
-      placeholder: '选择填报周期',
+      placeholder: '年份',
       picker: 'year',
       style: { width: '100%' },
       valueFormat: 'YYYY',
@@ -97,7 +97,7 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 4 },
   },
 ];
-
+// 前半部分
 export const formSchema: FormSchema[] = [
   {
     field: 'projectName',
@@ -106,6 +106,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
+      disabled: true,
       style: { border: 'none' },
     },
     colProps: { span: 7, offset: 1 },
@@ -117,6 +118,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
+      disabled: true,
       style: { border: 'none' },
     },
     colProps: { span: 7, offset: 1 },
@@ -132,12 +134,18 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 7, offset: 1 },
   },
 ];
-export const Content: FormSchema[] = [
+// 后半部分
+export const subFormSchema: FormSchema[] = [
   {
     field: 'contractName',
     label: ' 合同名称',
-    required: true,
+    required: false,
     component: 'Input',
+    componentProps: {
+      readonly: true,
+      disabled: true,
+      style: { border: 'none' },
+    },
     colProps: { span: 7, offset: 1 },
   },
   {
@@ -206,7 +214,7 @@ export const Content: FormSchema[] = [
     required: true,
     component: 'InputNumber',
     componentProps: ({ formModel, formActionType }) => ({
-      addonAfter: '元',
+      addonAfter: '万元',
       onChange: (value) => {
         formModel.contractAmount = value;
         updateAmountRatio(formModel, formActionType);
@@ -223,7 +231,7 @@ export const Content: FormSchema[] = [
     required: true,
     component: 'InputNumber',
     componentProps: ({ formModel, formActionType }) => ({
-      addonAfter: '元',
+      addonAfter: '万元',
       onChange: (value) => {
         formModel.changeAmount = value;
         updateAmountRatio(formModel, formActionType);
@@ -286,7 +294,7 @@ export const Content: FormSchema[] = [
     required: true,
     component: 'InputNumber',
     componentProps: ({ formModel, formActionType }) => ({
-      addonAfter: '元',
+      addonAfter: '万元',
       onChange: (value) => {
         formModel.updateAmount = value;
         updateContractValueRatio(formModel, formActionType);
@@ -334,7 +342,7 @@ export const Content: FormSchema[] = [
     required: true,
     component: 'InputNumber',
     componentProps: ({ formModel, formActionType }) => ({
-      addonAfter: '元',
+      addonAfter: '万元',
       onChange: (value) => {
         formModel.visaAmount = value;
         updateEstimatedAmountRatio(formModel, formActionType);

src/views/changeSignature/index.vue

@@ -19,7 +19,7 @@
             :actions="[
               {
                 label: '修改',
-                onClick: handleEdit.bind(null, record, true),
+                onClick: handleEdit.bind(null, record, 0),
               },
               {
                 label: '审核',
@@ -49,11 +49,11 @@
             :actions="[
               {
                 label: '修改',
-                onClick: handleEdit.bind(null, record, true),
+                onClick: handleEdit.bind(null, record, 0),
               },
               {
                 label: '详情',
-                onClick: handleEdit.bind(null, record, false),
+                onClick: handleEdit.bind(null, record, 1),
               },
               {
                 label: '删除',
@@ -89,7 +89,7 @@
   import { getDepartmentList } from '@/api/project/settlementManage';
   import { useMessage } from '@/hooks/web/useMessage';
   import yearModal from '@/components/yearModal/yearModal.vue';
-  import {useUserStore} from "@/store/modules/user";
+  import { useUserStore } from '@/store/modules/user';
 
   const { createMessage } = useMessage();
   const { push } = useRouter();
@@ -125,7 +125,7 @@
       }
     });
     const data = await getDepartmentList();
-    console.log('data',data)
+    console.log('data', data);
     searchFormSchema[2].componentProps.options = data;
   });
 
@@ -143,13 +143,14 @@
   };
 
   //修改
-  function handleEdit(record: Recordable, isUpdate: boolean) {
+  function handleEdit(record: Recordable, disabled: number) {
     push({
       path: '/changeSignature/edit',
       query: {
         id: record.id,
-        statusResult: record.statusResult,
-        isUpdate: isUpdate,
+        givenYear: record.givenYear,
+        quarter: record.quarter,
+        disabled: String(disabled),
       },
     });
   }