Browse Source

禅道问题修复

刘湘琪 3 years ago
parent
commit
c74253ca43

BIN
src/assets/images/icon_audit.png


+ 18 - 0
src/assets/styles/index.scss

@@ -690,3 +690,21 @@ $border: #ddd;
       font-size: 14px;
     }
   }
+.entIcon {
+	position: absolute;
+	right: 20px;
+	width: 200px;
+	height: 200px;
+	z-index: 111;
+}
+.entIcon {
+	&.pass {
+		background: url(~@/assets/images/icon_pass.png) no-repeat center;
+	}
+	&.refuse {
+		background: url(~@/assets/images/icon_refuse.png) no-repeat center;
+	}
+  &.audit {
+    background: url(~@/assets/images/icon_audit.png) no-repeat center;
+  }
+}

+ 3 - 0
src/views/enterprise/ent/basicInfo.vue

@@ -1,5 +1,8 @@
 <template>
   <div class="app-container" v-loading="loading">
+    <i v-if="info.authState == 1" class="entIcon audit"></i>
+    <i v-if="info.authState == 2" class="entIcon pass"></i>
+    <i v-if="info.authState == 3" class="entIcon refuse"></i>
     <h3 class="toolbar">
       <span class="title">企业信息</span>
     </h3>

+ 3 - 0
src/views/enterprise/ent/info.vue

@@ -1,5 +1,8 @@
 <template>
   <div class="app-container" v-loading="loading">
+    <i v-if="info.authState == 1" class="entIcon audit"></i>
+    <i v-if="info.authState == 2" class="entIcon pass"></i>
+    <i v-if="info.authState == 3" class="entIcon refuse"></i>
     <h3 class="toolbar">
       <span class="title">企业信息</span>
     </h3>

+ 51 - 0
src/views/enterprise/project/components/BasicInfo.vue

@@ -40,6 +40,12 @@
         <th>国家自主创新示范区企业</th>
         <td>{{innovateFlag}}</td>
       </tr>
+      <tr>
+        <th>技术分配人</th>
+        <th>{{info.techUser}}</th>
+        <th>财务分配人</th>
+        <th>{{info.finUser}}</th>
+      </tr>
     </table>
     <h3 class="toolbar mt20">
       <span class="title">项目是否跨年</span>
@@ -80,6 +86,26 @@
         </td>
       </tr>
     </table>
+    <h3 class="toolbar mt20">
+      <span class="title">操作日志</span>
+    </h3>
+    <h3 class="toolbar">
+      <div class="tool">
+        <el-button type="text" size="mini" @click="handleMore">更多</el-button>
+      </div>
+    </h3>
+    <el-table v-loading="loading" :data="list" border style="width: 100%">
+      <el-table-column type="index" label="日志编号" align="center" width="100"></el-table-column>
+      <el-table-column label="日志内容" prop="content" align="center"></el-table-column>
+      <el-table-column label="操作人" prop="createBy" align="center"></el-table-column>
+      <el-table-column label="操作日期" prop="createTime" align="center"></el-table-column>
+    </el-table>
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getData"/>
   </div>
 </template>
 
@@ -94,7 +120,14 @@
         id: undefined,
         roleType: '',
         info: {
+          projectLogList: []
         },
+        list: [],
+        total: 0,
+        queryParams: {
+          pageNum: 1,
+          pageSize: 1
+        }
       }
     },
     props: {
@@ -135,13 +168,31 @@
         getProjectInfoCommonApi(this.id).then(res => {
           if(this.projectOwner == '1') {
             this.info = res.data.entProject || {}
+            if(this.info.projectLogList.length > 0) {
+              this.list.push(this.info.projectLogList[0])
+            }
           }else if(this.projectOwner == '2') {
             this.info = res.data.techProject || {}
+            if(this.info.projectLogList.length > 0 ) {
+              this.list.push(this.info.projectLogList[0])
+            }
           }else if(this.projectOwner == '3') {
             this.info = res.data.finProject || {}
+            if(this.info.projectLogList.length > 0) {
+              this.list.push(this.info.projectLogList[0])
+            }
           }
         })
       },
