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

renchao@pashanhoo.com
Showing 4 changed files with 64 additions and 64 deletions
src/components/Base/base.js
src/views/workflow/components/processViewer.vue
src/views/workflow/components/szxx.vue
src/views/workflow/components/zslq.vue
--- a/src/components/Base/base.js
View file @af0a4a9
+++ b/src/components/Base/base.js
View file @af0a4a9
 /*
 * @Description: 引入公共组件
 * @Autor: renchao
- * @LastEditTime: 2023-04-10 11:16:54
+ * @LastEditTime: 2023-04-25 15:18:20
 */
-import dialogBox from '@/components/DialogBox/dialogBox.vue'
+import dialogBox from '@/components/dialogBox/dialogBox.vue'
 import LbTable from '@/components/LbTable/lb-table.vue'
 import Theme from '@/components/Theme/theme.vue'
 import Popup from '@/components/Popup/index'
--- a/src/views/workflow/components/processViewer.vue
View file @af0a4a9
+++ b/src/views/workflow/components/processViewer.vue
View file @af0a4a9
@@ -53,22 +53,21 @@
      </el-select>
      <el-table :data="taskCommentList" size="mini" border header-cell-class-name="table-header-gray">
        <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" />
-        <el-table-column label="候选办理" prop="candidate" minWidth="150" align="center" />
+        <el-table-column label="环节名称" prop="candidate" minWidth="150px" align="center" />
-        <el-table-column label="实际办理" prop="assigneeName" minWidth="140" align="center" />
+        <el-table-column label="办理人" prop="assigneeName" minWidth="100px" align="center" />
-        <el-table-column label="处理时间" prop="createTime" width="160" align="center" />
+        <el-table-column label="处理时间" prop="createTime" width="140px" align="center" />
-        <el-table-column label="办结时间" prop="finishTime" width="160" align="center" />
+        <el-table-column label="办结时间" prop="finishTime" width="140px" align="center" />
-        <el-table-column label="耗时" prop="duration" minWidth="100px" align="center" />
+        <el-table-column label="操作方式" align="center">
-        <el-table-column label="操作类型" align="center">
        </el-table-column>
      </el-table>
    </div>
  </div>
 </template>
 <script>
