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

@@ -67,3 +67,12 @@ export function getSlsqBdcqzList (params) {
         params
     })
 }
+
+// 证书预览
+export function bdcqzPreview (data) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/ywbl/bdcqz/bdcqzPreview',
+        method: 'post',
+        data
+    })
+}
\ No newline at end of file

@@ -97,7 +97,7 @@ export function stepExpandInfo (data) {
 // 获取审批意见
 export function getSpyjList (data) {
     return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/getSpyjList',
+        url: SERVER.SERVERAPI + '/rest/ywbl/opinion/getSpyjList',
         method: 'post',
         data
     })
@@ -106,7 +106,7 @@ export function getSpyjList (data) {
 // 保存审批意见
 export function saveSpyj (data) {
     return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/saveSpyj',
+        url: SERVER.SERVERAPI + '/rest/ywbl/opinion/saveSpyj',
         method: 'post',
         data
     })
@@ -114,7 +114,7 @@ export function saveSpyj (data) {
 // 根据受理申请保存审批意见
 export function saveSpyjBySlsq (data) {
     return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/saveSpyjBySlsq',
+        url: SERVER.SERVERAPI + '/rest/ywbl/opinion/saveSpyjBySlsq',
         method: 'post',
         data
     })
@@ -127,62 +127,7 @@ export function record (data) {
         data
     })
 }
