Merge branch 'develop' of http://gitlab.91isoft.com:90/purple-cloud/web-progeam into develop

src/views/biddingManagement/index.vue

@@ -25,7 +25,7 @@
                 label: '修改',
                 onClick: handleEdit.bind(null, record, 0),
                 ifShow: (_action) => {
-                  return record.reviewStatus == null;
+                  return record.reviewStatus == '0';
                 },
               },
               {
@@ -37,7 +37,7 @@
                   confirm: handleDelete.bind(null, record),
                 },
                 ifShow: (_action) => {
-                  return record.reviewStatus == null;
+                  return record.reviewStatus == '0';
                 },
               },
               {
@@ -49,7 +49,7 @@
                   confirm: examine.bind(null, record, true),
                 },
                 ifShow: (_action) => {
-                  return record.reviewStatus == null;
+                  return record.reviewStatus == '0';
                 },
               },
             ]"
@@ -72,9 +72,10 @@
   import { useModal } from '@/components/Modal';
   import yearModal from '@/components/yearModal.vue';
   import { useRouter } from 'vue-router';
+  import { useMessage } from '@/hooks/web/useMessage';
+
   const { push } = useRouter();
-  import {useMessage} from "@/hooks/web/useMessage";
-  const {createMessage} = useMessage();
+  const { createMessage } = useMessage();
   const { error } = createMessage;
   defineOptions({ name: 'RoleManagement' });
 

src/views/biddingPlan/index.vue

@@ -25,7 +25,7 @@
                 label: '编辑',
                 onClick: handleEdit.bind(null, record, 0),
                 ifShow: (_action) => {
-                  return record.reviewStatus == null;
+                  return record.reviewStatus == '0';
                 },
               },
               {
@@ -37,7 +37,7 @@
                   confirm: handleDelete.bind(null, record),
                 },
                 ifShow: (_action) => {
-                  return record.reviewStatus == null;
+                  return record.reviewStatus == '0';
                 },
               },
               {
@@ -49,7 +49,7 @@
                   confirm: examine.bind(null, record, true),
                 },
                 ifShow: (_action) => {
-                  return record.reviewStatus == null;
+                  return record.reviewStatus == '0';
                 },
               },
             ]"
@@ -67,8 +67,9 @@
   import yearModal from '@/components/yearModal.vue';
   import { columns, searchFormSchema } from './biddingPlan.data';
   import { useRouter } from 'vue-router';
-  import {useMessage} from "@/hooks/web/useMessage";
-  const {createMessage} = useMessage();
+  import { useMessage } from '@/hooks/web/useMessage';
+
+  const { createMessage } = useMessage();
   const { error } = createMessage;
   const { push } = useRouter();
   const [register, { openModal: openModal, closeModal: closeModal }] = useModal();

src/views/monthlyPlan/monthlyPlanEdit/monthlyPlanEdit.vue

@@ -7,7 +7,7 @@
     headerSticky
   >
     <template #extra>
-      <a-button type="primary" danger> 删除 </a-button>
+      <!--      <a-button type="primary" danger> 删除 </a-button>-->
       <a-button type="primary" v-if="!disabled" @click="handleSubmit"> 提交 </a-button>
       <a-button type="default" @click="router.back()"> 返回 </a-button>
     </template>
@@ -20,10 +20,9 @@
           preIcon="ant-design:delete-outlined"
           danger
           @click="deleteItem(index)"
-        >
-        </a-button>
+        />
       </template>
-      <BasicForm :loading="loading" @register="item.Form[0]"> </BasicForm>
+      <BasicForm :loading="loading" @register="item.Form[0]" />
       <PageCard
         v-for="(content, key) in item.list"
         :key="key"
@@ -61,6 +60,7 @@
   import { useModal } from '@/components/Modal';
   import { router } from '@/router';
   import { useRoute } from 'vue-router';
+
   const [registerDrawer, { openDrawer }] = useDrawer();
   const loadingRef = ref(false);
   const [register, { openModal: openModal }] = useModal();

src/views/performance/performanceEdit.vue

@@ -7,7 +7,7 @@
     headerSticky
   >
     <template #extra>
-      <a-button type="primary" danger> 删除 </a-button>
+      <!--      <a-button type="primary" danger> 删除 </a-button>-->
       <a-button type="primary" v-if="!disabled" @click="handleSubmit"> 提交 </a-button>
       <a-button type="default" @click="router.back()"> 返回 </a-button>
     </template>
@@ -20,8 +20,7 @@
             preIcon="ant-design:delete-outlined"
             danger
             @click="deleteItem(index)"
-          >
-          </a-button>
+          />
         </template>
         <BasicForm :loading="loading" @register="item.Form[0]" />
       </PageCard>
@@ -39,7 +38,6 @@
 <script lang="ts" setup>
   import addPlanModel from './addPlanModel.vue';
   import { useModal } from '@/components/Modal';
-  const [register, { openModal: openModal }] = useModal();
   import { unref, computed, onMounted, ref, reactive, nextTick, provide } from 'vue';
   import { PageWrapper } from '@/components/Page';
   import PageCard from '@/components/Page/src/PageCard.vue';