-import '@/styles/package/theme/index.scss'
+  import '@/styles/package/theme/index.scss'
-import BpmnViewer from 'bpmn-js/lib/Viewer'
+  import BpmnViewer from 'bpmn-js/lib/Viewer'
-import MoveCanvasModule from 'diagram-js/lib/navigation/movecanvas'
+  import MoveCanvasModule from 'diagram-js/lib/navigation/movecanvas'
-export default {
+  export default {
    props: {
      formData: {
        type: Object,
@@ -190,7 +189,7 @@ export default {
            this.bpmnViewer = new BpmnViewer({
              additionalModules: [
                // 移动整个画布
-              MoveCanvasModule,
+                MoveCanvasModule
              ],
              container: this.$refs.processCanvas
            })
@@ -252,14 +251,10 @@ export default {
        }
      }
    }
-}
+  }
 </script>
 <style scoped lang="scss">
-/deep/.bjs-powered-by {
+  .information-list {
-  display: none !important;
-}
-.information-list {
    height: 150px;
    margin-top: 10px;
@@ -267,5 +262,5 @@ export default {
      font-size: 16px;
      line-height: 24px;
    }
-}
+  }
 </style>
--- a/src/views/workflow/components/szxx.vue
View file @af0a4a9
+++ b/src/views/workflow/components/szxx.vue
View file @af0a4a9
@@ -70,10 +70,10 @@
  </div>
 </template>
 <script>
-import { getSlsqBdcqzList, invalidCertificate, getSzRecordList } from "@/api/bdcqz.js";
+  import { getSlsqBdcqzList, invalidCertificate, getSzRecordList } from "@/api/bdcqz.js";
-import bdcqzPrint from "./zsdy.vue";
+  import bdcqzPrint from "./zsdy.vue";
-import { popupDialog } from "@/utils/popup.js";
+  import { popupDialog } from "@/utils/popup.js";
-export default {
+  export default {
    components: { bdcqzPrint },
    props: {},
    data () {
@@ -85,6 +85,7 @@ export default {
        zfyy: "",
        invalidDiglog: false,
        bsmSz: "",
+        bsmBdcqz: ""
      };
    },
    created () {
@@ -144,6 +145,7 @@ export default {
      openInvalidDiglog (item) {
        this.bsmSz = item.bsmSz;
        this.invalidDiglog = true;
+        this.bsmBdcqz = item.bsmBdcqz
      },
      closeInvalidDiglog () {
        this.invalidDiglog = false;
@@ -152,7 +154,7 @@ export default {
      },
      //作废缮证信息
      confirmInvalid () {
-      invalidCertificate({ bsmSz: this.bsmSz, zfyy: this.zfyy }).then((res) => {
+        invalidCertificate({ bsmbdcqz: this.bsmBdcqz, zfyy: this.zfyy }).then((res) => {
          if (res.code === 200) {
            this.list();
            this.$message.success("作废成功");
@@ -167,12 +169,12 @@ export default {
        popupDialog("缮证记录", "workflow/components/szRecord", { bsmBdcqz: item.bsmBdcqz }, '50%')
      }
    },
-};
+  };
 </script>
 <style scoped lang='scss'>
-@import "~@/styles/public.scss";
+  @import "~@/styles/public.scss";
-.szxx {
+  .szxx {
    box-sizing: border-box;
    padding-right: 15px;
    width: 100%;
@@ -189,9 +191,9 @@ export default {
        height: 240px;
      }
    }
-}
+  }
-.szxx_header {
+  .szxx_header {
    color: #ffffff;
    font-weight: bolder;
    font-size: 16px;
@@ -207,40 +209,40 @@ export default {
      margin-top: 10px;
      line-height: 30px;
    }
-}
+  }
-.top_line {
+  .top_line {
    border-top: 2px solid rgb(222, 222, 222);
-}
+  }
-.text {
+  .text {
    margin-bottom: 10px;
    text-align: center;
-}
+  }
-.color_iray {
+  .color_iray {
    color: rgb(153, 153, 153);
-}
+  }
-.color_red {
+  .color_red {
    color: rgb(255, 89, 24);
-}
+  }
-.middle_margin {
+  .middle_margin {
    margin-bottom: 10px;
-}
+  }
-.operation_button {
+  .operation_button {
    border: 1px solid rgb(0, 121, 254);
    padding: 5px;
    text-align: center;
-}
+  }
-.card_padding {
+  .card_padding {
    padding-top: 8px;
-}
+  }
-.invalid-diglog {
+  .invalid-diglog {
    padding-bottom: 20px;
    font-size: 16px;
    font-weight: bold;
@@ -271,13 +273,13 @@ export default {
      display: flex;
      justify-content: flex-end;
    }
-}
+  }
-/deep/.el-card__header {
+  /deep/.el-card__header {
    background-color: rgb(198, 67, 83);
-}
+  }
-/deep/.el-card__body {
+  /deep/.el-card__body {
    padding: 0px;
-}
+  }
 </style>
--- a/src/views/workflow/components/zslq.vue
View file @af0a4a9
+++ b/src/views/workflow/components/zslq.vue
View file @af0a4a9
 <template>
- <dialogBox title="不动产权证领取" width="85%" @closeDialog="closeDialog" @submitForm="handleSubmit" v-model="value" >
+  <dialogBox title="不动产权证领取" width="85%" @closeDialog="closeDialog" @submitForm="handleSubmit" v-model="value">
    <div class="zslq">
      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
        <el-row>
          <el-col :span="8">
            <el-form-item label="发证人姓名">
-            <el-input v-model="ruleForm.fzrxm" disabled></el-input>
+              <el-input v-model="ruleForm.fzrmc" disabled></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="发证时间">
-            <el-input v-model="ruleForm.fzrxm" disabled></el-input>
+              <el-input v-model="ruleForm.fzsj" disabled></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
@@ -53,11 +53,11 @@
 </template>
 <script>
-import store from '@/store/index.js'
+  import store from '@/store/index.js'
-import table from "@/utils/mixin/table";
+  import table from "@/utils/mixin/table";
-import { getUnclaimedBdcqz, issueCertificate } from "@/api/bdcqz.js";
+  import { getUnclaimedBdcqz, issueCertificate } from "@/api/bdcqz.js";
-import { datas } from "../javascript/fzxxdata";
+  import { datas } from "../javascript/fzxxdata";
-export default {
+  export default {
    props: {
      value: { type: Boolean, default: true }
    },
@@ -66,7 +66,7 @@ export default {
      return {
        zjzlData: store.getters.dictData['A30'],
        ruleForm: {
-        fzrxm: '',
+          fzrmc: '',
          fzsj: '',
          fzsl: '',
          bdcqzList: [],
@@ -108,8 +108,11 @@ export default {
      loadGrid () {
        getUnclaimedBdcqz({ bsmSlsq: this.$route.query.bsmSlsq }).then(res => {
          if (res.code === 200) {
-          this.tableData.data = res.result;
+            this.tableData.data = res.result.list;
-          this.ruleForm.bdcqzList = res.result;          
+            this.ruleForm.fzrmc = res.result.fzrmc
+            this.ruleForm.fzsj = res.result.fzsj
+            this.ruleForm.fzsl = res.result.fzsl
          }
        })
      },
@@ -135,8 +138,8 @@ export default {
        this.$emit("input", false);
      },
    }
-}
+  }
 </script>
 <style scoped lang="scss">
-@import "~@/styles/mixin.scss";
+  @import "~@/styles/mixin.scss";
 </style>