+      //更多
+      handleMore() {
+        if(this.info.projectLogList.length <= 1) {
+          this.$message('日志已全部加载');
+        }else {
+          this.list = this.info.projectLogList || []
+        }
+        
+      },
       cancel() {
         this.$store.dispatch("tagsView/delView", this.$route); // 关闭当前tab
         this.$router.go(-1);

+ 5 - 1
src/views/enterprise/project/components/EntBasic.vue

@@ -141,7 +141,7 @@
           <el-col :span="24">
             <el-form-item style="width:100%;text-align: center;" label-width="0px">
               <el-button :loading="loading" size="medium" type="primary" @click.native.prevent="submitForm" style="width: 100px;">自填保存</el-button>
-              <el-button size="medium" type="primary" style="width: 100px;">取消</el-button>
+              <el-button size="medium" type="primary" style="width: 100px;" @click="cancel">取消</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -319,6 +319,10 @@ export default {
       this.form.techLicense = file.url;
       this.form.fileName = '高新证书';
     },
+    cancel() {
+      this.$store.dispatch("tagsView/delView", this.$route); // 关闭当前tab
+      this.$router.go(-1);
+    },
     submitForm() {
       this.$refs.form.validate(valid => {
         if(valid) {

+ 5 - 1
src/views/enterprise/project/components/FinBasic.vue

@@ -143,7 +143,7 @@
               <el-button @click="synTechSubmit" size="medium" type="primary">同步技术填报</el-button>
               <el-button @click="synEntSubmit" size="medium" type="primary">同步企业填报</el-button>
               <el-button :loading="loading" size="medium" type="primary" @click.native.prevent="submitForm" style="width: 100px;">财务保存</el-button>
-              <el-button size="medium" type="primary" style="width: 100px;">取消</el-button>
+              <el-button size="medium" type="primary" style="width: 100px;" @click="cancel">取消</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -350,6 +350,10 @@ export default {
         this.form.attachIds.push(item.response.data.id)
       });
     },
+    cancel() {
+      this.$store.dispatch("tagsView/delView", this.$route); // 关闭当前tab
+      this.$router.go(-1);
+    },
     submitForm() {
       this.$refs.form.validate(valid => {
         if(valid) {

+ 5 - 1
src/views/enterprise/project/components/TechBasic.vue

@@ -144,7 +144,7 @@
             <el-form-item style="width:100%;text-align: center;" label-width="0px">
               <el-button @click="synSubmit" size="medium" type="primary">同步企业填报</el-button>
               <el-button :loading="loading" size="medium" type="primary" @click.native.prevent="submitForm" style="width: 100px;">技术保存</el-button>
-              <el-button size="medium" type="primary" style="width: 100px;">取消</el-button>
+              <el-button size="medium" type="primary" style="width: 100px;" @click="cancel">取消</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -327,6 +327,10 @@ export default {
       this.form.techLicense = file.url;
       this.form.fileName = '高新证书';
     },
+    cancel() {
+      this.$store.dispatch("tagsView/delView", this.$route); // 关闭当前tab
+      this.$router.go(-1);
+    },
     submitForm() {
       this.$refs.form.validate(valid => {
         if(valid) {

+ 1 - 0
src/views/enterprise/project/components/addProject.vue

@@ -96,6 +96,7 @@
         this.open = true;
         this.getFinUserData()
         this.getTechUserData()
+        this.resetForm("form");
       },
       getFinUserData() {
         //财务

+ 25 - 5
src/views/enterprise/project/info.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="app-container" v-loading="loading">
-    <el-tabs :tab-position="tabPosition" stretch ref="tabsFirst" v-model="activeName">
+    <el-tabs :tab-position="tabPosition" stretch ref="tabsFirst" v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="企业自填" name="1">
         <!-- <basic-info :projectOwner="'1'"></basic-info> -->
-        <el-tabs type="border-card">
+        <el-tabs type="border-card" v-if="entVisible">
           <el-tab-pane label="项目基本信息">
             <basic-info :projectOwner="'1'"></basic-info>
           </el-tab-pane>
@@ -16,7 +16,7 @@
       <!-- <template v-if="userType ! = 'ENT_ADMIN'"> -->
         <el-tab-pane label="企业技术" name="2">
           <!-- <basic-info :projectOwner="'2'"></basic-info> -->
-          <el-tabs type="border-card">
+          <el-tabs type="border-card" v-if="techVisible">
             <el-tab-pane label="项目基本信息">
               <basic-info :projectOwner="'2'"></basic-info>
             </el-tab-pane>
@@ -29,7 +29,7 @@
       <!-- <template v-if="userType != 'ENT_ADMIN' || userType != 'ENT_TECH' || userType != 'ENT_ADMIN_TECH'"> -->
         <el-tab-pane label="企业财务" name="3">
           <!-- <basic-info :projectOwner="'3'"></basic-info> -->
-          <el-tabs type="border-card">
+          <el-tabs type="border-card" v-if="finVisible">
             <el-tab-pane label="项目基本信息">
               <basic-info :projectOwner="'3'"></basic-info>
             </el-tab-pane>
@@ -69,10 +69,30 @@ export default {
     return {
       activeName: '1',
       tabPosition: 'left',
-      loading: false,
+      loading: false,
+      entVisible: true,
+      finVisible: false,
+      techVisible: false
     };
   },
   created() {
+  },
+  methods: {
+    handleClick(tab,event) {
+      if(tab.name == '1') {
+        this.entVisible = true
+        this.techVisible = false
+        this.finVisible = false
+      }else if(tab.name == '2') {
+        this.techVisible = true
+        this.entVisible = false
+        this.finVisible = false
+      }else if(tab.name == '3') {
+        this.finVisible = true
+        this.entVisible = false
+        this.techVisible = false
+      }
+    }
   }
 };
 </script>