Merge remote-tracking branch 'origin/dev' into dev

+/*
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-06-14 15:05:38
+ */
 import Vue from 'vue'
 import Vue from 'vue'
 import Popup from './index.vue'
 import Popup from './index.vue'
 const PopupBox = Vue.extend(Popup)
 const PopupBox = Vue.extend(Popup)
@@ -36,9 +41,9 @@ const Popup1 = (title, editItem, data, formData) => {
   document.body.appendChild(instance.$el)
   document.body.appendChild(instance.$el)
   Vue.nextTick(() => {
   Vue.nextTick(() => {
     instance.isShow = true
     instance.isShow = true
-  })
     // 将组件实例赋值给loading
     // 将组件实例赋值给loading
     popuping = instance
     popuping = instance
+  })
   return instance
   return instance
 }
 }
 export default Popup1
 export default Popup1

 <template>
 <template>
   <div class="from-clues-header">
   <div class="from-clues-header">
     <div>收件信息</div>
     <div>收件信息</div>
-    <!-- <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag"
-      label-width="120px">
-      <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
+    <el-form :model="form"  label-width="120px">
+      <div class="slxx_con">
         <div class="slxx_title title-block">
         <div class="slxx_title title-block">
           受理信息
           受理信息
           <div class="triangle"></div>
           <div class="triangle"></div>
         </div>
         </div>
-        <el-row :gutter="10" v-if="ruleForm.slsq">
+        <el-row :gutter="10" v-if="form.slsq">
           <el-col :span="8">
           <el-col :span="8">
-            <el-form-item label="业务号：">
-              <el-input disabled v-model="ruleForm.slsq.ywh"></el-input>
+            <el-form-item label="补录编号：">
+              <el-input disabled v-model="form.Repair.ywh"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="8">
           <el-col :span="8">
-            <el-form-item label="受理人员：">
-              <el-input disabled v-model="ruleForm.slsq.slry"></el-input>
+            <el-form-item label="补录人员：">
+              <el-input disabled v-model="form.Repair.slry"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="8">
           <el-col :span="8">
-            <el-form-item label="受理时间：">
-              <el-input disabled v-model="ruleForm.slsq.slsj"></el-input>
+            <el-form-item label="补录时间：">
+              <el-input disabled v-model="form.Repair.slsj"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
-        <el-row :gutter="10" v-if="ruleForm.slsq">
+        <el-row :gutter="10">
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item label="权利类型：">
             <el-form-item label="权利类型：">
-              <el-input disabled v-model="ruleForm.slsq.qllxmc"></el-input>
+              <el-input disabled v-model="form.Repair.qllxmc"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item label="登记类型：">
             <el-form-item label="登记类型：">
-              <el-input disabled v-model="ruleForm.slsq.djlxmc"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="登记情形：">
-              <el-input disabled v-model="ruleForm.slsq.djqxmc"></el-input>
+              <el-input disabled v-model="form.Repair.djlxmc"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
       </div>
       </div>
-    </el-form>-->
+    </el-form>
     <div class="btn">
     <div class="btn">
       <el-button type="primary" @click="slxxsubmitForm">保存</el-button>
       <el-button type="primary" @click="slxxsubmitForm">保存</el-button>
       <el-button @click="closeDialog">取消</el-button>
       <el-button @click="closeDialog">取消</el-button>
