Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/management/info/index.vue

@@ -62,7 +62,7 @@
           <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;"  v-hasPermi="['projectInfo:info:edit']" @click="chei(scope.row)" >查看/审核</el-button>
           <el-button size="mini" type="text" style="background: #3FBCEF;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
             @click="infoBtn(scope.row)">{{scope.row.projectStatus%2==1?'提交审核':'驳回'}}</el-button>
-          <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']">修改</el-button>
+          <!-- <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']">修改</el-button> -->
           <el-button size="mini" type="text" style="background: #DE1939;color: #FFF;padding: 7px;" @click="handleDelete(scope.row)"
             v-hasPermi="['projectInfo:info:remove']">销号</el-button>
         </template>
@@ -462,7 +462,7 @@
       /** 删除按钮操作 */
       handleDelete(row) {
         const ids = row.id || this.ids;
-        this.$confirm('是否确认删除项目-线索信息编号为"' + ids + '"的数据项?', "警告", {
+        this.$confirm('是否确认删除项目-线索信息"' + ids + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

ruoyi-ui/src/views/management/nstruction/index.vue

@@ -76,6 +76,7 @@
           <el-form
             :model="queryParamstwr"
             ref="queryForm"
+            :rules="queryForm"
             :inline="true"
             v-show="showSearch"
             label-width="135px"
@@ -755,11 +756,11 @@ export default {
       },
       imagese: [],
       numhu: 0, //判断
-      // 表单校验
+      // 添加开工照片表单校验
       rules: {
-        // configName: [
-        //   { required: true, message: "参数名称不能为空", trigger: "blur" }
-        // ],
+        rateType: [
+          { required: true, message: '请选择进度', trigger: 'change' }
+        ]
         // configKey: [
         //   { required: true, message: "参数键名不能为空", trigger: "blur" }
         // ],
@@ -767,8 +768,30 @@ export default {
         //   { required: true, message: "参数键值不能为空", trigger: "blur" }
         // ]
       },
+      // 项目施工
+      queryForm:{
+        isConstruction: [
+          { required: true, message: "请选择	是否开工建设", trigger: "blur" }
+        ],
+        constructionStartdate: [
+          { type: 'date', required: true, message: '请选择开工时间', trigger: 'change' }
+        ],
+        constructionEnddate: [
+          { type: 'date', required: true, message: '请选择预计完工时间', trigger: 'change' }
+        ]
+      },
+      //项目入统
+      queryFormtwo:{
+       statisticsDate: [
+         { type: 'date', required: true, message: '请选择入统时间', trigger: 'change' }
+       ]
+      },
       rulestwo: {},
-      rulesther: {},
+      rulesther: {
+        payForMoney: [
+          { required: true, message: '请输入金额', trigger: 'change' }
+        ]
+      },
       //开工照片
       onstruction: [],
       permit: [],
@@ -1176,6 +1199,14 @@ export default {
       if (this.numhu == 0) {
         this.$refs["form"].validate((valid) => {
           if (valid) {
+            if(this.form.rateType == undefined){
+              this.msgSuccess("请选择进度");
+              return  false
+            }
+            if(this.form.photo == undefined){
+              this.msgSuccess("请上传照片");
+              return  false
+            }
             addConfigther(this.form).then((response) => {
               this.msgSuccess("新增成功");
               this.open = false;
@@ -1186,6 +1217,14 @@ export default {
       } else if (this.numhu == 1) {
         this.$refs["formtwo"].validate((valid) => {
           if (valid) {
+            if(this.formtwo.eqType == undefined){
+              this.msgSuccess("请选择进度");
+              return  false
+            }
+            if(this.formtwo.photo == undefined){
+              this.msgSuccess("请上传照片");
+              return  false
+            }
             addConfigfour(this.formtwo).then((response) => {
               this.msgSuccess("新增成功");
               this.opentwo = false;
@@ -1197,8 +1236,18 @@ export default {
         console.log("步骤3");
         this.$refs["formther"].validate((valid) => {
           if (valid) {
-            console.log("步骤5");
-            console.log("步骤4");
+            if(this.formther.payForType == undefined){
+              this.msgSuccess("请选择进度");
+              return  false
+            }
+            if(this.formther.payForMoney == undefined){
+              this.msgSuccess("请输入到资金额");
+              return  false
+            }
+            if(this.formther.photo == undefined){
+              this.msgSuccess("请上传照片");
+              return  false
+            }
             addConfigfiv(this.formther).then((response) => {
               this.msgSuccess("新增成功");
               this.openther = false;
@@ -1216,7 +1265,31 @@ export default {
       if (this.tab == 0) {
         this.$refs["queryForm"].validate((valid) => {
           if (valid) {
+            // if(this.queryParamstwr.constructionCode == ''){
+            //   this.msgSuccess("请上传施工许可证");
+            //   return  false
+            // }
             if (this.modify == 1) {
+              if(this.queryParamstwr.constructionCode == null){
+                this.msgSuccess("请上传施工许可证");
+                return  false
+              }
+              if(this.queryParamstwr.constructionDoc == null){
+                this.msgSuccess("请上传施工施工合同");
+                return  false
+              }
+              if(this.queryParamstwr.constructionPhoto == null){
+                this.msgSuccess("请上传开工合同");
+                return  false
+              }
+              if(this.queryParamstwr.constructionEnddate == null){
+                this.msgSuccess("请选择预计完工日期");
+                return  false
+              }
+              if(this.queryParamstwr.constructionStartdate == null){
+                this.msgSuccess("请选择开工日期");
+                return  false
+              }
               //修改
               updateConfigatruction(this.queryParamstwr).then((response) => {
                 this.msgSuccess("修改成功");
@@ -1225,6 +1298,26 @@ export default {
                 this.$router.go(-1);
               });
             } else if (this.modify == 0) {
+              if(this.queryParamstwr.constructionCode == undefined){
+                this.msgSuccess("请上传施工许可证");
+                return  false
+              }
+              if(this.queryParamstwr.constructionDoc == undefined){
+                this.msgSuccess("请上传施工施工合同");
+                return  false
+              }
+              if(this.queryParamstwr.constructionPhoto == undefined){
+                this.msgSuccess("请上传开工合同");
+                return  false
+              }
+              if(this.queryParamstwr.constructionEnddate == undefined){
+                this.msgSuccess("请选择预计完工日期");
+                return  false
+              }
+              if(this.queryParamstwr.constructionStartdate == undefined){
+                this.msgSuccess("请选择开工日期");
+                return  false
+              }
               //新增
               this.queryParamstwr.bmProjectId = this.bmProjectId;
               addConfigtherction(this.queryParamstwr).then((response) => {
@@ -1240,6 +1333,14 @@ export default {
         this.$refs["queryFormtwo"].validate((valid) => {
           if (valid) {
             if (this.udgment == 1) {
+              if(this.queryParamstheyr.statisticsDate == null){
+                this.msgSuccess("请选择入统日期");
+                return  false
+              }
+              if(this.queryParamstheyr.statisticsPhoto == null){
+                this.msgSuccess("请上传入统截图");
+                return  false
+              }
               //修改
               updateConfigntegration(this.queryParamstheyr).then((response) => {
                 this.msgSuccess("修改成功");
@@ -1248,6 +1349,14 @@ export default {
                 this.$router.go(-1);
               });
             } else {
+              if(this.queryParamstheyr.statisticsDate == undefined){
+                this.msgSuccess("请选择入统日期");
+                return  false
+              }
+              if(this.queryParamstheyr.statisticsPhoto == undefined){
+                this.msgSuccess("请上传入统截图");
+                return  false
+              }
               this.queryParamstheyr.bmProjectId = this.bmProjectId;
               addConfigsix(this.queryParamstheyr).then((response) => {
                 this.msgSuccess("新增成功");
@@ -1264,7 +1373,7 @@ export default {
     handleDelete(row) {
       const configIds = row.id;
       this.$confirm(
-        '是否确认删除参数编号为"' + configIds + '"的数据项?',
+        '是否确认删除"' + configIds + '"的数据项?',
         "警告",
         {
           confirmButtonText: "确定",
@@ -1284,7 +1393,7 @@ export default {
     handleDeletetwo(row) {
       const configIds = row.id;
       this.$confirm(
-        '是否确认删除参数编号为"' + configIds + '"的数据项?',
+        '是否确认删除"' + configIds + '"的数据项?',
         "警告",
         {
           confirmButtonText: "确定",
@@ -1304,7 +1413,7 @@ export default {
     handleDeletether(row) {
       const configIds = row.id;
       this.$confirm(
-        '是否确认删除参数编号为"' + configIds + '"的数据项?',
+        '是否确认删除"' + configIds + '"的数据项?',
         "警告",
         {
           confirmButtonText: "确定",

ruoyi-ui/src/views/under/index.vue

@@ -20,7 +20,7 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          @click="cancel"
+          @click="cancelqiu"
           v-hasPermi="['system:config:edit']"
           >取消</el-button
         >
@@ -658,7 +658,7 @@
         </el-form-item> -->
         <el-form-item label="联系方式" prop="phone">
           <el-input
-            v-model.number="formtwo.phone"
+            v-model="formtwo.phone"
             type="phone"
             placeholder="请输入联系方式"
           />
@@ -804,10 +804,19 @@ export default {
         ],
         idcode: [
           { required: true, message: "身份证号码不能为空", trigger: "blur" },
+          {
+            pattern: /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)/,
+            message: "身份证号码格式不对",
+            trigger: "blur",
+          }
         ],
         phone: [
           { required: true, message: "联系方式不能为空", trigger: "blur" },
-          { type: "number", message: "联系方式必须为数字值" },
+          {
+            pattern: /^0{0,1}(13[0-9]|15[7-9]|153|156|18[7-9])[0-9]{8}$/,
+            message: "手机号格式不对",
+            trigger: "blur",
+          }
         ],
       },
 
@@ -1285,6 +1294,10 @@ export default {
       this.$emit("changeTab", index);
       // this.tab = index
     },
+    // 取消按钮
+    cancelqiu(){
+      this.$router.go(-1);
+    }
   },
 };
 </script>