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

@@ -67,6 +67,9 @@ export function uploadSjClmx (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/ywbl/clxx/uploadSjClmx',
         method: 'post',
+        headers: {
+            'Content-Type': 'multipart/form-data'
+        },
         data
     })
 }

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-06-14 09:25:12
+ * @LastEditTime: 2023-06-14 11:10:26
 -->
 <template>
   <div class="rlPopup">
@@ -127,6 +127,29 @@
        * @author: renchao
        */
       handleViewScan () {
+        function dataURLtoBlob (base64String) {
+          const arr = base64String.split(',');
+          if (arr.length !== 2) {
+            throw new Error('Invalid Base64 format');
+          }
+          const mime = arr[0].match(/:(.*?);/)[1];
+          if (!mime) {
+            throw new Error('Cannot retrieve MIME type');
+          }
+          const bstr = atob(arr[1]);
+          const n = bstr.length;
+          const u8arr = new Uint8Array(n);
+          for (let i = 0; i < n; i++) {
+            u8arr[i] = bstr.charCodeAt(i);
+          }
+          return new Blob([u8arr], { type: mime });
+        }
+        function blobToFile (blob) {
+          const options = { type: blob.type };
+          const file = new File([blob], options);
+          return file;
+        }
+
         let data = {
           "filepath": "base64",
           "rotate": "0",
@@ -136,7 +159,21 @@
           "quality": "3"
         }
         axios.post("http://127.0.0.1:38088/video=grabimage", JSON.stringify(data)).then((res) => {
-          console.log(res.data);
+          let blob = dataURLtoBlob('data:image/png;base64,' + res.data.photoBase64);
+          let file = blobToFile(blob);
+          var formData = new FormData();
+          formData.append('file', file.raw)
+          formData.append("bsmSj", this.previewImg.bsmSj);
+          formData.append("bsmSlsq", this.previewImg.bsmSlsq);
+          uploadSjClmx(formData).then((res) => {
+            if (res.code == 200) {
+              this.$emit('updateList', res.result)
+              this.$message({
+                message: '上传成功!',
+                type: 'success'
+              })
+            }
+          })
         })
       },
       prev () {
@@ -189,8 +226,6 @@
         this.$refs.upload.clearFiles();
         setTimeout(() => {
           if (length !== this.maxLength) return
-          console.log(files);
-          // let data = _.cloneDeep(this.previewImg.imgList[this.previewImg.index])
           var formData = new FormData();
           files.forEach(file => {
             formData.append('file', file.raw)
@@ -204,10 +239,9 @@
                 message: '上传成功!',
                 type: 'success'
               })
-
             }
           })
