Merge remote-tracking branch 'origin/master'

@@ -28,18 +28,18 @@ export function jfInit (data) {
 }
 
 // 查封保存
-export function fristReg (data) {
+export function sealUpReg (data) {
     return request({
-        url: '/ywbl/cfdj/fristReg',
+        url: '/ywbl/cfdj/sealUpReg',
         method: 'post',
         data
     })
 }
 
 // 续封保存
-export function changeReg (data) {
+export function continuedSealReg (data) {
     return request({
-        url: '/ywbl/cfdj/changeReg',
+        url: '/ywbl/cfdj/continuedSealReg',
         method: 'post',
         data
     })
@@ -47,9 +47,9 @@ export function changeReg (data) {
 
 
 // 解封保存
-export function logoutReg (data) {
+export function unSealReg (data) {
     return request({
-        url: '/ywbl/cfdj/logoutReg',
+        url: '/ywbl/cfdj/unSealReg',
         method: 'post',
         data
     })

@@ -239,16 +239,20 @@ export default {
         formdata.append("bsmSldy", this.unitData[0]?.bsmSldy);
         formdata.append("bsmSlsq", this.$parent.bsmSlsq);
         clmlInit(formdata).then((res) => {
-          resolve(res.code)
-          if (res.result.result && res.result.result.length > 0) {
-            this.tableData = res.result.result;
-            this.treeCheckId = this.tableData[0].bsmSj;
-            this.title = this.tableData[0].sjmc;
-            this.titleYs = 1;
-            this.titleNum = this.tableData[0].children.length;
+          if(res.result.code == 200){
+            resolve(res.code)
+            if (res.result.result && res.result.result.length > 0) {
+              this.tableData = res.result.result;
+              this.treeCheckId = this.tableData[0].bsmSj;
+              this.title = this.tableData[0].sjmc;
+              this.titleYs = 1;
+              this.titleNum = this.tableData[0].children.length;
 
-            this.previewImg.imgList = this.tableData[0]?.children;
-            this.previewImg.bsmSj = this.tableData[0]?.bsmSj;
+              this.previewImg.imgList = this.tableData[0]?.children;
+              this.previewImg.bsmSj = this.tableData[0]?.bsmSj;
+            }
+          }else{
+            this.$message.error(res.result.message)
           }
         })
       })

@@ -35,31 +35,51 @@ export default {
       tableDataList: [],
       InformationTable: [
         {
+          width: '50',
+          renderHeader: (h, scope) => {
+            return <div> {
+              this.$route.query.viewtype == 1 ? '序号' : <i class="el-icon-plus pointer" onClick={() => { this.handleAdd() }}></i>
+            }
+            </div>
+          },
+          render: (h, scope) => {
+            return (
+              <div>
+                {
+                  this.$route.query.viewtype == 1 ? <span>{scope.$index + 1}</span> :
+                    <i class="el-icon-minus pointer" onClick={() => { this.handleMinus(scope.$index, scope.row) }}></i>
+                }
+              </div>
+            )
+          }
+        },
+        {
           prop: "sqrmc",
-          label: "姓名"
+          label: "姓名/名称"
         },
         {
-          prop: "dlrzjlx",
+          prop: "zjzl",
           label: "证件种类"
         },
         {
-          prop: "dlrzjh",
+          prop: "zjh",
           label: "证件号"
         },
         {
-          prop: "fr",
+          prop: "dh",
+          label: "联系电话"
+        },
+        {
+          prop: "frmc",
           label: "法人"
         },
         {
-          label: '修改',
+          label: '操作',
           render: (h, scope) => {
             return (
               <div>
                 {
-                  <el-button
-                    icon="el-icon-view"
-                    type="text"
-                    onClick={() => { this.handleView(scope.$index, scope.row) }}>查看</el-button>
+                  <el-button icon="el-icon-view" type="text" onClick={() => { this.handleView(scope.$index, scope.row) }}>查看</el-button>
                 }
               </div>
             )

@@ -48,7 +48,7 @@
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="不动产权证号：" prop="qlxx.bdcqzh">
-              <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
+              <el-input disabled v-model="ruleForm.qlxx.bdcqzh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -58,7 +58,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="权利人：" prop="qlxx.qlrmc">
-              <el-input disabled v-model="ruleForm.qlxx.qlrmc"></el-input>
+              <el-input disabled v-model="ruleForm.qlxx.ywrmc"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -94,12 +94,12 @@
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封机关：" prop="cfdj.cfjg">
-              <el-input v-model="ruleForm.cfdj.cfjg"></el-input>
+              <el-input v-model="ruleForm.cfdj.cfjg" :disabled="$route.query.viewtype"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封类型：" prop="cfdj.cflx">
-              <el-select v-model="ruleForm.cfdj.cflx" class="width100" filterable clearable placeholder="请选择查封类型：">
+              <el-select v-model="ruleForm.cfdj.cflx" class="width100" filterable clearable placeholder="请选择查封类型："  :disabled="$route.query.viewtype">
                 <el-option v-for="item in dictData['A32']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                 </el-option>
               </el-select>
@@ -107,56 +107,56 @@
           </el-col>
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文件：" prop="cfdj.cfwj">
-              <el-input v-model="ruleForm.cfdj.cfwj"></el-input>
+              <el-input v-model="ruleForm.cfdj.cfwj" :disabled="$route.query.viewtype"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文号：" prop="cfdj.cfwh">
-              <el-input v-model="ruleForm.cfdj.cfwh"></el-input>
+              <el-input v-model="ruleForm.cfdj.cfwh" :disabled="$route.query.viewtype"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间：" prop="cfdj.cfqssj">
-              <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" type="date" placeholder="选择日期"></el-date-picker>
+              <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100"  :disabled="$route.query.viewtype"
+              type="date" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封结束时间：" prop="cfdj.cfjssj">
-              <el-date-picker v-model="ruleForm.cfdj.cfjssj" class="width100" type="date" placeholder="选择日期"></el-date-picker>
+              <el-date-picker v-model="ruleForm.cfdj.cfjssj" class="width100"  :disabled="$route.query.viewtype"
+              type="date" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="24">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封范围：" prop="cfdj.cffw">
-              <el-input v-model="ruleForm.cfdj.cffw"></el-input>
+              <el-input v-model="ruleForm.cfdj.cffw" :disabled="$route.query.viewtype"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="24">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="附记：" prop="cfdj.fj">
-              <el-input v-model="ruleForm.cfdj.fj" type="textarea"></el-input>
+              <el-input v-model="ruleForm.cfdj.fj" type="textarea" :disabled="$route.query.viewtype"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <div class="slxx_title">不动产权利人信息</div>
-        <sqrViewTable :tableData="ruleForm.qlrxx" />
-                <InformationTable @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList"
-          :gyfs="ruleForm.qlxx.gyfs" />
+        <sqrViewTable :tableData="ruleForm.ywrList" />
         <div class="slxx_title">登记原因</div>
         <el-row :gutter="10">
           <el-col>
             <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="cfdj.djyy">
-              <el-input class="textArea" type="textarea" v-model="ruleForm.cfdj.djyy"></el-input>
+              <el-input class="textArea" type="textarea" v-model="ruleForm.cfdj.djyy" :disabled="$route.query.viewtype"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </div>
       <el-row>
-        <el-form-item :class="flag ? 'marginBot0' : ''" class="btn">
+        <el-form-item :class="flag ? 'marginBot0' : ''" class="btn" v-if="!$route.query.viewtype">
           <el-button type="primary" @click="onSubmit">保存</el-button>
         </el-form-item>
       </el-row>
@@ -165,8 +165,7 @@
 </template>
 <script>
 import sqrViewTable from "@/views/workflow/components/sqrViewTable";
-import InformationTable from "@/views/workflow/components/InformationTable";
-import { cfInit, fristReg } from "@/api/cfdjFlow.js";
+import { cfInit, sealUpReg } from "@/api/cfdjFlow.js";
 import { mapGetters } from "vuex";
 export default {
   data () {
@@ -194,7 +193,7 @@ export default {
   watch: {
 
   },
-  components: { sqrViewTable,InformationTable },
+  components: { sqrViewTable },
   props: {
     flag: {
       type: Boolean,
@@ -220,9 +219,9 @@ export default {
       });
     },
     onSubmit () {
-      fristReg().then((res) => {
+      sealUpReg(this.ruleForm).then((res) => {
         if (res.code === 200 && res.result) {
-          console.log(res);
+          this.$message.success('保存成功');
         }
       });
     },