liuxiangqi пре 1 година
родитељ
комит
8e430769be

+ 1 - 0
src/utils/dataFormat.js

@@ -36,6 +36,7 @@ export const techScopeOptions = [
   { dictLabel: '资源与环境', dictValue: '7'},
   { dictLabel: '先进制造与自动化', dictValue: '8'},
   { dictLabel: '其他', dictValue: '9'},
+  { dictLabel: '高新技术改造传统产业', dictValue: '9'}
 ]
 
 export const userListOptions = [

+ 1 - 1
src/views/common/registerFirst.vue

@@ -423,7 +423,7 @@ export default {
         ],
         address: [
           { required: true, trigger: "blur", message: "请输入通信地址" },
-          {max: 50, message: '最多输入50个字符', trigger: 'blur' }
+          {max: 200, message: '最多输入50个字符', trigger: 'blur' }
         ],
         zipCode: [
           { required: true, trigger: "blur", message: "请输入邮政编码" },

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

@@ -480,7 +480,7 @@ export default {
         address: [
           { required: true, trigger: "blur", message: "请输入通信地址" },
           { validator: validAdress, trigger: 'blur'},
-          {max: 50, message: '最多输入50个字符', trigger: 'blur' }
+          {max: 200, message: '最多输入50个字符', trigger: 'blur' }
         ],
         zipCode: [
           { required: true, trigger: "blur", message: "请输入邮政编码" },

+ 5 - 46
src/views/enterprise/project/components/ent-edit.vue

@@ -111,8 +111,9 @@
                       <el-option value="小学">小学</el-option>
                       <el-option value="初中">初中</el-option>
                       <el-option value="高中">高中</el-option>
-                      <el-option value="大学(本科/专科)">大学(本科/专科)</el-option>
-                      <el-option value="硕士研究生">硕士研究生</el-option>
+                      <el-option value="专科">专科</el-option>
+                      <el-option value="本科">本科</el-option>
+                      <el-option value="硕士研究生">硕士</el-option>
                       <el-option value="博士">博士</el-option>
                     </el-select>
                   </el-form-item>
@@ -303,7 +304,7 @@ export default {
     },
     roleTypeFlag() {
       let roleType = this.$store.state.user.userType
-      return ['ENT_ADMIN_TECH', 'ENT_ADMIN_FIN', 'ENT_TECH', 'ENT_FIN'].includes(roleType) //判断是否为技术负责人,财务负责人
+      return ['ENT_ADMIN_TECH', 'ENT_ADMIN_FIN', 'ENT_FIN'].includes(roleType) //判断是否为技术负责人,财务负责人
     }
   },
   mounted() {
@@ -432,20 +433,7 @@ export default {
       captchaOnOff: true
     };
   },
-  mounted() {
-    let laydate = window.laydate;
-    laydate.render({
-      elem: '#inputUI', // 输入框的id属性,用来绑定到dom
-      type: 'date',
-      range: true,
-      done: (value) => {
-        this.form.projectTime = value; // 将选中的值赋给组件中的变量
-      }
-    });
-
-
-
-  },
+
   created() {
     this.$nextTick(() => {
     	this.$refs.form.clearValidate()
@@ -505,35 +493,6 @@ export default {
         }
       })
     },
-    synSubmit() {
-      this.loading = true
-      synTechApi(this.adminId).then(res => {
-        this.loading = false
-        if(res.code == 200) {
-          this.$message.success('已同步完成');
-          // this.getData()
-        }
-      })
-    },
-    async getEntData() {
-      listEntUserApi().then(res => {
-        if(!this.form.entName) {
-          this.form.entName = res.data.entName
-        }
-        if(!this.form.linkName) {
-          this.form.linkName = res.data.linkName
-        }
-        if(!this.form.linkPhone) {
-          this.form.linkPhone = res.data.linkPhone
-        }
-        if(!this.form.linkMobile) {
-          this.form.linkMobile = res.data.linkMobile
-        }
-        if(!this.form.techFlag) {
-          this.form.techFlag = res.data.techFlag
-        }
-      })
-    },
     handleSuccess(file) {
       this.$refs.techLicenseUpload.clearValidate()
       this.form.techLicense = file.url;

+ 1 - 1
src/views/enterprise/project/components/year-edit.vue

@@ -244,7 +244,7 @@ export default {
     },
     roleTypeFlag() {
       let roleType = this.$store.state.user.userType
-      return ['ENT_ADMIN_TECH', 'ENT_ADMIN_FIN', 'ENT_TECH', 'ENT_FIN'].includes(roleType) //判断是否为技术负责人,财务负责人
+      return ['ENT_ADMIN_TECH', 'ENT_ADMIN_FIN', 'ENT_FIN'].includes(roleType) //判断是否为技术负责人,财务负责人
     }
   },
   data() {

+ 1 - 1
src/views/enterprise/project/index.vue

@@ -56,7 +56,7 @@
           <el-button type="text" @click="handleDownload(scope.row)">下载</el-button>
           <template v-if="!roleTypeFlag && (scope.row.reportState == 1 || scope.row.reportState == 2)">
             <el-button type="text" @click="handleEdit(scope.row)">编辑</el-button>
-            <el-button type="text" @click="handleDeclare(scope.row)" v-if="scope.row.techRate == '100.0%' && scope.row.finRate == '100.0%'">提交申报</el-button>
+            <el-button type="text" @click="handleDeclare(scope.row)" v-if="scope.row.techRate == '100.0%' && scope.row.finRate == '100.0%'">项目提交</el-button>
             <el-button type="text" @click="handleDelete(scope.row)" v-if="userType == 'ENT_ADMIN'">删除</el-button>
           </template>
         </template>

+ 7 - 1
src/views/index.vue

@@ -146,13 +146,19 @@
       </div>
 
       <el-table v-loading="loading" :data="declareList" border>
+        <el-table-column label="年度" prop="projectYear" align="center" width="250"></el-table-column>
+        <el-table-column label="受理号" align="center" width="250"></el-table-column>
         <el-table-column label="项目名称" prop="projectName" align="center"/>
-        <el-table-column label="申报年度" prop="projectYear" align="center" width="250"></el-table-column>
         <el-table-column label="项目起止时间" align="center" class-name="small-padding fixed-width pd5" width="250">
           <template slot-scope="scope">
             <span>{{scope.row.projectStartDate}} - {{scope.row.projectEndDate}}</span>
           </template>
         </el-table-column>
+        <el-table-column label="申报状态" align="center" width="250">
+          <template slot-scope="scope">
+            <span>已申报</span>
+          </template>
+        </el-table-column>
       </el-table>
     </template>