--no commit message

@@ -11,11 +11,7 @@
       </div>
       </div>
 
 
       <div v-for="(item, index) in tableData" :key="index">
       <div v-for="(item, index) in tableData" :key="index">
-        <el-form
-          :model="tableData[index]"
-          label-width="120px"
-          ref="ruleFormRef'"
-        >
+        <el-form :model="tableData[index]" label-width="120px" ref="ruleForm'" :rules="rules">
           <div class="spyj_form">
           <div class="spyj_form">
             <div class="item_left">
             <div class="item_left">
               <div class="right">{{ item.jdmc }}意见</div>
               <div class="right">{{ item.jdmc }}意见</div>
@@ -23,7 +19,11 @@
             <div class="item_right">
             <div class="item_right">
               <el-row>
               <el-row>
                 <el-col :span="24">
                 <el-col :span="24">
-                  <el-form-item label-width="0" class="opinion_item">
+                  <el-form-item
+                    label-width="0"
+                    prop="shyj"
+                    class="opinion_item"
+                  >
                     <el-input
                     <el-input
                       :disabled="!viewEdit || item.show"
                       :disabled="!viewEdit || item.show"
                       type="textarea"
                       type="textarea"
@@ -58,7 +58,9 @@
         </el-form>
         </el-form>
       </div>
       </div>
       <div class="submit_button" v-if="viewEdit">
       <div class="submit_button" v-if="viewEdit">
-        <el-button type="primary" :disabled="shows" @click="onSubmit()">保存</el-button>
+        <el-button type="primary" :disabled="shows" @click="onSubmit()"
+          >保存</el-button
+        >
       </div>
       </div>
     </div>
     </div>
     <!-- <el-empty v-if="isNoData" description="暂无数据"></el-empty> -->
     <!-- <el-empty v-if="isNoData" description="暂无数据"></el-empty> -->
@@ -87,7 +89,10 @@ export default {
       falg1: false,
       falg1: false,
       jdmc: "",
       jdmc: "",
       indexdqlc: 0,
       indexdqlc: 0,
-      shows:false
+      shows: false,
+      rules: {
+        shyj: [{ required: true, message: "意见不能为空", trigger: "blur" }],
+      },
     };
     };
   },
   },
 
 
@@ -137,40 +142,39 @@ export default {
         this.$endLoading();
         this.$endLoading();
         if (res.code === 200 && res.result) {
         if (res.code === 200 && res.result) {
           this.$nextTick(() => {
           this.$nextTick(() => {
-               this.tableData = res.result;
-          if(this.shows){
-              this.shows=false
-          }
-
-          var index = this.tableData.findIndex(
-            (item) => item.jddm === this.$parent.dqhj
-          );
-          if (index == -1) {
-            switch (this.$parent.dqhj) {
-              case "cs":
-                this.tableData.push({ jdmc: "初审", jddm: "cs", sxh: 1 });
-                break;
-              case "fs":
-                this.tableData.push({ jdmc: "复审", jddm: "fs", sxh: 2 });
-                break;
-              case "hd":
-                this.tableData.push({ jdmc: "核定", jddm: "hd", sxh: 3 });
-                break;
+            this.tableData = res.result;
+            if (this.shows) {
+              this.shows = false;
             }
             }
-          }
-          this.tableData.forEach((item) => {
-            item.show = true;
-            if (this.$parent.dqhj == item.jddm) {
-              item["stepid"] = this.$route.query.bestepid;
-              item.shjssj = getNewDatesh();
-              item.shkssj = getNewDatesh();
-              item["shryxm"] = this.userInfo.name;
-              item["userid"] = this.userInfo.id;
-              item.show = false;
+
+            var index = this.tableData.findIndex(
+              (item) => item.jddm === this.$parent.dqhj
+            );
+            if (index == -1) {
+              switch (this.$parent.dqhj) {
+                case "cs":
+                  this.tableData.push({ jdmc: "初审", jddm: "cs", sxh: 1 });
+                  break;
+                case "fs":
+                  this.tableData.push({ jdmc: "复审", jddm: "fs", sxh: 2 });
+                  break;
+                case "hd":
+                  this.tableData.push({ jdmc: "核定", jddm: "hd", sxh: 3 });
+                  break;
+              }
             }
             }
+            this.tableData.forEach((item) => {
+              item.show = true;
+              if (this.$parent.dqhj == item.jddm) {
+                item["stepid"] = this.$route.query.bestepid;
+                item.shjssj = getNewDatesh();
+                item.shkssj = getNewDatesh();
+                item["shryxm"] = this.userInfo.name;
+                item["userid"] = this.userInfo.id;
+                item.show = false;
+              }
+            });
           });
           });
-          })
-
         }
         }
       });
       });
     },
     },
@@ -185,23 +189,26 @@ export default {
      * @author: renchao
      * @author: renchao
      */
      */
     onSubmit() {
     onSubmit() {
-      this.shows=true
-      this.tableData.forEach((item, index) => {
-        item["bsmBusiness"] = this.propsParam.bsmBusiness;
-        item["czjg"] = "1";
-      });
-      saveSpyjBySlsq(this.tableData).then((res) => {
-        if (res.code === 200) {
-          this.$message.success("保存成功");
-          this.refresh += 1;
-            this.getShList();
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          this.shows = true;
+          this.tableData.forEach((item, index) => {
+            item["bsmBusiness"] = this.propsParam.bsmBusiness;
+            item["czjg"] = "1";
+          });
+          saveSpyjBySlsq(this.tableData).then((res) => {
+            if (res.code === 200) {
+              this.$message.success("保存成功");
+              this.refresh += 1;
+              this.getShList();
+            } else {
+              this.$message.error(res.message);
+            }
+          });
         } else {
         } else {
-          this.$message.error(res.message);
+          return false;
         }
         }
       });
       });
-      // } else {
-      //   return false;
-      // }
     },
     },
     //打开常用意见列表弹窗
     //打开常用意见列表弹窗
     /**
     /**

@@ -212,7 +212,27 @@
         this.$popup("登记簿详情", "registerBook/djbFrame", {
         this.$popup("登记簿详情", "registerBook/djbFrame", {
           formData: param
           formData: param
         })
         })
-      }
+      },
+           /**
+       * @description: handleLpbClick
+       * @param {*} row
+       * @author: miaofang
+       */
+            handleLpbClick (item) {
+              console.log("item",item);
+              console.log("this.sqywInfo",this.sqywInfo);
+        this.$popup('楼盘表', 'lpb/index', {
+          width: '85%',
+          formData: {
+            bsm: item.bsm,
+            zrzbsm: item.bsm,
+            zdbsm: item.zdbsm,
+            bsmSqyw: this.sqywInfo.bsmSqyw,
+            djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
+            djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
+          }
+        })
+      },
     }
     }
   }
   }
 </script>
 </script>

@@ -92,7 +92,7 @@ class data extends filter {
       {
       {
         prop: "qlmjmc",
         prop: "qlmjmc",
         label: "面积",
         label: "面积",
-      },       
+      },
       {
       {
         prop: "zl",
         prop: "zl",
         label: "坐落",
         label: "坐落",
@@ -105,7 +105,7 @@ class data extends filter {
         render: (h, scope) => {
         render: (h, scope) => {
           return (
           return (
             <div>
             <div>
-              <el-button type="text" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
+              <el-button type="text" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表1</el-button>
               <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
               <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
             </div>
             </div>
           )
           )