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

src/api/project/biddingManagement.ts

@@ -16,6 +16,8 @@ enum Api {
   selectCount = '/pro/tenderManager/selectCount',
   Itemdelete = '/pro/tenderManager/details/del',
   audit = '/pro/tenderManager/examine',
+  GetListAll = '/pro/tenderManager/selectAll',
+  ExportCount = '/pro/export/tendMangeStatistic'
 }
 export const getListByPage = (params?: ProjectPageParams) =>
   defHttp.post<ListGetResultModel>({ url: Api.GetList, data: params });
@@ -59,3 +61,16 @@ export const selectCount = (params?: any) =>
     url: Api.selectCount,
     data: params,
   });
+
+export const getListAll = (params?: any) =>
+    defHttp.post<ProjectModel>({ url: Api.GetListAll, data: params });
+
+export const exportStatisticList = (params?: any) =>
+    defHttp.post<any>(
+        {
+            url: Api.ExportCount,
+            data: params,
+            responseType: 'blob',
+        },
+        { errorMessageMode: 'none', isTransformResponse: false },
+    );

src/router/routes/modules/biddingPlan.ts

@@ -35,6 +35,16 @@ const biddingPlan: AppRouteModule = {
         orderNo: 3,
       },
     },
+    {
+      path: 'statisticsBidding',
+      name: 'statisticsBidding',
+      component: () => import('@/views/biddingManagement/statisticsBidding.vue'),
+      meta: {
+        auth: '/www/dist/index.html#/biddingManagement/index',
+        title: '招标情况统计',
+        orderNo: 3,
+      },
+    },
     {
       path: 'situationEdit',
       name: 'situationEdit',

src/views/biddingManagement/biddingManagement.data.ts

@@ -81,34 +81,6 @@ export const searchFormSchema: FormSchema[] = [
     },
     colProps: { span: 4 },
   },
-  {
-    field: 'companyName',
-    label: '',
-    component: 'Select',
-    componentProps: {
-      placeholder: '公司名称',
-      options: [
-        {
-          label: '公司名称',
-          value: '公司名称',
-          key: '公司名称',
-        },
-      ],
-    },
-    colProps: { span: 4 },
-  },
-  // {
-  //   field: 'status',
-  //   label: '状态',
-  //   component: 'Select',
-  //   componentProps: {
-  //     options: [
-  //       { label: '启用', value: '1' },
-  //       { label: '停用', value: '0' },
-  //     ],
-  //   },
-  //   colProps: { span: 8 },
-  // },
 ];
 
 export const formSchema: FormSchema[] = [
@@ -119,6 +91,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -130,6 +103,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     componentProps: {
       readonly: true,
+      disabled: true,
     },
     colProps: { span: 7, offset: 1 },
   },
