From 3dd54f752e5851cffd7fb0daf0b612ca63409b9a Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Wed, 6 Sep 2023 11:07:37 +0800
Subject: [PATCH] 2023-9-6

---
 .env.production                               |  1 +
 .../finance/components/addPropertyPlan.vue    | 24 +++++++++++++-----
 src/views/finance/components/file.vue         |  6 +++--
 src/views/finance/financialEvaluation.vue     | 25 +++++++++++++------
 .../components/addGovPlane.vue                |  3 +++
 src/views/statisticalReport/govProcure.vue    |  6 ++---
 6 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/.env.production b/.env.production
index 32ef9e2..788deaf 100644
--- a/.env.production
+++ b/.env.production
@@ -5,3 +5,4 @@ ENV = 'production'
 VUE_APP_DOMIAN=http://192.168.60.99:9003/
 VUE_APP_BASE_API = ''
 VUE_APP_OUT_URL = http://192.168.60.18:2021
+VUE_APP_UPLOAD=http://192.168.60.99:9003/api/admin/upload-file
diff --git a/src/views/finance/components/addPropertyPlan.vue b/src/views/finance/components/addPropertyPlan.vue
index f0c9f5b..c41c2b5 100644
--- a/src/views/finance/components/addPropertyPlan.vue
+++ b/src/views/finance/components/addPropertyPlan.vue
@@ -34,13 +34,15 @@
         <div class="xy-table-item">
           <div class="xy-table-item-label">评审内容 ：</div>
           <div class="xy-table-item-content">
-            <el-input
-              type="textarea"
+            <el-select
               v-model="form.content"
               clearable
-              placeholder="请输入评审内容"
+              placeholder="请选择评审内容"
               style="width: 300px"
-            ></el-input>
+            >
+              <el-option v-for="i in ['概算评审','预算评审','竣工结算评审','竣工财务评审']" :label="i" :value="i">
+              </el-option>
+            </el-select>
           </div>
         </div>
       </template>
@@ -49,6 +51,7 @@
           <div class="xy-table-item-label">计划评审时间 ：</div>
           <div class="xy-table-item-content">
             <el-date-picker
+              type="month"
               v-model="form.plan_date"
               placeholder="请选择计划评审时间"
               style="width: 300px"
@@ -192,14 +195,22 @@ export default {
           sortable: false,
           customFn: (row) => {
             return (
-              <el-input
+              <el-select
                 placeholder="评审内容"
                 readonly={this.role == 1}
                 style="width: 100%;"
                 v-model={row.content}
                 size="mini"
                 clearable={true}
-              ></el-input>
+              >
+                {
+                  ['概算评审','预算评审','竣工结算评审','竣工财务评审'].map(i => {
+                    return (
+                      <el-option label={i} value={i}></el-option>
+                    )
+                  })
+                }
+              </el-select>
             );
           },
         },
