Merge remote-tracking branch '云效/test'

src/api/business/onlineTaskInfo.js

@@ -77,3 +77,12 @@ export function delOnlineTaskInfo(id) {
     method: 'get'
   })
 }
+
+//签署合同文件
+export function signContractFile(data) {
+  return request({
+    url: '/business/onlineTaskInfo/signContractFile',
+    method: 'post',
+    data: data
+  })
+}

src/api/business/sealCompanyInfo.js

+import request from '@/utils/request'
+
+// 查询电子章信息列表
+export function listSealCompanyInfo(query) {
+  return request({
+    url: '/business/sealCompanyInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询电子章信息所有列表
+export function listAllSealCompanyInfo(query) {
+  return request({
+    url: '/business/sealCompanyInfo/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询电子章信息详细
+export function getSealCompanyInfo(id) {
+  return request({
+    url: '/business/sealCompanyInfo/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增电子章信息
+export function addSealCompanyInfo(data) {
+  return request({
+    url: '/business/sealCompanyInfo/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改电子章信息
+export function updateSealCompanyInfo(data) {
+  return request({
+    url: '/business/sealCompanyInfo/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除电子章信息
+export function delSealCompanyInfo(id) {
+  return request({
+    url: '/business/sealCompanyInfo/remove/' + id,
+    method: 'get'
+  })
+}
+
+//电子签章前置校验
+export function makeSealPreCheck(id , type) {
+  return request({
+    url: '/business/sealCompanyInfo/makeSealPreCheck',
+    method: 'get',
+    params: {
+      id: id,
+      type: type
+    }
+  })
+}
+//获取企业已提交信息
+export function getSubmittedCompanyInfo(id , type) {
+  return request({
+    url: '/business/sealCompanyInfo/getSubmittedCompanyInfo',
+    method: 'get',
+    params: {
+      id: id,
+      type: type
+    }
+  })
+}
+// 新增电子章信息--up
+export function saveSealCompanyInfo(data) {
+  return request({
+    url: '/business/sealCompanyInfo/saveSealCompanyInfo',
+    method: 'post',
+    data: data,
+    timeout: 1000 * 60 * 2
+  })
+}
+//制作电子章
+export function makeSeaApil(id) {
+  return request({
+    url: '/business/sealCompanyInfo/makeSeal' ,
+    method: 'get',
+    params: {
+      id: id
+    },
+    timeout: 1000 * 60 * 3
+  })
+}
+//查询电子章信息
+export function querySealPicApi(id) {
+  return request({
+    url: '/business/sealCompanyInfo/querySealPic' ,
+    method: 'get',
+    params:{
+      id: id
+    },
+    timeout: 1000 * 60 * 3
+  })
+}

src/api/business/sealCompanyInfoLog.js

+import request from '@/utils/request'
+
+// 查询企业电子章盖章记录信息列表
+export function listSealCompanyInfoLog(query) {
+  return request({
+    url: '/business/sealCompanyInfoLog/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询企业电子章盖章记录信息所有列表
+export function listAllSealCompanyInfoLog(query) {
+  return request({
+    url: '/business/sealCompanyInfoLog/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询企业电子章盖章记录信息详细
+export function getSealCompanyInfoLog(id) {
+  return request({
+    url: '/business/sealCompanyInfoLog/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增企业电子章盖章记录信息
+export function addSealCompanyInfoLog(data) {
+  return request({
+    url: '/business/sealCompanyInfoLog/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改企业电子章盖章记录信息
+export function updateSealCompanyInfoLog(data) {
+  return request({
+    url: '/business/sealCompanyInfoLog/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除企业电子章盖章记录信息
+export function delSealCompanyInfoLog(id) {
+  return request({
+    url: '/business/sealCompanyInfoLog/remove/' + id,
+    method: 'get'
+  })
+}

src/api/business/sealLocation.js

+import request from '@/utils/request'
+
+// 查询睿印-模板盖章位置列表
+export function listSealLocation(query) {
+  return request({
+    url: '/business/sealLocation/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询睿印-模板盖章位置所有列表
+export function listAllSealLocation(query) {
+  return request({
+    url: '/business/sealLocation/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询睿印-模板盖章位置详细
+export function getSealLocation(id) {
+  return request({
+    url: '/business/sealLocation/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增睿印-模板盖章位置
+export function addSealLocation(data) {
+  return request({
+    url: '/business/sealLocation/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改睿印-模板盖章位置
+export function updateSealLocation(data) {
+  return request({
+    url: '/business/sealLocation/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除睿印-模板盖章位置
+export function delSealLocation(id) {
+  return request({
+    url: '/business/sealLocation/remove/' + id,
+    method: 'get'
+  })
+}

src/api/business/templateConfig.js

+import request from '@/utils/request'
+
+// 查询睿印-凭证模板配置列表
+export function listTemplateConfig(query) {
+  return request({
+    url: '/business/templateConfig/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询睿印-凭证模板配置所有列表
+export function listAllTemplateConfig(query) {
+  return request({
+    url: '/business/templateConfig/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询睿印-凭证模板配置详细
+export function getTemplateConfig(id) {
+  return request({
+    url: '/business/templateConfig/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增睿印-凭证模板配置
+export function addTemplateConfig(data) {
+  return request({
+    url: '/business/templateConfig/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改睿印-凭证模板配置
+export function updateTemplateConfig(data) {
+  return request({
+    url: '/business/templateConfig/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除睿印-凭证模板配置
+export function delTemplateConfig(id) {
+  return request({
+    url: '/business/templateConfig/remove/' + id,
+    method: 'get'
+  })
+}

src/views/business/authentication/authentication.vue

@@ -76,12 +76,12 @@
           </el-row>
           <el-row :gutter="56">
             <el-col :span="10">
-              <el-form-item label="法人身份证正面" prop="legalIdPicFront">
+              <el-form-item label="法人身份证人像" prop="legalIdPicFront">
                 <image-upload v-model="form.legalIdPicFront" :limit="1"></image-upload>
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="法人身份证背面" prop="legalIdPicBack">
+              <el-form-item label="法人身份证国徽" prop="legalIdPicBack">
                 <image-upload v-model="form.legalIdPicBack" :limit="1"></image-upload>
               </el-form-item>
             </el-col>
@@ -146,7 +146,7 @@ export default {
           { required: true, message: "法人联系邮箱不能为空", trigger: "blur" }
         ],
         legalIdPicFront: [
-          { required: true, message: "法人身份证正面不能为空", trigger: "blur" }
+          { required: true, message: "法人身份证人像不能为空", trigger: "blur" }
         ],
         legalIdPicBack: [
           { required: true, message: "法人身份证号背面不能为空", trigger: "blur" }

src/views/business/authentication/unitAuthentication.vue

@@ -76,12 +76,12 @@
           </el-row>
           <el-row :gutter="56">
             <el-col :span="10">
-              <el-form-item label="法人身份证正面" prop="legalIdPicFront">
+              <el-form-item label="法人身份证人像" prop="legalIdPicFront">
                 <image-upload v-model="form.legalIdPicFront" :limit="1"></image-upload>
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="法人身份证背面" prop="legalIdPicBack">
+              <el-form-item label="法人身份证国徽" prop="legalIdPicBack">
                 <image-upload v-model="form.legalIdPicBack" :limit="1"></image-upload>
               </el-form-item>
             </el-col>
@@ -193,7 +193,7 @@ export default {
           { required: true, message: "法人联系邮箱不能为空", trigger: "blur" }
         ],
         legalIdPicFront: [
-          { required: true, message: "法人身份证正面不能为空", trigger: "blur" }
+          { required: true, message: "法人身份证人像不能为空", trigger: "blur" }
         ],
         legalIdPicBack: [
           { required: true, message: "法人身份证号背面不能为空", trigger: "blur" }

src/views/business/companyInfo/merchant.vue

@@ -78,6 +78,24 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+
+          <el-button
+            v-if="scope.row.signetId == null"
+            size="mini"
+            type="text"
+            icon="el-icon-info"
+            @click="makeSealPre(scope.row)"
+          >生成电子签章
+          </el-button>
+          <el-button
+            v-if="scope.row.signetId != null"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="viewSealInfo(scope.row)"
+          >查看电子签章
+          </el-button>
+
           <el-button
             size="mini"
             type="text"
@@ -130,7 +148,8 @@
 
 <script>
 import { listCompanyInfo, getCompanyInfo, delCompanyInfo, addCompanyInfo, updateCompanyInfo } from "@/api/business/companyInfo";
-import { deptTreeSelect } from '@/api/system/user'
+import { deptTreeSelect } from '@/api/system/user';
+import {makeSealPreCheck} from "@/api/business/sealCompanyInfo";
 
 export default {
   name: "CompanyInfo",
@@ -283,6 +302,27 @@ export default {
       this.download('business/companyInfo/export', {
         ...this.queryParams
       }, `companyInfo_${new Date().getTime()}.xlsx`)
+    },
+    /** 生成电子签章 */
+    makeSealPre(row) {
+      const type = "hr";
+      //是否确认生成电子签章 ，如果确认，调用接口生成电子签章，然后跳转到电子签章页面
+      this.$modal.confirm('是否确认为【'+row.companyName+'】企业生成电子签章？').then(() => {
+        makeSealPreCheck(row.id,type).then(response => {
+          console.log(response.code == 200)
+          if (response.code == 200) {
+            //校验完成 前往生成电子签章页面 sealCompanyInfo/index
+            this.$router.push({ path: '/seal/sealCompanyInfo', query: { bussinessId: row.id, bussinessType: type, showFlag:1 } })
+          }else {
+            this.$modal.msgError(response.msg)
+          }
+        })
+      })
+    },
+    /** 查看电子签章 */
+    viewSealInfo(row) {
+      const type = "hr";
+      this.$router.push({ path: '/seal/sealCompanyInfo', query: { bussinessId: row.id, bussinessType: type, showFlag:0 } })
     }
   }
 };

src/views/business/component/payerCompanyForm.vue

@@ -81,12 +81,12 @@
           </el-row>
           <el-row :gutter="56">
             <el-col :span="10">
-              <el-form-item label="法人身份证正面" prop="legalIdPicFront">
+              <el-form-item label="法人身份证人像" prop="legalIdPicFront">
                 <image-upload v-model="form.legalIdPicFront" :limit="1"></image-upload>
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="法人身份证背面" prop="legalIdPicBack">
+              <el-form-item label="法人身份证国徽" prop="legalIdPicBack">
                 <image-upload v-model="form.legalIdPicBack" :limit="1"></image-upload>
               </el-form-item>
             </el-col>
@@ -163,7 +163,7 @@ export default {
           }
         ],
         legalIdPicFront: [
-          { required: true, message: "法人身份证正面不能为空", trigger: "blur" }
+          { required: true, message: "法人身份证人像不能为空", trigger: "blur" }
         ],
         legalIdPicBack: [
           { required: true, message: "法人身份证号背面不能为空", trigger: "blur" }

src/views/business/component/taxUnitInfoForm.vue

@@ -76,12 +76,12 @@
             </el-row>
             <el-row :gutter="56">
               <el-col :span="10">
-                <el-form-item label="法人身份证正面" prop="legalIdPicFront">
+                <el-form-item label="法人身份证人像" prop="legalIdPicFront">
                   <image-upload v-model="form.legalIdPicFront" :limit="1"></image-upload>
                 </el-form-item>
               </el-col>
               <el-col :span="10">
-                <el-form-item label="法人身份证背面" prop="legalIdPicBack">
+                <el-form-item label="法人身份证国徽" prop="legalIdPicBack">
                   <image-upload v-model="form.legalIdPicBack" :limit="1"></image-upload>
                 </el-form-item>
               </el-col>
@@ -197,7 +197,7 @@ export default {
           }
         ],
         legalIdPicFront: [
-          { required: true, message: "法人身份证正面不能为空", trigger: "blur" }
+          { required: true, message: "法人身份证人像不能为空", trigger: "blur" }
         ],
         legalIdPicBack: [
           { required: true, message: "法人身份证号背面不能为空", trigger: "blur" }