@@ -211,6 +185,7 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 7, offset: 1 },
     componentProps: {
       readonly: true,
+      disabled: true,
     },
   },
   {

src/views/biddingManagement/biddingManagementEdit.vue

@@ -8,26 +8,51 @@
   >
     <template #extra>
       <!--      <a-button type="primary" danger> 删除 </a-button>-->
-      <a-button type="primary" v-if="!disabled" @click="handleSubmit"> 提交 </a-button>
+      <a-button type="primary" v-if="!disabled"  :disabled="loadingRef"  @click="handleSubmit('0')"> 暂存 </a-button>
+      <a-button type="primary" v-if="!disabled" @click="handleSubmit('1')"> 提交 </a-button>
       <a-button type="primary" @click="history" v-if="historyData">历史记录 </a-button>
       <a-button type="default" @click="router.back()"> 返回 </a-button>
     </template>
 
-    <template v-for="(item, index) in tabsFormSchema">
-      <PageCard v-if="item.show" :key="index" :title="item.name">
-        <template #right>
-          <a-button
+    <CollapseContainer v-for="(item, index) in tabsFormSchema" :key="index">
+      <template #title>
+        <span class="projectName">{{ item.name }}</span>
+      </template>
+      <template #action>
+        <a-button
             v-if="!disabled"
             type="text"
             preIcon="ant-design:delete-outlined"
             danger
-            @click="deleteItem(index)"
-          />
+            @click="deleteItemPro(index)"
+        >删除项目</a-button
+        >
+      </template>
+      <BasicForm :loading="loading" @register="item.Form[0]" />
+      <!--   左上角为项目名   -->
+      <CollapseContainer
+          v-for="(content, key) in item.list"
+          :key="key"
+          class="subCard"
+          :title="content.name"
+      >
+        <template #title>
+          <span class="contractName">{{ content.name }}</span>
         </template>
-        <BasicForm :loading="loading" @register="item.Form[0]" />
-      </PageCard>
-    </template>
-
+        <!--   右上角的删除按钮   -->
+        <template #action>
+          <a-button
+              v-if="!disabled"
+              type="text"
+              preIcon="ant-design:delete-outlined"
+              danger
+              @click="deleteItemCon(index, key)"
+          >删除合同</a-button
+          >
+        </template>
+        <BasicForm :loading="loading" @register="content.form" />
+      </CollapseContainer>
+    </CollapseContainer>
     <a-button v-if="!disabled" type="dashed" @click="add" preIcon="ei:plus">
       从项目库导入
     </a-button>
@@ -59,6 +84,8 @@
   //历史记录
   import Operations from '@/components/Operations/Operations.vue';
   import { addItem, updateItem, getItem } from '@/api/project/biddingManagement';
+  import CollapseContainer from '@/components/Container/src/collapse/CollapseContainer.vue';
+
   //历史记录是否可查
   const historyData = ref(true);
   //页面传递过来了的id
@@ -90,7 +117,7 @@
     } else {
       isUpdate.value = true;
       tenderId.value = id;
-      formData.value.tenderld = id;
+      formData.value.tenderId = id;
       disabled.value = route.query.disabled == '0' ? false : true;
       if (disabled.value) {
         getTitle.value = '查看招标管理';
@@ -102,7 +129,7 @@
       for (let i = 0; i < res.length; i++) {
         const source = res[i];
         const item = {
-          name: '序号' + (i + 1),
+          name: '项目:' + source.projectName,
           show: true,
           forceRender: true,
           Form: useForm(
@@ -153,12 +180,21 @@
       });
     }
   }
+  /*删除项目表单*/
+  async function deleteItemPro(index: any) {
+    console.log(formData.value);
+    formData.value.tenderPlanPro.splice(index, 1);
+    tabsFormSchema.splice(index, 1);
+    loadingRef.value = false;
+    console.log(formData.value);
+    // }
+  }
   /***
    *
    */
   async function handleNew(info: any) {
     const item = {
-      name: '序号' + (tabsFormSchema.length + 1),
+      name: '项目:'+info.projectName,
       forceRender: true,
       show: true,
       Form: useForm(Object.assign({ schemas: formSchema }, baseFormConfig) as FormProps),
@@ -179,20 +215,7 @@
   }
   async function deleteItem(index: any) {
     formData.value.tenderPlanPro.splice(index, 1);
-    // loadingRef.value = true;
-    // const id = formData.value.tenderPlanPro[index].id;
-    // if (id) {
-    //   await Itemdelete({
-    //     id,
-    //   });
-    //   formData.value.tenderPlanPro.splice(index, 1);
-    //   tabsFormSchema.splice(index, 1);
-    //   loadingRef.value = false;
-
-    // tabsFormSchema[index].show = false;
     tabsFormSchema.splice(index, 1);
-    // loadingRef.value = false;
-    // }
   }
 
   async function handleAdd() {
@@ -204,32 +227,108 @@
     console.log(params);
     handleNew(params);
   }
-  async function handleSubmit() {
+  async function handleSubmit(isSubmit) {
+    for(let i = 0; i < tabsFormSchema.length; i++){
+        let formSchema = tabsFormSchema[i].Form[1]
+        const { updateSchema } = formSchema
+        await nextTick(() => {
+          if (isSubmit == '0') {
+            updateSchema([
+              {field: 'projectName', required: false},
+              {field: 'fundingSource', required: false},
+              {field: 'investmentAmount', required: false},
+              {field: 'field11', required: false},
+              {field: 'biddingType', required: false},
+              {field: 'tenderContent', required: false},
+              {field: 'controlPrice', required: false},
+              {field: 'constructionMode', required: false},
+              {field: 'procurementMethod', required: false},
+              {field: 'evaluationMethod', required: false},
+              {field: 'field11', required: false},
+              {field: 'completionStatus', required: false},
+              {field: 'openingTime', required: false},
+              {field: 'winningBidder', required: false},
+              {field: 'winningAmount', required: false},
+              {field: 'winningPeriod', required: false},
+              {field: 'signingDate', required: false},
+              {field: 'meetingMinute', required: false},
+              {field: 'releaseChannels', required: false},
+              {field: 'detailedInformation', required: false},
+              {field: 'publishWebsite', required: false},
+              {field: 'publicityWebsite', required: false},
+              {field: 'isReportingSituation', required: false},
+              {field: 'handSituation', required: false},
+              {
+                field: 'remark', dynamicRules: ({values}) => {
+                  return [{required: false,}]
+                },
+              },
+            ])
+          } else {
+            updateSchema([
+              {field: 'projectName', required: true},
+              {field: 'fundingSource', required: true},
+              {field: 'investmentAmount', required: true},
+              {field: 'field11', required: true},
+              {field: 'biddingType', required: true},
+              {field: 'tenderContent', required: true},
+              {field: 'controlPrice', required: true},
+              {field: 'constructionMode', required: true},
+              {field: 'procurementMethod', required: true},
+              {field: 'evaluationMethod', required: true},
+              {field: 'field11', required: true},
+              {field: 'completionStatus', required: true},
+              {field: 'openingTime', required: true},
+              {field: 'winningBidder', required: true},
+              {field: 'winningAmount', required: true},
+              {field: 'winningPeriod', required: true},
+              {field: 'signingDate', required: true},
+              {field: 'meetingMinute', required: true},
+              {field: 'releaseChannels', required: true},
+              {field: 'detailedInformation', required: true},
+              {field: 'publishWebsite', required: true},
+              {field: 'publicityWebsite', required: true},
+              {field: 'isReportingSituation', required: true},
+              {field: 'handSituation', required: true},
+              {
+                field: 'remark', dynamicRules: ({values}) => {
+                  return values.fundGap ? [{required: true, message: '说明必填'}] : [];
+                },
+              }
+            ])
+          }
+        })
+    }
     loadingRef.value = true;
+    console.log('333333')
     try {
       for (let i = 0; i < tabsFormSchema.length; i++) {
+        console.log('4444')
         let item = tabsFormSchema[i];
         if (item.show) {
           const { validate, getFieldsValue } = item.Form[1];
           await validate();
           let res = getFieldsValue();
           formData.value.tenderPlanPro[i] = deepMerge(formData.value.tenderPlanPro[i], res);
-          console.log(formData.value.tenderPlanPro);
         }
+
       }
-      formData.value.proNumber = formData.value.tenderPlanPro.Length;
 
+      formData.value.proNumber = formData.value.tenderPlanPro.Length;
+      formData.value.isSubmit = isSubmit;
+      console.log('formData.value:',formData.value)
       let res = isUpdate.value ? await updateItem(unref(formData)) : await addItem(unref(formData));
-
       loadingRef.value = true;
       addItemData.operateType = operateType.update;
       addItemData.businessId = routeId.value;
       addItemData.businessType = '招标管理';
       const showDatem = await addItemApi(addItemData);
-      console.log(showDatem, '记录添加成功');
-      console.log(res);
-      createMessage.success('提交成功!');
-      router.back();
+      if (isSubmit === '0'){
+        createMessage.success('暂存成功!');
+      }else{
+        createMessage.success('提交成功!');
+      }
+      // router.back();
     } catch (e) {
       // 验证失败或出错，切换到对应标签页
       console.log(e);
@@ -245,3 +344,18 @@
     console.log('历史记录');
   }
 </script>
+<style scoped>
+.subCard {
+  border: 1px solid #e8eaec;
+}
+.projectName {
+  border-left: blue solid 6px;
+  padding-left: 10px;
+  font-weight: bold;
+}
+.contractName {
+  border-left: red solid 6px;
+  padding-left: 10px;
+  font-weight: bold;
+}
+</style>

src/views/biddingManagement/index.vue

@@ -49,7 +49,7 @@
                   confirm: examine.bind(null, record, true),
                 },
                 ifShow: (_action) => {
-                  return record.reviewStatus == '0'||record.reviewStatus == null;
+                  return (record.reviewStatus == '0'||record.reviewStatus == null) && record.isSubmit == '1' && deptId !== '100';
                 },
               },
             ]"
@@ -76,9 +76,11 @@
   import yearModal from '@/components/yearModal.vue';
   import { useRouter } from 'vue-router';
   import { useMessage } from '@/hooks/web/useMessage';
-  import {onMounted} from "vue";
+  import {onMounted, ref} from "vue";
   import {getDepartmentList} from "@/api/project/settlementManage";
+  import { useUserStore } from '@/store/modules/user';
 
+  const deptId = ref('');
   const { push } = useRouter();
   const { createMessage } = useMessage();
   const { error } = createMessage;
@@ -106,6 +108,8 @@
   const [register, { openModal: openModal, closeModal: closeModal }] = useModal();
 
   onMounted(async () => {
+    deptId.value = useUserStore().userInfo.deptId;
+    // console.log('deptId.value:',deptId.value)
     const data = await getDepartmentList();
     searchFormSchema[2].componentProps.options = data;
   });

src/views/monthlyPlan/monthlyPlanEdit/monthlyPlanEdit.vue

@@ -348,69 +348,74 @@
   }
   /*提交表单*/
   async function handleSubmit(isSubmit) {
-    for(let i = 0; i < tabsFormSchema.length; i++){
-      let formProjectSchema = tabsFormSchema[i].Form[1]
-      const { updateSchema }  = formProjectSchema
-      if(isSubmit == '0'){
-      updateSchema([
-      {field: 'projectName' ,required: false},
-      {field: 'sourceType' ,required: false},
-      ])
+    for (let i = 0; i < tabsFormSchema.length; i++) {
+      let formProjectSchema = tabsFormSchema[i].Form[1];
+      const { updateSchema } = formProjectSchema;
+      if (isSubmit == '0') {
+        updateSchema([
+          { field: 'projectName', required: false },
+          { field: 'sourceType', required: false },
+        ]);
+      }
+      for (let j = 0; j < tabsFormSchema[i].list.length; j++) {
+        let formSchema = tabsFormSchema[i].list[j].form[1];
+
+        const { updateSchema } = formSchema;
+        console.log(subFormSchema);
+        nextTick(() => {
+          if (isSubmit == '0') {
+            updateSchema([
+              { field: 'contrcatName', required: false },
+              { field: 'collectingUnit', required: false },
+              { field: 'contractAmount', required: false },
+              { field: 'paymentLevel', required: false },
+              { field: 'completionValueActual', required: false },
+              { field: 'accumulateCompletionValue', required: false },
+              { field: 'planCompletionValue', required: false },
+              { field: 'lastMonthPlan', required: false },
+              { field: 'lastMonthActual', required: false },
+              { field: 'accumulatePayment', required: false },
+              { field: 'thisPlanNumber', required: false },
+              { field: 'specialFund', required: false },
+              { field: 'governmentFund', required: false },
+              { field: 'banFinancing', required: false },
+              { field: 'ownFund', required: false },
+              { field: 'fundGap', required: false },
+              {
+                field: 'remark',
+                dynamicRules: ({ values }) => {
+                  return [{ required: false }];
+                },
+              },
+            ]);
+          } else {
+            updateSchema([
+              { field: 'contrcatName', required: true },
+              { field: 'collectingUnit', required: true },
+              { field: 'contractAmount', required: true },
+              { field: 'paymentLevel', required: true },
+              { field: 'completionValueActual', required: true },
+              { field: 'accumulateCompletionValue', required: true },
+              { field: 'planCompletionValue', required: true },
+              { field: 'lastMonthPlan', required: true },
+              { field: 'lastMonthActual', required: true },
+              { field: 'accumulatePayment', required: true },
+              { field: 'thisPlanNumber', required: true },
+              { field: 'specialFund', required: true },
+              { field: 'governmentFund', required: true },
+              { field: 'banFinancing', required: true },
+              { field: 'ownFund', required: true },
+              {
+                field: 'remark',
+                dynamicRules: ({ values }) => {
+                  return values.fundGap ? [{ required: true, message: '说明必填' }] : [];
+                },
+              },
+            ]);
+          }
+        });
       }
-    for(let j = 0; j < tabsFormSchema[i].list.length; j++){
-      let formSchema = tabsFormSchema[i].list[j].form[1]
- 
-      const { updateSchema } = formSchema
-      console.log(subFormSchema)
-      nextTick(()=>{
-        if(isSubmit == '0'){
-          updateSchema([
-          {field: 'contrcatName' ,required: false},
-          {field: 'collectingUnit' ,required: false},
-          {field: 'contractAmount' ,required: false},
-          {field: 'paymentLevel' ,required: false},
-          {field: 'completionValueActual' ,required: false},
-          {field: 'accumulateCompletionValue' ,required: false},
-          {field: 'planCompletionValue' ,required: false},
-          {field: 'lastMonthPlan' ,required: false},
-          {field: 'lastMonthActual' ,required: false},
-          {field: 'accumulatePayment' ,required: false},
-          {field: 'thisPlanNumber' ,required: false},
-          {field: 'specialFund' ,required: false},
-          {field: 'governmentFund' ,required: false},
-          {field: 'banFinancing' ,required: false},
-          {field: 'ownFund' ,required: false},
-          {field: 'fundGap' ,required: false},
-          {field: 'remark' , dynamicRules: ({ values }) => {
-          return  [{ required: false, }]
-          },},
-        ])
-        }else{
-          updateSchema([
-          {field: 'contrcatName' ,required: true},
-          {field: 'collectingUnit' ,required: true},
-          {field: 'contractAmount' ,required: true},
-          {field: 'paymentLevel' ,required: true},
-          {field: 'completionValueActual' ,required: true},
-          {field: 'accumulateCompletionValue' ,required: true},
-          {field: 'planCompletionValue' ,required: true},
-          {field: 'lastMonthPlan' ,required: true},
-          {field: 'lastMonthActual' ,required: true},
-          {field: 'accumulatePayment' ,required: true},
-          {field: 'thisPlanNumber' ,required: true},
-          {field: 'specialFund' ,required: true},
-          {field: 'governmentFund' ,required: true},
-          {field: 'banFinancing' ,required: true},
-          {field: 'ownFund' ,required: true},
-          {field: 'remark' , dynamicRules: ({ values }) => {
-      return values.fundGap ? [{ required: true, message: '说明必填' }] : [];
-    },}
-        ])
-        }
-      
-      })
     }
-  }
     console.log('moth的值', moth.value);
     loadingRef.value = true;
     try {