From 5d655d4a97d02cf585005bcfacf0b1f1539ceaa9 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Wed, 12 Apr 2023 14:25:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BD=91=E7=AD=BE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sunVillage_info/fixedAssets.js        | 35 ++++++++++++++++---
 src/permission.js                             |  4 +++
 src/views/sunVillage_info/list_cbf.vue        | 26 +++++++-------
 src/views/sunVillage_info/list_cbht.vue       |  7 ++--
 .../sunVillage_info/list_cbht_detail.vue      |  1 -
 .../sunVillage_info/list_multipleLotsNh.vue   | 11 +++---
 6 files changed, 58 insertions(+), 26 deletions(-)

diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js
index e86dc26f..be9b2243 100644
--- a/src/api/sunVillage_info/fixedAssets.js
+++ b/src/api/sunVillage_info/fixedAssets.js
@@ -747,7 +747,7 @@ export function getMultiplelotsNh(query, id) {
 // 标段合同乙方签字
 export function multipleLotsSecondSign(data, id) {
   return request({
-    url: '/transaction/multiplelotsnh/secondSign/' + id,
+    url: '/home/mobile/multiplelotsnh/secondSign/' + id,
     method: 'post',
     data: data
   })
@@ -765,7 +765,7 @@ export function listCbht(query) {
 // 承包合同甲方签名
 export function cbhtFirstSign(data,id) {
   return request({
-    url: '/service/cbht/sign/first/' + id,
+    url: '/home/mobile/cbht/sign/first/' + id,
     method: 'post',
     data: data
   })
@@ -774,7 +774,7 @@ export function cbhtFirstSign(data,id) {
 // 查询承包合同详细
 export function getCbht(query, id) {
   return request({
-    url: '/service/cbht/get/' + id,
+    url: '/home/mobile/cbht/get/' + id,
     method: 'get',
     params: query
   })
@@ -800,8 +800,35 @@ export function getCbhtList(query) {
 // 承包合同乙方签名
 export function cbhtSecondSign(data,id) {
   return request({
-    url: '/service/cbht/sign/second/' + id,
+    url: '/home/mobile/cbht/sign/second/' + id,
     method: 'post',
     data: data
   })
 }
+
+// 附件查询
+export function attachmentQuery(query) {
+  return request({
+    url: '/home/mobile/attach/query',
+    method: 'get',
+    params: query
+  })
+}
+
+// 附件删除
+export function attachmentRemove(ids) {
+  return request({
+    url: '/home/mobile/attach/remove/' + ids,
+    method: 'get'
+  })
+}
+
+// 附件上传
+export function attachmentUpload(data) {
+  return request({
+    url: '/home/mobile/common/attach',
+    method: 'post',
+    header: { "Content-Type": 'application/x-www-form-urlencoded' },
+    data: data
+  })
+}
diff --git a/src/permission.js b/src/permission.js
index ce67350e..8d65b1db 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -149,6 +149,10 @@ const whiteList = [
   '/sunVillage_info/list_signature',
   '/sunVillage_info/list_official',
   '/sunVillage_info/list_signature_add',
+  '/sunVillage_info/list_multipleLotsNh',
+  '/sunVillage_info/list_multipleLotsNh_detail',
+  '/sunVillage_info/list_cbf',
+  '/sunVillage_info/list_cbht_detail',
 
   // 新型经营主体
   'newBusinessEntity/newsBulletin', //新闻公告
diff --git a/src/views/sunVillage_info/list_cbf.vue b/src/views/sunVillage_info/list_cbf.vue
index 693f399a..e26f8d7c 100644
--- a/src/views/sunVillage_info/list_cbf.vue
+++ b/src/views/sunVillage_info/list_cbf.vue
@@ -90,17 +90,14 @@
 </template>
 
 <script>
-  import { getCbf, getCbhtList, cbhtSecondSign } from "@/api/sunVillage_info/fixedAssets";
-  import {attachmentList, commonAttach, systemAttachment} from "@/api/sunVillage_info/fixedAssets";
-  import request from "@/utils/request";
+  import { getCbf, getCbhtList, cbhtSecondSign, attachmentQuery, attachmentUpload, removeAttach } from "@/api/sunVillage_info/fixedAssets";
   import vueEsign from "vue-esign";
-  import signatureUploadSignature from "@/views/yinnong/signatureUploadSignature";
   import $ from "jquery";
   import Cookies from "js-cookie";
 
   export default {
     name: "sunVillageInfoListCbf",
-    components: {vueEsign, signatureUploadSignature},
+    components: { vueEsign },
     data() {
       return {
         applicationList: [],
@@ -141,10 +138,12 @@
         $('#canvasTT').css('display', 'none');
       },
       getCbfInfo() {
-        getCbf(JSON.parse(Cookies.get('user')).idcard).then(response => {
-          this.queryParams.cbfbm = response.data.cbfbm;
-          this.getList();
-        });
+        if (Cookies.get('user')) {
+          getCbf(JSON.parse(Cookies.get('user')).idcard).then(response => {
+            this.queryParams.cbfbm = response.data.cbfbm;
+            this.getList();
+          });
+        }
       },
       getList() {
         if (this.queryParams.cbfbm != null) {
@@ -185,7 +184,7 @@
           tableId: id,
           tableName: 't_sys_cbht',
         };
-        attachmentList(queryParams).then(response => {
+        attachmentQuery(queryParams).then(response => {
           response.rows.map(res => {
             // let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
             this.fileList.push({
@@ -204,12 +203,15 @@
         params.append("bizPath", "service");
         params.append("fileType", '0');
         params.append("file", file.file);
-        commonAttach(params).then(response => {
+        params.append("userName", JSON.parse(Cookies.get('user')).memberName);
+        attachmentUpload(params).then(response => {
           this.$notify({ type: 'success', message: '上传成功' });
+          let newFile = this.fileList[this.fileList.length - 1];
+          this.$set(newFile, 'id', response.id);
         });
       },
       deleteFile(file){
-        systemAttachment(file.id).then(res => {
+        removeAttach(file.id).then(res => {
           this.$notify({ type: 'success', message: '删除成功' });
         });
       },
diff --git a/src/views/sunVillage_info/list_cbht.vue b/src/views/sunVillage_info/list_cbht.vue
index 263864d9..62c4ddb4 100644
--- a/src/views/sunVillage_info/list_cbht.vue
+++ b/src/views/sunVillage_info/list_cbht.vue
@@ -95,16 +95,13 @@
 </template>
 
 <script>
-  import { listCbht, cbhtFirstSign } from "@/api/sunVillage_info/fixedAssets";
-  import {attachmentList, commonAttach, systemAttachment} from "@/api/sunVillage_info/fixedAssets";
-  import request from "@/utils/request";
+  import { listCbht, cbhtFirstSign, attachmentList, commonAttach, systemAttachment } from "@/api/sunVillage_info/fixedAssets";
   import vueEsign from "vue-esign";
-  import signatureUploadSignature from "@/views/yinnong/signatureUploadSignature";
   import $ from "jquery";
 
   export default {
     name: "sunVillageInfoListCbht",
-    components: {vueEsign, signatureUploadSignature},
+    components: { vueEsign },
     data() {
       return {
         applicationList: [],
diff --git a/src/views/sunVillage_info/list_cbht_detail.vue b/src/views/sunVillage_info/list_cbht_detail.vue
index bd1c2449..84ff7675 100644
--- a/src/views/sunVillage_info/list_cbht_detail.vue
+++ b/src/views/sunVillage_info/list_cbht_detail.vue
@@ -8,7 +8,6 @@
       <van-divider>承包合同合同信息</van-divider>
       <van-field v-model="form.cbhtbm" label="承包合同编码" placeholder="承包合同编码" input-align="right" :border="false"/>
       <van-field v-model="form.ycbhtbm" label="原承包合同编码" placeholder="原承包合同编码" input-align="right" :border="false"/>
-      <van-field v-model="form.cbhtmc" label="承包合同名称" placeholder="承包合同名称" input-align="right" :border="false"/>
       <van-field v-model="form.cbflx" label="承包方类型" placeholder="承包方类型" input-align="right" :border="false"/>
       <van-field v-model="form.cbfbm" label="承包方编码" placeholder="承包方编码" input-align="right" :border="false"/>
       <van-field v-model="form.cbfmc" label="承包方名称" placeholder="承包方名称" input-align="right" :border="false"/>
diff --git a/src/views/sunVillage_info/list_multipleLotsNh.vue b/src/views/sunVillage_info/list_multipleLotsNh.vue
index 8c426c87..7c40c27a 100644
--- a/src/views/sunVillage_info/list_multipleLotsNh.vue
+++ b/src/views/sunVillage_info/list_multipleLotsNh.vue
@@ -81,7 +81,7 @@
 </template>
 
 <script>
-  import { listMultipleLotsNh, multipleLotsSecondSign, attachmentList, commonAttach, systemAttachment } from "@/api/sunVillage_info/fixedAssets";
+  import { listMultipleLotsNh, multipleLotsSecondSign, attachmentQuery, attachmentUpload, attachmentRemove } from "@/api/sunVillage_info/fixedAssets";
   import vueEsign from "vue-esign";
   import signatureUploadSignature from "@/views/yinnong/signatureUploadSignature";
   import $ from "jquery";
@@ -160,7 +160,7 @@
           tableId: id,
           tableName: 't_transaction_multiplelotsnh',
         };
-        attachmentList(queryParams).then(response => {
+        attachmentQuery(queryParams).then(response => {
           response.rows.map(res => {
             // let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
             this.fileList.push({
@@ -179,12 +179,15 @@
         params.append("bizPath", "transaction");
         params.append("fileType", '0');
         params.append("file", file.file);
-        commonAttach(params).then(response => {
+        params.append("userName", JSON.parse(Cookies.get('user')).memberName);
+        attachmentUpload(params).then(response => {
           this.$notify({ type: 'success', message: '上传成功' });
+          let newFile = this.fileList[this.fileList.length - 1];
+          this.$set(newFile, 'id', response.id);
         });
       },
       deleteFile(file){
-        systemAttachment(file.id).then(res => {
+        attachmentRemove(file.id).then(res => {
           this.$notify({ type: 'success', message: '删除成功' });
         });
       },