Merge branch 'rongxin_dev' of http://218.59.175.43:3000/zhangzl/nsgk_mobile into rongxin_dev

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalApproval13.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" style="padding-left: 10px;padding-right: 10px;"></div>
+        <van-field label="*理事会提议/村党支部提议" input-align="right" label-width="auto" readonly />
+        <div id="dzbtyOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
+        <van-field label="*村党支部和理事会商议/两委会商议" input-align="right" label-width="auto" readonly />
+        <div id="lwhsyOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
+        <van-field label="*党员会审议/党群议事会审议和决议" input-align="right" label-width="auto" readonly />
+        <div id="dqyshsyhjyOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
+        <van-field label="*成员（代表）会决议/党群议事会审议和决议" input-align="right" label-width="auto" readonly />
+        <div id="cydbhjyOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
+        <van-field label="*决策结果公开" input-align="right" label-width="auto" readonly />
+        <div id="jcjggkOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
+        <van-field label="*实施情况公开" input-align="right" label-width="auto" readonly />
+        <div id="ssqkgkOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
         <van-field label="备注" input-align="right" label-width="auto"/>
         <van-field v-model="form.remark" type="textarea" placeholder="请输入备注" rows="2"/>
       </div>
@@ -244,6 +232,13 @@
       getForm(){
         getMajorevent(this.$route.query.id).then(response => {
           this.form = response.data;
+          document.getElementById('eventContentOpenContent').innerHTML = response.data.eventContent;
+          document.getElementById('dzbtyOpenContent').innerHTML = response.data.dzbty;
+          document.getElementById('lwhsyOpenContent').innerHTML = response.data.lwhsy;
+          document.getElementById('dqyshsyhjyOpenContent').innerHTML = response.data.dqyshsyhjy;
+          document.getElementById('cydbhjyOpenContent').innerHTML = response.data.cydbhjy;
+          document.getElementById('jcjggkOpenContent').innerHTML = response.data.jcjggk;
+          document.getElementById('ssqkgkOpenContent').innerHTML = response.data.ssqkgk;
           if(!this.isAudit)
           {
             A_auditHistoryDetail(this.$route.query.taskId).then((resp) => {

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail13.vue

@@ -52,72 +52,34 @@
         </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" style="padding-left: 10px;padding-right: 10px;"></div>
+        <van-field label="*理事会提议/村党支部提议" input-align="right" label-width="auto" readonly />
+        <div id="dzbtyOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
+        <van-field label="*村党支部和理事会商议/两委会商议" input-align="right" label-width="auto" readonly />
+        <div id="lwhsyOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
+        <van-field label="*党员会审议/党群议事会审议和决议" input-align="right" label-width="auto" readonly />
+        <div id="dqyshsyhjyOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
+        <van-field label="*成员（代表）会决议/党群议事会审议和决议" input-align="right" label-width="auto" readonly />
+        <div id="cydbhjyOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
+        <van-field label="*决策结果公开" input-align="right" label-width="auto" readonly />
+        <div id="jcjggkOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
+        <van-field label="*实施情况公开" input-align="right" label-width="auto" readonly />
+        <div id="ssqkgkOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
         <van-field label="备注" input-align="right" label-width="auto"/>
         <van-field v-model="form.remark" type="textarea" placeholder="请输入备注" rows="2"/>
       </div>
-      <p style="margin-top:20px;padding: 0 10px">附件{{fileList&&fileList.length==0?':暂无可下载文件':''}}</p>
-      <van-cell v-for="(item,index) in fileList" :key="index">
-        <a :href="item.url" target="_blank">{{index+1}}.{{item.fileName}}</a>
-      </van-cell>
     </van-form>
-    <div class="main_box examine_box">
-      <van-row type="flex" justify="space-between" align="center">
-        <van-col span="5">审批<br/>意见</van-col>
-        <van-col span="19">
-          <van-radio-group v-model="pass" direction="horizontal" :disabled="!isAudit">
-            <van-radio name="true">同意</van-radio>
-            <van-radio name="false">驳回</van-radio>
-          </van-radio-group>
-          <van-field :readonly="!isAudit" rows="2" autosize v-model="comment" type="textarea" placeholder="请输入审批意见"/>
-        </van-col>
-      </van-row>
-    </div>
-
-    <div style="margin: 16px 2%;" v-if="isAudit">
-      <van-row>
-        <van-col span="24" align="center">
-          <van-button type="info" native-type="submit" @click="submitForm" class="submitButton">提交</van-button>
-        </van-col>
-      </van-row>
-      <div class="clear"></div>
-    </div>
   </div>
 </template>
 
 <script>
-  import { addMajorevent , getMajorevent , attachmentList , updateMajorevent,approval,listTemplate,selectApprovalByTemplateId } from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import { addMajorevent , getMajorevent , attachmentList , updateMajorevent,listTemplate,selectApprovalByTemplateId } from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request';
   import Dialog from "vant/lib/dialog";
   import Editor from '@/components/Editor';
-  import {A_auditHistoryDetail} from "@/api/audit/aauditpipeline";
   export default {
-    name: "approvalApproval13",
+    name: "approvalAdd3",
     components: {
       Editor,
     },
@@ -182,18 +144,13 @@
         },
         projectFundType:'',
         uploadFiles:[],
-        // 审核意见默认值
-        pass: "true",
-        comment: "同意",
-        templateList:[],
       };
     },
     created() {
       this.reset();
-      this.getForm();
-      this.getFileList();
       this.getDictionaries();
       this.getTemplateList();
+      this.getForm();
     },
     methods: {
       // 表单重置
@@ -244,17 +201,26 @@
       getForm(){
         getMajorevent(this.$route.query.id).then(response => {
           this.form = response.data;
-          if(!this.isAudit)
-          {
-            A_auditHistoryDetail(this.$route.query.taskId).then((resp) => {
-              this.pass = resp.data.auditStatus === '3' ? "true" : 'false';
-              this.comment = resp.data.auditRemark;
-            });
-          }
+          document.getElementById('eventContentOpenContent').innerHTML = response.data.eventContent;
+          document.getElementById('dzbtyOpenContent').innerHTML = response.data.dzbty;
+          document.getElementById('lwhsyOpenContent').innerHTML = response.data.lwhsy;
+          document.getElementById('dqyshsyhjyOpenContent').innerHTML = response.data.dqyshsyhjy;
+          document.getElementById('cydbhjyOpenContent').innerHTML = response.data.cydbhjy;
+          document.getElementById('jcjggkOpenContent').innerHTML = response.data.jcjggk;
+          document.getElementById('ssqkgkOpenContent').innerHTML = response.data.ssqkgk;
+        });
+      },
+      getAttachmentList(){
+        attachmentList(this.form.id).then(response => {
+          this.fileList = response.data;
+        });
+      },
+      getCapitalExpenditureType(){
+        this.getDicts("capital_expenditure_type").then((res) => {
         });
       },
       goFlow(){
-        window.location='approvalProcess13?id='+this.$route.query.approvalTemplateId;
+        window.location='approvalProcess13?id='+this.form.approvalTemplateId;
       },
       getChange(){
         updateMajorevent(this.form).then(response => {
@@ -341,15 +307,16 @@
       getFileList(){
         let oData= {
           tableId: this.$route.query.id,
-          tableName: 't_yinnong_majorevent',
+          tableName: "t_yinnong_majorevent",
           bizPath: "yinnong",
           fileType: "",
         }
         attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            // this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
-            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName})
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
             console.log(r)
           })
         })
@@ -361,38 +328,7 @@
       deleteChargeItme(index){
         this.chargeItme.splice(index,1)
       },
-      /** 提交按钮 */
-      submitForm() {
-        const data = {
-          taskId: this.$route.query.taskId,
-          auditbatchNo: this.$route.query.auditbatchNo,
-          remark: this.comment,
-          pass: this.pass === "true",
-          deptId: this.form.deptId
-        };
-        approval(data).then((response) => {
-          if(response.code==200){
-            this.$toast.success("操作成功");
-            setTimeout(function(){
-              history.go(-1)
-            },2000)
-          } else{
-            this.$toast.success("操作失败");
-          }
-        });
-      },
     },
-    watch: {
-      pass: function (val) {
-        if(this.isAudit)
-          this.comment = val === "true" ? "同意" : "驳回";
-      },
-    },
-    computed: {
-      isAudit() {
-        return this.$route.query.type != 'done';
-      }
-    }
   }
 </script>
 
@@ -415,8 +351,9 @@
     background-color: #FFF;
   }
   .submitButton{
-    width: 96%;
+    width: 80%;
     margin: 0 auto;
+    background-color: #1D6FE9;
   }
 
   .addFamily{
@@ -432,29 +369,4 @@
     z-index: 9;
     border-radius: 50%;
   }
