Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -131,7 +131,7 @@ export default {
 .ls-title {
   padding: 16px;
   color: #ffffff;
-  background: linear-gradient(-2deg, #409EFF, transparent; background: linear-gradient(3deg, #409EFF, transparent));
+  background: linear-gradient(3deg, #409EFF, transparent);
 }
 
 .ls-title .svg-icon {

@@ -104,4 +104,28 @@
 .btnCol {
   box-sizing: border-box;
   text-align: right;
+}
+
+.title-block {
+  display: inline-block;
+  position: relative;
+  background: #3498db;
+  color: #fff !important;
+  text-align: center;
+  padding: 0px 20px;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 5px 5px 5px 0px;
+  letter-spacing: 2px;
+}
+
+.title-block .triangle {
+  width: 0px;
+  height: 0px;
+  position: absolute;
+  border: 5px solid transparent;
+  border-top: 5px solid #3498db;
+  border-right: 5px solid #3498db;
+  left: 0px;
+  bottom: -10px;
 }
\ No newline at end of file

@@ -87,33 +87,19 @@ export default {
   },
   methods: {
     prev () {
-      if (this.isFirst) {
-        if (this.previewImg.selectedIndex - 1 >= 0) {
-          this.$parent.previewImg.index = 1
-        }
-        return
-      }
       let len = this.previewImg.imgList.length
-      this.$parent.previewImg.index = (this.$parent.previewImg.index - 1 + len) % len
-      this.reset()
-    },
-    next () {
-      if (this.isLast) {
-        if (this.previewImg.selectedIndex + 1 < this.previewImg.attachmentList.length) {
-          this.$parent.previewImg.index = 0
-        }
-        return
+      if (this.isFirst || len == 0) {
+        this.$emit('prevPriview')
       } else {
-        console.log(this.$parent.previewImg.selectedIndex);
+        this.$parent.previewImg.index = (this.$parent.previewImg.index - 1 + len) % len
       }
-      let len = this.previewImg.imgList.length
-      this.$parent.previewImg.index = (this.$parent.previewImg.index + 1) % len
-      this.reset()
     },
-    reset () {
-      this.transform = {
-        scale: 1,
-        degree: 0
+    next () {
+      let len = this.previewImg.imgList.length
+      if (this.isLast || len == 0) {
+        this.$emit('nextPriview')
+      } else {
+        this.$parent.previewImg.index = (this.$parent.previewImg.index + 1) % len
       }
     },
     showCurrent (index) {

@@ -72,6 +72,10 @@ export default {
                   icon="el-icon-edit-outline"
                   type="text"
                   onClick={() => { this.handleEdit(scope.$index, scope.row) }}>编辑</el-button>
+                <el-button
+                  icon="el-icon-view"
+                  type="text"
+                  onClick={() => { this.handleView(scope.$index, scope.row) }}>查看</el-button>
               </div>
             )
           }
@@ -121,6 +125,9 @@ export default {
     handleEdit () {
       this.dialog = true
     },
+    handleView () {
+      this.dialog = true
+    }
   }
 }
 </script>

@@ -19,8 +19,8 @@
           <div class="item">
             材料目录({{tableData.length}})
             <div>
-              <div v-for="item in tableData" :key="item.bsmSj"
-                :class="['child', treeCheckId == item.bsmSj ? 'checked' : '']" @click="treeClick(item)">
+              <div v-for="(item,index) in tableData" :key="item.bsmSj"
+                :class="['child', treeCheckId == item.bsmSj ? 'checked' : '']" @click="treeClick(item,index)">
                 <span v-if="item.isrequired==1" class="required">必选</span>
                 {{ item.sjmc }}
                 <span class="cl_number">({{item.children.length}})</span>
@@ -28,7 +28,8 @@
             </div>
           </div>
         </div>
-        <image-preview ref='imageRef' :previewImg="previewImg" @updateList="updateList" />
+        <image-preview ref='imageRef' :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
+          @prevPriview="prevPriview" />
       </div>
     </div>
     <clxxAddDialog v-model="isDialog" />
@@ -56,6 +57,7 @@ export default {
       ],
       iclass: "",
       // 材料目录选中
+      treeCheckIndex: 0,
       treeCheckId: "",
       checkedId: "1",
       column: [
@@ -205,6 +207,25 @@ export default {
     this.clmlInitList()
   },
   methods: {
+    // 自动预览
+    nextPriview () {
+      if (this.treeCheckIndex < this.tableData.length) {
+        this.treeCheckIndex++
+        this.treeCheckId = this.tableData[this.treeCheckIndex].bsmSj
+        this.previewImg.index = 0
+        this.previewImg.imgList = this.tableData[this.treeCheckIndex].children
+        this.previewImg.bsmSj = this.tableData[this.treeCheckIndex].bsmSj
+      }
+    },
+    prevPriview () {
+      if (this.treeCheckIndex >= 1) {
+        this.treeCheckIndex--
+        this.treeCheckId = this.tableData[this.treeCheckIndex].bsmSj
+        this.previewImg.index = this.previewImg.imgList.length
+        this.previewImg.imgList = this.tableData[this.treeCheckIndex].children
+        this.previewImg.bsmSj = this.tableData[this.treeCheckIndex].bsmSj
+      }
+    },
     // 材料目录明细初始化
     clmlInitList () {
       return new Promise(resolve => {
@@ -228,6 +249,7 @@ export default {
       })
     },
     updateList (val) {
+      let that = this
       if (val != null) { //删除最后一张图片时 val=null
         this.tableData.forEach(item => {
           if (item.bsmSj === val.bsmSj) {
@@ -240,9 +262,10 @@ export default {
         }
       } else {
         this.previewImg.imgList = []
-        this.tableData.forEach(item => {
+        this.tableData.forEach((item, index) => {
           if (this.treeCheckId == item.bsmSj) {
             item.children = []
+            that.treeCheckIndex = index
           }
         })
       }
@@ -343,9 +366,10 @@ export default {
       })
     },
     // 材料目录点击选中
-    treeClick (item) {
+    treeClick (item, index) {
       this.previewImg.index = 0
-      this.treeCheckId = item.bsmSj
+      this.treeCheckId = item?.bsmSj
+      this.treeCheckIndex = index
       this.previewImg.imgList = item?.children
       this.previewImg.bsmSj = item?.bsmSj
     },
@@ -469,8 +493,9 @@ export default {
             cursor: pointer;
             box-sizing: border-box;
             border-radius: 6px;
-            line-height: 24px;
+            line-height: 20px;
             transition: all 0.3s;
+            padding: 8px 0;
           }
 
           .child:hover {

@@ -171,7 +171,7 @@ export default {
       })
     },
     ywhClick (item) {
-      const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&viewtype=1' + '&sqywbm=' + item.djywbm);
+      const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&sqywbm=' + item.djywbm);
       window.open(href, '_blank');
     }
   }

@@ -170,7 +170,7 @@
           </el-col>
         </el-row>
         <InformationTable :tableData="ruleForm.qlrxx" :gyfs="ruleForm.gyfs" />
-        <div class="slxx_title">登记原因{{flag}}</div>
+        <div class="slxx_title">登记原因</div>
         <el-row :gutter="10">
           <el-col>
             <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy">
@@ -179,7 +179,7 @@
           </el-col>
         </el-row>
       </div>
-      <el-row class="btn">
+      <el-row class="btn" v-if="!$route.query.viewtype">
         <el-form-item :class="flag ? 'marginBot0' : ''">
           <el-button type="primary" @click="onSubmit">保存</el-button>
         </el-form-item>
@@ -195,7 +195,7 @@ export default {
   async created () {
     this.propsParam = this.$attrs;
     Init({
-        bsmSldy: this.propsParam.bsmSldy.split(",")
+      bsmSldy: this.propsParam.bsmSldy.split(",")
     }).then((res) => {
       if (res.code === 200 && res.result) {
         this.ruleForm = {
@@ -256,7 +256,7 @@ export default {
   methods: {
     list (bsmSldy) {
       Init({
-          bsmSldy: bsmSldy.split(',')
+        bsmSldy: bsmSldy.split(',')
       }).then((res) => {
         if (res.code === 200 && res.result) {
           this.ruleForm = {

@@ -4,7 +4,10 @@
     <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag"
       label-width="120px">
       <div class="slxx_con">
-        <div class="slxx_title">受理信息</div>
+        <div class="slxx_title title-block">
+          受理信息
+          <div class="triangle"></div>
+        </div>
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="业务号：" prop="ywh">
@@ -45,7 +48,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <div class="slxx_title">不动产单元情况</div>
+        <div class="slxx_title title-block">
+          不动产单元情况
+          <div class="triangle"></div>
+        </div>
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="宗地代码：" prop="zddm">
@@ -113,7 +119,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <div class="slxx_title">权利人信息</div>
+        <div class="slxx_title title-block">
+          权利人信息
+          <div class="triangle"></div>
+        </div>
         <el-row :gutter="10">
           <el-col :span="14">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
@@ -142,7 +151,10 @@
           </el-col>
         </el-row>
         <InformationTable :tableData="ruleForm.qlrxx" :gyfs="ruleForm.gyfs" />
-        <div class="slxx_title">登记原因{{flag}}</div>
+        <div class="slxx_title title-block">
+          登记原因
+          <div class="triangle"></div>
+        </div>
         <el-row :gutter="10">
           <el-col>
             <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy">

@@ -4,7 +4,10 @@
     <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag"
       label-width="120px">
       <div class="slxx_con">
-        <div class="slxx_title">受理信息</div>
+        <div class="slxx_title title-block">
+          受理信息
+          <div class="triangle"></div>
+        </div>
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="业务号：" prop="ywh">
@@ -45,7 +48,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <div class="slxx_title">不动产单元情况</div>
+        <div class="slxx_title title-block">
+          不动产单元情况
+          <div class="triangle"></div>
+        </div>
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="宗地代码：" prop="zddm">
@@ -75,8 +81,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="权利设定方式：" prop="qlsdfs"> 
-              <el-input disabled v-model="ruleForm.qlsdfsmc"></el-input>            
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="权利设定方式：" prop="qlsdfs">
+              <el-input disabled v-model="ruleForm.qlsdfsmc"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -113,7 +119,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <div class="slxx_title">权利人信息</div>
+        <div class="slxx_title title-block">
+          权利人信息
+          <div class="triangle"></div>
+        </div>
         <el-row :gutter="10">
           <el-col :span="14">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
@@ -142,16 +151,20 @@
           </el-col>
         </el-row>
         <InformationTable :tableData="ruleForm.qlrxx" :gyfs="ruleForm.gyfs" />
-        <div class="slxx_title">登记原因{{flag}}</div>
+        <div class="slxx_title title-block">
+          登记原因
+          <div class="triangle"></div>
+        </div>
         <el-row :gutter="10">
           <el-col>
             <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy">
-              <el-input class="textArea" type="textarea" v-model="ruleForm.djyy"></el-input>
+              <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype" v-model="ruleForm.djyy">
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </div>
-      <el-row class="btn">
+      <el-row class="btn" v-if="!$route.query.viewtype">
         <el-form-item :class="flag ? 'marginBot0' : ''">
           <el-button type="primary" @click="onSubmit">保存</el-button>
         </el-form-item>

@@ -50,7 +50,8 @@
               <i class="el-icon-circle-close" @click="handelItem(index)"></i>
             </li>
           </ul>
-          <el-button class="clean-btn" type="text" v-if="searchList.length>0" @click.native="hanldeCleanAll">清除全部</el-button>
+          <el-button class="clean-btn" type="text" v-if="searchList.length>0" @click.native="hanldeCleanAll">清除全部
+          </el-button>
         </el-row>
       </el-form>
     </div>
@@ -83,7 +84,6 @@ export default {
   },
   data () {
     return {
-
       queryForm: {
         ywly: "",
         qllx: "",