@@ -211,6 +222,7 @@ export default {
           customFn: (row) => {
             return (
               <el-date-picker
+                type="money"
                 placeholder="计划评审时间"
                 readonly={this.role == 1}
                 style="width: 100%;"
diff --git a/src/views/finance/components/file.vue b/src/views/finance/components/file.vue
index 1cb8351..68921c5 100644
--- a/src/views/finance/components/file.vue
+++ b/src/views/finance/components/file.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
       >
 
@@ -20,7 +20,9 @@
 import { getToken } from "@/utils/auth";
 import { show, save, store } from "@/api/propertyPlan";
 export default {
-  props: {},
+  props: {
+    role: Number
+  },
   data() {
     return {
       fileList: [],
diff --git a/src/views/finance/financialEvaluation.vue b/src/views/finance/financialEvaluation.vue
index d7c7373..43c273f 100644
--- a/src/views/finance/financialEvaluation.vue
+++ b/src/views/finance/financialEvaluation.vue
@@ -49,6 +49,12 @@
             </Poptip>
           </template>
         </el-table-column>
+
+        <el-table-column v-else label="操作" prop="more" header-align="center" align="center" width="100">
+          <template  #default="{ row }">
+            <Button size="small" type="primary" @click="$refs['file'].setId(row.pid),$refs['file'].show()">附件查看</Button>
+          </template>
+        </el-table-column>
       </template>
     </xy-table>
 
@@ -67,7 +73,7 @@
 
     <addPropertyPlan ref="addPropertyPlan" :role="role" @refresh="getList"></addPropertyPlan>
     <remark ref="remark"></remark>
-    <file ref="file"></file>
+    <file :role="role" ref="file"></file>
   </div>
 </template>
 
@@ -115,11 +121,17 @@ export default {
           prop: "plan_date",
           label: "计划评审时间",
           width: 170,
+          formatter: (cell, data, value) => {
+            return value ? this.$moment(new Date(value)).format("YYYY年MM月") : '未完成';
+          },
         },
         {
           prop: "actually_date",
           label: "实际评审时间",
           width: 170,
+          formatter: (cell, data, value) => {
+            return value ? this.$moment(new Date(value)).format("YYYY年MM月DD") : '未完成';
+          },
         },
       ],
       total: 0,
@@ -127,12 +139,9 @@ export default {
   },
   methods: {
     destroy (row) {
-      let temp = this.originalList.find(i => i.id === row.pid)
-      let index = temp?.item?.indexOf(temp?.item?.find(o => o.id === row.id))
-      temp.item.splice(index,1)
-      save({
-        ...temp,
-        item_list: temp.item
+      console.log(row)
+      destroy({
+        id: row.pid
       }).then(res => {
         this.$message({
           type: 'success',
@@ -159,7 +168,7 @@ export default {
           })
         } else {
           list.push({
-
+            pid: i.id,
             index: index+1,
             type: 1,
             ...i
diff --git a/src/views/statisticalReport/components/addGovPlane.vue b/src/views/statisticalReport/components/addGovPlane.vue
index 1038831..c141d85 100644
--- a/src/views/statisticalReport/components/addGovPlane.vue
+++ b/src/views/statisticalReport/components/addGovPlane.vue
@@ -64,6 +64,7 @@
           <div class="xy-table-item-label">采购意向公开计划时间 ：</div>
           <div class="xy-table-item-content">
             <el-date-picker
+              type="month"
               v-model="form.public_plane_date"
               placeholder="请选择采购意向公开计划时间"
               style="width: 300px"
@@ -90,6 +91,7 @@
           <div class="xy-table-item-label">招标文件挂网计划时间 ：</div>
           <div class="xy-table-item-content">
             <el-date-picker
+              type="month"
               v-model="form.invite_plane_date"
               placeholder="请选择招标文件挂网计划时间"
               style="width: 300px"
@@ -116,6 +118,7 @@
           <div class="xy-table-item-label">项目开标计划时间 ：</div>
           <div class="xy-table-item-content">
             <el-date-picker
+              type="month"
               v-model="form.open_plane_date"
               placeholder="请选择项目开标计划时间"
               style="width: 300px"
diff --git a/src/views/statisticalReport/govProcure.vue b/src/views/statisticalReport/govProcure.vue
index e168156..5b8a1a3 100644
--- a/src/views/statisticalReport/govProcure.vue
+++ b/src/views/statisticalReport/govProcure.vue
@@ -116,7 +116,7 @@ export default {
           label: "采购意向公开计划时间",
           width: 190,
           formatter: (cell, data, value) => {
-            return value ? this.$moment(new Date(value)).format("YYYY年MM月DD") : '未完成';
+            return value ? this.$moment(new Date(value)).format("YYYY年MM月") : '未完成';
           },
         },
         {
@@ -132,7 +132,7 @@ export default {
           label: "招标文件挂网计划时间",
           width: 190,
           formatter: (cell, data, value) => {
-            return value ? this.$moment(new Date(value)).format("YYYY年MM月DD") : '未完成';
+            return value ? this.$moment(new Date(value)).format("YYYY年MM月") : '未完成';
           },
         },
         {
@@ -148,7 +148,7 @@ export default {
           label: "项目开标计划时间",
           width: 180,
           formatter: (cell, data, value) => {
-            return value ? this.$moment(new Date(value)).format("YYYY年MM月DD") : '未完成';
+            return value ? this.$moment(new Date(value)).format("YYYY年MM月") : '未完成';
           },
         },
         {