From 72ceafdf1b3ff054a93adfb3c03e97e78d654e7c Mon Sep 17 00:00:00 2001
From: yangfuda <945208611@qq.com>
Date: Thu, 26 Jun 2025 14:13:29 +0800
Subject: [PATCH] =?UTF-8?q?TASK=2044198=20=E6=B2=B3=E5=8D=970620=E7=BA=AA?=
 =?UTF-8?q?=E5=A7=94=E9=9C=80=E6=B1=82=E5=90=8E=E5=8F=B0=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bankAgriculture/paymentApproval.js        |   9 +-
 .../paymentApproval/approvalList13.vue        |   5 +-
 .../paymentApproval/approvalAdd13.vue         | 104 +++++++++++++-----
 .../paymentApproval/approvalDetail13.vue      |  40 +++----
 .../paymentApproval/approvalList13.vue        |   5 +-
 5 files changed, 98 insertions(+), 65 deletions(-)

diff --git a/src/api/onlineHome/bankAgriculture/paymentApproval.js b/src/api/onlineHome/bankAgriculture/paymentApproval.js
index 17c0fee8..07289300 100644
--- a/src/api/onlineHome/bankAgriculture/paymentApproval.js
+++ b/src/api/onlineHome/bankAgriculture/paymentApproval.js
@@ -449,15 +449,14 @@ export function addMajorevent(data) {
 export function customSubmitMajorevent(id) {
   return request({
     url: '/yinnong/majorevent/customSubmitNew/' + id,
-    method: 'post'
+    method: 'get'
   })
 }
 // 撤回
-export function updateTYinnongMajoreventFoStatus(data) {
+export function updateTYinnongMajoreventFoStatus(id) {
   return request({
-    url: '/yinnong/majorevent/updateTYinnongMajoreventFoStatus',
-    method: 'post',
-    data: data
+    url: '/yinnong/majorevent/updateTYinnongMajoreventFoStatus/' + id,
+    method: 'get'
   })
 }
 // 查询重大事项申请详细
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalList13.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalList13.vue
index 692d3f60..9994d693 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalList13.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalList13.vue
@@ -163,14 +163,11 @@ methods: {
     });
   },
   cancelApply(id) {
-    const form = {};
-    form.id = id;
-    debugger;
     this.$dialog.confirm({
       message: '您确认撤回申请？',
     })
     .then(() => {
-      return updateTYinnongMajoreventFoStatus(form).then(response => {
+      return updateTYinnongMajoreventFoStatus(id).then(response => {
         this.$toast.success('撤回成功');
         setTimeout(function(){
           history.go(0)
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd13.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd13.vue
index ed10fe6a..f808e5ae 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd13.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd13.vue
@@ -90,32 +90,21 @@
             @cancel="showtemplate = false"
           />
         </van-popup>
-        <van-field
-          label="事项内容"
-          input-align="right"
-          label-width="auto"
-          readonly
-        />
-        <van-field
-          v-model="form.eventContent"
-          type="textarea"
-          placeholder="请输入事项内容"
-          rows="4"
-          required
-          :rules="[{ required: true , message:'请输入事项内容'  }]"
-        />
-        <van-field label="理事会提议" input-align="right" label-width="auto" readonly />
-        <van-field v-model="form.dzbty" type="textarea" placeholder="请输入理事会提议/村党支部提议" rows="2" required :rules="[{ required: true , message:'请输入理事会提议/村党支部提议'  }]" />
-        <van-field label="村党支部和理事会商议" input-align="right" label-width="auto" readonly />
-        <van-field v-model="form.lwhsy" type="textarea" placeholder="请输入村党支部和理事会商议/两委会商议" rows="2" required :rules="[{ required: true , message:'请输入村党支部和理事会商议/两委会商议'  }]" />
-        <van-field label="党员会审议" input-align="right" label-width="auto" readonly />
-        <van-field v-model="form.dqyshsyhjy" type="textarea" placeholder="请输入党员会审议/党群议事会审议和决议" rows="2" required :rules="[{ required: true , message:'请输入党员会审议/党群议事会审议和决议'  }]" />
-        <van-field label="成员（代表）会决议" input-align="right" label-width="auto" readonly />
-        <van-field v-model="form.cydbhjy" type="textarea" placeholder="请输入成员（代表）会决议/党群议事会审议和决议" rows="2" required :rules="[{ required: true , message:'请输入成员（代表）会决议/党群议事会审议和决议'  }]" />
-        <van-field label="决策结果公开" input-align="right" label-width="auto" readonly />
-        <van-field v-model="form.jcjggk" type="textarea" placeholder="请输入决策结果公开" rows="2" required :rules="[{ required: true , message:'请输入决策结果公开'  }]" />
-        <van-field label="实施情况公开" input-align="right" label-width="auto" readonly />
-        <van-field v-model="form.ssqkgk" type="textarea" placeholder="请输入实施情况公开" rows="2" required :rules="[{ required: true , message:'请输入实施情况公开'  }]" />
+        <van-field label="*事项内容" input-align="right" label-width="auto" readonly/>
+        <vue-html5-editor :content="form.eventContent" :height="200" @change="eventContentUpdateData"></vue-html5-editor>
+        <!-- <van-field v-model="form.eventContent" type="textarea" placeholder="请输入事项内容" rows="4" required :rules="[{ required: true , message:'请输入事项内容'  }]"/> -->
+        <van-field label="*理事会提议/村党支部提议" input-align="right" label-width="auto" readonly />
+        <vue-html5-editor :content="form.dzbty" :height="200" @change="dzbtyUpdateData"></vue-html5-editor>
+        <van-field label="*村党支部和理事会商议/两委会商议" input-align="right" label-width="auto" readonly />
+        <vue-html5-editor :content="form.lwhsy" :height="200" @change="lwhsyUpdateData"></vue-html5-editor>
+        <van-field label="*党员会审议/党群议事会审议和决议" input-align="right" label-width="auto" readonly />
+        <vue-html5-editor :content="form.dqyshsyhjy" :height="200" @change="dqyshsyhjyUpdateData"></vue-html5-editor>
+        <van-field label="*成员（代表）会决议/党群议事会审议和决议" input-align="right" label-width="auto" readonly />
+        <vue-html5-editor :content="form.cydbhjy" :height="200" @change="cydbhjyUpdateData"></vue-html5-editor>
+        <van-field label="*决策结果公开" input-align="right" label-width="auto" readonly />
+        <vue-html5-editor :content="form.jcjggk" :height="200" @change="jcjggkUpdateData"></vue-html5-editor>
+        <van-field label="*实施情况公开" input-align="right" label-width="auto" readonly />
+        <vue-html5-editor :content="form.ssqkgk" :height="200" @change="ssqkgkUpdateData"></vue-html5-editor>
         <van-field label="备注" input-align="right" label-width="auto"/>
         <van-field v-model="form.remark" type="textarea" placeholder="请输入备注" rows="2"/>
       </div>
@@ -221,6 +210,41 @@
       this.getTemplateList();
     },
     methods: {
+      eventContentUpdateData(e = ''){
+        let c1 = e.replace(/<img width="100%"/g, '<img');
+        let c2 = c1.replace(/<img/g, '<img width="100%"');
+        this.form.eventContent = c2;
+      },
+      dzbtyUpdateData(e = ''){
+        let c1 = e.replace(/<img width="100%"/g, '<img');
+        let c2 = c1.replace(/<img/g, '<img width="100%"');
+        this.form.dzbty = c2;
+      },
+      lwhsyUpdateData(e = ''){
+        let c1 = e.replace(/<img width="100%"/g, '<img');
+        let c2 = c1.replace(/<img/g, '<img width="100%"');
+        this.form.lwhsy = c2;
+      },
+      dqyshsyhjyUpdateData(e = ''){
+        let c1 = e.replace(/<img width="100%"/g, '<img');
+        let c2 = c1.replace(/<img/g, '<img width="100%"');
+        this.form.dqyshsyhjy = c2;
+      },
+      cydbhjyUpdateData(e = ''){
+        let c1 = e.replace(/<img width="100%"/g, '<img');
+        let c2 = c1.replace(/<img/g, '<img width="100%"');
+        this.form.cydbhjy = c2;
+      },
+      jcjggkUpdateData(e = ''){
+        let c1 = e.replace(/<img width="100%"/g, '<img');
+        let c2 = c1.replace(/<img/g, '<img width="100%"');
+        this.form.jcjggk = c2;
+      },
+      ssqkgkUpdateData(e = ''){
+        let c1 = e.replace(/<img width="100%"/g, '<img');
+        let c2 = c1.replace(/<img/g, '<img width="100%"');
+        this.form.ssqkgk = c2;
+      },
       // 表单重置
       reset() {
         this.form = {
@@ -274,6 +298,34 @@
         }
       },
       getChange(){
+        if(this.form.eventContent == null || this.form.eventContent == undefined || this.form.eventContent == ''){
+          this.$notify({ type: 'danger', message: '请输入事项内容！' });
+          return;
+        }
+        if(this.form.dzbty == null || this.form.dzbty == undefined || this.form.dzbty == ''){
+          this.$notify({ type: 'danger', message: '请输入理事会提议/村党支部提议！' });
+          return;
+        }
+        if(this.form.lwhsy == null || this.form.lwhsy == undefined || this.form.lwhsy == ''){
+          this.$notify({ type: 'danger', message: '请输入村党支部和理事会商议/两委会商议！' });
+          return;
+        }
+        if(this.form.dqyshsyhjy == null || this.form.dqyshsyhjy == undefined || this.form.dqyshsyhjy == ''){
+          this.$notify({ type: 'danger', message: '请输入党员会审议/党群议事会审议和决议！' });
+          return;
+        }
+        if(this.form.cydbhjy == null || this.form.cydbhjy == undefined || this.form.cydbhjy == ''){
+          this.$notify({ type: 'danger', message: '请输入成员（代表）会决议/党群议事会审议和决议！' });
+          return;
+        }
+        if(this.form.jcjggk == null || this.form.jcjggk == undefined || this.form.jcjggk == ''){
+          this.$notify({ type: 'danger', message: '请输入决策结果公开！' });
+          return;
+        }
+        if(this.form.ssqkgk == null || this.form.ssqkgk == undefined || this.form.ssqkgk == ''){
+          this.$notify({ type: 'danger', message: '请输入实施情况公开！' });
+          return;
+        }
         addMajorevent(this.form).then(response => {
           this.$toast.success('保存成功');
           setTimeout(function(){
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail13.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail13.vue
index 08504dfa..325a43e9 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail13.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail13.vue
@@ -52,32 +52,20 @@
         </van-popup>
         <van-field readonly label="审批流程" :value="tempalteFormat(form.approvalTemplateId)"
           input-align="right" label-width="auto"/>
-        <van-field
-          label="事项内容"
-          input-align="right"
-          label-width="auto"
-          readonly
-        />
-        <van-field
-          v-model="form.eventContent"
-          type="textarea"
-          placeholder="请输入事项内容"
-          rows="4"
-          required
-          :rules="[{ required: true , message:'请输入事项内容'  }]"
-        />
-        <van-field label="理事会提议" input-align="right" label-width="auto" readonly />
-        <van-field v-model="form.dzbty" type="textarea" placeholder="请输入理事会提议/村党支部提议" rows="2" required :rules="[{ required: true , message:'请输入理事会提议/村党支部提议'  }]" />
-        <van-field label="村党支部和理事会商议" input-align="right" label-width="auto" readonly />
-        <van-field v-model="form.lwhsy" type="textarea" placeholder="请输入村党支部和理事会商议/两委会商议" rows="2" required :rules="[{ required: true , message:'请输入村党支部和理事会商议/两委会商议'  }]" />
-        <van-field label="党员会审议" input-align="right" label-width="auto" readonly />
-        <van-field v-model="form.dqyshsyhjy" type="textarea" placeholder="请输入党员会审议/党群议事会审议和决议" rows="2" required :rules="[{ required: true , message:'请输入党员会审议/党群议事会审议和决议'  }]" />
-        <van-field label="成员（代表）会决议" input-align="right" label-width="auto" readonly />
-        <van-field v-model="form.cydbhjy" type="textarea" placeholder="请输入成员（代表）会决议/党群议事会审议和决议" rows="2" required :rules="[{ required: true , message:'请输入成员（代表）会决议/党群议事会审议和决议'  }]" />
-        <van-field label="决策结果公开" input-align="right" label-width="auto" readonly />
-        <van-field v-model="form.jcjggk" type="textarea" placeholder="请输入决策结果公开" rows="2" required :rules="[{ required: true , message:'请输入决策结果公开'  }]" />
-        <van-field label="实施情况公开" input-align="right" label-width="auto" readonly />
-        <van-field v-model="form.ssqkgk" type="textarea" placeholder="请输入实施情况公开" rows="2" required :rules="[{ required: true , message:'请输入实施情况公开'  }]" />
+        <van-field label="*事项内容" input-align="right" label-width="auto" readonly/>
+        <div id="eventContentOpenContent"></div>
+        <van-field label="*理事会提议/村党支部提议" input-align="right" label-width="auto" readonly />
+        <div id="dzbtyOpenContent"></div>
+        <van-field label="*村党支部和理事会商议/两委会商议" input-align="right" label-width="auto" readonly />
+        <div id="lwhsyOpenContent"></div>
+        <van-field label="*党员会审议/党群议事会审议和决议" input-align="right" label-width="auto" readonly />
+        <div id="dqyshsyhjyOpenContent"></div>
+        <van-field label="*成员（代表）会决议/党群议事会审议和决议" input-align="right" label-width="auto" readonly />
+        <div id="cydbhjyOpenContent"></div>
+        <van-field label="*决策结果公开" input-align="right" label-width="auto" readonly />
+        <div id="jcjggkOpenContent"></div>
+        <van-field label="*实施情况公开" input-align="right" label-width="auto" readonly />
+        <div id="ssqkgkOpenContent"></div>
         <van-field label="备注" input-align="right" label-width="auto"/>
         <van-field v-model="form.remark" type="textarea" placeholder="请输入备注" rows="2"/>
       </div>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList13.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList13.vue
index 1f82fcf1..f47d6edc 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList13.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList13.vue
@@ -163,14 +163,11 @@ export default {
       });
     },
     cancelApply(id) {
-      const form = {};
-      form.id = id;
-      debugger;
       this.$dialog.confirm({
         message: '您确认撤回申请？',
       })
       .then(() => {
-        return updateTYinnongMajoreventFoStatus(form).then(response => {
+        return updateTYinnongMajoreventFoStatus(id).then(response => {
           this.$toast.success('撤回成功');
           setTimeout(function(){
             history.go(0)