-// 获取不动产权证列表
-export function getBdcqzList (params) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/getBdcqzList',
-        method: 'get',
-        params: params
-    })
-}
-// 获取印刷序列号
-export function readYsxlh (params) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/readYsxlh',
-        method: 'get',
-        params: params
-    })
-}
-// 缮证
-export function certificate (data) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/certificate',
-        method: 'post',
-        data
-    })
-}
-// 作废缮证信息
-export function invalidCertificate (data) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/invalidCertificate',
-        method: 'post',
-        data
-    })
-}
-// 缮证列表
-export function getCertificateList (data) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/getCertificateList',
-        method: 'post',
-        data
-    })
-}
-// 发证
-export function issueCertificate (data) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/issueCertificate',
-        method: 'post',
-        data
-    })
-}
-// 获取受理申请下全部不动产权证
-export function getSlsqBdcqzList (params) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/getSlsqBdcqzList',
-        method: 'get',
-        params
-    })
-}
+
 // 终止任务
 export function stopTask (data) {
     return request({

+<template>
+  <el-dialog
+    :title="sqqlRule.nodename"
+    :visible.sync="dialogVisible"
+    :before-close="cancelDialog"
+  >
+    <ul class="edit-title-list" v-if="djlxList.length > 0">
+      <li
+        v-for="(item, index) in djlxList"
+        @click="handleTitleSelct(item, index)"
+        :key="index"
+        :class="{ active: index == tn }"
+      >
+        {{ item.nodename }}
+      </li>
+    </ul>
+    <el-collapse v-model="activeName" accordion>
+      <el-collapse-item title="业务详情" name="1">
+        <el-form
+          :model="form"
+          v-show="n == 0"
+          :rules="rules"
+          label-width="135px"
+          ref="ruleForm"
+        >
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="权利类型编码">
+                <el-input v-model="form.ywDetail.qllxbm" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="8">
+              <el-form-item label="权利类型名称">
+                <el-input v-model="form.ywDetail.qllxmc" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="申请分类">
+                <el-select v-model="form.ywDetail.sqfl" disabled placeholder="请选择" class="width100">
+                  <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col> -->
+          </el-row>
+          <!-- <el-row>
+            <el-col :span="8">
+              <el-form-item label="登记类型编码">
+                <el-input v-model="form.ywDetail.djlxbm" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="登记类型名称">
+                <el-input v-model="form.ywDetail.djlxmc" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="发起业务单元类型">
+                <el-select v-model="form.ywDetail.fqywdylx" disabled placeholder="请选择" class="width100">
+                  <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="登记业务编码">
+                <el-input v-model="form.ywDetail.djywbm" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item label="登记业务名称">
+                <el-input v-model="form.ywDetail.djywmc" disabled></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="是否启用" prop="enabled">
+                <el-radio-group v-model="form.ywDetail.enabled">
+                  <el-radio label="1">启用</el-radio>
+                  <el-radio label="0">禁用</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item label="业务流程ID" prop="flowid">
+                <el-input v-model="form.ywDetail.flowid"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="登记情形及材料">
+                <el-input v-model="form.ywDetail.djqxcl" placeholder="仅支持execl文件导入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1">
+              <el-upload ref="upload" :action="imgUploadUrl" :limit="1" accept=".xls, .xlsx" :show-file-list="false"
+                :disabled='requested' :file-list="fileList" :before-upload="uploadRecord" :on-success="handleSuccess">
+                <el-button type="primary" icon="el-icon-upload" :loading="requested">上传材料</el-button>
+              </el-upload>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="登记原因设置" prop="sfqydjyymb">
+                <el-radio-group v-model="form.ywDetail.sfqydjyymb">
+                  <el-radio label="1">启用</el-radio>
+                  <el-radio label="0">禁用</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="登记原因模板" prop="djyy">
+                <el-input type="textarea" :rows="4" placeholder="请输入内容" v-model="form.ywDetail.djyy">
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row> -->
+        </el-form>
+      </el-collapse-item>
+      <el-collapse-item title="登记情形设置" name="2">
+        <div>
+          控制反馈：通过界面样式和交互动效让用户可以清晰的感知自己的操作；
+        </div>
+        <div>页面反馈：操作后，通过页面元素的变化清晰地展现当前状态。</div>
+      </el-collapse-item>
+      <el-collapse-item title="材料信息设置" name="3">
+        <div>简化流程：设计简洁直观的操作流程；</div>
+        <div>
+          清晰明确：语言表达清晰且表意明确，让用户快速理解进而作出决策；
+        </div>
+        <div>
+          帮助用户识别：界面简单直白，让用户快速识别而非回忆，减少用户记忆负担。
+        </div>
+      </el-collapse-item>
+      <el-collapse-item title="刷选条件设置" name="4">
+        <div>
+          用户决策：根据场景可给予用户操作建议或安全提示，但不能代替用户进行决策；
+        </div>
+        <div>
+          结果可控：用户可以自由的进行操作，包括撤销、回退和终止当前操作等。
+        </div>
+      </el-collapse-item>
+    </el-collapse>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="cancelDialog">取 消</el-button>
+      <el-button type="primary" @click="cancelDialog">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { getDjlxInfo, getSqdjywDetail } from "@/api/system.js";
+export default {
+  //父组件 传 过来的 值
+  props: {
+    dialogVisible: { type: Boolean, default: false },
+    sqqlRule: { type: Object, default: {} },
+  },
+  watch: {
+    dialogVisible: {
+      handler: function (newVal, oldVal) {
+        if (newVal) {
+          this.init();
+        }
+      },
+      immediate: true,
+    },
+  },
+  components: {},
+  name: "componentDialog",
+  data() {
+    return {
+      tn: 0,
+      n: 0,
+      djlxList: [],
+      title: "",
+      activeName: "1",
+      form: {},
+    };
+  },
+  mounted() {},
+  methods: {
+    //页面初始化
+    init() {
+      getDjlxInfo(this.sqqlRule.bsmSqyw).then((res) => {
+        let { result } = res;
+        this.djlxList = result ? result : [];
+        this.getDetail(this.djlxList[0].bsmSqyw);
+      });
+      //}
+    },
+    //tab选项卡事件
+    handleTitleSelct(obj, index) {
+      this.n = 0;
+      this.tn = index;
+      this.getDetail(this.djlxList[index].bsmSqyw);
+    },
+    getDetail(bsmSqyw) {
+       getSqdjywDetail(bsmSqyw).then((res) => {
+        if (res.code === 200) {
+          this.form = res.result;
+        } else {
+          this.$alert(res.message);
+        }
+      });
+    },
+    //修改父组件传过来的值
+    cancelDialog() {
+      this.$emit("update:dialogVisible", false);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+@import "~@/styles/mixin.scss";
+.form {
+  background: #eee;
+  padding: 0 10px;
+}
+.dialog-footer {
+  text-align: center;
+}
+.edit-title-list {
+  @include flex;
+
+  li {
+    flex: 1;
+    @include flex-center;
+    border: 1px solid $borderColor;
+    line-height: 36px;
+    margin-bottom: 10px;
+    cursor: pointer;
+    transition: all 0.3s;
+
+    &:hover {
+      @extend .active;
+    }
+  }
+}
+.active {
+  background: $light-blue !important;
+  color: #fff;
+}
+</style>
\ No newline at end of file

@@ -34,18 +34,21 @@
         :column="tableData.columns" :data="tableData.data">
       </lb-table>
     </div>
-    <editDialog v-model="isDialog" :detailList="detailList" :bsmSqyw="bsmSqyw" />
+    <!-- <editDialog v-model="isDialog" :detailList="detailList" :bsmSqyw="bsmSqyw" /> -->
+    <component-dialog :dialogVisible="dialogVisible" v-if="sqqlRule&&flag" :sqqlRule="sqqlRule" @update:dialogVisible="dialogVisibles"></component-dialog>
   </div>
 </template>
 <script>
 import table from "@/utils/mixin/table"
 import editDialog from "./components/editDialog.vue"
+import componentDialog from "./sqywDetail.vue"
 import { datas, sendThis } from "./sqywgzdata"
 import { getSysSqdjywBysearch, getDjlxInfo } from "@/api/system.js"
 export default {
   name: "djbcx",
   components: {
-    editDialog
+    editDialog,
+    componentDialog
   },
   mixins: [table],
   mounted () {
@@ -54,6 +57,10 @@ export default {
   },
   data () {
     return {
+      flag:false,
+       //控制弹窗 显示
+      dialogVisible: false,
+      qllxmc:"",
       isDialog: false,
       queryForm: {
         qllx: "",
@@ -66,7 +73,8 @@ export default {
         data: []
       },
       detailList: [],
-      bsmSqyw: ''
+      bsmSqyw:"",
+      sqqlRule:"",
     }
   },
   methods: {
@@ -84,17 +92,24 @@ export default {
     },
     //编辑
     editClick (row) {
-      if (row.nodecode === 'B50') {
-        this.detailList = []
-        this.bsmSqyw = row.bsmSqyw
-        this.isDialog = true
-      } else {
-        getDjlxInfo(row.bsmSqyw).then(res => {
-          let { result } = res
-          this.detailList = result ? result : []
-          this.isDialog = true
-        })
-      }
+      this.flag=true;
+        this.sqqlRule = row;
+        this.dialogVisible = true;       
+      // if (row.nodecode === 'B50') {
+      //   this.detailList = []
+      //   this.bsmSqyw = row.bsmSqyw
+      //   this.isDialog = true
+      // } else {
+      //   getDjlxInfo(row.bsmSqyw).then(res => {
+      //     let { result } = res
+      //     this.detailList = result ? result : []
+      //     this.isDialog = true
+      //   })
+      // }
+    },
+     //子组件传 过来的 数据
+    dialogVisibles(v){
+        this.dialogVisible = v;
     }
   },
 };

@@ -88,7 +88,7 @@
         </div>
       </div>
     </el-dialog>
-    <bdcqzPrint v-model="dialog" :bdcqz="bdcqz" />
+    <bdcqzPrint ref="bdcqzPrint" v-model="dialog" :bdcqz="bdcqz" />
     <el-empty description="暂无数据" v-if="tableData.length == 0"></el-empty>
   </div>
 </template>
@@ -145,8 +145,11 @@ export default {
           },
         });
       } else {
+        this.$nextTick(() => {
           this.dialog = true;
           this.bdcqz = item;
+          this.$refs.bdcqzPrint.getBdcqzPreview();
+        })
         //证书打印
         // this.$popup("证书打印", "workflow/components/zsdy", {
         //   height: "700px",

@@ -28,12 +28,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <div
-        class="aaaa"
-        :style="{
-          backgroundImage: 'url(' + require('@/image/bdcqz/bdcqzs2.jpg') + ')',
-        }"
-      >
+      <div class="aaaa" v-if="bdcqz.bdcqzlx==1" :style="{backgroundImage: 'url(' + require('@/image/bdcqz/bdcqzs2.jpg') + ')',}">
         <div class="bdcqzh">
           <span>{{ bdcqz.sjjc }}</span> <span>{{ bdcqz.djnd }}</span>
           <span>{{ bdcqz.sxqc }}</span> <span>{{ bdcqz.sxh }}</span>
@@ -76,13 +71,52 @@
           </div>
         </div>
       </div>
+      <div class="bdcdjzm" v-else :style="{backgroundImage: 'url(' + require('@/image/bdcqz/bdcdjzm.jpg') + ')',}">
+        <div class="bdcqzh">
+          <span>{{ bdcqz.sjjc }}</span> <span>{{ bdcqz.djnd }}</span>
+          <span>{{ bdcqz.sxqc }}</span> <span>{{ bdcqz.sxh }}</span>
+        </div>
+        <div class="zmyl-box">
+          <div class="qlr">
+              {{ bdcqz.qlr }}
+            </div>
+            <div class="gyqk">
+              {{ bdcqz.gyqk }}
+            </div>
+            <div class="zl">
+              {{ bdcqz.zl }}
+            </div>
+            <div class="bdcdyh">
+              {{ bdcqz.bdcdyh }}
+            </div>
+            <div class="qllx">
+              {{ bdcqz.qllx }}
+            </div>
+            <div class="qlxz">
+              {{ bdcqz.qlxz }}
+            </div>
+            <div class="yt">
+              {{ bdcqz.yt }}
+            </div>
+            <div class="mj">
+              {{ bdcqz.mj }}
+            </div>
+            <div class="syqx">
+              {{ bdcqz.syqx }}
+            </div>
+            <div class="qt">
+              {{ bdcqz.qlqtzk }}
+            </div>      
+           <div class="fj">{{ bdcqz.fj }}</div>
+        </div>
+      </div>
     </div>
   </dialogBox>
 </template>
 
 <script>
 import { datas } from "../javascript/zsyl.js";
-import { readYsxlh, certificate, getSlsqBdcqzList } from "@/api/bdcqz.js";
+import { readYsxlh, certificate, getSlsqBdcqzList,bdcqzPreview } from "@/api/bdcqz.js";
 export default {
   components: {},
   props: {
@@ -118,13 +152,18 @@ export default {
       this.columns = datas.columns();
     },
   },
-  created() {},
+  created() {
+    this.ysxlhList();
+    },
   methods: {
     //获取印刷序列号列表
     ysxlhList() {
+      console.log(this.bdcqz);
       readYsxlh({ zslx: this.bdcqz.bdcqzlx }).then((res) => {
         if (res.code === 200) {
           this.ysxlh = res.result;
+          console.log(this.ysxlh);
+          //this.bdcqz.ysxlh= this.ysxlh[0];
         }
       });
     },
@@ -139,6 +178,10 @@ export default {
       var value = this.bdcqz[code];
       return value;
     },
+    getBdcqzPreview(){
+      bdcqzPreview(this.bdcqz).then(res => {
+      })
+    },
     //打印证书
     childFn() {
       this.ruleForm.bsmBdcqz = this.bdcqz.bsmBdcqz;
@@ -164,6 +207,21 @@ export default {
   font-family: KaiTi;
   font-weight: 700;
 }
+.bdcdjzm {
+  width: 1123px;
+  height: 794px;
+  font-family: KaiTi;
+  font-weight: 700;
+}
+.zmyl-box {
+  //position: relative;
+  position:absolute;
+  height: 600px;
+  width: 280px;
+  margin-left: 775px;
+  font-size: 16px;
+  justify-content: space-between;
+}
 .bdcqzh {
   height: 70px;
   left: 0;