@@ -57,6 +55,9 @@
     GetEngineProjectList,
     Itemdelete,
   } from '@/api/project/performance';
+
+  const [register, { openModal: openModal }] = useModal();
+
   const loadingRef = ref(false);
   const { createMessage } = useMessage();
   const isUpdate = ref(false);

src/views/project/annexDrawer/drawerData.ts

@@ -6,35 +6,35 @@ export const annexDrawer: FormSchema[] = [
     label: '文件名',
     field: 'fileName',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '大小',
     field: 'fileSize',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '上传时间',
     field: 'createTime',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '上传人员',
     field: 'createBy',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '备注内容',
     field: 'remark',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
 ];

src/views/project/annualDrawer/annualDrawer.vue

@@ -52,4 +52,9 @@
     console.log('年度资金计划res的值详情', res);
     setFieldsValue(res);
   }
+
+  // 点击确认按钮关闭详情
+  async function handleSubmit() {
+    closeDrawer();
+  }
 </script>

src/views/project/biddingManagementDrawer/biddingManagementDrawer.vue

@@ -52,4 +52,8 @@
     console.log('招标管理res的值详情', res);
     setFieldsValue(res);
   }
+  // 点击确认按钮关闭详情
+  async function handleSubmit() {
+    closeDrawer();
+  }
 </script>

src/views/project/biddingPlanDrawer/biddingFormDrawer.vue

@@ -51,4 +51,8 @@
     console.log('投资计划res的值详情', res);
     setFieldsValue(res);
   }
+  // 点击确认按钮关闭详情
+  async function handleSubmit() {
+    closeDrawer();
+  }
 </script>

src/views/project/changeSignatureDrawer/drawerData.ts

