From f55d6c3c4f13e1564899d3c88cbe698537aefcf9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 六月 2024 10:21:42 +0800
Subject: [PATCH] sssssssssss
---
company/src/components/business/OpearaUnionChange.vue | 1
company/src/components/business/OperaSolutionsDescWindow.vue | 2
company/src/components/business/InsuranceDetailsWtb.vue | 4
company/src/components/business/OperaInsuranceApplyWindow.vue | 12
company/src/components/business/OpearaUnionChangeUnit.vue | 1
company/src/views/enterprise/myPolicy.vue | 1
company/src/components/business/OperaUnionApplyCheckWindow.vue | 4
company/src/components/enterprise/renewalInsurance.vue | 1
company/.env.developmentShop | 4
company/src/components/business/OperaSettleClaimsWindow.vue | 4
company/src/views/business/policyList.vue | 1
company/src/components/business/InsuranceDetails.vue | 12
company/src/components/business/OperaPdfViewerWindow.vue | 275 +++++++++++++++++++++
company/src/components/business/OperaApplyChangeUnitDetailWindow.vue | 17
company/package.json | 1
company/src/views/business/solutions.vue | 4
company/src/components/business/detailsPolicyholder.vue | 4
company/src/components/enterprise/additionSubtractionApplication.vue | 5
company/src/components/enterprise/factoryChange.vue | 1
company/src/components/business/OperaWtbApplyShopWindow.vue | 33 +
company/src/views/business/unionApply.vue | 1
company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue | 18
company/src/components/enterprise/reinsurance.vue | 1
company/src/components/business/detailsEntrustedInsurance.vue | 1
company/.env.developmentCom | 4
company/src/components/business/OperaInsuranceApplyShopWindow.vue | 5
company/src/components/business/OperaSolutionsWindow.vue | 10
company/README.md | 11
company/src/views/business/insuranceApplyShop.vue | 1
company/src/components/business/OpearaUnionApply.vue | 4
company/src/views/business/insuranceApply.vue | 1
company/src/components/business/OperaApplyChangeDetailWindow.vue | 9
company/package-lock.json | 113 +++++++-
company/src/components/enterprise/OperaInsuranceApplyAddWindowNew.vue | 171 ++++++++----
company/src/views/enterprise/insuranceApply.vue | 2
company/src/components/enterprise/editFactoryChange.vue | 1
company/.env.development | 4
37 files changed, 603 insertions(+), 141 deletions(-)
diff --git a/company/.env.development b/company/.env.development
index f419a10..7abe4de 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -11,5 +11,5 @@
#VUE_APP_API = 'http://localhost:10030/'
-#VUE_APP_API = 'http://192.168.0.143:10030/'
-VUE_APP_API = 'https://www.yyb.red/yyb_admin_api/'
+VUE_APP_API = 'http://192.168.0.135:10030/'
+#VUE_APP_API = 'https://www.yyb.red/yyb_admin_api/'
diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index 360c46c..7cd8616 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -9,6 +9,6 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
#VUE_APP_API = 'http://localhost:10031/'
-#VUE_APP_API = 'http://192.168.0.143:10031/'
+VUE_APP_API = 'http://192.168.0.135:10031/'
-VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
+#VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
diff --git a/company/.env.developmentShop b/company/.env.developmentShop
index 9dcbd67..1c61b78 100644
--- a/company/.env.developmentShop
+++ b/company/.env.developmentShop
@@ -7,8 +7,8 @@
VUE_APP_SYSTEM_TITLE = '浜戞槗淇濆鎴锋湇鍔＄郴缁�-鍟嗘埛绔�'
#VUE_APP_API = 'https://www.yyb.red/yyb_shop_api/'
-# VUE_APP_API = 'http://192.168.0.143:10032/'
+ VUE_APP_API = 'http://192.168.0.135:10032/'
#VUE_APP_API = 'http://localhost:10032/'
-VUE_APP_API = 'https://www.yyb.red/yyb_shop_api/'
+#VUE_APP_API = 'https://www.yyb.red/yyb_shop_api/'
diff --git a/company/README.md b/company/README.md
index 17c5eac..39718c0 100644
--- a/company/README.md
+++ b/company/README.md
@@ -38,3 +38,14 @@
console.log('璋冪敤澶辫触', e)
})
```
+
+#瑙ｅ喅vuepdf涓嶆樉绀虹珷鍗伴棶棰�
+#鎵惧埌 node_modules/pdfjs-dist/es5/build/pdf.worker.js 杩欎釜鐩綍
+```javascript
+if (data.fieldType === "Sig") {
+data.fieldValue = null;
+//pdf棰勮涓嶆樉绀虹孩绔犻棶棰�
+// _this3.setFlags(_util.AnnotationFlag.HIDDEN);//灏嗚繖涓�琛屾敞閲婃帀
+}
+```
+
diff --git a/company/package-lock.json b/company/package-lock.json
index 6e29c3e..0a6eab0 100644
--- a/company/package-lock.json
+++ b/company/package-lock.json
@@ -2374,7 +2374,6 @@
"version": "6.12.6",
"resolved": "https://registry.nlark.com/ajv/download/ajv-6.12.6.tgz?cache=0&sync_timestamp=1621023838921&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fajv%2Fdownload%2Fajv-6.12.6.tgz",
"integrity": "sha1-uvWmLoArB9l3A0WG+MO69a3ybfQ=",
- "dev": true,
"requires": {
"fast-deep-equal": "^3.1.1",
"fast-json-stable-stringify": "^2.0.0",
@@ -2391,8 +2390,7 @@
"ajv-keywords": {
"version": "3.5.2",
"resolved": "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1616882441894&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz",
- "integrity": "sha1-MfKdpatuANHC0yms97WSlhTVAU0=",
- "dev": true
+ "integrity": "sha1-MfKdpatuANHC0yms97WSlhTVAU0="
},
"alphanum-sort": {
"version": "1.0.2",
@@ -2811,6 +2809,11 @@
"@babel/helper-define-polyfill-provider": "^0.2.0"
}
},
+ "babel-plugin-syntax-dynamic-import": {
+ "version": "6.18.0",
+ "resolved": "https://registry.npmmirror.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
+ "integrity": "sha512-MioUE+LfjCEz65Wf7Z/Rm4XCP5k2c+TbMd2Z2JKc7U9uwjBhAfNPE48KC4GTGKhppMeYVepwDBNO/nGY6NYHBA=="
+ },
"babel-runtime": {
"version": "6.26.0",
"resolved": "https://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz",
@@ -2929,8 +2932,7 @@
"big.js": {
"version": "5.2.2",
"resolved": "https://registry.nlark.com/big.js/download/big.js-5.2.2.tgz?cache=0&sync_timestamp=1620132748267&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbig.js%2Fdownload%2Fbig.js-5.2.2.tgz",
- "integrity": "sha1-ZfCvOC9Xi83HQr2cKB6cstd2gyg=",
- "dev": true
+ "integrity": "sha1-ZfCvOC9Xi83HQr2cKB6cstd2gyg="
},
"binary-extensions": {
"version": "2.2.0",
@@ -5184,8 +5186,7 @@
"emojis-list": {
"version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/emojis-list/download/emojis-list-3.0.0.tgz",
- "integrity": "sha1-VXBmIEatKeLpFucariYKvf9Pang=",
- "dev": true
+ "integrity": "sha1-VXBmIEatKeLpFucariYKvf9Pang="
},
"encodeurl": {
"version": "1.0.2",
@@ -6220,8 +6221,7 @@
"fast-deep-equal": {
"version": "3.1.3",
"resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz?cache=0&sync_timestamp=1591599697571&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-deep-equal%2Fdownload%2Ffast-deep-equal-3.1.3.tgz",
- "integrity": "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU=",
- "dev": true
+ "integrity": "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU="
},
"fast-glob": {
"version": "2.2.7",
@@ -6263,8 +6263,7 @@
"fast-json-stable-stringify": {
"version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/fast-json-stable-stringify/download/fast-json-stable-stringify-2.1.0.tgz?cache=0&sync_timestamp=1576340291001&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-json-stable-stringify%2Fdownload%2Ffast-json-stable-stringify-2.1.0.tgz",
- "integrity": "sha1-h0v2nG9ATCtdmcSBNBOZ/VWJJjM=",
- "dev": true
+ "integrity": "sha1-h0v2nG9ATCtdmcSBNBOZ/VWJJjM="
},
"fast-levenshtein": {
"version": "2.0.6",
@@ -8066,8 +8065,7 @@
"json-schema-traverse": {
"version": "0.4.1",
"resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz?cache=0&sync_timestamp=1607999852153&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson-schema-traverse%2Fdownload%2Fjson-schema-traverse-0.4.1.tgz",
- "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
- "dev": true
+ "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA="
},
"json-stable-stringify-without-jsonify": {
"version": "1.0.1",
@@ -8091,7 +8089,6 @@
"version": "2.2.0",
"resolved": "https://registry.npm.taobao.org/json5/download/json5-2.2.0.tgz",
"integrity": "sha1-Lf7+cgxrpSXZ69kJlQ8FFTFsiaM=",
- "dev": true,
"requires": {
"minimist": "^1.2.5"
}
@@ -8672,7 +8669,6 @@
"version": "1.4.0",
"resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-1.4.0.tgz?cache=0&sync_timestamp=1584445207623&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Floader-utils%2Fdownload%2Floader-utils-1.4.0.tgz",
"integrity": "sha1-xXm140yzSxp07cbB+za/o3HVphM=",
- "dev": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
@@ -8683,7 +8679,6 @@
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/json5/download/json5-1.0.1.tgz",
"integrity": "sha1-d5+wAYYE+oVOrL9iUhgNg1Q+Pb4=",
- "dev": true,
"requires": {
"minimist": "^1.2.0"
}
@@ -9227,8 +9222,7 @@
"minimist": {
"version": "1.2.5",
"resolved": "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fminimist%2Fdownload%2Fminimist-1.2.5.tgz",
- "integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI=",
- "dev": true
+ "integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI="
},
"minipass": {
"version": "3.1.3",
@@ -10207,6 +10201,11 @@
"sha.js": "^2.4.8"
}
},
+ "pdfjs-dist": {
+ "version": "2.6.347",
+ "resolved": "https://registry.npmmirror.com/pdfjs-dist/-/pdfjs-dist-2.6.347.tgz",
+ "integrity": "sha512-QC+h7hG2su9v/nU1wEI3SnpPIrqJODL7GTDFvR74ANKGq1AFJW16PH8VWnhpiTi9YcLSFV9xLeWSgq+ckHLdVQ=="
+ },
"performance-now": {
"version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/performance-now/download/performance-now-2.1.0.tgz",
@@ -11086,8 +11085,7 @@
"punycode": {
"version": "2.1.1",
"resolved": "https://registry.npm.taobao.org/punycode/download/punycode-2.1.1.tgz",
- "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=",
- "dev": true
+ "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew="
},
"q": {
"version": "1.5.1",
@@ -11170,6 +11168,42 @@
"http-errors": "1.7.2",
"iconv-lite": "0.4.24",
"unpipe": "1.0.0"
+ }
+ },
+ "raw-loader": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmmirror.com/raw-loader/-/raw-loader-4.0.2.tgz",
+ "integrity": "sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==",
+ "requires": {
+ "loader-utils": "^2.0.0",
+ "schema-utils": "^3.0.0"
+ },
+ "dependencies": {
+ "@types/json-schema": {
+ "version": "7.0.15",
+ "resolved": "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.15.tgz",
+ "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="
+ },
+ "loader-utils": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+ "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+ "requires": {
+ "big.js": "^5.2.2",
+ "emojis-list": "^3.0.0",
+ "json5": "^2.1.2"
+ }
+ },
+ "schema-utils": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-3.3.0.tgz",
+ "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+ "requires": {
+ "@types/json-schema": "^7.0.8",
+ "ajv": "^6.12.5",
+ "ajv-keywords": "^3.5.2"
+ }
+ }
}
},
"read-pkg": {
@@ -13483,7 +13517,6 @@
"version": "4.4.1",
"resolved": "https://registry.npm.taobao.org/uri-js/download/uri-js-4.4.1.tgz?cache=0&sync_timestamp=1610237624359&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Furi-js%2Fdownload%2Furi-js-4.4.1.tgz",
"integrity": "sha1-mxpSWVIlhZ5V9mnZKPiMbFfyp34=",
- "dev": true,
"requires": {
"punycode": "^2.1.0"
}
@@ -13708,6 +13741,24 @@
"dev": true
}
}
+ },
+ "vue-pdf": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmmirror.com/vue-pdf/-/vue-pdf-4.3.0.tgz",
+ "integrity": "sha512-zd3lJj6CbtrawgaaDDciTDjkJMUKiLWtbEmBg5CvFn9Noe9oAO/GNy/fc5c59qGuFCJ14ibIV1baw4S07e5bSQ==",
+ "requires": {
+ "babel-plugin-syntax-dynamic-import": "^6.18.0",
+ "loader-utils": "^1.4.0",
+ "pdfjs-dist": "2.6.347",
+ "raw-loader": "^4.0.2",
+ "vue-resize-sensor": "^2.0.0",
+ "worker-loader": "^2.0.0"
+ }
+ },
+ "vue-resize-sensor": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmmirror.com/vue-resize-sensor/-/vue-resize-sensor-2.0.0.tgz",
+ "integrity": "sha512-W+y2EAI/BxS4Vlcca9scQv8ifeBFck56DRtSwWJ2H4Cw1GLNUYxiZxUHHkuzuI5JPW/cYtL1bPO5xPyEXx4LmQ=="
},
"vue-router": {
"version": "3.5.1",
@@ -14519,6 +14570,26 @@
"errno": "~0.1.7"
}
},
+ "worker-loader": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmmirror.com/worker-loader/-/worker-loader-2.0.0.tgz",
+ "integrity": "sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==",
+ "requires": {
+ "loader-utils": "^1.0.0",
+ "schema-utils": "^0.4.0"
+ },
+ "dependencies": {
+ "schema-utils": {
+ "version": "0.4.7",
+ "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-0.4.7.tgz",
+ "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
+ "requires": {
+ "ajv": "^6.1.0",
+ "ajv-keywords": "^3.1.0"
+ }
+ }
+ }
+ },
"wrap-ansi": {
"version": "7.0.0",
"resolved": "https://registry.nlark.com/wrap-ansi/download/wrap-ansi-7.0.0.tgz",
diff --git a/company/package.json b/company/package.json
index 85b254e..dec5f78 100644
--- a/company/package.json
+++ b/company/package.json
@@ -26,6 +26,7 @@
"umy-ui": "^1.1.6",
"vue": "^2.6.11",
"vue-clipboard2": "^0.3.1",
+ "vue-pdf": "^4.3.0",
"vue-router": "^3.5.1",
"vuescroll": "^4.17.3",
"vuex": "^3.4.0"
diff --git a/company/src/components/business/InsuranceDetails.vue b/company/src/components/business/InsuranceDetails.vue
index 49e2c9a..7ad0e78 100644
--- a/company/src/components/business/InsuranceDetails.vue
+++ b/company/src/components/business/InsuranceDetails.vue
@@ -16,7 +16,7 @@
<div class="box_table_head_item">淇濋櫓鏂规</div>
<div class="box_table_head_item">淇濋櫓鐢熸晥璧锋湡</div>
<div class="box_table_head_item">淇濋櫓鐢熸晥姝㈡湡</div>
- <div class="box_table_head_item">鎶曚繚浜烘暟</div>
+ <div class="box_table_head_item">鍦ㄤ繚/鎶曚繚浜烘暟</div>
<div class="box_table_head_item">鎬昏垂鐢�(鍏�)</div>
</div>
<div class="box_table_content " >
@@ -24,7 +24,7 @@
<div class="box_table_content_item box_table_content_header">{{ model.solutionsName }}</div>
<div class="box_table_content_item box_table_content_header">{{ model.startTime }}</div>
<div class="box_table_content_item box_table_content_header">{{ model.endTime }}</div>
- <div class="box_table_content_item box_table_content_header">{{ model.insureNum }}</div>
+ <div class="box_table_content_item box_table_content_header">{{ model.guaranteeNum }} / {{ model.insureNum }}</div>
<div class="box_table_content_item box_table_content_header">{{model.fee!=null?model.fee:'-'}}</div>
</div>
</div>
@@ -70,7 +70,6 @@
<el-button type="primary" :loading="isWorking.export" @click="exportDetail">瀵煎嚭璇﹀崟</el-button>
<el-button @click="visible=false">鍙栨秷</el-button>
</template>
- </div>
</GlobalWindow>
</template>
@@ -119,7 +118,8 @@
this.getDetailListDo()
},
getDetailListDo(){
- getDetailList({applyId: this.model.id}).then(res => {
+ getDetailList({applyId: this.model.id,
+ isExcel:1}).then(res => {
this.detailList = res
}).catch(err => {
})
@@ -128,7 +128,9 @@
this.$dialog.exportConfirm('纭瀵煎嚭璇﹀崟鍚楋紵')
.then(() => {
this.isWorking = true
- exportDetailExcel({ id: this.model.id })
+ exportDetailExcel({
+ isExcel:1,
+ id: this.model.id })
.then(response => {
this.download(response)
})
diff --git a/company/src/components/business/InsuranceDetailsWtb.vue b/company/src/components/business/InsuranceDetailsWtb.vue
index 85226fc..ea80b0b 100644
--- a/company/src/components/business/InsuranceDetailsWtb.vue
+++ b/company/src/components/business/InsuranceDetailsWtb.vue
@@ -17,7 +17,7 @@
<div class="box_table_head_item">淇濋櫓鏂规</div>
<div class="box_table_head_item">淇濋櫓鐢熸晥璧锋湡</div>
<div class="box_table_head_item">淇濋櫓鐢熸晥姝㈡湡</div>
- <div class="box_table_head_item">鎶曚繚浜烘暟</div>
+ <div class="box_table_head_item">鍦ㄤ繚/鎶曚繚浜烘暟</div>
<div class="box_table_head_item">鎬昏垂鐢�(鍏�)</div>
</div>
<div class="box_table_content " >
@@ -26,7 +26,7 @@
<div class="box_table_content_item box_table_content_header">{{ model.solutionName }}</div>
<div class="box_table_content_item box_table_content_header">{{ model.startTime }}</div>
<div class="box_table_content_item box_table_content_header">{{ model.endTime }}</div>
- <div class="box_table_content_item box_table_content_header">{{ model.insureNum }}</div>
+ <div class="box_table_content_item box_table_content_header">{{ model.guaranteeNum }} / {{ model.insureNum }}</div>
<div class="box_table_content_item box_table_content_header">{{model.fee!=null?model.fee:'-'}}</div>
</div>
</div>
diff --git a/company/src/components/business/OpearaUnionApply.vue b/company/src/components/business/OpearaUnionApply.vue
index facef5e..f1fe42c 100644
--- a/company/src/components/business/OpearaUnionApply.vue
+++ b/company/src/components/business/OpearaUnionApply.vue
@@ -87,6 +87,10 @@
label="鎶曚繚浜烘暟">
</el-table-column>
<el-table-column
+ prop="guaranteeNum"
+ label="鍦ㄤ繚浜烘暟">
+ </el-table-column>
+ <el-table-column
prop="fee"
label="鎬昏垂鐢�">
</el-table-column>
diff --git a/company/src/components/business/OpearaUnionChange.vue b/company/src/components/business/OpearaUnionChange.vue
index 6282bed..2a868cd 100644
--- a/company/src/components/business/OpearaUnionChange.vue
+++ b/company/src/components/business/OpearaUnionChange.vue
@@ -134,6 +134,7 @@
<el-table-column prop="code" label="淇濆崟鍙�" min-width="100px"></el-table-column>
<el-table-column prop="solutionName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
<el-table-column prop="insureNum" label="鎶曚繚浜烘暟" min-width="100px"></el-table-column>
+ <el-table-column prop="guaranteeNum" label="鍦ㄤ繚浜烘暟" min-width="100px"></el-table-column>
<el-table-column prop="addApplyNum" label="鐢宠鍗曟暟" min-width="100px"></el-table-column>
<el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
diff --git a/company/src/components/business/OpearaUnionChangeUnit.vue b/company/src/components/business/OpearaUnionChangeUnit.vue
index b5f950b..669154c 100644
--- a/company/src/components/business/OpearaUnionChangeUnit.vue
+++ b/company/src/components/business/OpearaUnionChangeUnit.vue
@@ -130,6 +130,7 @@
<el-table-column prop="code" label="淇濆崟鍙�" min-width="100px"></el-table-column>
<el-table-column prop="solutionName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
<el-table-column prop="insureNum" label="鎶曚繚浜烘暟" min-width="100px"></el-table-column>
+ <el-table-column prop="guaranteeNum" label="鍦ㄤ繚浜烘暟" min-width="100px"></el-table-column>
<el-table-column prop="changeApplyNum" label="鐢宠鍗曟暟" min-width="100px"></el-table-column>
<el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index 2ebf584..e4765a1 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -211,6 +211,7 @@
<OperaInsuranceApply ref="OperaInsuranceApply" @success="successEvent" />
<!-- 鍔犲噺淇濈敵璇� -->
<reinsurance ref="reinsurance" @success="successEvent" />
+ <OperaPdfViewerWindow ref="OperaPdfViewerWindow" />
<!-- 鏇存崲娲鹃仯鍗曚綅鐢宠 -->
<factoryChange ref="factoryChange" @success="successEvent" />
<!-- 鎶曚繚璇︽儏 -->
@@ -268,6 +269,7 @@
import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyAddWindow'
import { mapState } from 'vuex'
+import OperaPdfViewerWindow from '@/components/business/OperaPdfViewerWindow'
export default {
name: 'OperaApplyChangeDetailWindow1',
extends: BaseOpera,
@@ -278,6 +280,7 @@
add_subtract_return,
OperaInsuranceApply,
reinsurance,
+ OperaPdfViewerWindow,
factoryChange,
insuranceApplyDetails: () => import ('@/components/business/OperaInsuranceApplyWindow')
},
@@ -439,12 +442,14 @@
},
viewApplyFile(){
if(this.model.applyFile && this.model.applyFile.fileurlFull){
- window.open(this.model.applyFile.fileurlFull)
+ this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鐢宠鍗�',this.model.applyFile.fileurlFull)
+ // window.open(this.model.applyFile.fileurlFull)
}
},
viewPidan(){
if(this.model.pidanFile && this.model.pidanFile.fileurlFull){
- window.open(this.model.pidanFile.fileurlFull)
+ this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鎵瑰崟',this.model.pidanFile.fileurlFull)
+ // window.open(this.model.pidanFile.fileurlFull)
}
},
handleSizeChange(val){
diff --git a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
index dba05cf..926d1b5 100644
--- a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
@@ -225,6 +225,7 @@
<editFactoryChange ref="editFactoryChange" @success="successEvent" />
<!-- 鎶曚繚璇︽儏 -->
<insuranceApplyDetails ref="insuranceApplyDetails" @success="successEvent" />
+ <OperaPdfViewerWindow ref="OperaPdfViewerWindow" />
<template v-slot:footer>
<el-button @click="visible=false">杩斿洖</el-button>
</template>
@@ -242,6 +243,7 @@
import applyReturn from '@/components/enterprise/applyReturn'
import add_subtract_return from '@/components/enterprise/add_subtract_return'
// import insuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
+import OperaPdfViewerWindow from '@/components/business/OperaPdfViewerWindow'
import {
getDetail,
getChangeDetail,
@@ -258,6 +260,7 @@
extends: BaseOpera,
components: {
GlobalWindow,
+ OperaPdfViewerWindow,
ApplyChangeUnitDetails,
OperaApplyChangeUnitCheckWindow,
applyReturn,
@@ -429,14 +432,16 @@
this.$tip.apiFailed(err)
})
},
- viewApplyFile () {
- if (this.model.applyUnitFile && this.model.applyUnitFile.fileurlFull) {
- window.open(this.model.applyUnitFile.fileurlFull)
+ viewApplyFile(){
+ if(this.model.applyUnitFile && this.model.applyUnitFile.fileurlFull){
+ this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鐢宠鍗�',this.model.applyUnitFile.fileurlFull)
+ // window.open(this.model.applyFile.fileurlFull)
}
},
- viewPidan () {
- if (this.model.pidanFile && this.model.pidanFile.fileurlFull) {
- window.open(this.model.pidanFile.fileurlFull)
+ viewPidan(){
+ if(this.model.pidanFile && this.model.pidanFile.fileurlFull){
+ this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鎵瑰崟',this.model.pidanFile.fileurlFull)
+ // window.open(this.model.pidanFile.fileurlFull)
}
},
handleSizeChange (val) {
diff --git a/company/src/components/business/OperaInsuranceApplyShopWindow.vue b/company/src/components/business/OperaInsuranceApplyShopWindow.vue
index ade21f1..7b82d2e 100644
--- a/company/src/components/business/OperaInsuranceApplyShopWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyShopWindow.vue
@@ -78,6 +78,11 @@
label="鎶曚繚浜烘暟">
</el-table-column>
<el-table-column
+ prop="guaranteeNum"
+ align="center"
+ label="鍦ㄤ繚浜烘暟">
+ </el-table-column>
+ <el-table-column
prop="serviceDays"
align="center"
label="淇濆崟鏃堕暱锛堝ぉ锛�">
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index 08f97b1..8c7d0bb 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -466,6 +466,7 @@
<OperaApplyChangeUnitDetailWindow ref="OperaApplyChangeUnitDetailWindow" @success="successEvent"/>
<!-- 楠岃瘉鎵嬫満鍙� -->
<operaverifyPhoneNumberWindew ref="operaverifyPhoneNumberWindew" @success="goSign" />
+ <OperaPdfViewerWindow ref="OperaPdfViewerWindow" />
<template v-slot:footer>
<el-button @click="visible=false">杩斿洖</el-button>
</template>
@@ -491,11 +492,13 @@
import OperaInsuranceApplyAddWindow from '@/components/enterprise/OperaInsuranceApplyAddWindow'
import { mapState } from 'vuex'
+import OperaPdfViewerWindow from '@/components/business/OperaPdfViewerWindow'
export default {
name: 'OperaInsuranceApplyWindow1',
extends: BaseOpera,
components: {
GlobalWindow,
+ OperaPdfViewerWindow,
InsuranceDetails,
OperaInsuranceApplyCheckWindow,
applyReturn,
@@ -782,18 +785,21 @@
viewToubaodan(){
if(this.model.toubaodanSignedFile && this.model.toubaodanSignedFile.fileurlFull){
setTimeout(() => {
- window.open(this.model.toubaodanSignedFile.fileurlFull)
+ this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鎶曚繚鍗�',this.model.toubaodanSignedFile.fileurlFull)
+ // window.open(this.model.toubaodanSignedFile.fileurlFull)
}, 500);
} else if(this.model.toubaodanFile && this.model.toubaodanFile.fileurlFull){
setTimeout(() => {
- window.open(this.model.toubaodanFile.fileurlFull)
+ this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鎶曚繚鍗�',this.model.toubaodanFile.fileurlFull)
+ // window.open(this.model.toubaodanFile.fileurlFull)
},500)
}
},
viewBaoxiandan(){
if(this.model.baoxiandanFile && this.model.baoxiandanFile.fileurlFull){
- window.open(this.model.baoxiandanFile.fileurlFull)
+ this.$refs.OperaPdfViewerWindow.open('鏌ョ湅淇濋櫓鍗�',this.model.baoxiandanFile.fileurlFull)
+ // window.open(this.model.baoxiandanFile.fileurlFull)
}
},
handleSizeChange(val){
diff --git a/company/src/components/business/OperaPdfViewerWindow.vue b/company/src/components/business/OperaPdfViewerWindow.vue
new file mode 100644
index 0000000..4f0c064
--- /dev/null
+++ b/company/src/components/business/OperaPdfViewerWindow.vue
@@ -0,0 +1,275 @@
+<template>
+ <GlobalWindow
+ :title="title"
+ width="100%"
+ :visible.sync="visible"
+ :confirm-working="isWorking"
+ @confirm="confirm"
+ >
+ <div class="pdfView">
+ <div class="show">
+ <!--鍒嗛〉鏄剧ず-->
+ <pdf
+ ref="pdf"
+ :src="pdfUrl"
+ :page="pageNum"
+ :rotate="pageRotate"
+ @password="password"
+ @progress="loadedRatio = $event"
+ @loaded="onLoadSuccess"
+ @page-loaded="pageLoaded($event)"
+ @num-pages="pageTotalNum = $event"
+ @error="pdfError($event)"
+ @link-clicked="page = $event"
+ >
+ </pdf>
+ </div>
+ <div class="pdf_footer">
+ <div class="info">
+ <div>褰撳墠椤垫暟/鎬婚〉鏁帮細{{ pageNum }}/{{ pageTotalNum }}</div>
+ <!-- <div>杩涘害锛歿{ loadedRatio }}</div> -->
+ <!-- <div>椤甸潰鍔犺浇鎴愬姛: {{ curPageNum }}</div> -->
+ </div>
+ </div>
+ </div>
+ <template v-slot:footer>
+ <el-button-group>
+ <el-button type="primary" icon="el-icon-arrow-left" style="border-radius: 30px 0 0 30px" @click.stop="prePage">涓婁竴椤�</el-button>
+ <el-button type="primary" @click.stop="nextPage" style="border-radius: 0 30px 30px 0">涓嬩竴椤�<i class="el-icon-arrow-right el-icon--right"></i></el-button>
+ </el-button-group>
+ <el-button-group style="margin-left: 30px">
+ <el-button type="primary" style="border-radius: 30px 0 0 30px" @click="scaleD">鏀惧ぇ</el-button>
+ <el-button type="primary" style="border-radius: 0 30px 30px 0" @click="scaleX">缂╁皬</el-button>
+ </el-button-group>
+ <el-button-group style="margin-left: 30px">
+ <el-button type="primary" style="border-radius: 30px 0 0 30px" @click="download(pdfUrl)">涓嬭浇</el-button>
+ <el-button @click="visible=false" style="border-radius: 0 30px 30px 0" >鍏抽棴</el-button>
+ </el-button-group>
+ </template>
+ </GlobalWindow>
+</template>
+
+<script>
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+import pdf from 'vue-pdf'
+export default {
+ name: 'OperaPdsViewerWindow',
+ extends: BaseOpera,
+ components: {
+ GlobalWindow,
+ pdf
+ },
+ data () {
+ return {
+ pdfUrl: '',
+ // 鎬婚〉鏁�
+ pageTotalNum: 1,
+ // 褰撳墠椤垫暟
+ pageNum: 1,
+ // 鍔犺浇杩涘害
+ loadedRatio: 0,
+ // 椤甸潰鍔犺浇瀹屾垚
+ curPageNum: 0,
+ // 鏀惧ぇ绯绘暟 榛樿鐧惧垎鐧�
+ scale: 100,
+ // 鏃嬭浆瑙掑害 鈥�90鈥欑殑鍊嶆暟鎵嶆湁鏁�
+ pageRotate: 0,
+ // 鍗曞嚮鍐呴儴閾炬帴鏃惰Е鍙� (鐩墠鎴戞病鏈夐亣鍒颁娇鐢ㄥ満鏅�)
+ page: 0,
+ // 褰撳墠椤垫暟
+ numPages: 1,
+ // 棰勮璺緞
+ localUrl: '',
+ loading: true
+ }
+ },
+ methods: {
+ open (title, target) {
+ this.pdfUrl = target
+ this.title = title
+ this.localUrl = ''
+ this.localUrl = this.pdfUrl
+ console.log(this.pdfUrl)
+ const loadingTask = pdf.createLoadingTask(this.localUrl)
+ loadingTask.promise.then(pdf => {
+ this.numPages = pdf.numPages
+ this.loading = false
+ }).catch((err) => {
+ this.$message.error('鏂囦欢鍔犺浇澶辫触锛屽彲灏濊瘯涓嬭浇鏂囦欢鏌ョ湅锛�')
+ })
+ this.visible = true
+ },
+ onLoadSuccess (pdf) {
+ // PDF鍔犺浇鎴愬姛鍚庯紝鍙互灏嗗垵濮嬮〉鐮佽缃负绗竴椤�
+ this.pageNum = 1
+ },
+ download (url) {
+ const link = document.createElement('a')
+ // 杩欓噷鏄皢閾炬帴鍦板潃url杞垚blob鍦板潃锛�
+ fetch(url)
+ .then((res) => res.blob())
+ .then((blob) => {
+ link.href = URL.createObjectURL(blob)
+ // 涓嬭浇鏂囦欢鐨勫悕绉板強鏂囦欢绫诲瀷鍚庣紑
+ link.download = this.title
+ document.body.appendChild(link)
+ link.click()
+ // 鍦ㄨ祫婧愪笅杞藉畬鎴愬悗 娓呴櫎 鍗犵敤鐨勭紦瀛樿祫婧�
+ window.URL.revokeObjectURL(link.href)
+ document.body.removeChild(link)
+ })
+ },
+ // 涓嬭浇PDF
+ fileDownload (data, fileName) {
+ const blob = new Blob([data], {
+ // type绫诲瀷鍚庣杩斿洖鏉ョ殑鏁版嵁涓細鏈夛紝鏍规嵁鑷繁瀹為檯杩涜淇敼
+ type: 'application/pdf'
+ })
+ const filename = fileName || 'pdf.pdf'
+ if (typeof window.navigator.msSaveBlob !== 'undefined') {
+ window.navigator.msSaveBlob(blob, filename)
+ } else {
+ var blobURL = URL.createObjectURL(blob)
+ // 鍒涘缓闅愯棌<a>鏍囩杩涜涓嬭浇
+ var tempLink = document.createElement('a')
+ tempLink.style.display = 'none'
+ tempLink.href = blobURL
+ tempLink.setAttribute('download', filename)
+ if (typeof tempLink.download === 'undefined') {
+ tempLink.setAttribute('target', '_blank')
+ }
+ document.body.appendChild(tempLink)
+ tempLink.click()
+ document.body.removeChild(tempLink)
+ window.URL.revokeObjectURL(blobURL)
+ }
+ },
+ // 鎵撳嵃
+ pdfPrintAll () {
+ this.$refs.pdf.print()
+ },
+ // 鏀惧ぇ
+ scaleD () {
+ this.scale += 5
+ this.$refs.pdf.$el.style.width = parseInt(this.scale) + '%'
+ },
+
+ // 缂╁皬
+ scaleX () {
+ // scale 鏄櫨鍒嗙櫨灞曠ず 涓嶅缓璁缉鏀�
+ if (this.scale == 100) {
+ return
+ }
+ this.scale += -5
+ console.log(parseInt(this.scale) + '%')
+ this.$refs.pdf.$el.style.width = parseInt(this.scale) + '%'
+ },
+ // 鍒囨崲涓婁竴椤�
+ prePage () {
+ var p = this.pageNum
+ p = p > 1 ? p - 1 : this.pageTotalNum
+ this.pageNum = p
+ },
+ // 鍒囨崲涓嬩竴椤�
+ nextPage () {
+ var p = this.pageNum
+ p = p < this.pageTotalNum ? p + 1 : 1
+ this.pageNum = p
+ },
+ // pdf 鏈夊瘑鐮� 鍒欓渶瑕佽緭鍏ョ瀵�
+ password (updatePassword, reason) {
+ updatePassword(prompt('password is "test"'))
+ console.log('...reason...')
+ console.log(reason)
+ console.log('...reason...')
+ },
+ // 椤甸潰鍔犺浇鎴愬姛 褰撳墠椤垫暟
+ pageLoaded (e) {
+ console.log('pageLoaded', e)
+ this.$emit('current', e)
+ this.curPageNum = e
+ },
+ // 寮傚父鐩戝惉
+ pdfError (error) {
+ console.error('寮傚父鐩戝惉', error)
+ }
+ // getNumPages() {
+ // let loadingTask = pdf.createLoadingTask(this.pdfUrl);
+ // loadingTask.promise.then(pdf => {
+ // this.numPages = pdf.numPages;
+ // console.log('this.numPages', this.numPages)
+ // }).catch((err) => {
+ // console.error('pdf鍔犺浇澶辫触')
+ // })
+ // },
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+.pdfView {
+ padding: 20px;
+ .show {
+ overflow: auto;
+ margin: auto;
+ max-width: 100%;
+ //height: 80vh;
+ max-height: 100%;
+ border: 2px solid #eee;
+ border-radius: 6px;
+ background-color: #eeeeee;
+ // 婊氬姩鏉℃牱寮�
+ &::-webkit-scrollbar {
+ width: 10px;
+ }
+ &::-webkit-scrollbar-thumb {
+ background-color: #999;
+ border-radius: 6px;
+ }
+ &::-webkit-scrollbar-track {
+ background-color: transparent;
+ border-radius: 6px;
+ }
+ }
+ .pdf_footer {
+ position: fixed;
+ bottom: 10px;
+ font-size: 14px;
+ //left: 0;
+ right: 50px;
+ text-align: right;
+ //width: 50%;
+ padding: 10px 0;
+ background-color: rgba(255, 255, 255, 0.5);
+ .info {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-around;
+ div {
+ //width: 30%;
+ }
+ }
+ .operate {
+ margin: 10px 0 0;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ div {
+ // width: 80px;
+ text-align: center;
+ font-size: 15px;
+ }
+ .btn {
+ cursor: pointer;
+ margin: 5px 10px;
+ width: 120px;
+ border-radius: 10px;
+ padding: 5px;
+ color: #fff;
+ background-color: #3dcbbc;
+ }
+ }
+ }
+}
+</style>
diff --git a/company/src/components/business/OperaSettleClaimsWindow.vue b/company/src/components/business/OperaSettleClaimsWindow.vue
index e6a9076..b887d4e 100644
--- a/company/src/components/business/OperaSettleClaimsWindow.vue
+++ b/company/src/components/business/OperaSettleClaimsWindow.vue
@@ -157,6 +157,10 @@
<div class="desc_list_item_val"> {{model.informantPhone}} </div>
</div>
<div class="desc_list_item" style="width: 100%;">
+ <div class="desc_list_item_label"> 琚繚闄╀汉锛� </div>
+ <div class="desc_list_item_val">{{model.companyName}}</div>
+ </div>
+ <div class="desc_list_item" style="width: 100%;">
<div class="desc_list_item_label"> 浜嬫晠鎻忚堪锛� </div>
<div class="desc_list_item_val">{{model.content}}</div>
</div>
diff --git a/company/src/components/business/OperaSolutionsDescWindow.vue b/company/src/components/business/OperaSolutionsDescWindow.vue
index 4272fe3..cd6eca5 100644
--- a/company/src/components/business/OperaSolutionsDescWindow.vue
+++ b/company/src/components/business/OperaSolutionsDescWindow.vue
@@ -36,7 +36,7 @@
<div class="info_list_item_val">{{form.minAge}}鑷硔{form.maxAge}}</div>
</div>
<div class="info_list_item">
- <div class="info_list_item_label" v-if="form.type !=1">淇濋櫓璐圭敤锛�</div>
+ <div class="info_list_item_label" v-if="form.type !=1">鏂规璐圭敤锛�</div>
<div class="info_list_item_label" v-else>鏈嶅姟璐圭敤锛�</div>
<div class="info_list_item_val">
{{form.price}}鍏�/浜�/
diff --git a/company/src/components/business/OperaSolutionsWindow.vue b/company/src/components/business/OperaSolutionsWindow.vue
index 08f9813..ebc08e4 100644
--- a/company/src/components/business/OperaSolutionsWindow.vue
+++ b/company/src/components/business/OperaSolutionsWindow.vue
@@ -44,7 +44,7 @@
</el-select>
</div>
</el-form-item>
- <el-form-item label="淇濋櫓璐圭敤" prop="price">
+ <el-form-item label="鏂规璐圭敤" prop="price">
<div style="display: flex; align-items: center;">
<el-input v-model="form.price" style="flex: 1;" placeholder="璇疯緭鍏�" v-trim/>
<span style="margin: 0 30px;">鍏�/浜�</span>
@@ -96,14 +96,14 @@
</el-radio-group>
</div>
</el-form-item>
- <el-form-item label="鎵瑰鐢熸晥锛堝ぉ鏁帮級" prop="addValidDays">
+ <el-form-item label="鎵瑰鐢熸晥锛堝ぉ鏁帮級" prop="addValidDays" v-if="form.delOnlyReplace != 1">
<div style="width: 100%; display: flex; align-items: center;">
- <el-input style="margin-left: 20px;" type="number" v-model="form.addValidDays" placeholder="璇疯緭鍏ユ壒澧炵敓鏁堟椂闂达紙澶╂暟锛�" ></el-input>
+ <el-input style="margin-left: 0px;" type="number" v-model="form.addValidDays" placeholder="璇疯緭鍏ユ壒澧炵敓鏁堟椂闂达紙澶╂暟锛�" ></el-input>
</div>
</el-form-item>
<el-form-item label="鎵瑰噺鐢熸晥锛堝ぉ鏁帮級" prop="delValidDays">
<div style="width: 100%; display: flex; align-items: center;">
- <el-input style="margin-left: 20px;" type="number" v-model="form.delValidDays" placeholder="璇疯緭鍏ユ壒鍑忕敓鏁堟椂闂达紙澶╂暟锛�" ></el-input>
+ <el-input style="margin-left: 0px;" type="number" v-model="form.delValidDays" placeholder="璇疯緭鍏ユ壒鍑忕敓鏁堟椂闂达紙澶╂暟锛�" ></el-input>
</div>
</el-form-item>
<el-form-item label="鎶曚繚绫诲瀷" prop="type">
@@ -259,7 +259,7 @@
{ required: true, message: '璇烽�夋嫨鎶曚繚骞撮緞' }
],
price: [
- { required: true, message: '璇疯緭鍏ヤ繚闄╄垂鐢�' }
+ { required: true, message: '璇疯緭鍏ユ柟妗堣垂鐢�' }
],
insureCycleUnit: [
{ required: true, message: '璇疯緭鍏ユ壒鏀硅璐瑰崟浣�' }
diff --git a/company/src/components/business/OperaUnionApplyCheckWindow.vue b/company/src/components/business/OperaUnionApplyCheckWindow.vue
index 1c264ce..9a8da47 100644
--- a/company/src/components/business/OperaUnionApplyCheckWindow.vue
+++ b/company/src/components/business/OperaUnionApplyCheckWindow.vue
@@ -60,14 +60,14 @@
<div class="box_table_head">
<div class="box_table_head_item">搴忓彿</div>
<div class="box_table_head_item">琚繚闄╀汉</div>
- <div class="box_table_head_item">鎶曚繚浜烘暟</div>
+ <div class="box_table_head_item">鍦ㄤ繚/鎶曚繚浜烘暟</div>
<div class="box_table_head_item">鎿嶄綔</div>
<div class="box_table_head_item">鏈嶅姟璐�(褰撳墠淇濆崟)</div>
</div>
<div class="box_table_content" v-for="(item, index) in model.applyList" :key="index">
<div class="box_table_content_item">{{index + 1}}</div>
<div class="box_table_content_item" >{{ item.companyName }}</div>
- <div class="box_table_content_item">{{ item.insureNum }}</div>
+ <div class="box_table_content_item">{{item.guaranteeNum}} / {{ item.insureNum }}</div>
<div class="box_table_content_item">
<el-form-item label="" prop="bxdMultifileList[index]">
<UploadFileLink @remove="deleIndex(1,index)" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileIndex="index" :showTips="showTips" :fileList="model.applyList[index].fileList1" @uploadSuccess="baoxianFileUploaded2" />
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index 35b3080..a1b815a 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -85,6 +85,7 @@
align="center"
label="鎶曚繚浜烘暟">
</el-table-column>
+ <el-table-column prop="guaranteeNum" align="center" label="鍦ㄤ繚浜烘暟" ></el-table-column>
<el-table-column
prop="serviceDays"
align="center"
@@ -460,7 +461,7 @@
<!-- 浼佷笟鐢宠閫�鍥� -->
<applyReturn ref="applyReturn" @success="successEvent" />
<!-- 鏂板鎶曚繚 -->
- <OperaInsuranceApplyAddWindow ref="OperaInsuranceApplyAddWindow" @success="successEvent" />
+ <OperaInsuranceApplyAddWindowNew ref="OperaInsuranceApplyAddWindow" @success="successEvent" />
<!-- 鍔犲噺淇濈敵璇� -->
<additionSubtractionApplication ref="additionSubtractionApplication" @success="successEvent" />
<!-- 鏇存崲娲鹃仯鍗曚綅鐢宠 -->
@@ -470,6 +471,7 @@
<!-- 鏇存崲娲鹃仯鍗曚綅璇︽儏 -->
<OperaApplyChangeUnitDetailWindow ref="OperaApplyChangeUnitDetailWindow" @success="successEvent"/>
<!-- 楠岃瘉鎵嬫満鍙� -->
+ <OperaPdfViewerWindow ref="OperaPdfViewerWindow" />
<operaverifyPhoneNumberWindew ref="operaverifyPhoneNumberWindew" @success="goSign" />
<template v-slot:footer>
<el-button @click="visible=false">杩斿洖</el-button>
@@ -506,10 +508,11 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
-import OperaInsuranceApplyAddWindow from '@/components/enterprise/OperaInsuranceApplyAddWindow'
+import OperaInsuranceApplyAddWindowNew from '@/components/enterprise/OperaInsuranceApplyAddWindowNew'
import GlobalWindow from '@/components/common/GlobalWindow'
import InsuranceDetails from '@/components/business/InsuranceDetails'
import OperaWtbApplyCheckWindow from '@/components/business/OperaWtbApplyCheckWindow'
+import OperaPdfViewerWindow from '@/components/business/OperaPdfViewerWindow'
import additionSubtractionApplication from '@/components/enterprise/additionSubtractionApplication'
import factoryChange from '@/components/enterprise/factoryChange'
import operaverifyPhoneNumberWindew from '@/components/business/operaverifyPhoneNumberWindew'
@@ -537,9 +540,10 @@
components: {
GlobalWindow,
InsuranceDetails,
+ OperaPdfViewerWindow,
OperaWtbApplyCheckWindow,
applyReturn,
- OperaInsuranceApplyAddWindow,
+ OperaInsuranceApplyAddWindowNew,
additionSubtractionApplication,
factoryChange,
OperaApplyChangeDetailWindow,
@@ -793,7 +797,7 @@
exportExcel () {
if (this.activeName === '0') {
exportExcel({
- capacity: 10,
+ capacity: 60000,
page: this.currentPage,
model: {
solutionName: this.tableData[0].solutionsName,
@@ -812,7 +816,7 @@
})
} else {
applyChagneDetailExcel({
- capacity: 10,
+ capacity: 60000,
page: this.currentPage,
model: {
applyId: this.dataId,
@@ -905,27 +909,34 @@
viewToubaodan () {
if (this.model.toubaodanSignedFile && this.model.toubaodanSignedFile.fileurlFull) {
setTimeout(() => {
- window.open(this.model.toubaodanSignedFile.fileurlFull)
+ this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鎶曚繚鍗�',this.model.toubaodanSignedFile.fileurlFull)
+ // window.open(this.model.toubaodanSignedFile.fileurlFull)
}, 500)
} else if (this.model.toubaodanFile && this.model.toubaodanFile.fileurlFull) {
setTimeout(() => {
- window.open(this.model.toubaodanFile.fileurlFull)
+ this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鎶曚繚鍗�',this.model.toubaodanFile.fileurlFull)
+ // window.open(this.model.toubaodanFile.fileurlFull)
}, 500)
}
},
viewBaoxiandan () {
if (this.model.baoxiandanFile && this.model.baoxiandanFile.fileurlFull) {
- window.open(this.model.baoxiandanFile.fileurlFull)
+
+ this.$refs.OperaPdfViewerWindow.open('鏌ョ湅淇濋櫓鍗�',this.model.baoxiandanFile.fileurlFull)
+ // window.open(this.model.baoxiandanFile.fileurlFull)
}
},
viewFanganshu () {
if (this.model.fanganFile && this.model.fanganFile.fileurlFull) {
- window.open(this.model.fanganFile.fileurlFull)
+ this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鏂规纭涔�',this.model.fanganFile.fileurlFull)
+
+ // window.open(this.model.fanganFile.fileurlFull)
}
},
viewShenqingdan () {
- if (this.model.shenqingdanFile && this.model.shenqingdanFile.fileurlFull) {
- window.open(this.model.shenqingdanFile.fileurlFull)
+ if (this.model.shenqingdanFile && this.model.shenqingdanFile.fileurlFull){
+ this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鐢宠鍗�',this.model.shenqingdanFile.fileurlFull)
+ // window.open(this.model.shenqingdanFile.fileurlFull)
}
},
handleSizeChange (val) {
diff --git a/company/src/components/business/detailsEntrustedInsurance.vue b/company/src/components/business/detailsEntrustedInsurance.vue
index 130dae9..54921fd 100644
--- a/company/src/components/business/detailsEntrustedInsurance.vue
+++ b/company/src/components/business/detailsEntrustedInsurance.vue
@@ -62,6 +62,7 @@
align="center"
label="鎶曚繚浜烘暟">
</el-table-column>
+ <el-table-column prop="guaranteeNum" align="center" label="鍦ㄤ繚浜烘暟" ></el-table-column>
<el-table-column
prop="serviceDays"
align="center"
diff --git a/company/src/components/business/detailsPolicyholder.vue b/company/src/components/business/detailsPolicyholder.vue
index b208b78..741f563 100644
--- a/company/src/components/business/detailsPolicyholder.vue
+++ b/company/src/components/business/detailsPolicyholder.vue
@@ -16,7 +16,7 @@
<div class="box_table_head_item" style="flex:2">淇濋櫓鏂规</div>
<div class="box_table_head_item" style="flex:2">淇濋櫓鐢熸晥璧锋湡</div>
<div class="box_table_head_item" style="flex:2">淇濋櫓鐢熸晥姝㈡湡</div>
- <div class="box_table_head_item">鎶曚繚浜烘暟</div>
+ <div class="box_table_head_item">鍦ㄤ繚/鎶曚繚浜烘暟</div>
<div class="box_table_head_item">鎬昏垂鐢�(鍏�)</div>
</div>
<div class="box_table_content " >
@@ -24,7 +24,7 @@
<div class="box_table_content_item box_table_content_header" style="flex:2"><span>{{ model.solutionName }}</span></div>
<div class="box_table_content_item box_table_content_header" style="flex:2">{{ model.applyStartTime }}</div>
<div class="box_table_content_item box_table_content_header" style="flex:2">{{ model.applyEndTime }}</div>
- <div class="box_table_content_item box_table_content_header">{{ model.insureNum }}</div>
+ <div class="box_table_content_item box_table_content_header">{{ model.guaranteeNum }} / {{ model.insureNum }}</div>
<div class="box_table_content_item box_table_content_header" >{{model.solutionType==0?model.totalPrice:model.totalPrice}}</div>
</div>
</div>
diff --git a/company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue b/company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue
index 7232ab8..7e8a4ab 100644
--- a/company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue
+++ b/company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue
@@ -168,10 +168,10 @@
<confirmJobType ref="confirmJobType" @result="getUser" />
<!-- 鏌ョ湅璇﹀崟 -->
<detailsPolicyholder ref="detailsPolicyholder" @success="successEvent" />
-<!-- <!– 鐩翠繚鎶曚繚璇︽儏 –>
+ <!-- 鐩翠繚鎶曚繚璇︽儏 -->
<OperaInsuranceApplyDetails ref="OperaInsuranceApplyDetails" />
- <!– 濮旀墭鎶曚繚璇︽儏 –>
- <OperaWtbApplyShopWindow ref="OperaWtbApplyShopWindow" />-->
+ <!-- 濮旀墭鎶曚繚璇︽儏 -->
+ <OperaWtbApplyShopWindow ref="OperaWtbApplyShopWindow" />
</GlobalWindow>
</template>
@@ -183,8 +183,8 @@
import importEmployees from '@/components/enterprise/importEmployees'
import confirmJobType from '@/components/enterprise/confirmJobType'
import detailsPolicyholder from '@/components/business/detailsPolicyholder'
-// import OperaInsuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
-// import OperaWtbApplyShopWindow from '@/components/business/OperaWtbApplyShopWindow'
+import OperaInsuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
+import OperaWtbApplyShopWindow from '@/components/business/OperaWtbApplyShopWindow'
import { all, getNewVersion } from '@/api/business/solutions'
import { mapState } from 'vuex'
import { create, getCountCyclePriceVO, getDetail, findList, updateData } from '@/api/business/insuranceApply'
@@ -192,11 +192,11 @@
// Vue.component(UTable.name, UTable);
// Vue.component(UTableColumn.name, UTableColumn);
export default {
- name: 'OperaInsuranceApplyAddWindow',
+ name: 'OperaInsuranceApplyAddWindowNew',
extends: BaseOpera,
components: {
GlobalWindow, selectEmployees, addEmployee, importEmployees, confirmJobType, detailsPolicyholder, UTable, UTableColumn
- // , OperaWtbApplyShopWindow, OperaInsuranceApplyDetails
+ , OperaWtbApplyShopWindow, OperaInsuranceApplyDetails
},
data () {
return {
@@ -264,11 +264,11 @@
console.log(res)
this.visible = false
if (this.item.type == 1) {
- // this.$refs.OperaWtbApplyShopWindow.open('濮旀墭鎶曚繚璇︽儏', { id: res })
this.$emit('success', 1, { id: res })
+ this.$refs.OperaWtbApplyShopWindow.open('濮旀墭鎶曚繚璇︽儏', { id: res })
} else {
- // this.$refs.OperaInsuranceApplyDetails.open('鎶曚繚璇︽儏', { id: res })
this.$emit('success', 1, { id: res })
+ this.$refs.OperaInsuranceApplyDetails.open('鎶曚繚璇︽儏', { id: res })
}
this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
// this.$emit('success','濮旀墭鎶曚繚璇︽儏', { id: res })
diff --git a/company/src/components/enterprise/OperaInsuranceApplyAddWindow2.vue b/company/src/components/enterprise/OperaInsuranceApplyAddWindowNew.vue
similarity index 81%
rename from company/src/components/enterprise/OperaInsuranceApplyAddWindow2.vue
rename to company/src/components/enterprise/OperaInsuranceApplyAddWindowNew.vue
index a30989d..7e8a4ab 100644
--- a/company/src/components/enterprise/OperaInsuranceApplyAddWindow2.vue
+++ b/company/src/components/enterprise/OperaInsuranceApplyAddWindowNew.vue
@@ -48,17 +48,17 @@
placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</el-form-item>
- <el-form-item label="鎶曚繚骞撮緞" v-if="item">
+<!-- <el-form-item label="鎶曚繚骞撮緞" v-if="item && item.id !=null">
<span>{{item.minAge}} 鑷� {{item.maxAge}}</span>
</el-form-item>
- <el-form-item label="璐圭敤" v-if="item && item.type ==0">
+ <el-form-item label="璐圭敤" v-if="item && item.id !=null">
<span>{{item.price}}鍏�</span>
<span v-if="item.timeUnit === 0">/澶�</span>
<span v-if="item.timeUnit === 1">/鍗婃湀</span>
<span v-if="item.timeUnit === 2">/鏈�</span>
<span v-if="item.timeUnit === 3">/骞�</span>
<span>/浜�</span>
- </el-form-item>
+ </el-form-item>-->
</el-form>
</div>
<div class="btns">
@@ -69,35 +69,52 @@
<el-button type="danger" @click="deleItem">鍒犻櫎</el-button>
</div>
<div class="btns_item">
+ <div style="display: inline-block;margin-right: 30px;font-size: 14px" v-if="item && item.id !=null">
+ <span>鎶曚繚骞撮緞锛�</span>
+ <span>{{item.minAge}} 鑷� {{item.maxAge}}鍛ㄥ瞾</span>
+ <span style="margin-left: 20px">璐圭敤锛�</span>
+ <span>{{item.price}}鍏�</span>
+ <span v-if="item.timeUnit === 0">/澶�</span>
+ <span v-if="item.timeUnit === 1">/鍗婃湀</span>
+ <span v-if="item.timeUnit === 2">/鏈�</span>
+ <span v-if="item.timeUnit === 3">/骞�</span>
+ <span>/浜�</span>
+ </div>
+ <div style="display: inline-block;margin-right: 30px;font-size: 14px"><span>鍚堣璐圭敤锛�</span>
+ <span style="font-weight: bold;color: red">{{sumFee}}</span>鍏�
+ </div>
<el-button type="primary" @click="sele">閫夊彇娲鹃仯鍗曚綅</el-button>
</div>
</div>
- <el-table
+<!-- show-summary
+ :summary-method="getSummaries"-->
+ <u-table
:data="tableData"
border
- show-summary
- :summary-method="getSummaries"
+ use-virtual
+ :row-height="30"
+ :height="680"
ref="multipleTable"
@selection-change="handleSelectionChange"
style="width: 100%;margin-bottom: 15px;">
- <el-table-column
+ <u-table-column
type="selection"
width="55">
- </el-table-column>
- <el-table-column label="搴忓彿" width="80px">
+ </u-table-column>
+ <u-table-column label="搴忓彿" width="80px">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
- </el-table-column>
- <el-table-column
+ </u-table-column>
+ <u-table-column
prop="memberName"
label="濮撳悕">
- </el-table-column>
- <el-table-column
+ </u-table-column>
+ <u-table-column
prop="idCard"
label="韬唤璇佸彿">
- </el-table-column>
- <el-table-column
+ </u-table-column>
+ <u-table-column
label="骞撮緞">
<template slot-scope="{row}">
<template v-if="item">
@@ -105,37 +122,37 @@
<span v-else>{{ getAgeByIdCard(row.idCard) }}</span>
</template>
</template>
- </el-table-column>
- <el-table-column
+ </u-table-column>
+ <u-table-column
prop="duName"
label="娲鹃仯鍗曚綅">
- </el-table-column>
- <el-table-column
+ </u-table-column>
+ <u-table-column
prop="workTypeName"
label="鎵�灞炲伐绉�">
- </el-table-column>
- <el-table-column
+ </u-table-column>
+ <u-table-column
prop="fee"
label="璐圭敤">
<template slot-scope="{row}">
- {{item.type==1?row.fee:row.fee}}
+ {{row.fee}}
</template>
- </el-table-column>
- <el-table-column
+ </u-table-column>
+ <u-table-column
prop="remark"
align="center"
label="澶囨敞">
<template slot-scope="{row}">
<el-input v-model="row.remark" placeholder="璇疯緭鍏�"></el-input>
</template>
- </el-table-column>
- <el-table-column
+ </u-table-column>
+ <u-table-column
label="鎿嶄綔">
<template slot-scope="scope">
<el-button type="text" style="color: red;" @click="dele(scope.$index)">鍒犻櫎</el-button>
</template>
- </el-table-column>
- </el-table>
+ </u-table-column>
+ </u-table>
<div class="info" v-if="item">
<span v-if="item.specialAgreement" v-html="item.specialAgreement"></span>
<span v-if="item.specialInfo" v-html="item.specialInfo"> </span>
@@ -151,10 +168,10 @@
<confirmJobType ref="confirmJobType" @result="getUser" />
<!-- 鏌ョ湅璇﹀崟 -->
<detailsPolicyholder ref="detailsPolicyholder" @success="successEvent" />
-<!-- <!– 鐩翠繚鎶曚繚璇︽儏 –>
+ <!-- 鐩翠繚鎶曚繚璇︽儏 -->
<OperaInsuranceApplyDetails ref="OperaInsuranceApplyDetails" />
- <!– 濮旀墭鎶曚繚璇︽儏 –>
- <OperaWtbApplyShopWindow ref="OperaWtbApplyShopWindow" />-->
+ <!-- 濮旀墭鎶曚繚璇︽儏 -->
+ <OperaWtbApplyShopWindow ref="OperaWtbApplyShopWindow" />
</GlobalWindow>
</template>
@@ -166,20 +183,24 @@
import importEmployees from '@/components/enterprise/importEmployees'
import confirmJobType from '@/components/enterprise/confirmJobType'
import detailsPolicyholder from '@/components/business/detailsPolicyholder'
-// import OperaInsuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
-// import OperaWtbApplyShopWindow from '@/components/business/OperaWtbApplyShopWindow'
+import OperaInsuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
+import OperaWtbApplyShopWindow from '@/components/business/OperaWtbApplyShopWindow'
import { all, getNewVersion } from '@/api/business/solutions'
import { mapState } from 'vuex'
import { create, getCountCyclePriceVO, getDetail, findList, updateData } from '@/api/business/insuranceApply'
+import { UTable, UTableColumn } from 'umy-ui'
+// Vue.component(UTable.name, UTable);
+// Vue.component(UTableColumn.name, UTableColumn);
export default {
- name: 'OperaInsuranceApplyAddWindow',
+ name: 'OperaInsuranceApplyAddWindowNew',
extends: BaseOpera,
components: {
- GlobalWindow, selectEmployees, addEmployee, importEmployees, confirmJobType, detailsPolicyholder
- // , OperaWtbApplyShopWindow, OperaInsuranceApplyDetails
+ GlobalWindow, selectEmployees, addEmployee, importEmployees, confirmJobType, detailsPolicyholder, UTable, UTableColumn
+ , OperaWtbApplyShopWindow, OperaInsuranceApplyDetails
},
data () {
return {
+ sumFee:0,
form: {
id: null,
ID: null,
@@ -215,6 +236,17 @@
computed: {
...mapState(['userInfo'])
},
+ watch: {
+ // 鐩戝惉tableData鐨勫彉鍖�
+ tableData: {
+ deep: true,
+ handler(newVal, oldVal) {
+ // 鏁版嵁鍙樺寲鏃剁殑澶勭悊閫昏緫
+ this.getSummaries2()
+ console.log(this.tableData.length)
+ }
+ }
+ },
methods: {
successEvent () {
const arr = JSON.parse(JSON.stringify(this.tableData))
@@ -232,11 +264,11 @@
console.log(res)
this.visible = false
if (this.item.type == 1) {
- // this.$refs.OperaWtbApplyShopWindow.open('濮旀墭鎶曚繚璇︽儏', { id: res })
this.$emit('success', 1, { id: res })
+ this.$refs.OperaWtbApplyShopWindow.open('濮旀墭鎶曚繚璇︽儏', { id: res })
} else {
- // this.$refs.OperaInsuranceApplyDetails.open('鎶曚繚璇︽儏', { id: res })
this.$emit('success', 1, { id: res })
+ this.$refs.OperaInsuranceApplyDetails.open('鎶曚繚璇︽儏', { id: res })
}
this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
// this.$emit('success','濮旀墭鎶曚繚璇︽儏', { id: res })
@@ -316,25 +348,37 @@
this.changeSolution1(res.solutionId)
})
},
- getSummaries (param) {
- const { columns, data } = param
+ getSummaries ({ columns, data }) {
const sums = []
+ // this.currentData = data; //璁板綍褰撳墠椤垫暟鎹�;
columns.forEach((column, index) => {
- if (index === 0) {
+ if (index == 0) {
sums[index] = '鎬讳环'
- } else if (index === 7) {
- if (this.item || this.item.type == 1) {
- sums[index] = '-'
- } else {
- let total = 0
- this.tableData.forEach(item => {
- total += item.fee
- })
- sums[index] = total.toFixed(2)
- }
+ } else if (index == 7) {
+ // if (this.item || this.item.type == 1) {
+ // sums[index] = '-'
+ // } else {
+ let total = 0
+ this.tableData.forEach(item => {
+ total += item.fee
+ })
+ sums[index] = total.toFixed(2)
+ // }
+ }else {
+ sums[index] = ''
}
})
+ console.log(sums)
return sums
+ },
+ getSummaries2 () {
+ this.sumFee = 0;
+ if(this.tableData&&this.tableData.length){
+ this.tableData.forEach((column, index) => {
+ this.sumFee = parseFloat(this.sumFee) + parseFloat(column.fee)
+ })
+ this.sumFee = (this.sumFee || 0).toFixed(2)
+ }
},
deleItem () {
if (this.seleData.length === 0) {
@@ -348,6 +392,7 @@
}
})
})
+ // this.getSummaries2()
},
confirm () {
this.$refs.form.validate((valid) => {
@@ -447,14 +492,15 @@
},
// 鍒囨崲鏂规
changeSolution (e) {
+ this.sumFee =0;
this.form.applyEndTime = ''
this.form.applyStartTime = ''
if (!this.form.id) {
this.tableData = []
} else {
- this.price = ''
+ this.price = 0
this.tableData.forEach(item => {
- item.fee = ''
+ item.fee = 0
item.duName = ''
item.duId = ''
item.workTypeName = ''
@@ -463,11 +509,11 @@
}
this.company.forEach(item => {
if (item.id === e) {
- // this.price = item.price
+ this.price = item.price
this.item = item
- /* if (this.item && this.item.type == 1) {
- this.item.fee = 0
- }*/
+ // if (this.item && this.item.type == 1) {
+ // this.item.fee = 0
+ // }
this.updatePickerOptions()
}
})
@@ -482,23 +528,21 @@
this.form.solutionId = res.id
this.company.forEach(item => {
if (item.id === res.id) {
- // this.price = item.price
+ this.price = item.price
this.item = item
- if (this.item && this.item.type == 1) {
- this.item.fee = 0
- }
this.updatePickerOptions()
}
})
})
this.tableData.forEach(item => {
- if(this.item.type != 0){
+ // if (this.item.type != 0) {
item.fee = this.price
- }
+ // }
})
},
dele (index) {
this.tableData.splice(index, 1)
+ // this.getSummaries2()
},
getUser (obj) {
this.seleData.forEach(id => {
@@ -562,6 +606,7 @@
},
getValue (list) {
this.tableData.push(...list)
+ this.getSummaries2()
}
}
}
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index 2a266d5..39ca24b 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -71,6 +71,11 @@
label="鎶曚繚浜烘暟">
</el-table-column>
<el-table-column
+ prop="guaranteeNum"
+ align="center"
+ label="鍦ㄤ繚浜烘暟">
+ </el-table-column>
+ <el-table-column
prop="serviceDays"
align="center"
label="淇濆崟鏃堕暱锛堝ぉ锛�">
diff --git a/company/src/components/enterprise/editFactoryChange.vue b/company/src/components/enterprise/editFactoryChange.vue
index 0af7254..45740b1 100644
--- a/company/src/components/enterprise/editFactoryChange.vue
+++ b/company/src/components/enterprise/editFactoryChange.vue
@@ -69,6 +69,7 @@
align="center"
label="鎶曚繚浜烘暟">
</el-table-column>
+ <el-table-column prop="guaranteeNum" align="center" label="鍦ㄤ繚浜烘暟" ></el-table-column>
<el-table-column
prop="serviceDays"
align="center"
diff --git a/company/src/components/enterprise/factoryChange.vue b/company/src/components/enterprise/factoryChange.vue
index 5bb8f33..a294193 100644
--- a/company/src/components/enterprise/factoryChange.vue
+++ b/company/src/components/enterprise/factoryChange.vue
@@ -69,6 +69,7 @@
align="center"
label="鎶曚繚浜烘暟">
</el-table-column>
+ <el-table-column prop="guaranteeNum" align="center" label="鍦ㄤ繚浜烘暟" ></el-table-column>
<el-table-column
prop="serviceDays"
align="center"
diff --git a/company/src/components/enterprise/reinsurance.vue b/company/src/components/enterprise/reinsurance.vue
index 211dafc..8fffa28 100644
--- a/company/src/components/enterprise/reinsurance.vue
+++ b/company/src/components/enterprise/reinsurance.vue
@@ -70,6 +70,7 @@
align="center"
label="鎶曚繚浜烘暟">
</el-table-column>
+ <el-table-column prop="guaranteeNum" align="center" label="鍦ㄤ繚浜烘暟" ></el-table-column>
<el-table-column
prop="serviceDays"
align="center"
diff --git a/company/src/components/enterprise/renewalInsurance.vue b/company/src/components/enterprise/renewalInsurance.vue
index 2d422a5..6638b2a 100644
--- a/company/src/components/enterprise/renewalInsurance.vue
+++ b/company/src/components/enterprise/renewalInsurance.vue
@@ -27,6 +27,7 @@
</template>
</el-table-column>
<el-table-column prop="insureNum" label="鎶曚繚浜烘暟"></el-table-column>
+ <el-table-column prop="guaranteeNum" label="鍦ㄤ繚浜烘暟" ></el-table-column>
<el-table-column label="鎶曚繚鏃堕暱锛堝ぉ锛�">
<template slot-scope="{row}">
<span>{{row.serviceDays < 0 ? `-` : row.serviceDays}}</span>
diff --git a/company/src/views/business/insuranceApply.vue b/company/src/views/business/insuranceApply.vue
index 4eb4b0d..9babd40 100644
--- a/company/src/views/business/insuranceApply.vue
+++ b/company/src/views/business/insuranceApply.vue
@@ -70,6 +70,7 @@
<el-table-column prop="companyName" label="鎶曚繚浼佷笟" min-width="100px"></el-table-column>
<el-table-column prop="solutionsName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
<el-table-column prop="insureNum" label="鎶曚繚浜烘暟" min-width="100px"></el-table-column>
+ <el-table-column prop="guaranteeNum" label="鍦ㄤ繚浜烘暟" min-width="100px"></el-table-column>
<el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
<el-table-column
diff --git a/company/src/views/business/insuranceApplyShop.vue b/company/src/views/business/insuranceApplyShop.vue
index 44a477f..138eb2e 100644
--- a/company/src/views/business/insuranceApplyShop.vue
+++ b/company/src/views/business/insuranceApplyShop.vue
@@ -70,6 +70,7 @@
<el-table-column prop="companyName" label="鎶曚繚浼佷笟" min-width="100px"></el-table-column>
<el-table-column prop="solutionsName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
<el-table-column prop="insureNum" label="鎶曚繚浜烘暟" min-width="100px"></el-table-column>
+ <el-table-column prop="guaranteeNum" label="鍦ㄤ繚浜烘暟" min-width="100px"></el-table-column>
<el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
<el-table-column
diff --git a/company/src/views/business/policyList.vue b/company/src/views/business/policyList.vue
index a30c0b4..79d8915 100644
--- a/company/src/views/business/policyList.vue
+++ b/company/src/views/business/policyList.vue
@@ -74,6 +74,7 @@
<el-table-column prop="solutionsName" label="淇濋櫓鏂规" align="center" min-width="100px"></el-table-column>
<el-table-column prop="code" label="淇濆崟鍙�" align="center" min-width="100px"></el-table-column>
<el-table-column prop="insureNum" label="鎶曚繚浜烘暟" align="center" min-width="100px"></el-table-column>
+ <el-table-column prop="guaranteeNum" label="鍦ㄤ繚浜烘暟" align="center" min-width="100px"></el-table-column>
<el-table-column prop="serviceDays" align="center" label="淇濆崟鏃堕暱锛堝ぉ锛�"> </el-table-column>
<el-table-column prop="currentFee" align="center" label="宸蹭骇鐢熻垂鐢�(鍏�)"></el-table-column>
<el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級" align="center" min-width="100px"></el-table-column>
diff --git a/company/src/views/business/solutions.vue b/company/src/views/business/solutions.vue
index 9536699..7fe6a82 100644
--- a/company/src/views/business/solutions.vue
+++ b/company/src/views/business/solutions.vue
@@ -54,7 +54,7 @@
</el-table-column>
<!-- <el-table-column prop="addValidDays" label="鎵瑰鐢熸晥鏃堕棿" min-width="100px"> </el-table-column>
<el-table-column prop="delValidDays" label="鎵瑰噺鐢熸晥鏃堕棿" min-width="100px"> </el-table-column>-->
- <el-table-column label="淇濋櫓璐圭敤" min-width="100px">
+ <el-table-column label="鏂规璐圭敤" min-width="100px">
<template slot-scope="{row}">
<span>{{row.price}}鍏�/浜�/</span>
<span v-if="row.timeUnit === 0">澶�</span>
@@ -65,7 +65,7 @@
<span v-if="row.timeUnit === 5">骞�</span>
</template>
</el-table-column>
- <el-table-column label="濮旀墭绫诲瀷" min-width="120px" align="center">
+ <el-table-column label="鎶曚繚绫诲瀷" min-width="120px" align="center">
<template slot-scope="{row}">
<span v-if="row.type === 0">鐩翠繚</span>
<span v-if="row.type === 1">濮旀墭<div style="color: blue;display: block" >{{row.shopName||'-'}}</div></span>
diff --git a/company/src/views/business/unionApply.vue b/company/src/views/business/unionApply.vue
index 5c7d707..4c93380 100644
--- a/company/src/views/business/unionApply.vue
+++ b/company/src/views/business/unionApply.vue
@@ -59,6 +59,7 @@
</el-table-column>
<el-table-column prop="solutionName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
<el-table-column prop="insureNum" label="鎶曚繚浜烘暟" min-width="100px"></el-table-column>
+ <el-table-column prop="guaranteeNum" label="鍦ㄤ繚浜烘暟"></el-table-column>
<el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
<el-table-column
diff --git a/company/src/views/enterprise/insuranceApply.vue b/company/src/views/enterprise/insuranceApply.vue
index d316324..3db129b 100644
--- a/company/src/views/enterprise/insuranceApply.vue
+++ b/company/src/views/enterprise/insuranceApply.vue
@@ -69,6 +69,7 @@
</template>
</el-table-column>
<el-table-column prop="insureNum" label="鎶曚繚浜烘暟"></el-table-column>
+ <el-table-column prop="guaranteeNum" label="鍦ㄤ繚浜烘暟"></el-table-column>
<el-table-column label="鎶曚繚鏃堕暱锛堝ぉ锛�">
<template slot-scope="{row}">
<span>{{(row.serviceDays - row.loseEfficacyDays) < 0 ? `-` : row.serviceDays - row.loseEfficacyDays}}</span>
@@ -112,7 +113,6 @@
<OperaInsuranceApplyDetails ref="OperaInsuranceApplyDetails" @success="handlePageChange" />
</TableLayout>
</template>
-
<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
diff --git a/company/src/views/enterprise/myPolicy.vue b/company/src/views/enterprise/myPolicy.vue
index 0c1ca3f..91636c2 100644
--- a/company/src/views/enterprise/myPolicy.vue
+++ b/company/src/views/enterprise/myPolicy.vue
@@ -100,6 +100,7 @@
</template>
</el-table-column>
<el-table-column prop="insureNum" label="鎶曚繚浜烘暟"></el-table-column>
+ <el-table-column prop="guaranteeNum" label="鍦ㄤ繚浜烘暟"></el-table-column>
<el-table-column label="鎶曚繚鏃堕暱锛堝ぉ锛�">
<template slot-scope="{row}">
<span>{{(row.serviceDays - row.loseEfficacyDays) < 0 ? `-` : row.serviceDays - row.loseEfficacyDays}}</span>
--
Gitblit v1.9.3