From 48088f5d42b1c2317135bc13f1b9c177f551988a Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Wed, 8 May 2024 11:18:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E5=8A=A1=E4=BA=BA=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E5=BE=85=E5=8A=9E=E5=AE=A1=E6=89=B9=E3=80=81?=
 =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E7=9A=84=E8=B7=B3=E8=BD=AC=E3=80=81=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E4=BF=AE=E6=94=B9=E8=B7=B3=E8=BD=AC=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   4 +-
 src/layout/components/FixedHeader/index.vue   |   4 +-
 .../enterpriseDirectory/index.vue             |   2 +-
 .../onlineDeclaration/pendingReview/index.vue |   8 +-
 src/views/onlineDeclaration/records/index.vue |   9 +-
 src/views/policyDocument/index.vue            |  10 +-
 src/views/project/index.vue                   |   4 +-
 src/views/project/projectInfo/index.vue       |  10 +-
 src/views/workbench/index.vue                 | 146 +++++++++++++++++-
 9 files changed, 171 insertions(+), 26 deletions(-)

diff --git a/.env.development b/.env.development
index 65db24a..f62caaf 100644
--- a/.env.development
+++ b/.env.development
@@ -5,8 +5,8 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
 ENV = 'development'
 
 # 金鸡湖现代服务业品牌管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.105:9040'
-# VUE_APP_BASE_API = 'http://39.101.188.84:9040'
+# VUE_APP_BASE_API = 'http://192.168.0.105:9040'
+VUE_APP_BASE_API = 'http://39.101.188.84:9040'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/layout/components/FixedHeader/index.vue b/src/layout/components/FixedHeader/index.vue
index e2f98b1..2dc4ebe 100644
--- a/src/layout/components/FixedHeader/index.vue
+++ b/src/layout/components/FixedHeader/index.vue
@@ -33,8 +33,8 @@
         </el-dropdown>
       </div>
     </div>
-    <div class="crumbs-box" v-if="breadcrumbShow">
-      <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
+    <div class="crumbs-box" v-show="breadcrumbShow">
+      <breadcrumb v-if="breadcrumbShow" id="breadcrumb-container" class="breadcrumb-container" />
     </div>
   </div>
 </template>
diff --git a/src/views/onlineDeclaration/enterpriseDirectory/index.vue b/src/views/onlineDeclaration/enterpriseDirectory/index.vue
index 138234c..cab2eff 100644
--- a/src/views/onlineDeclaration/enterpriseDirectory/index.vue
+++ b/src/views/onlineDeclaration/enterpriseDirectory/index.vue
@@ -182,7 +182,7 @@
               <!-- <el-radio-group v-model="form.isFrame">
                 <el-radio label="0">Excel批量导入</el-radio>
               </el-radio-group> -->
-              <el-radio-group v-model="form.isFrame" @input="changeIsFrame">
+              <el-radio-group v-model="form.isFrame">
                 <el-radio label="0">所有企业</el-radio>
                 <el-radio label="1">部分企业</el-radio>
               </el-radio-group>
diff --git a/src/views/onlineDeclaration/pendingReview/index.vue b/src/views/onlineDeclaration/pendingReview/index.vue
index 7687d8b..621b640 100644
--- a/src/views/onlineDeclaration/pendingReview/index.vue
+++ b/src/views/onlineDeclaration/pendingReview/index.vue
@@ -238,16 +238,18 @@ export default {
     };
   },
   mounted() {
+    if(this.$route.params.approvalStatusStr) {
+      this.queryParams.approvalStatusStr = this.$route.params.approvalStatusStr
+      this.radio = this.$route.params.approvalStatusStr
+    }
     this.cancalDebounce();
     // console.log(this.deptId,"deptId");
     window.addEventListener('resize', this.cancalDebounce);
+    this.getList();
   },
   destroyed() {
     window.removeEventListener('resize', this.cancalDebounce);
   },
