承包方、发包方审批签字优化

src/api/sunVillage_info/fixedAssets.js

@@ -814,6 +814,14 @@ export function cbhtSecondSign(data,id) {
     data: data
   })
 }
+// 承包方公示结果签字
+export function updateGsjgSign(data) {
+  return request({
+    url: '/open/home/mobile/updateGsjgSign',
+    method: 'post',
+    data: data
+  })
+}
 
 // 附件查询
 export function attachmentQuery(query) {

src/views/sunVillage_info/list_cbf.vue

@@ -44,6 +44,10 @@
                 <img src="../../assets/images/sunVillage_info/signature_icon_03.png" alt="" width="35">
                 <p>预览</p>
               </div> -->
+              <div class="opera_btn" @click="openPopupGsjg(item.cbfbm)">
+                <img src="../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="30">
+                <p>公示结果签名</p>
+              </div>
               <div class="opera_btn">
                 <img src="../../assets/images/sunVillage_info/signature_icon_03.png" alt="" width="35">
                 <p>预览</p>
@@ -73,7 +77,8 @@
         </div>
         <img src="../../assets/images/sunVillage_info/signature_icon_10.png" id="canvasTT" style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%)" alt="">
         <div class="signature-footer">
-          <van-button @click="handleGenerate" type="info" size="small">保存签字</van-button>
+          <van-button @click="handleGenerate" v-if="!showGsjgqz" type="info" size="small">保存签字</van-button>
+          <van-button @click="handleGenerateGsjg" v-if="showGsjgqz" type="info" size="small">保存签字</van-button>
           <van-button @click="handleReset" class="clearBtn" type="info" plain  size="small">清空画板</van-button>
         </div>
       </van-cell-group>
@@ -90,7 +95,7 @@
 </template>
 
 <script>
-  import { getCbf, getCbhtList, cbhtSecondSign, attachmentQuery, attachmentUpload, attachmentRemove } from "@/api/sunVillage_info/fixedAssets";
+  import { getCbf, getCbhtList, cbhtSecondSign,updateGsjgSign, attachmentQuery, attachmentUpload, attachmentRemove } from "@/api/sunVillage_info/fixedAssets";
   import vueEsign from "vue-esign";
   import $ from "jquery";
   import Cookies from "js-cookie";
@@ -107,6 +112,7 @@
         showFile: false,
         fileList: [],
         listLength: '0',
+        cbfbm:"",
         queryParams: {
           pageNum: 1,
           pageSize: 10,
@@ -171,11 +177,20 @@
       },
       openPopup(id, url) {
         this.show = true;
+        this.showGsjgqz = false;
         this.signaId = id;
         this.$nextTick(() => {
           this.handleReset();
         });
       },
+      openPopupGsjg(cbfbm, url) {
+        this.show = true;
+        this.showGsjgqz = true;
+        this.cbfbm = cbfbm;
+        this.$nextTick(() => {
+          this.handleReset();
+        });
+      },
       openPopupFile(id){
         this.fileList = [];
         this.signaId = id;
@@ -248,6 +263,29 @@
             this.$toast.fail('请签名后再保存签字');
           });
       },