@@ -6,42 +6,42 @@ export const changeSignatureDrawer: FormSchema[] = [
     label: '填报周期',
     field: 'yearQuarter',
     labelWidth: '280px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '项目名称',
     field: 'projectName',
     labelWidth: '280px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '招标方式',
     field: 'biddingMethod',
     labelWidth: '280px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '合同名称',
     field: 'contractName',
     labelWidth: '280px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '合同类型',
     field: 'contractType',
     labelWidth: '280px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     labelWidth: '140px',
     field: 'formOfContract',
     label: '合同形式',
-
+    required: false,
     component: 'Select',
     componentProps: {
       options: [
@@ -68,7 +68,7 @@ export const changeSignatureDrawer: FormSchema[] = [
     labelWidth: '140px',
     field: 'contractAmount',
     label: '合同金额',
-
+    required: false,
     component: 'InputNumber',
     componentProps: {
       addonAfter: '元',
@@ -78,6 +78,7 @@ export const changeSignatureDrawer: FormSchema[] = [
     labelWidth: '140px',
     field: 'amountInvested',
     label: '立项投资额',
+    required: false,
     component: 'InputNumber',
     componentProps: {
       addonAfter: '万元',
@@ -87,77 +88,77 @@ export const changeSignatureDrawer: FormSchema[] = [
     label: '甲方单位名称',
     field: 'firstPartyName',
     labelWidth: '280px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '乙方单位名称',
     field: 'partyName',
     labelWidth: '280px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '合同累计签证、变更金额（含本次）（元）',
     field: 'changeAmount',
     labelWidth: '280px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '累计变更签证金额占合同金额比例',
     field: 'amountRatio',
     labelWidth: '280px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '变更编号',
     field: 'changeNumber',
     labelWidth: '280px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '变更类型',
     field: 'changeType',
     labelWidth: '280px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '责任方',
     field: 'responsibleParty',
     labelWidth: '280px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '变更内容',
     field: 'changeContent',
     labelWidth: '280px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '预估变更金额（元)',
     field: 'visaAmount',
     labelWidth: '280px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '预估变更金额占合同金额比例',
     field: 'contractValueRatio',
     labelWidth: '280px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '签证编号',
     field: 'visaNumber',
     labelWidth: '280px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   //签证类型:
@@ -165,7 +166,7 @@ export const changeSignatureDrawer: FormSchema[] = [
     labelWidth: '140px',
     field: 'visaType',
     label: '签证类型:',
-
+    required: false,
     component: 'Input',
   },
 
@@ -174,6 +175,7 @@ export const changeSignatureDrawer: FormSchema[] = [
     labelWidth: '140px',
     field: 'visaContent',
     label: '签证内容:',
+    required: false,
     component: 'Input',
   },
 
@@ -182,9 +184,8 @@ export const changeSignatureDrawer: FormSchema[] = [
     //meeting_minutes
     label: '会议纪要',
     field: 'meetingMinutes',
-
+    required: false,
     component: 'InputTextArea',
-
     componentProps: {
       maxlength: 100,
       showCount: true,
@@ -194,7 +195,7 @@ export const changeSignatureDrawer: FormSchema[] = [
     label: '资金来源',
     field: 'fundingSource',
     labelWidth: '280px',
-    required: true,
+    required: false,
     component: 'Input',
   },
 ];

src/views/project/completedDrawer/completedDrawer.vue

@@ -52,4 +52,8 @@
     console.log('已竣工验收项目陈欠资金计划res的值详情', res);
     setFieldsValue(res);
   }
+  // 点击确认按钮关闭详情
+  async function handleSubmit() {
+    closeDrawer();
+  }
 </script>

src/views/project/contractDrawer/drawerData.ts

@@ -6,35 +6,35 @@ export const contractDrawer: FormSchema[] = [
     label: '合同名称',
     field: 'contrcatName',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '项目名称',
     field: 'projectName',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '结算金额',
     field: 'investmentAmount',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '收款单位',
     field: 'collectingUnit',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '合同额',
     field: 'contractAmount',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
 ];

src/views/project/investmentPlanDrawer/investmentPlanDrawer.vue

@@ -52,4 +52,8 @@
     console.log('投资计划res的值详情', res);
     setFieldsValue(res);
   }
+  // 点击确认按钮关闭详情
+  async function handleSubmit() {
+    closeDrawer();
+  }
 </script>

src/views/project/monthDrawer/monthDrawer.vue

@@ -52,4 +52,8 @@
     console.log('月度资金res的值详情', res);
     setFieldsValue(res);
   }
+  // 点击确认按钮关闭详情
+  async function handleSubmit() {
+    closeDrawer();
+  }
 </script>

src/views/project/performanceDrawer/performanceDrawer.vue

@@ -52,4 +52,8 @@
     console.log('计划完成res的值详情', res);
     setFieldsValue(res);
   }
+  // 点击确认按钮关闭详情
+  async function handleSubmit() {
+    closeDrawer();
+  }
 </script>

src/views/project/potentialSafetyDrawer/drawerData.ts

@@ -6,63 +6,63 @@ export const potentialSafetyDrawer: FormSchema[] = [
     label: '填报周期',
     field: 'fillingPeriod',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '隐患描述',
     field: 'describe',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '隐患级别',
     field: 'level',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '计划费用(万元)',
     field: 'planCost',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '实际费用(万元)',
     field: 'actualCost',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '计划时间',
     field: 'planTime',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '实际时间',
     field: 'actualTime',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '隐患治理后的评估情况',
     field: 'assessmentSituation',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '责任人',
     field: 'responsiblePerson',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
 ];

src/views/project/safetyEducationDrawer/drawerData.ts

@@ -6,70 +6,70 @@ export const safetyEducationDrawer: FormSchema[] = [
     label: '填报周期',
     field: 'fillingPeriod',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '培训时间',
     field: 'trainingTime',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '培训主题',
     field: 'trainingTheme',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '培训类型',
     field: 'trainingType',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '培训形式',
     field: 'trainingFormat',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '计划会议',
     field: 'trainingMeet',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '培训人员',
     field: 'trainers',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '学识(合计)',
     field: 'knowledge',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '人数',
     field: 'numberOfPeople',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '备注',
     field: 'remark',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
 ];

src/views/project/settlementDrawer/drawerData.ts

@@ -6,28 +6,28 @@ export const settlementDrawer: FormSchema[] = [
     label: '填报周期',
     field: 'yearQuarter',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '立项投资额（万元）',
     field: 'projectInvestment',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '资金来源',
     field: 'fundingSource',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '招标方式',
     field: 'biddingMethod',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Select',
     componentProps: {
       options: [
@@ -58,7 +58,7 @@ export const settlementDrawer: FormSchema[] = [
     label: '合同类型',
     field: 'contracYpe',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Select',
     componentProps: {
       options: [
@@ -85,28 +85,28 @@ export const settlementDrawer: FormSchema[] = [
     label: '合同名称',
     field: 'contractName',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '甲方单位名称',
     field: 'firstPartyName',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '乙方单位名称',
     field: 'secondPartyName',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '合同形式',
     field: 'formOfContract',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Select',
     componentProps: {
       options: [
@@ -133,70 +133,70 @@ export const settlementDrawer: FormSchema[] = [
     label: '合同签订时间',
     field: 'contractSigningTime',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '竣工时间',
     field: 'closingTime',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '结算完成时间',
     field: 'closingTimeDatetime',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '合同金额（元）',
     field: 'contractAmount',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '签证、变更金额（元）',
     field: 'submittedForSettlement',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '结算报送金额（元)',
     field: 'superContractScale',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '结算审定金额（元）',
     field: 'sumOfMoney',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '结算审核金额超合同额比例',
     field: 'proportionContractAmount',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '会议纪要',
     field: 'meetingMinutes',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
   {
     label: '备注',
     field: 'remark',
     labelWidth: '140px',
-    required: true,
+    required: false,
     component: 'Input',
   },
 ];

src/views/statement/monthlyPlanDrawer/detail.data.ts

@@ -525,7 +525,7 @@ export function getFormConfig(): Partial<FormProps> {
         label: '填报周期',
         component: 'DatePicker',
         componentProps: {
-          picker: 'date',
+          picker: 'month',
           valueFormat: 'YYYY-MM',
           format: 'YYYY-MM',
           style: {