Merge branch 'dev'

renchao@pashanhoo.com
Showing 2 changed files with 45 additions and 22 deletions
src/views/workflow/components/dialog/addQlr.vue
src/views/workflow/javascript/addQlrData.js
--- a/src/views/workflow/components/dialog/addQlr.vue
View file @cc7f71b
+++ b/src/views/workflow/components/dialog/addQlr.vue
View file @cc7f71b
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-09-01 11:01:28
+ * @LastEditTime: 2023-09-01 14:09:02
 -->
 <template>
  <dialogBox
@@ -12,12 +12,12 @@
    :isFullscreen="false"
    @submitForm="submitForm"
    @closeDialog="closeDialog"
-    :isButton="showButton">
+    :isButton="isShow">
    <el-tabs v-model="activeName" @tab-click="handleClick" class="from-clues-header">
      <el-tab-pane label="基本信息" name="1"></el-tab-pane>
-      <el-tab-pane label="个人信息备案" name="2"></el-tab-pane>
+      <el-tab-pane label="银行信息" name="2"></el-tab-pane>
-      <el-tab-pane label="企业信息备案" name="3"></el-tab-pane>
+      <el-tab-pane label="企业信息" name="3"></el-tab-pane>
    </el-tabs>
    <el-form
@@ -28,6 +28,7 @@
      label-width="120px">
      <el-form-item label="身份证读卡器">
        <el-button type="text" icon="el-icon-tickets" :disabled="!showButton" @click="readClick">读取</el-button>
+        <el-button type="primary">信息备案</el-button>
      </el-form-item>
      <el-row>
        <el-col :span="8">
@@ -252,7 +253,7 @@
        </el-col>
      </el-row>
    </el-form>
-    <div v-if="activeName==2">
+    <div v-if="activeName==2" class="padding10">
      <el-form :model="queryForm" label-width="80px">
        <el-row>
          <el-col :span="8">
@@ -274,8 +275,8 @@
          </el-col>
        </el-row>
      </el-form>
-      <el-table :data="tableDataGr.data" border v-Loading="loading" :height="368">
+      <el-table :data="tableDataYh.data" border v-Loading="loading" :height="426.8">
-        <el-table-column v-for="item in tableDataGr.columns" :key="item.index" :prop="item.prop" :label="item.label" align="center">
+        <el-table-column v-for="item in tableDataYh.columns" :key="item.index" :prop="item.prop" :label="item.label" align="center">
        </el-table-column>
        <el-table-column label="证件种类">
          <template slot-scope="scope">
@@ -289,18 +290,18 @@
            </el-select>
          </template>
        </el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" width="50">
          <template slot-scope="scope">
-            <el-button type="text" @click="handlesGrSelect(scope.row)">使用</el-button>
+            <el-button type="text" @click="handlesYhSelect(scope.row)">使用</el-button>
          </template>
        </el-table-column>
      </el-table>
-      <el-pagination background layout="prev, pager, next,total" :total="tableDataGr.total"
+      <el-pagination background layout="prev, pager, next,total" :total="tableDataYh.total"
        @current-change="handleCurrentChange"></el-pagination>
    </div>
-    <div v-if="activeName==3">
+    <div v-if="activeName==3" class="padding10">
      <el-form :model="queryForm" label-width="80px">
        <el-row>
          <el-col :span="8">
@@ -322,7 +323,7 @@
          </el-col>
        </el-row>
      </el-form>
-      <el-table :data="tableDataQy.data" border v-Loading="loading" :height="368">
+      <el-table :data="tableDataQy.data" border v-Loading="loading" :height="426.8">
        <el-table-column v-for="item in tableDataQy.columns" :key="item.index" :prop="item.prop" :label="item.label" align="center">
        </el-table-column>
        <el-table-column label="证件种类">
@@ -337,9 +338,9 @@
            </el-select>
          </template>
        </el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" width="50">
          <template slot-scope="scope">
-            <el-button type="text" @click="handlesGrSelect(scope.row)">使用</el-button>
+            <el-button type="text" @click="handlesYhSelect(scope.row)">使用</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -352,7 +353,7 @@
 <script>
  import { mapGetters } from "vuex";
  import { getIdCardInfo } from '@/utils/operation.js'
-  import { dataGr, dataQy, sendThis } from "../../javascript/addQlrData";
+  import { dataYh, dataQy, sendThis } from "../../javascript/addQlrData";
  export default {
    props: {
      value: { type: Boolean, default: false },
@@ -364,6 +365,7 @@
    },
    data () {
      return {
+        isShow: false,
        activeName: '1',
        loading: false,
        myValue: this.value,
@@ -396,10 +398,18 @@
          zjzl: [{ required: true, message: "证件种类", trigger: "change" }],
          zjh: [{ required: true, message: "证件号", trigger: "blur" }],
        },
-        tableDataGr: {
+        tableDataYh: {
          total: 0,
-          columns: dataGr.columns(),
+          columns: dataYh.columns(),
-          data: [],
+          data: [
+            {
+              sqrmc: '李怡然',
+              zjh: '99999999999',
+              frmc: '李怡然同学',
+              txdz: '山东日照',
+              dh: '18802933269'
+            }
+          ],
        },
        queryForm: {
          zjh: "",
@@ -418,6 +428,7 @@
    watch: {
      value (val) {
        this.myValue = _.cloneDeep(val)
+        this.isShow = this.showButton
      },
      details: {
        handler: function (val, oldVal) {
@@ -427,8 +438,17 @@
      }
    },
    methods: {
-      handleClick (event, tab) { },
+      handleClick (event, tab) {
-      handlesGrSelect () { },
+        if (this.activeName != 1) {
+          this.isShow = false
+        } else {
+          this.isShow = true
+        }
+      },
+      handlesYhSelect (row) {
+        this.$emit("updateDetail", _.cloneDeep(row));
+        this.$emit("input", false);
+      },
      handleSearch () { },
      handleCurrentChange (val) {
        console.log(val);
@@ -494,4 +514,7 @@
    padding-top: 10px;
    background-color: #fff;
  }
+  .padding10 {
+    padding-bottom: 10px;
+  }
 </style>
--- a/src/views/workflow/javascript/addQlrData.js
View file @cc7f71b
+++ b/src/views/workflow/javascript/addQlrData.js
View file @cc7f71b
@@ -71,10 +71,10 @@ class data2 extends filter {
  }
 }
-let dataGr = new data1()
+let dataYh = new data1()
 let dataQy = new data2()
 export {
-  dataGr,
+  dataYh,
  dataQy,
  sendThis
 }