+      handleGenerateGsjg(){
+        this.$refs.esign
+          .generate() // 使用生成器调用把签字的图片转换成为base64图片格式
+          .then((res) => {
+            this.signature.resultImg = res;
+            let wj = this.dataURLtoBlob(res);
+            let param = new FormData()  // 创建form对象
+            param.append('file', wj)  // 通过append向form对象添加数据
+            param.append('cbfbm', this.cbfbm)
+            updateGsjgSign(param).then(response => {
+              this.$notify({type: 'success', message: '签字成功'});
+              this.show = false;
+              // location.reload();
+              this.applicationList = [];
+              this.getList();
+            });
+
+          })
+          .catch((err) => {
+            // 画布没有签字时会执行这里提示一下
+            this.$toast.fail('请签名后再保存签字');
+          });
+      },
       dataURLtoBlob(dataurl, filename = 'file') {
         let arr = dataurl.split(',')
         let mime = arr[0].match(/:(.*?);/)[1]

src/views/sunVillage_info/list_chronicles_process.vue

@@ -38,7 +38,7 @@
       <div class="subForm2" v-if="showJsxx">
         <img class="topImg" src="../../assets/images/sunVillage_info/list_employer_process_icon_03.png" alt="">
         <van-field readonly v-model="form.gsjs" label="记事内容" placeholder="记事内容" input-align="right" :border="false" />
-        <van-cell title="记事人" style="border: none;" >
+        <van-cell title="记事人" style="border: none;color: #646566;" >
           <van-field readonly style="padding: 0 0;height: 30px;" label="记事人" input-align="right" :border="false" >
             <template #label>
               <img  :src="'/api'+form.gsjsrqz" width="10%" alt="" v-if="form.gsjsrqz" >

src/views/sunVillage_info/list_chronicles_single_process.vue

@@ -26,7 +26,7 @@
         <van-field readonly v-model="form.cbfdcjs" label="调查记事" placeholder="调查记事" input-align="right" :border="false" />
         <van-field readonly v-model="form.gsjs" label="公示记事" placeholder="公示记事" input-align="right" :border="false" />
 <!--        <van-field readonly v-model="form.gsjsrqz" label="公示记事人" placeholder="公示记事人" input-align="right" :border="false" />-->
-        <van-cell title="公示记事人签字" >
+        <van-cell title="公示记事人签字" style="color: #646566;">
           <van-field style="padding: 0 0;height: 30px;" readonly label="公示记事人签字" input-align="right" :border="false" >
             <template #label>
               <img :src="'/api'+form.gsjsrqz" width="10%" alt="" v-if="form.gsjsrqz" >
@@ -35,7 +35,14 @@
         </van-cell>
         <van-field readonly v-model="form.gsjsrq" label="公示记事时间" placeholder="公示记事时间" input-align="right" :border="false" />
         <van-field readonly v-model="form.gsjgyj" label="承包方公示结果意见" placeholder="承包方公示结果意见" input-align="right" :border="false" />
-        <van-field readonly v-model="form.gsjgqz" label="承包方公示结果签字" placeholder="承包方公示结果签字" input-align="right" :border="false" />
+
+        <van-cell title="承包方公示结果签字" style="color: #646566;" >
+          <van-field style="padding: 0 0;height: 30px;width: 100%;background-color: #ffffff; border-radius: 5PX;" readonly label="承包方公示结果签字" input-align="right" :border="false" >
+            <template #label>
+              <img :src="'/api'+form.gsjgqz" style="top:55px;border:none;" width="10%" alt="" v-if="form.gsjgqz" >
+            </template>
+          </van-field>
+        </van-cell>
         <van-field readonly v-model="form.gsjgqzrq" label="承包方公示日期" placeholder="承包方公示日期" input-align="right" :border="false" />
 
       </div>
@@ -55,7 +62,7 @@
         <van-cell title="记事人" style="color: #ffffff;" >
           <van-field style="padding: 0 0;height: 30px;width: 100%;background-color: #ffffff; border-radius: 5PX;" readonly label="记事人" input-align="right" :border="false" >
             <template #label>
-              <img :src="'/api'+form.gsjsrqz" style="top:55px;border:none;" width="10%" alt="" v-if="form.gsjsrqz" >
+              <img :src="'/api'+form.gsjsrqz" style="top:55px;border:none;width: 40%;"  alt="" v-if="form.gsjsrqz" >
             </template>
           </van-field>
         </van-cell>
@@ -66,10 +73,10 @@
       <div class="subForm2" v-if="showForm2">
         <img class="topImg" src="../../assets/images/sunVillage_info/list_employer_process_icon_03.png" alt="">
         <van-field readonly v-model="form.gsjs" label="记事内容" placeholder="记事内容" input-align="right" :border="false" />
-        <van-cell title="记事人" >
+        <van-cell title="记事人" style="color: #646566;">
           <van-field style="padding: 0 0;height: 30px;" readonly label="记事人" input-align="right" :border="false" >
             <template #label>
-              <img :src="'/api'+form.gsjsrqz" width="10%" alt="" v-if="form.gsjsrqz" >
+              <img :src="'/api'+form.gsjsrqz" style="width: 10%;" alt="" v-if="form.gsjsrqz" >
             </template>
           </van-field>
         </van-cell>

src/views/sunVillage_info/list_contractor_process.vue

@@ -34,7 +34,7 @@
           <p class="tit">信息核对</p>
         </div>
         <van-field readonly v-model="form.gsjs" label="记事内容" placeholder="记事内容" input-align="right" :border="false" />
-        <van-cell title="记事人" style="border: none;" >
+        <van-cell title="记事人" style="border: none;color: #646566;" >
           <van-field readonly style="padding: 0 0;height: 30px;" label="记事人" input-align="right" :border="false" >
             <template #label>
               <img  :src="'/api'+form.gsjsrqz" width="10%" alt="" v-if="form.gsjsrqz" >
@@ -60,10 +60,10 @@
       <div class="subForm2" v-if="showForm2">
         <img class="topImg" src="../../assets/images/sunVillage_info/list_employer_process_icon_03.png" alt="">
         <van-field readonly v-model="form.gsshyj" label="审核意见" placeholder="审核意见" input-align="right" :border="false" />
-        <van-cell title="审核人" style="border: none;" >
+        <van-cell title="审核人" style="border: none;color: #646566;" >
           <van-field readonly style="padding: 0 0;height: 30px;" label="审核人" input-align="right" :border="false" >
             <template #label>
-              <img  :src="'/api'+form.gsshqz" width="10%" alt="" v-if="form.gsshqz" >
+              <img  :src="'/api'+form.gsshqz" style="width: 10%;" alt="" v-if="form.gsshqz" >
             </template>
           </van-field>
         </van-cell>

src/views/sunVillage_info/list_contractor_single_process.vue

@@ -26,7 +26,7 @@
       <van-field readonly v-model="form.cbfdcjs" label="调查记事" placeholder="调查记事" input-align="right" :border="false" />
       <van-field readonly v-model="form.gsjs" label="公示记事" placeholder="公示记事" input-align="right" :border="false" />
       <!--        <van-field readonly v-model="form.gsjsrqz" label="公示记事人" placeholder="公示记事人" input-align="right" :border="false" />-->
-      <van-cell title="公示记事人签字" >
+      <van-cell title="公示记事人签字" style="color: #646566;">
         <van-field style="padding: 0 0;height: 30px;" readonly label="公示记事人签字" input-align="right" :border="false" >
           <template #label>
             <img :src="'/api'+form.gsjsrqz" width="10%" alt="" v-if="form.gsjsrqz" >
@@ -35,7 +35,13 @@
       </van-cell>
       <van-field readonly v-model="form.gsjsrq" label="公示记事时间" placeholder="公示记事时间" input-align="right" :border="false" />
       <van-field readonly v-model="form.gsjgyj" label="承包方公示结果意见" placeholder="承包方公示结果意见" input-align="right" :border="false" />
-      <van-field readonly v-model="form.gsjgqz" label="承包方公示结果签字" placeholder="承包方公示结果签字" input-align="right" :border="false" />
+      <van-cell title="承包方公示结果签字" style="color: #646566;">
+      <van-field style="padding: 0 0;height: 30px;width: 100%;background-color: #ffffff; border-radius: 5PX;" readonly label="承包方公示结果签字" input-align="right" :border="false" >
+        <template #label>
+          <img :src="'/api'+form.gsjgqz" style="top:55px;border:none;" width="10%" alt="" v-if="form.gsjgqz" >
+        </template>
+      </van-field>
+    </van-cell>
       <van-field readonly v-model="form.gsjgqzrq" label="承包方公示日期" placeholder="承包方公示日期" input-align="right" :border="false" />
 
     </div>
@@ -55,7 +61,7 @@
       <van-cell title="审核人" style="color: #ffffff;" >
         <van-field style="padding: 0 0;height: 30px;width: 100%;background-color: #ffffff; border-radius: 5PX;" readonly label="审核人" input-align="right" :border="false" >
           <template #label>
-            <img :src="'/api'+form.gsshqz" style="top:55px;border:none;" width="10%" alt="" v-if="form.gsshqz" >
+            <img :src="'/api'+form.gsshqz" style="top:55px;border:none;width: 80%;" alt="" v-if="form.gsshqz" >
           </template>
         </van-field>
       </van-cell>
@@ -66,10 +72,10 @@
     <div class="subForm2" v-if="showForm2">
       <img class="topImg" src="../../assets/images/sunVillage_info/list_employer_process_icon_03.png" alt="">
       <van-field readonly v-model="form.gsshyj" label="审核意见" placeholder="审核意见" input-align="right" :border="false" />
-      <van-cell title="审核人" >
+      <van-cell title="审核人" style="color: #646566;">
         <van-field style="padding: 0 0;height: 30px;" readonly label="审核人" input-align="right" :border="false" >
           <template #label>
-            <img :src="'/api'+form.gsshqz" width="10%" alt="" v-if="form.gsshqz" >
+            <img :src="'/api'+form.gsshqz" style="width: 20%;" alt="" v-if="form.gsshqz" >
           </template>
         </van-field>
       </van-cell>

src/views/sunVillage_info/list_employer_process.vue

@@ -17,7 +17,7 @@
         <van-field readonly v-model="form.fbfdcjs" label="调查记事" placeholder="调查记事" input-align="right" :border="false" />
         <van-field readonly v-model="form.fbfdcy" label="调查员" placeholder="调查员" input-align="right" :border="false" />
         <van-field readonly v-model="form.fbfdcrq" label="调查日期" placeholder="调查日期" input-align="right" :border="false" />
-        <van-cell title="调查签名" >
+        <van-cell title="调查签名" style="color: #646566;">
         <van-field style="padding: 0 0;" readonly label="调查签名" input-align="right" :border="false" >
           <template #label>
             <img :src="'/api'+form.fbfdcqz" width="10%" alt="" v-if="form.fbfdcqz" >
@@ -45,7 +45,7 @@
       <div class="subForm2" v-if="showShenHe">
         <img class="topImg" src="../../assets/images/sunVillage_info/list_employer_process_icon_03.png" alt="">
         <van-field readonly v-model="form.shyj" label="审核意见" placeholder="审核意见" input-align="right" :border="false" />
-        <van-cell title="审核人" style="border: none;height: 40px;" >
+        <van-cell title="审核人" style="border: none;height: 40px;color: #646566;" >
           <van-field readonly style="padding: 0 0;" label="审核人" input-align="right" :border="false" >
             <template #label>
               <img :src="'/api'+form.shrqz" width="10%" alt="" v-if="form.shrqz" >