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

+ 4 - 4
src/utils/dataFormat.js

@@ -351,10 +351,10 @@ export const devOptions = [
 ]
 
 export const projectTypeOptions = [
-  { dictLabel: '自主研发', dictValue: '1'},
-  { dictLabel: '委托研发', dictValue: '2'},
-  { dictLabel: '合作研发', dictValue: '3'},
-  { dictLabel: '自主研发(含委托研发)', dictValue: '4'},
+  { dictLabel: '自主研发', dictValue: 1},
+  { dictLabel: '委托研发', dictValue: 2},
+  { dictLabel: '合作研发', dictValue: 3},
+  { dictLabel: '自主研发(含委托研发)', dictValue: 4},
 ]
 
 export const industryTypeOptions = [

+ 0 - 3
src/views/enterprise/declare/index.vue

@@ -27,9 +27,6 @@
           <el-input v-model="queryParams.license" style="width: 200px;" placeholder="请输入社会信用代码"></el-input>
         </el-form-item>
       </template>
-      <el-form-item label="项目编号" prop="projectNo">
-        <el-input v-model="queryParams.projectNo" style="width: 200px;" placeholder="请输入项目编号"></el-input>
-      </el-form-item>
       <el-form-item label="项目名称" prop="projectName">
         <el-input v-model="queryParams.projectName" style="width: 200px;" placeholder="请输入项目名称"></el-input>
       </el-form-item>

+ 13 - 8
src/views/enterprise/employee/index.vue

@@ -326,16 +326,21 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.userId != undefined) {
-            updateUserApi(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
+            updateUserApi(this.form).then(response => {
+              if(res.code == 200) {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              }
+              
             });
           } else {
-            addRoleApi(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
+            addRoleApi(this.form).then(response => {
+              if(res.code == 200) {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              }
             });
           }
         }

+ 12 - 60
src/views/enterprise/project/components/ent-edit.vue

@@ -373,71 +373,23 @@ export default {
         developFlag: ''
       },
       rules: {
-        userName: [
-          { required: true, trigger: "blur", message: "请输入您的账号" },
-          { min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
+        projectYear: [
+          { required: true, trigger: "change", message: "请选择加计扣除年度" }
         ],
-        password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" },
-          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
+        developFlag: [
+          { required: true, trigger: "change", message: "请选择研发成果" }
         ],
-        address: [
-          { required: true, trigger: "blur", message: "请输入通讯地址" },
-          { max: 100, message: '不超过100字符', trigger: 'blur' }
+        projectName: [
+          { required: true, trigger: "blur", message: "请填写项目名称" }
         ],
-        linkName: [
-          { required: true, trigger: "blur", message: "请输入企业联系人" },
-          { max: 100, message: '不超过100字符', trigger: 'blur' }
+        projectDate: [
+          { required: true, trigger: "[blur,change]", message: "请选择立项时间" }
         ],
-        linkPhone: [
-          { required: true, trigger: "blur", message: "请输入联系电话(座机)" },
-          // { max: 11, message: '请输入正确的电话格式', trigger: 'blur' }
+        projectTime: [
+          { required: true, trigger: "[blur,change]", message: "请选择起止时间" }
         ],
-        linkMobile: [
-          { required: true, trigger: "blur", message: "请输入手机号" },
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ],
-        totoalPersons: [
-          { required: true, trigger: "blur", message: "请输入职工总人数" },
-          { validator: validNumber, trigger: 'blur'}
-        ],
-        sales: [
-          { required: true, trigger: "blur", message: "请输入年度企业销售收入(万元)" },
-          { validator: validAmount, trigger: 'blur'}
-        ],
-        techPersons: [
-          { required: true, trigger: "blur", message: "请输入研发人数" },
-          { validator: validNumber, trigger: 'blur'}
-        ],
-        techInvest: [
-          { required: true, trigger: "blur", message: "请输入年度研发投入(万元)" },
-          { validator: validAmount, trigger: 'blur'}
-        ],
-        techRate: [
-          { required: true, trigger: "blur", message: "请输入占销售收入比例(%)" },
-          { validator: validPercentage, trigger: 'blur'}
-        ],
-        industry: [
-          { required: true, trigger: "blur", message: "请选择企业所属行业" }
-        ],
-        innovateFlag: [
-          { required: true, trigger: "[blur,change]", message: "请选择国家自主创新示范区企业" }
-        ],
-        overYearFlag: [
-          { required: true, trigger: "change", message: "请选择是否跨年" }
-        ],
-        smallFlag: [
-          { required: true, trigger: "[blur,change]", message: "请选择是否科技型中小企业" }
-        ],
-        techFlag: [
-          { required: true, trigger: "[blur,change]", message: "请选择是否高新技术企业" }
-        ],
-        techLicense: [
-          { required: true, trigger: "change", message: "请上传高新企业证书" }
+        projectType: [
+          { required: true, trigger: "change", message: "请选择项目类型" }
         ],
       },
       loading: false,