Browse Source

科德提出的问题修复

刘湘琪 3 years ago
parent
commit
66c8863ea0

+ 7 - 0
src/api/admin/ent/ent.js

@@ -80,3 +80,10 @@ export function registerEnterUserApi(data) {
     data: data
   })
 }
+export function updateServiceTimeApi(data) {
+  return request({
+    url: '/admin/enterprise/modifyServiceTime',
+    method: 'put',
+    data: data
+  })
+}

+ 9 - 1
src/api/ent/ent.js

@@ -7,4 +7,12 @@ export function listEntUserApi(query) {
     method: 'get',
     params: query
   })
-}
+}
+//获取修改记录
+export function listRecordApi(id) {
+  return request({
+    url: `/admin/enterprise/getModifyServiceTimeList/${id}`,
+    method: 'get'
+  })
+}
+

+ 4 - 3
src/utils/dataFormat.js

@@ -71,9 +71,10 @@ export const yesOrNoOptions = [
  */
 
 export const authStateOptions =[
-  { dictLabel: '待审核', dictValue: '1'},
-  { dictLabel: '通过', dictValue: '2'},
-  { dictLabel: '驳回', dictValue: '3'}
+  { dictLabel: '待提交', dictValue: '1'},
+  { dictLabel: '待审核', dictValue: '2'},
+  { dictLabel: '审核通过', dictValue: '3'},
+  { dictLabel: '审核拒绝', dictValue: '4'}
 ]
 export const dutyAreaOptions =[
   { dictLabel: '省级', dictValue: 1},

+ 12 - 1
src/utils/validate.js

@@ -141,4 +141,15 @@ export function validPercentage(rule, value, cb) {
   } else {
     cb()
   }
-}
+}
+
+export function validAdr(str) {
+  return /^\d{1,}$/.test(str)
+}
+export function validAdress(rule, value, cb) {
+  if(validAdr(value)) {
+    cb(new Error('不可以只输入纯数字'))
+  }else{
+    cb()
+  }
+}

+ 5 - 1
src/views/enterprise/ent/basicInfo.vue

@@ -158,7 +158,7 @@
       </tr>
     </table>
     <div class="oper">
-      <template v-if="info.authState == '2'">
+      <template v-if="info.authState == '2' && userType == 'entAdmin'">
         <el-button @click="handleUpdate">修改</el-button>
       </template>
     </div>
@@ -180,12 +180,16 @@
         attachType: 'ENT',
         info: {
         },