-  .examine_box{
-    background-color: #1D6FE9!important;
-    padding: 0.18rem!important;
-    padding-left: 0!important;
-    border-radius: 0.15rem!important;
-    margin-top: 0.3rem!important;
-  }
-  .examine_box .van-col:first-child{
-    color: #FFF!important;
-    font-size: 0.45rem!important;
-    text-align: center!important;
-  }
-  .examine_box .van-col:last-child{
-    background-color: #FFF!important;
-    border-radius: 0.15rem!important;
-    overflow: hidden!important;
-    .van-radio-group--horizontal{
-      padding: 0.2rem 0;
-      border-bottom: 1px solid #eee;
-    }
-  }
-  /deep/.van-radio--horizontal{
-    margin-left: 20px;
-    margin-right: 0;
-  }
 </style>

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify13.vue

@@ -87,32 +87,23 @@
             @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="8"
-          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" 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"/>
         <van-field v-model="form.remark" type="textarea" placeholder="请输入备注" rows="2"/>
       </div>
@@ -216,6 +207,41 @@
       this.getForm();
     },
     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 = {

src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval13.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" style="padding-left: 10px;padding-right: 10px;"></div>
+        <van-field label="*理事会提议/村党支部提议" input-align="right" label-width="auto" readonly />
+        <div id="dzbtyOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
+        <van-field label="*村党支部和理事会商议/两委会商议" input-align="right" label-width="auto" readonly />
+        <div id="lwhsyOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
+        <van-field label="*党员会审议/党群议事会审议和决议" input-align="right" label-width="auto" readonly />
+        <div id="dqyshsyhjyOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
+        <van-field label="*成员（代表）会决议/党群议事会审议和决议" input-align="right" label-width="auto" readonly />
+        <div id="cydbhjyOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
+        <van-field label="*决策结果公开" input-align="right" label-width="auto" readonly />
+        <div id="jcjggkOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
+        <van-field label="*实施情况公开" input-align="right" label-width="auto" readonly />
+        <div id="ssqkgkOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
         <van-field label="备注" input-align="right" label-width="auto"/>
         <van-field v-model="form.remark" type="textarea" placeholder="请输入备注" rows="2"/>
       </div>
@@ -244,6 +232,13 @@
       getForm(){
         getMajorevent(this.$route.query.id).then(response => {
           this.form = response.data;
+          document.getElementById('eventContentOpenContent').innerHTML = response.data.eventContent;
+          document.getElementById('dzbtyOpenContent').innerHTML = response.data.dzbty;
+          document.getElementById('lwhsyOpenContent').innerHTML = response.data.lwhsy;
+          document.getElementById('dqyshsyhjyOpenContent').innerHTML = response.data.dqyshsyhjy;
+          document.getElementById('cydbhjyOpenContent').innerHTML = response.data.cydbhjy;
+          document.getElementById('jcjggkOpenContent').innerHTML = response.data.jcjggk;
+          document.getElementById('ssqkgkOpenContent').innerHTML = response.data.ssqkgk;
           if(!this.isAudit)
           {
             A_auditHistoryDetail(this.$route.query.taskId).then((resp) => {

src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail13.vue

@@ -53,19 +53,19 @@
         <van-field readonly label="审批流程" :value="tempalteFormat(form.approvalTemplateId)"
           input-align="right" label-width="auto"/>
         <van-field label="*事项内容" input-align="right" label-width="auto" readonly/>
-        <div id="eventContentOpenContent"></div>
+        <div id="eventContentOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
         <van-field label="*理事会提议/村党支部提议" input-align="right" label-width="auto" readonly />
-        <div id="dzbtyOpenContent"></div>
+        <div id="dzbtyOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
         <van-field label="*村党支部和理事会商议/两委会商议" input-align="right" label-width="auto" readonly />
-        <div id="lwhsyOpenContent"></div>
+        <div id="lwhsyOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
         <van-field label="*党员会审议/党群议事会审议和决议" input-align="right" label-width="auto" readonly />
-        <div id="dqyshsyhjyOpenContent"></div>
+        <div id="dqyshsyhjyOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
         <van-field label="*成员（代表）会决议/党群议事会审议和决议" input-align="right" label-width="auto" readonly />
-        <div id="cydbhjyOpenContent"></div>
+        <div id="cydbhjyOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
         <van-field label="*决策结果公开" input-align="right" label-width="auto" readonly />
-        <div id="jcjggkOpenContent"></div>
+        <div id="jcjggkOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
         <van-field label="*实施情况公开" input-align="right" label-width="auto" readonly />
-        <div id="ssqkgkOpenContent"></div>
+        <div id="ssqkgkOpenContent" style="padding-left: 10px;padding-right: 10px;"></div>
         <van-field label="备注" input-align="right" label-width="auto"/>
         <van-field v-model="form.remark" type="textarea" placeholder="请输入备注" rows="2"/>
       </div>
@@ -201,6 +201,22 @@
       getForm(){
         getMajorevent(this.$route.query.id).then(response => {
           this.form = response.data;
+          document.getElementById('eventContentOpenContent').innerHTML = response.data.eventContent;
+          document.getElementById('dzbtyOpenContent').innerHTML = response.data.dzbty;
+          document.getElementById('lwhsyOpenContent').innerHTML = response.data.lwhsy;
+          document.getElementById('dqyshsyhjyOpenContent').innerHTML = response.data.dqyshsyhjy;
+          document.getElementById('cydbhjyOpenContent').innerHTML = response.data.cydbhjy;
+          document.getElementById('jcjggkOpenContent').innerHTML = response.data.jcjggk;
+          document.getElementById('ssqkgkOpenContent').innerHTML = response.data.ssqkgk;
+        });
+      },
+      getAttachmentList(){
+        attachmentList(this.form.id).then(response => {
+          this.fileList = response.data;
+        });
+      },
+      getCapitalExpenditureType(){
+        this.getDicts("capital_expenditure_type").then((res) => {
         });
       },
       goFlow(){

src/views/yinnong/bankAgriculture/paymentApproval/approvalModify13.vue

@@ -87,32 +87,23 @@
             @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="8"
-          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" 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"/>
         <van-field v-model="form.remark" type="textarea" placeholder="请输入备注" rows="2"/>
       </div>
@@ -216,6 +207,41 @@
       this.getForm();
     },
     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 = {