2023-10-25

src/views/finance/components/addPropertyPlan.vue

@@ -48,7 +48,7 @@
       </template>
       <template v-slot:plan_date v-if="role === 0">
         <div class="xy-table-item">
-          <div class="xy-table-item-label">计划评审时间 ：</div>
+          <div class="xy-table-item-label">计划送审时间 ：</div>
           <div class="xy-table-item-content">
             <el-date-picker
               type="month"
@@ -62,7 +62,7 @@
       </template>
       <template v-slot:actually_date v-if="role === 1">
         <div class="xy-table-item">
-          <div class="xy-table-item-label">实际评审时间 ：</div>
+          <div class="xy-table-item-label">实际送审时间 ：</div>
           <div class="xy-table-item-content">
             <el-date-picker
               v-model="form.actually_date"
@@ -85,6 +85,7 @@
               content: '',
               plan_date: '',
               actually_date: '',
+              report_date: ''
             })
           "
           >新增</el-button
@@ -250,6 +251,25 @@ export default {
             );
           },
         },
+        {
+          prop: "report_date",
+          label: "出具报告时间",
+          sortable: false,
+          width: 160,
+          customFn: (row) => {
+            return (
+              <el-date-picker
+                placeholder="出具报告时间"
+                readonly={this.role == 0}
+                style="width: 100%;"
+                value-format="yyyy-MM-dd"
+                v-model={row.report_date}
+                size="mini"
+                clearable={true}
+              ></el-date-picker>
+            );
+          },
+        },
         {
           label: "操作",
           width: 180,
@@ -496,6 +516,7 @@ export default {
           content: i.content || '',
           plan_date: i.plan_date || '',
           actually_date: i.actually_date || '',
+          report_date: i.report_date || ''
         };
       });
     },

src/views/finance/components/remark.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <Modal v-model="isShow" title="备注" footer-hide :width="64">
-      <Button type="primary" shape="circle" icon="ios-add" @click="add"
+      <Button v-if="(role === 1 || role === 0)" type="primary" shape="circle" icon="ios-add" @click="add"
         >新增</Button
       >
 
@@ -19,7 +19,9 @@
 <script>
 import { show, save } from "@/api/propertyPlan";
 export default {
-  props: {},
+  props: {
+    role: Number
+  },
   data() {
     return {
       key: 1,

src/views/finance/financialEvaluation.vue

@@ -124,7 +124,7 @@
           prop="more"
           header-align="center"
           align="center"
-          width="100"
+          width="164"
         >
           <template #default="{ row }">
             <Button
@@ -133,6 +133,12 @@
               @click="$refs['file'].setId(row.pid), $refs['file'].show()"
               >附件查看</Button
             >
+            <Button
+              size="small"
+              type="primary"
+              @click="$refs['remark'].setId(row.pid), $refs['remark'].show()"
+            >备注
+            </Button>
           </template>
         </el-table-column>
       </template>
@@ -146,7 +152,7 @@
           (e) => {
             select.page = e;
             getList();
-``          }
+          }
         "
       />
     </div>
@@ -163,7 +169,7 @@
         }
       "
     ></addPropertyPlan>
-    <remark ref="remark"></remark>
+    <remark :role="role" ref="remark"></remark>
     <file :role="role" ref="file"></file>
   </div>
 </template>
@@ -215,7 +221,7 @@ export default {
         },
         {
           prop: "plan_date",
-          label: "计划评审时间",
+          label: "计划送审时间",
           width: 170,
           formatter: (cell, data, value) => {
             return value
@@ -225,7 +231,7 @@ export default {
         },
         {
           prop: "actually_date",
-          label: "实际评审时间",
+          label: "实际送审时间",
           width: 170,
           formatter: (cell, data, value) => {
             return value
@@ -233,6 +239,16 @@ export default {
               : "未完成";
           },
         },
+        {
+          prop: 'report_date',
+          label: '出具报告时间',
+          width: 170,
+          formatter: (cell, data, value) => {
+            return value
+              ? this.$moment(new Date(value)).format("YYYY年MM月DD")
+              : "未完成";
+          },
+        }
       ],
       total: 0,
     };

src/views/statisticalReport/govProcure.vue

@@ -34,6 +34,10 @@
             style="width: 180px"
           ></Input>
         </span>
+        <i-switch size="large" style="margin-left: 12px;" v-model="switch1" @on-change="pageChange" >
+          <span slot="open">分页</span>
+          <span slot="close">不分页</span>
+        </i-switch>
         <Button
           type="primary"
           style="margin-left: 10px"
@@ -81,6 +85,7 @@
 
     <div style="display: flex; justify-content: flex-end; margin-top: 10px">
       <Page
+        :page-size="select.page_size"
         :total="total"
         show-elevator
         @on-change="
@@ -110,6 +115,7 @@ export default {
   },
   data() {
     return {
+      switch1: true,//是否分页
       type: -1, //0为业务员1财审
       departments: [],
       select: {
@@ -121,11 +127,6 @@ export default {
       total: 0,
       list: [],
       table: [
-        {
-          prop: "department.name",
-          label: "责任科室",
-          width: 160,
-        },
         {
           prop: "name",
           label: "项目名称",
@@ -133,19 +134,17 @@ export default {
           align: "left",
         },
         {
-          prop: "content",
+          label: '未完成情况',
-          label: "项目内容",
-          minWidth: 220,
-          align: "left",
-        },
-        {
-          prop: "plan_money",
-          label: "采购预算",
           width: 160,
-          align: "right",
+          customFn:row => {
-          formatter: (cell, data, value) => {
+            return (
-            return `¥ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+              <div>
-          },
+                { row.public_act_date ? '' : (<Tag color="warning">采购意向公开未完成</Tag>) }
+                { row.invite_act_date ? '' : (<Tag color="warning">招标文件挂网未完成</Tag>) }
+                { row.open_act_date ? '' : (<Tag color="warning">项目开标未完成</Tag>) }
+              </div>
+            )
+          }
         },
         {
           prop: "public_plane_date",
@@ -207,6 +206,26 @@ export default {
               : "未完成";
           },
         },
+        {
+          prop: "department.name",
+          label: "责任科室",
+          width: 160,
+        },
+        {
+          prop: "content",
+          label: "项目内容",
+          minWidth: 220,
+          align: "left",
+        },
+        {
+          prop: "plan_money",
+          label: "采购预算",
+          width: 160,
+          align: "right",
+          formatter: (cell, data, value) => {
+            return `¥ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+          },
+        },
         {
           prop: "plan.name",
           label: "关联计划",
@@ -222,6 +241,11 @@ export default {
     };
   },
   methods: {
+    pageChange (e) {
+      this.select.page_size = e ? 10 : 9999;
+      this.getList();
+    },
+
     cellStyle({ column }) {
       if (/计划时间/g.test(column.label)) {
         return {