-        })
+        }, 0)
       },
       handleDelete () {
         let that = this

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-06-14 09:01:30
+ * @LastEditTime: 2023-06-14 09:47:38
 -->
 <template>
   <div>
@@ -201,8 +201,11 @@
           if (res.data.code == 0) {
             let data = res.data.IDCardInfo
             row.sqrmc = data.name
-            row.zjzl = 1
+            row.zjzl = '1'
             row.zjh = data.cardID
+            row.xb = data.sexCode
+            row.txdz = data.address
+            row.fzjg = data.issueOrgan
             this.$message({
               message: '读取成功！',
               type: 'success'

@@ -320,6 +320,7 @@ export default {
     var formdata = new FormData();
     formdata.append("bsmSldy", this.propsParam.bsmSldy);
     formdata.append("djlx", this.propsParam.djlx);
+    formdata.append("isEdit", this.ableOperation);
     Init(formdata).then((res) => {
       if (res.code === 200 && res.result) {
         this.ruleForm = res.result;

@@ -265,6 +265,7 @@
       formdata.append("bsmSldy", this.propsParam.bsmSldy);
       formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
       formdata.append("djlx", this.propsParam.djlx);
+      formdata.append("isEdit", this.ableOperation);
       Init(formdata).then((res) => {
         if (res.code === 200 && res.result) {
           this.ruleForm = res.result;

@@ -216,6 +216,7 @@
       var formdata = new FormData();
       formdata.append("bsmSldy", this.propsParam.bsmSldy);
       formdata.append("djlx", this.propsParam.djlx);
+      formdata.append("isEdit", this.ableOperation);
       Init(formdata).then((res) => {
         if (res.code === 200 && res.result) {
           this.ruleForm = {

@@ -200,6 +200,7 @@
       var formdata = new FormData();
       formdata.append("bsmSldy", this.propsParam.bsmSldy);
       formdata.append("djlx", this.propsParam.djlx);
+      formdata.append("isEdit", this.ableOperation);
       Init(formdata).then((res) => {
         if (res.code === 200 && res.result) {
           this.ruleForm = {

@@ -81,6 +81,7 @@
         var formdata = new FormData();
         formdata.append("bsmSldy", this.propsParam.formData.bsmSldy);
         formdata.append("qllx", this.propsParam.formData.qllx);
+        formdata.append("isEdit", this.ableOperation);
         getFdcqLSInfo(formdata).then((res) => {
           if (res.code === 200) {
             this.tableData = res.result;

@@ -165,6 +165,7 @@ export default {
     formdata.append("bsmSldy", this.propsParam.bsmSldy);
     formdata.append("djlx", this.propsParam.djlx);
     formdata.append("bsmSlsq", this.bsmSlsq);
+    formdata.append("isEdit", this.ableOperation);
     BatchInit(formdata).then((res) => {
       if (res.code === 200 && res.result) {
         this.ruleForm = res.result;

@@ -250,6 +250,7 @@
       list (bsmSldy) {
         var formdata = new FormData();
         formdata.append("bsmSldy", bsmSldy);
+        formdata.append("isEdit", this.ableOperation);
         Init(formdata).then((res) => {
           if (res.code === 200 && res.result) {
             this.ruleForm = {

@@ -204,6 +204,7 @@
       this.$startLoading();
       formdata.append("bsmSldy", this.propsParam.bsmSldy);
       formdata.append("djlx", this.propsParam.djlx);
+      formdata.append("isEdit", this.ableOperation);
       Init(formdata).then((res) => {
         this.$nextTick(() => {
           that.ruleForm = res.result;

@@ -198,6 +198,7 @@
       this.$startLoading();
       formdata.append("bsmSldy", this.propsParam.bsmSldy);
       formdata.append("djlx", this.propsParam.djlx);
+      formdata.append("isEdit", this.ableOperation);
       Init(formdata).then((res) => {
         if (res.code === 200 && res.result) {
           this.ruleForm = res.result;

@@ -244,6 +244,7 @@
       var formdata = new FormData();
       formdata.append("bsmSldy", this.propsParam.bsmSldy);
       formdata.append("djlx", this.propsParam.djlx);
+      formdata.append("isEdit", this.ableOperation);
       Init(formdata).then((res) => {
         this.ruleForm = res.result;
         this.$endLoading();

@@ -250,6 +250,7 @@
       this.$startLoading();
       formdata.append("bsmSldy", this.propsParam.bsmSldy);
       formdata.append("djlx", this.propsParam.djlx);
+      formdata.append("isEdit", this.ableOperation);
       Init(formdata).then((res) => {
         this.ruleForm = res.result;
         this.$endLoading();

@@ -161,7 +161,7 @@
       var formdata = new FormData();
       formdata.append("bsmSldy", this.propsParam.bsmSldy);
       formdata.append("djlx", this.propsParam.djlx);
-
+      formdata.append("isEdit", this.ableOperation);
       Init(formdata).then(res => {
         if (res.code === 200 && res.result) {
           this.$endLoading();

@@ -165,6 +165,7 @@
       this.$startLoading();
       formdata.append("bsmSldy", this.propsParam.bsmSldy);
       formdata.append("djlx", this.propsParam.djlx);
+      formdata.append("isEdit", this.ableOperation);
       Init(formdata).then((res) => {
         if (res.code === 200 && res.result) {
           this.$endLoading();

@@ -214,6 +214,7 @@
       formdata.append("bsmSldy", this.propsParam.bsmSldy);
       formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
       formdata.append("djlx", this.propsParam.djlx);
+      formdata.append("isEdit", this.ableOperation);
       Init(formdata).then((res) => {
         if (res.code === 200 && res.result) {
           that.ruleForm = res.result;

@@ -256,6 +256,7 @@
       formdata.append("bsmSldy", this.propsParam.bsmSldy);
       formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
       formdata.append("djlx", this.propsParam.djlx);
+      formdata.append("isEdit", this.ableOperation);
       Init(formdata).then((res) => {
         if (res.code === 200 && res.result) {
           this.ruleForm = res.result;

@@ -68,6 +68,10 @@ class data extends filter {
         minWidth: '150'
       },
       {
+        prop: "gyqk",
+        label: "共有方式",
+      },
+      {
         prop: "qlrmc",
         label: "使用权人",
       },
@@ -81,13 +85,18 @@ class data extends filter {
         label: "权利性质",
       },
       {
-        prop: "mj",
+        prop: "mjmc",
         width: '100',
         label: "使用权面积",
-      },
+      },     
       {
         prop: "ytmc",
         label: "土地用途",
+      }, 
+      {
+        prop: "qdjgmc",
+        width: '100',
+        label: "取得价格",
       },
       {
         prop: "zl",

@@ -86,9 +86,14 @@ class data extends filter {
         label: "义务人",
       },
       {
-        prop: "mj",
+        prop: "mjmc",
         label: "面积",
-        width: '80'
+        width: '130'
+      },
+      {
+        prop: "qlxzmc",
+        label: "权利性质",
+        minWidth: '130'
       },
       {
         prop: "ytmc",
@@ -96,6 +101,11 @@ class data extends filter {
         minWidth: '130'
       },
       {
+        prop: "qdjgmc",
+        label: "取得价格",
+        minWidth: '80'
+      },
+      {
         prop: "zl",
         label: "坐落",
         minWidth: '150'