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

src/api/project/index.js

@@ -295,6 +295,16 @@ export default {
       params,
       'post'
     )
+  },
+  /**
+   * 项目结转
+   */
+  projectCarry(parmas) {
+    return fetch(
+      '/blade-project-manage-v2/project/v2/projectCarryOver',
+      parmas,
+      'post'
+    )
   }
 }
 

src/config/website.js

@@ -6,5 +6,31 @@ export default {
   tenant: '000000',
   clientId: 'project_web', // 客户端id
   clientSecret: 'project_web_key', // 客户端密钥
-  statusWhiteList: []
+  statusWhiteList: [],
+  reportTypes: [
+    {
+      label: '未备案/批复',
+      value: 0
+    },
+    {
+      label: '已备案/批复（未上报）',
+      value: 1
+    },
+    {
+      label: '待审核',
+      value: 2
+    },
+    {
+      label: '审核通过',
+      value: 3
+    },
+    {
+      label: '审核未通过',
+      value: 4
+    },
+    {
+      label: '固定资产',
+      value: 5
+    }
+  ]
 }

src/views/home/component/dash.vue

@@ -56,6 +56,13 @@
           title="汇总数据导出"
           @click="diaType = 2"
         />
+        <base-button
+          class="ml-20 mt-20"
+          type="0"
+          icon="el-icon-coordinate"
+          title="项目结转"
+          @click="projectCarry"
+        />
       </div>
     </div>
     <avue-crud
@@ -101,7 +108,7 @@
             row.report_type === 2
           "
           type="primary"
-          @click="projectApproval(row)"
+          @click="rowClick(row, 1)"
           >审批</el-button
         >
         <el-button
@@ -274,6 +281,22 @@
         <el-button @click="track(currentReport)">确 定</el-button>
       </div>
     </el-dialog>
+    <!--    项目审批-->
+    <el-dialog v-model="showApproval" title="审批">
+      <div>
+        <el-input
+          type="textarea"
+          v-model="approvalMsg"
+          placeholder="请填写审批意见"
+        />
+        <div class="full-width flex flex-justify-end mt-20">
+          <el-button plain type="primary" @click="showApproval = false"
+            >取消</el-button
+          >
+          <el-button type="primary" @click="projectApproval">确定</el-button>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -284,6 +307,7 @@ import formDialog from '@/views/home/component/form_dialog.vue'
 import { getLazyList } from '@/api/project/index.js'
 import summaryDialog from '@/views/home/component/summary_dialog.vue'
 import { useStore } from '@/store/user.js'
+import confing from '@/config/website'
 
 export default {
   name: 'dash',
@@ -295,7 +319,8 @@ export default {
   },
   data() {
     return {
-      projectApprovalBtn: false,
+      showApproval: false,
+      approvalMsg: '',
       reportTime: '',
       currentReport: null,
       reportShow: false,
@@ -421,22 +446,17 @@ export default {
           {
             label: '认定时间',
             prop: 'year',
-            width: 160
-          },
-          {
-            label: '存在问题',
-            prop: 'year',
-            width: 80
+            width: 120
           },
           {
-            label: '数据更新时间',
-            prop: 'year',
-            width: 160
+            label: '预警提示',
+            prop: 'tips',
+            width: 100
           },
           {
             label: '状态',
             prop: 'report_type',
-            width: 100,
+            width: 170,
             slot: true
           }
         ]
@@ -535,13 +555,11 @@ export default {
               e.selected = true
               const xian = e.name.indexOf('县')
               e.name = this.dev ? e.name.substring(xian + 1) : e.name
-              e.report_type_name = '未上报'
-              if (e.report_type === 2) {
-                e.report_type_name = '待审批'
-              } else if (e.report_type === 3) {
-                e.report_type_name = '通过'
-              } else if (e.report_type === 4) {
-                e.report_type_name = '固定资产'
+              const status = confing.reportTypes.find(
+                ele => ele.value === e.report_type
+              )
+              if (status) {
+                e.report_type_name = status.label
               }
               return e
             })
@@ -655,6 +673,12 @@ export default {
         }
       })
     },