-  created() {
-    this.getList();
-  },
   methods: {
     // 屏幕尺寸变化
     cancalDebounce(){
diff --git a/src/views/onlineDeclaration/records/index.vue b/src/views/onlineDeclaration/records/index.vue
index 4cccab0..6bb48e6 100644
--- a/src/views/onlineDeclaration/records/index.vue
+++ b/src/views/onlineDeclaration/records/index.vue
@@ -84,8 +84,9 @@
           <el-radio-button label="">全部</el-radio-button>
           <el-radio-button label="1,8">初审</el-radio-button>
           <el-radio-button label="2,7">复审</el-radio-button>
+          <!-- <el-radio-button label="3,6">专家评审</el-radio-button> -->
           <el-radio-button label="3,6">专家评审</el-radio-button>
-          <el-radio-button label="4">市级评审</el-radio-button>
+          <!-- <el-radio-button label="4">市级评审</el-radio-button> -->
           <el-radio-button label="5">评定通过</el-radio-button>
         </el-radio-group>
       </el-col>
@@ -206,17 +207,17 @@
           <span v-if="scope.row.status == 9" class="approval_status9">评定不通过</span>
         </template>
       </el-table-column>
-      <el-table-column label="申报时间" align="center" prop="createTime" min-width="160">
+      <el-table-column label="申报时间" align="center" prop="createTime" min-width="120">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="updateTime" label="更新时间" min-width="160">
+      <el-table-column prop="updateTime" label="更新时间" min-width="120">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="140" fixed="right">
+      <el-table-column label="操作" align="center" width="200" fixed="right">
         <!-- 0: 草稿 8：初审拒绝  7：复审拒绝 6：专家评审拒绝  9：评定不通过 -->
         <!-- v-if="userType == '01' && (scope.row.status == 0 || scope.row.status == 8||scope.row.status == 7||scope.row.status == 6||scope.row.status == 9)" -->
         <template slot-scope="scope">
diff --git a/src/views/policyDocument/index.vue b/src/views/policyDocument/index.vue
index ce662b4..09c84d6 100644
--- a/src/views/policyDocument/index.vue
+++ b/src/views/policyDocument/index.vue
@@ -381,9 +381,13 @@ export default {
     },
     // 去往项目库搜索
     goToProject(id){
-      this.$router.replace({
-        path: '/project/index',
-        query: { projectId: id }
+      // this.$router.push({
+      //   path: '/project/index',
+      //   params: { projectId: id }
+      // })
+      this.$router.push({
+        name: 'ProjectList',
+        params: { projectId: id }
       })
     },
     // 屏幕尺寸变化
diff --git a/src/views/project/index.vue b/src/views/project/index.vue
index 0f824c7..0c4b1c0 100644
--- a/src/views/project/index.vue
+++ b/src/views/project/index.vue
@@ -286,8 +286,8 @@ export default {
     };
   },
   mounted() {
-    if(this.$route.query.projectId) {
-      this.formInline.projectClassify = this.$route.query.projectId;
+    if(this.$route.params.projectId) {
+      this.formInline.projectClassify = this.$route.params.projectId + '';
       this.pagination = { ...this.pagination,...this.formInline };
     }
     this.cancalDebounce();
diff --git a/src/views/project/projectInfo/index.vue b/src/views/project/projectInfo/index.vue
index 6380a90..9e87daf 100644
--- a/src/views/project/projectInfo/index.vue
+++ b/src/views/project/projectInfo/index.vue
@@ -91,9 +91,13 @@ export default {
     },
     goback(id){
       // console.log(id,"id");
-      this.$router.replace({
-        path: '/project/index',
-        query: { projectId: id }
+      // this.$router.replace({
+      //   path: '/project/index',
+      //   query: { projectId: id }
+      // })
+      this.$router.push({
+        name: 'ProjectList',
+        params: { projectId: id }
       })
     },
     // 屏幕尺寸变化
diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue
index bc28b45..86fafb2 100644
--- a/src/views/workbench/index.vue
+++ b/src/views/workbench/index.vue
@@ -31,23 +31,73 @@
           <div class="main-right">
             <div class="right-header">
               <div class="title">【待办提醒】</div>
-              <el-button type="text">>> 更多记录</el-button>
+              <el-button @click="MoreRecords" type="text" v-if="backlogArray.length > 0">>> 更多记录</el-button>
             </div>
-            <div class="right-main">
+            <div class="right-main" v-if="backlogArray.length > 0">
               <div class="main-items" v-for="(item,index) in backlogArray" :key="index" :class="index % 2 == 0 ? '':'main-item'">
                 <div>{{ item.projectName }}</div>
                 <div>审批【知识产权】材料</div>
-                <div>去审批</div>
+                <div @click="handleApproval(item)">去审批</div>
               </div>
             </div>
+            <div class="right-main" v-else>
+              <el-divider content-position="center">暂未待审核</el-divider>
+            </div>
           </div>
         </el-col>
       </el-row>
     </main>
+    <!-- 申报审核对话框 -->
+    <el-dialog title="申报审核" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px" label-position="left">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="审批状态" prop="approvalStatus">
+              <el-radio-group v-model="form.approvalStatus">
+                <el-radio label="1">审批通过</el-radio>
+                <el-radio label="2">审批驳回</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="审批意见" prop="approvalOpinions">
+              <el-input v-model="form.approvalOpinions" type="textarea" placeholder="请输入审批意见" maxlength="200"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="审批附件" prop="fileList">
+              <el-upload
+                class="upload-demo"
+                :show-file-list="false"
+                action=""
+                accept=".xlsx,.XLSX,.XSL,.doc,.xls,.ppt,.pdf,.png,.jpg,.jpeg,.rar,.zip,.docx"
+                :http-request="handleFileUpload"
+                :file-list="fileList"
+                >
+                <el-button slot="trigger" size="small" type="success">上传文件</el-button>
+                <div slot="tip" class="el-upload__tip">请上传格式为<span style="color: red;">doc/xls/ppt/pdf/png/jpg/jpeg/rar/zip/docx/xlsx</span>的文件</div>
+              </el-upload>
+              <ul v-if="fileList.length >0" class="upload_ul">
+                <li v-for="item in uploadList" :key="item.url" class="upload_li">
+                  <img src="@/assets/images/uploadBgc.jpg" class="li_img" alt="">
+                  <span class="icon_name">{{ item.name }}</span>
+                  <el-button type="text" style="color: red;" @click="deleteUpload(item)">删除</el-button>
+                </li>
+              </ul>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
-import { approvalList } from "@/api/onlineDeclartion/pendingReview"
+import { approvalList, approvalEdit, uploadFile } from "@/api/onlineDeclartion/pendingReview"
 export default {
   data() {
     return {
@@ -56,7 +106,25 @@ export default {
       pagination: {
         pageNum:1,
         pageSize:10,
+        approvalStatusStr: 0,
+      },
+      // 是否显示弹出层
+      open: false,
+      // 表单参数
+      form: {
+        approvalOpinions: ''
+      },
+      // 表单校验
+      rules: {
+        approvalStatus: [
+          { required: true, message: "请选择审批状态", trigger: "blur" }
+        ],
+        approvalOpinions: [
+          { required: true, message: "名录维护方式不能为空", trigger: "blur" }
+        ],
       },
+      fileList: [],
+      uploadList: [],
     }
   },
   mounted(){
@@ -65,10 +133,76 @@ export default {
   methods:{
     getList(){
       approvalList(this.pagination).then(res=>{
-        console.log(res);
+        // console.log(res);
         this.backlogArray = res.rows
       })
-    }
+    },
+    // 更多记录
+    MoreRecords(){
+      this.$router.push({
+        name: 'PendingReview',
+        params: { approvalStatusStr: "0" }
+      })
+    },
+    handleApproval(row) {
+      this.reset();
+      this.form.declarationRecordsId = row.declarationRecordsId
+      this.open = true;
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        approvalOpinions: '',
+        approvalStatus: '1',
+        approvalAttachment: '',
+      };
+      this.resetForm("form");
+      this.uploadList = []
+    },
+    handleFileUpload(params) {
+      const file = params.file
+      let form = new FormData()
+      form.append('file', file)
+      uploadFile(form).then(response => {
+        this.fileList = []
+        this.fileList.push(file)
+        this.form.fileList = this.fileList
+        let data = {}
+        data.name = response.originalFilename;
+        data.url = response.url;
+        this.uploadList.push(data)
+        // console.log('this.fileList: ', this.fileList);
+      })
+    },
+    deleteUpload(value) {
+      this.uploadList =  this.uploadList.filter(item => {
+        return item.url != value.url
+      })
+    },
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.uploadList.forEach((item,index) => {
+            if(this.uploadList.length-1 == index){
+              this.form.approvalAttachment+=`${item.url}`
+            } else {
+              this.form.approvalAttachment+=`${item.url},`
+            }
+          })
+          // console.log("sdas", this.form);
+          approvalEdit(this.form).then(response => {
+            this.$modal.msgSuccess("审核完成");
+            this.open = false;
+            this.getList();
+          });
+        }
+      });
+    },
   },
 }
 </script>