@@ -86,7 +80,7 @@ export default {
     ...mapGetters(["dictData"]),
     ...mapGetters(["dictData"]),
   },
   },
   created() {
   created() {
-    this.init()
+    this.loadData();
     // this.clmlInitList(1)
     // this.clmlInitList(1)
   },
   },
   mounted() {
   mounted() {
@@ -110,9 +104,10 @@ export default {
   },
   },
 
 
   methods: {
   methods: {
-    init() {
+    loadData() {
       init(this.propsParam.bsmRepair).then((res) => {
       init(this.propsParam.bsmRepair).then((res) => {
-        if (res.code === 200) {
+        if (res.code == 200) {
+          this.form=res.result;
           console.log("/rest/djbRepair/init",res);
           console.log("/rest/djbRepair/init",res);
           // this.tableData = res.result;
           // this.tableData = res.result;
           // if (this.tableData.length < datas.columns().emptycolNum) {
           // if (this.tableData.length < datas.columns().emptycolNum) {

@@ -26,9 +26,67 @@
       </lb-table>
       </lb-table>
       <!-- 权利人 -->
       <!-- 权利人 -->
       <b class="title">权利人</b>
       <b class="title">权利人</b>
-      <lb-table :column="qlrColumns" :data="form.qlrList" heightNumSetting :heightNum="300"
-        :pagination="false">
-      </lb-table>
+      <el-table
+        :data="form.qlrList"
+        height="160"
+        border
+        :cell-style="{ textAlign: 'center' }"
+        :header-cell-style="{textAlign: 'center'}"
+        style="width: 100%">
+        <el-table-column width="60">
+          <template slot="header">
+            <i class="el-icon-plus pointer" @click="handleAddqlr"></i>
+          </template>
+          <template slot-scope="scope">
+            <i class="el-icon-minus pointer" @click="remove(scope.$index, scope.row, 'qlr')"></i>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="身份证读卡器"
+          width="150">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              icon="el-icon-edit-outline"
+              @click="handleRead(scope.row, 'qlr')">
+              读取
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="姓名/名称"
+          width="150">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.sqrxm"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="证件种类">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.sqrzjlxbm" class="width100">
+              <el-option
+                v-for="item in zjzlData"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="证件号">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.sqrzjhm"></el-input>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          label="联系电话">
+          <template slot-scope="scope">
+            <el-input type="tel" v-model="scope.row.lxdh"></el-input>
+          </template>
+        </el-table-column>
+      </el-table>
       <div v-show="isSearch">
       <div v-show="isSearch">
         <b class="title">查询结果</b>
         <b class="title">查询结果</b>
         <p>查询编号：{{ form.djSqcxDO.cxbh }}</p>
         <p>查询编号：{{ form.djSqcxDO.cxbh }}</p>
@@ -71,6 +129,7 @@
     data () {
     data () {
       return {
       return {
         key: 0,
         key: 0,
+        zjzlData: store.getters.dictData['A30'],
         //是否查询
         //是否查询
         isSearch: false,
         isSearch: false,
         //查询结果列表字段
         //查询结果列表字段
@@ -210,140 +269,6 @@
             );
             );
           },
           },
         }],
         }],
-        //权利人列表字段
-        qlrColumns: [{
-          width: "60",
-          renderHeader: (h, scope) => {
-            return (
-              <i
-                class="el-icon-plus pointer"
-                onClick={() => {
-                  this.handleAddqlr();
-                }}
-                style="color:#409EFF"
-              ></i>
-            );
-          },
-          render: (h, scope) => {
-            return (
-              <i
-                class="el-icon-minus pointer"
-                onClick={() => {
-                  this.remove(scope.$index, scope.row, "qlr");
-                }}
-              ></i>
-            );
-          },
-        },
-        {
-          width: "150",
-          label: "身份证读卡器",
-          render: (h, scope) => {
-            return (
-              <div>
-                <el-button
-                  type="text"
-                  icon="el-icon-edit-outline"
-                  onClick={() => {
-                    this.handleRead(scope.row, 'qlr');
-                  }}
-                >
-                  读取
-                </el-button>
-              </div>
-            );
-          },
-        },
-        {
-          width: "150",
-          prop: "sqrxm",
-          label: "姓名/名称",
-          render: (h, scope) => {
-            return (
-              <el-input
-                placeholder="姓名/名称"
-                value={scope.row[scope.column.property]}
-                onInput={(val) => {
-                  scope.row[scope.column.property] = val;
-                }}
-              ></el-input>
-            );
-          },
-        },
-        {
-          prop: "sqrzjlxbm",
-          label: "证件种类",
-          render: (h, scope) => {
-            return (
-              <el-select
-                class="width100"
-                value={scope.row[scope.column.property]}
-                onChange={(val) => {
-                  scope.row[scope.column.property] = val;
-                }}
-              >
-                {this.getDictData('A30').map((option) => {
-                  return (
-                    <el-option
-                      label={option.dname}
-                      value={option.dcode}
-                    ></el-option>
-                  );
-                })}
-              </el-select>
-            );
-          },
-        },
-        {
-          prop: "sqrzjhm",
-          label: "证件号",
-          render: (h, scope) => {
-            return (
-              <el-input
-                placeholder="证件号"
-                value={scope.row[scope.column.property]}
-                onInput={(val) => {
-                  scope.row[scope.column.property] = val;
-                }}
-                maxlength="21"
-              ></el-input>
-            );
-          },
-        },
-        {
-          prop: "lxdh",
-          label: "联系电话",
-          render: (h, scope) => {
-            return (
-              <div class="typePhone">
-                <el-input
-                  placeholder="联系电话"
-                  value={scope.row[scope.column.property]}
-                  onInput={(val) => {
-                    scope.row[scope.column.property] = val;
-                  }}
-                  onBlur={(val) => {
-                    this.teltest(scope.row);
-                  }}
-                  type="tel"
-                  maxlength="11"
-                ></el-input>
-                <span
-                  v-show={scope.row.inputErr}
-                  style={{
-                    fontSize: "12px",
-                    color: "red",
-                    position: "absolute",
-                    bottom: "-2px",
-                    left: "0",
-                  }}
-                >
-                  请输入正确手机号
-                </span>
-              </div>
-            );
-          },
-        }],
         newData: {
         newData: {
           sqrxm: "",
           sqrxm: "",
           sqrzjlxbm: "",
           sqrzjlxbm: "",