+    rowClick(item, type) {
+      this.form = item
+      if (type === 1) {
+        this.showApproval = true
+      }
+    },
     /**
      * 管理员审批项目
      * @param res
@@ -685,6 +709,19 @@ export default {
         }
       })
     },
+    projectCarry() {
+      console.log(this.selectList)
+      this.$api.project
+        .projectCarry({ ids: this.selectList.join(',') })
+        .then(res => {
+          if (res.code === 200) {
+            this.$message.success(res.msg)
+            this.refreshChange()
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+    },
     track(res) {
       const data = {
         id: res.id,

src/views/home/component/owner_serach.vue

@@ -116,7 +116,6 @@
               </div>
             </el-form-item>
           </div>
-          <div class="flex flex-center flex-justify-end"></div>
           <div>
             <el-form-item class="full-width" label="计划(实际)入库时间">
               <el-date-picker
@@ -132,6 +131,18 @@
               />
             </el-form-item>
           </div>
+          <div class="flex flex-center flex-justify-end">
+            <el-form-item class="full-width" label="项目状态">
+              <el-select v-model="form.reportType" style="width: 100%">
+                <el-option
+                  v-for="item in reportTypes"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </div>
           <div class="flex flex-align-center flex-justify-end">
             <base-button
               class="pointer"
@@ -211,6 +222,7 @@
 <script>
 import baseButton from '../../../components/base-button.vue'
 import { useStore } from '@/store/user.js'
+import confing from '@/config/website'
 
 export default {
   name: 'owner_serach',
@@ -232,6 +244,7 @@ export default {
   data() {
     return {
       deptList: [],
+      reportTypes: [],
       form: {
         projectName: '', // 项目名称/关键字
         typeId: '', // 项目分类
@@ -242,7 +255,8 @@ export default {
         isFocusStart: '', // 是否集中开工
         deptIds: '', // 机构id，多选
         type: true,
-        projectYear: ''
+        projectYear: '',
+        reportType: ''
       },
       totalAmount: [
         {
@@ -331,6 +345,7 @@ export default {
     }
   },
   created() {
+    this.reportTypes = confing.reportTypes
     this.getTypeList()
     this.form.projectYear = new Date().getFullYear()
   },

src/views/home/component/params/params1.vue

@@ -100,6 +100,56 @@
           </el-form-item>
         </div>
 
+        <div class="full-width flex">
+          <el-form-item
+            label="备案号"
+            class="flex-child-average"
+            style="flex: 1"
+          >
+            <el-input v-model="form.industry" />
+          </el-form-item>
+          <el-form-item label="备案时间" class="flex-child-average ml-20">
+            <el-input
+              v-if="disabled"
+              v-model="form.construction_start_and_end"
+            />
+            <el-date-picker
+              v-else
+              v-model="form.construction_start_and_end_new"
+              @change="changeDate"
+              placeholder="备案时间"
+              style="width: 100%"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+          </el-form-item>
+        </div>
+
+        <div class="full-width flex">
+          <el-form-item
+            label="可研批复号"
+            class="flex-child-average"
+            style="flex: 1"
+          >
+            <el-input v-model="form.industry" />
+          </el-form-item>
+          <el-form-item label="可研批复时间" class="flex-child-average ml-20">
+            <el-input
+              v-if="disabled"
+              v-model="form.construction_start_and_end"
+            />
+            <el-date-picker
+              v-else
+              v-model="form.construction_start_and_end_new"
+              @change="changeDate"
+              placeholder="可研批复时间"
+              style="width: 100%"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+          </el-form-item>
+        </div>
+
         <div class="full-width flex">
           <el-form-item label="计划开工时间" style="flex: 1" class="full-width">
             <el-date-picker