+        userType: ''
       }
     },
     computed: {
       scopeId() {
         return this.$store.state.user.scopeId
       },
+      userType() {
+        return this.$store.state.user.userType
+      },
       regTypeFormat() {
         return getLabel(regTypeOptions, this.info.regType);
       },

+ 49 - 0
src/views/enterprise/ent/components/record.vue

@@ -0,0 +1,49 @@
+<template>
+  <div>
+    <el-dialog :title="title" v-dialogDrag :visible.sync="Visible" width="1000px" append-to-body :close-on-click-modal="false">
+      <el-table v-loading="loading" :data="recordList" stripe border>
+        <el-table-column type="index" width="50" align="center" label="序号"/>
+        <el-table-column label="修改人" align="center" prop="operName" />
+        <el-table-column label="修改时间" align="center" prop="createTime" />
+        <el-table-column label="修改记录" align="center" prop="operMsg" />
+      </el-table>
+    </el-dialog>
+  </div>
+</template>
+<script>
+  import {listRecordApi} from '@/api/ent/ent'
+  export default {
+    name: "record",
+    data() {
+      return {
+        ids: [],
+        // 遮罩层
+        loading: true,
+        title: '修改记录',
+        recordList: [],
+        Visible: false,
+        id: ''
+      };
+    },
+    created() {
+    },
+    methods: {
+      init(id) {
+        this.id = id || ''
+        this.Visible = true
+        if(this.id) {
+          this.getList();
+        }
+      },
+      getList() {
+        listRecordApi(this.id).then(res => {
+          this.loading = false
+          if(res.code == 200) {
+            this.recordList = res.data
+          }
+        })
+      },
+
+    }
+  };
+</script>

+ 2 - 2
src/views/enterprise/ent/components/service.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script>
-  import {auditEntApi,getEntInfoByIdApi,updateEntInfoApi} from "@/api/admin/ent/ent"
+  import {auditEntApi,getEntInfoByIdApi,updateServiceTimeApi} from "@/api/admin/ent/ent"
   export default {
     data () {
       return {
@@ -61,7 +61,7 @@
               this.form.startDate = ''
               this.form.endDate = ''
             }
-            updateEntInfoApi(this.form).then(res => {
+            updateServiceTimeApi(this.form).then(res => {
               this.disabled = false;
               if(res.code == 200) {
                 this.$message({

+ 2 - 1
src/views/enterprise/ent/edit.vue

@@ -374,7 +374,7 @@ import ImageUpload from '@/components/ImageUpload'
 import {getEnclosureApi,entUserAudit} from "@/api/enterprise/project/project"
 import UploadEnclosure from "./components/UploadEnclosure"
 import {deleteEnclosureApi} from '@/api/enterprise/project/project'
-import { validIDcard,validAmount,validNumber } from '@/utils/validate'
+import { validIDcard,validAmount,validNumber,validAdress } from '@/utils/validate'
 
 export default {
   name: "First",
@@ -500,6 +500,7 @@ export default {
         ],
         address: [
           { required: true, trigger: "blur", message: "请输入通信地址" },
+          { validator: validAdress, trigger: 'blur'},
           {max: 50, message: '最多输入50个字符', trigger: 'blur' }
         ],
         zipCode: [

+ 20 - 6
src/views/enterprise/ent/index.vue

@@ -79,20 +79,23 @@
       <el-table-column label="服务时间" align="center" width="200">
         <template slot-scope="scope">
           <template v-if="scope.row.entState == '1'">
-            <span>--</span>
+            <div>--</div>
           </template>
           <template v-else-if="scope.row.entState == '2'">
-            <span>{{scope.row.startDate}} - {{scope.row.endDate}}</span>
+            <div>{{scope.row.startDate}} - {{scope.row.endDate}}</div>
             <el-button @click="handleEdit(scope.row)" type="text" size="small">修改服务时间</el-button>
+            <el-button @click="handleRecord(scope.row)" type="text" size="small">修改记录</el-button>
           </template>
           <template v-else>
-            <span>已到期</span>
+            <div>已到期</div>
+            <el-button @click="handleEdit(scope.row)" type="text" size="small">修改服务时间</el-button>
+            <el-button @click="handleRecord(scope.row)" type="text" size="small">修改记录</el-button>
           </template>
         </template>
       </el-table-column>
       <el-table-column label="服务状态" prop="entState" align="center" width="120" :formatter="entSateFormat">
         <template slot-scope="scope">
-          <template v-if="scope.row.authState == '3'">
+          <template v-if="scope.row.authState == '4'">
             <span>驳回</span>
           </template>
           <template v-else>
@@ -130,6 +133,7 @@
       @pagination="getList"/>
 
       <audit-ent v-if="auditEntVisible" ref="auditEnt" @refreshData="getList()"></audit-ent>
+      <record v-if="recordVisible" ref="record" @refreshData="getList()"></record>
   </div>
 </template>
 <!-- 企业管理模块只有科德管理员和税务人员 -->
@@ -140,9 +144,11 @@
   import {listEntTaxApi} from '@/api/gov/gov'
   import { resetUserPwd } from "@/api/system/user";
   import AuditEnt from "./components/service"
+  import Record from "./components/record"
   export default {
     components: {
-      AuditEnt
+      AuditEnt,
+      Record
     },
     data () {
       return {
@@ -151,6 +157,7 @@
         provinceDataList: [],
         cityDataList: [],
         districtDataList: [],
+        recordVisible: false,
         entStateOptions: entStateOptions,
         authStateOptions: authStateOptions,
         dateRange: [],
@@ -163,7 +170,8 @@
           districtId: undefined,
           entName: '',
           license: '',
-          entState: ''
+          entState: '',
+          authState: '',
         },
         list: [],
         total: 0,
@@ -216,6 +224,12 @@
           this.$refs.auditEnt.init(row.id)
         })
       },
+      handleRecord(row) {
+        this.recordVisible = true
+        this.$nextTick(() => {
+          this.$refs.record.init(row.id)
+        })
+      },
       getAreaData() {
         getRegionChildrenApi(this.scopeId).then(res => {
           if(res.code == 200) {

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

@@ -195,7 +195,9 @@ export default {
         projectStartDate: '',
         projectEndDate: '',
         overYearFlag: 1,
-        techFlag: 1,
+        techFlag: 1,
+        innovateFlag: 1,
+        smallFlag: 1
       },
       rules: {
         userName: [
@@ -247,19 +249,19 @@ export default {
           { validator: validPercentage, trigger: 'blur'}
         ],
         industry: [
-          { required: true, trigger: "change", message: "请选择企业所属行业" }
+          { required: true, trigger: "blur", message: "请输入企业所属行业" }
         ],
         innovateFlag: [
-          { required: true, trigger: "change", message: "请选择国家自主创新示范区企业" }
+          { required: true, trigger: "[blur,change]", message: "请选择国家自主创新示范区企业" }
         ],
         overYearFlag: [
           { required: true, trigger: "change", message: "请选择是否跨年" }
         ],
         smallFlag: [
-          { required: true, trigger: "change", message: "请选择是否科技型中小企业" }
+          { required: true, trigger: "[blur,change]", message: "请选择是否科技型中小企业" }
         ],
         techFlag: [
-          { required: true, trigger: "change", message: "请选择是否高新技术企业" }
+          { required: true, trigger: "[blur,change]", message: "请选择是否高新技术企业" }
         ],
         techLicense: [
           { required: true, trigger: "change", message: "请上传高新企业证书" }
@@ -273,6 +275,9 @@ export default {
     };
   },
   created() {
+    this.$nextTick(() => {
+    	this.$refs.form.clearValidate()
+    })
     this.form.id = this.$route.query.id || undefined;
     this.form.entId = this.$route.query.entId || undefined;
     if(this.form.id) {

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

@@ -249,25 +249,25 @@ export default {
           { validator: validPercentage, trigger: 'blur'}
         ],
         industry: [
-          { required: true, trigger: "change", message: "请选择企业所属行业" }
+          { required: true, trigger: "blur", message: "请选择企业所属行业" }
         ],
         innovateFlag: [
-          { required: true, trigger: "change", message: "请选择国家自主创新示范区企业" }
+          { required: true, trigger: "[blur,change]", message: "请选择国家自主创新示范区企业" }
         ],
         overYearFlag: [
           { required: true, trigger: "change", message: "请选择是否跨年" }
         ],
         smallFlag: [
-          { required: true, trigger: "change", message: "请选择是否科技型中小企业" }
+          { required: true, trigger: "[blur,change]", message: "请选择是否科技型中小企业" }
         ],
         techFlag: [
-          { required: true, trigger: "change", message: "请选择是否高新技术企业" }
+          { required: true, trigger: "[blur,change]", message: "请选择是否高新技术企业" }
         ],
         techLicense: [
           { required: true, trigger: "change", message: "请上传高新企业证书" }
         ],
         lisenceTime: [
-          { required: true, trigger: "change", message: "请选择证书有效期限", type: 'array' }
+          { required: true, trigger: "change", message: "请选择证书有效期限" }
         ]
       },
       loading: false,
@@ -275,6 +275,9 @@ export default {
     };
   },
   mounted() {
+    this.$nextTick(() => {
+    	this.$refs.form.clearValidate()
+    })
     this.getEntData()
   },
   created() {

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

@@ -248,25 +248,25 @@ export default {
           { validator: validPercentage, trigger: 'blur'}
         ],
         industry: [
-          { required: true, trigger: "change", message: "请选择企业所属行业" }
+          { required: true, trigger: "blur", message: "请选择企业所属行业" }
         ],
         innovateFlag: [
-          { required: true, trigger: "change", message: "请选择国家自主创新示范区企业" }
+          { required: true, trigger: "[blur,change]", message: "请选择国家自主创新示范区企业" }
         ],
         overYearFlag: [
           { required: true, trigger: "change", message: "请选择是否跨年" }
         ],
         smallFlag: [
-          { required: true, trigger: "change", message: "请选择是否科技型中小企业" }
+          { required: true, trigger: "[blur,change]", message: "请选择是否科技型中小企业" }
         ],
         techFlag: [
-          { required: true, trigger: "change", message: "请选择是否高新技术企业" }
+          { required: true, trigger: "[blur,change]", message: "请选择是否高新技术企业" }
         ],
         techLicense: [
           { required: true, trigger: "change", message: "请上传高新企业证书" }
         ],
         lisenceTime: [
-          { required: true, trigger: "change", message: "请选择证书有效期限", type: 'array' }
+          { required: true, trigger: "change", message: "请选择证书有效期限" }
         ]
       },
       loading: false,
@@ -274,6 +274,9 @@ export default {
     };
   },
   created() {
+    this.$nextTick(() => {
+    	this.$refs.form.clearValidate()
+    })
     this.form.id = this.$route.query.id || undefined;
     this.form.entId = this.$route.query.entId || undefined;
     if(this.userType == 'ENT_TECH' || this.userType == 'ENT_ADMIN_TECH') {

+ 11 - 7
src/views/enterprise/project/index.vue

@@ -66,10 +66,10 @@
       </el-table-column>
       <el-table-column label="负责状态" align="center" width="160">
         <template slot-scope="scope">
-          <template v-if="scope.row.finCompRate !='100.0%'">
+          <template v-if="scope.row.compRate !='100.0%'">
             <span>待完善</span>
           </template>
-          <template v-if="scope.row.finCompRate =='100.0%' && scope.row.authState == '1'">
+          <template v-if="scope.row.compRate =='100.0%'">
             <span>已完善</span>
           </template>
           <template v-if="scope.row.authState == '2'">
@@ -89,18 +89,22 @@
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button type="text" @click="handleView(scope.row)">查看</el-button>
-          <el-button type="text" @click="handleDownload(scope.row)">下载</el-button>
+          <template v-if="scope.row.attachCnt != 0">
+            <el-button type="text" @click="handleDownload(scope.row)">下载</el-button>
+          </template>
           <el-button type="text" @click="handleDelete(scope.row)">删除</el-button>
           <template v-if="roleType == 'entAdmin' || roleType == 'entUser'">
             <el-button type="text" @click="handleEdit(scope.row)">编辑</el-button>
-            <template v-if="scope.row.finCompRate == '100.0%' && scope.row.reportState == '1'">
+            <template v-if="scope.row.compRate == '100.0%' && scope.row.reportState == '1'">
               <el-button type="text" @click="handleDeclare(scope.row)">提交申报</el-button>
             </template>
-            <template v-if="scope.row.finCompRate == '100.0%' && (scope.row.reportState == '2' || scope.row.reportState == '3') ">
+            <template v-if="scope.row.compRate == '100.0%' && (scope.row.reportState == '2' || scope.row.reportState == '3') ">
               <el-button type="text" @click="handleDeclare(scope.row)">重新申报</el-button>
             </template>
-            <template v-if="scope.row.finCompRate == '100.0%' && (userType == 'ENT_TECH' || userType == 'ENT_FIN') && (scope.row.authState == '1' || scope.row.authState == '4')">
-              <el-button type="text" @click="handleAudit(scope.row)">提交审核</el-button>
+            <template v-if="scope.row.compRate == '100.0%' && (userType == 'ENT_TECH' || userType == 'ENT_FIN')">
+              <!-- && (scope.row.authState == '1' || scope.row.authState == '4') -->
+              <el-button type="text" @click="handleAudit(scope.row)" v-if="scope.row.authState == '1'">提交审核</el-button>
+              <el-button type="text" @click="handleAudit(scope.row)" v-else-if="scope.row.authState == '4'">重新提交审核</el-button>
             </template>
             <template v-if="scope.row.authState == '2' && (userType == 'ENT_ADMIN_TECH' || userType == 'ENT_ADMIN_FIN')">
               <el-button type="text" @click="handleAuditAdmin(scope.row)">审核</el-button>