xin

pages/CompanyInfo/CompanyDetails/CompanyDetails.vue

@@ -119,14 +119,18 @@
 							<text class="right_title right_title2" v-if="item.status == 4">已电子盖章</text>
 							<text class="right_title right_title2" v-if="item.status == 5">已生效</text>
 						</view>
-						<view>合同甲方: {{item.contractA}}</view>
+						<view>合同甲方: {{item.ename}}</view>
+						<!-- <view>合同乙方: {{item.contractB}}</view> -->
 						<view>合同乙方: {{item.contractB}}</view>
 						<view>合同电量: {{item.electricity}}万kWh</view>
 						<!-- 固定价差 -->
 						<view v-if="item.contractType == 1||item.contractType == 5||item.contractType == 6">合同类型: 固定价差
 						</view>
-						<view v-if="item.contractType == 1||item.contractType == 5||item.contractType == 6">合同金额:
+						<!-- <view v-if="item.contractType == 1||item.contractType == 5||item.contractType == 6">合同金额:
 							{{item.fixedSpread}}厘
+						</view> -->
+						<view v-if="item.contractType == 1||item.contractType == 5||item.contractType == 6">合同金额:
+							{{item.price}}厘
 						</view>
 						<!-- 分时价差 -->
 						<view v-if="item.contractType == 2||item.contractType == 7||item.contractType == 8">合同类型: 分时价差

pagesA/Contracts/attachment/attachment.vue

@@ -19,7 +19,15 @@
 			let id = options.id
 			if (options.urlArr) {
 				// 如果是电客开局
-				let arr = JSON.parse(options.urlArr)
+				console.log('options.urlArr===',options.urlArr)
+				let arr 
+				if(options.urlArr.indexOf(',')>=0){
+					arr = options.urlArr.split(',')
+				}else{
+					arr = []
+					arr.push(options.urlArr)
+				}
+				
 				if (arr.length == 0) {
 					// 如果没有附件
 					get(api.downloadContractTemplate, {
@@ -63,7 +71,13 @@
 				} else {
 					// 如果是图片
 					// this.imgList.push(url)
-					this.imgList=JSON.parse(url)
+					if(url.indexOf(',')>=0){
+						this.imgList=url.split(',')
+					}else{
+						this.imgList=[]
+						this.imgList.push(url)
+					}
+					
 					this.isImage = true
 				}
 			}

unpackage/dist/build/mp-weixin/pages/CompanyInfo/CompanyDetails/CompanyDetails.js

-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/CompanyInfo/CompanyDetails/CompanyDetails"],{"065e":function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a=r(n("9036")),i=n("86df");function r(t){return t&&t.__esModule?t:{default:t}}var u={onLoad:function(t){var e=this;this.enterpriseId=t.id,this.getEnterpriseCertificationDetail(this.enterpriseId),(0,i.get)(a.default.getIndustryList).then((function(t){if(200==t.code){var n=t.data;e.industryName=t.data[0].industryName;n.filter((function(t){return t.type==e.type}))}}))},data:function(){return{tab:1,enterpriseId:"",companydata:{},type:"",industryName:"",contractdata:[],tabShow:!1,tableList:[]}},methods:{tabclick:function(t){this.tab=t,2==t&&this.getEnterpriseContractDetail(this.enterpriseId)},lookEnclosure:function(e,n){t.navigateTo({url:"/pagesA/Contracts/attachment/attachment?url="+e+"&id="+n})},lookPrice:function(){console.log("1111111"),this.tabShow=!0},getEnterpriseCertificationDetail:function(t){var e=this;(0,i.get)(a.default.getEnterpriseCertificationDetail,{enterpriseId:t}).then((function(t){200==t.code&&(e.companydata=t.data,e.type=t.data.industry)}))},getEnterpriseContractDetail:function(t){var e=this;(0,i.get)(a.default.getEnterpriseContractDetail,{enterpriseId:t}).then((function(t){200==t.code&&(e.contractdata=t.data,e.tableList=t.data.timeSharingSpreadRelatedList)}))}}};e.default=u}).call(this,n("543d")["default"])},"1e85":function(t,e,n){"use strict";n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return r})),n.d(e,"a",(function(){return a}));var a={uTable:function(){return n.e("uview-ui/components/u-table/u-table").then(n.bind(null,"2d78"))},uTr:function(){return n.e("uview-ui/components/u-tr/u-tr").then(n.bind(null,"07a0"))},uTd:function(){return n.e("uview-ui/components/u-td/u-td").then(n.bind(null,"5619"))}},i=function(){var t=this,e=t.$createElement;t._self._c;t._isMounted||(t.e0=function(e){t.tabShow=!1})},r=[]},"5c8c":function(t,e,n){},"74d6":function(t,e,n){"use strict";var a=n("5c8c"),i=n.n(a);i.a},"7f02":function(t,e,n){"use strict";n.r(e);var a=n("1e85"),i=n("eca0");for(var r in i)"default"!==r&&function(t){n.d(e,t,(function(){return i[t]}))}(r);n("74d6");var u,o=n("f0c5"),c=Object(o["a"])(i["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],u);e["default"]=c.exports},c809:function(t,e,n){"use strict";(function(t){n("78ef");a(n("66fd"));var e=a(n("7f02"));function a(t){return t&&t.__esModule?t:{default:t}}t(e.default)}).call(this,n("543d")["createPage"])},eca0:function(t,e,n){"use strict";n.r(e);var a=n("065e"),i=n.n(a);for(var r in a)"default"!==r&&function(t){n.d(e,t,(function(){return a[t]}))}(r);e["default"]=i.a}},[["c809","common/runtime","common/vendor"]]]);
\ No newline at end of file
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/CompanyInfo/CompanyDetails/CompanyDetails"],{"065e":function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a=r(n("9036")),i=n("86df");function r(t){return t&&t.__esModule?t:{default:t}}var u={onLoad:function(t){var e=this;this.enterpriseId=t.id,this.getEnterpriseCertificationDetail(this.enterpriseId),(0,i.get)(a.default.getIndustryList).then((function(t){if(200==t.code){var n=t.data;e.industryName=t.data[0].industryName;n.filter((function(t){return t.type==e.type}))}}))},data:function(){return{tab:1,enterpriseId:"",companydata:{},type:"",industryName:"",contractdata:[],tabShow:!1,tableList:[]}},methods:{tabclick:function(t){this.tab=t,2==t&&this.getEnterpriseContractDetail(this.enterpriseId)},lookEnclosure:function(e,n){t.navigateTo({url:"/pagesA/Contracts/attachment/attachment?url="+e+"&id="+n})},lookPrice:function(){console.log("1111111"),this.tabShow=!0},getEnterpriseCertificationDetail:function(t){var e=this;(0,i.get)(a.default.getEnterpriseCertificationDetail,{enterpriseId:t}).then((function(t){200==t.code&&(e.companydata=t.data,e.type=t.data.industry)}))},getEnterpriseContractDetail:function(t){var e=this;(0,i.get)(a.default.getEnterpriseContractDetail,{enterpriseId:t}).then((function(t){200==t.code&&(e.contractdata=t.data,e.tableList=t.data.timeSharingSpreadRelatedList)}))}}};e.default=u}).call(this,n("543d")["default"])},"5c8c":function(t,e,n){},6858:function(t,e,n){"use strict";n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return r})),n.d(e,"a",(function(){return a}));var a={uTable:function(){return n.e("uview-ui/components/u-table/u-table").then(n.bind(null,"2d78"))},uTr:function(){return n.e("uview-ui/components/u-tr/u-tr").then(n.bind(null,"07a0"))},uTd:function(){return n.e("uview-ui/components/u-td/u-td").then(n.bind(null,"5619"))}},i=function(){var t=this,e=t.$createElement;t._self._c;t._isMounted||(t.e0=function(e){t.tabShow=!1})},r=[]},"74d6":function(t,e,n){"use strict";var a=n("5c8c"),i=n.n(a);i.a},"7f02":function(t,e,n){"use strict";n.r(e);var a=n("6858"),i=n("eca0");for(var r in i)"default"!==r&&function(t){n.d(e,t,(function(){return i[t]}))}(r);n("74d6");var u,o=n("f0c5"),c=Object(o["a"])(i["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],u);e["default"]=c.exports},c809:function(t,e,n){"use strict";(function(t){n("78ef");a(n("66fd"));var e=a(n("7f02"));function a(t){return t&&t.__esModule?t:{default:t}}t(e.default)}).call(this,n("543d")["createPage"])},eca0:function(t,e,n){"use strict";n.r(e);var a=n("065e"),i=n.n(a);for(var r in a)"default"!==r&&function(t){n.d(e,t,(function(){return a[t]}))}(r);e["default"]=i.a}},[["c809","common/runtime","common/vendor"]]]);
\ No newline at end of file

unpackage/dist/build/mp-weixin/pagesA/Contracts/attachment/attachment.js

-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesA/Contracts/attachment/attachment"],{"22cf":function(t,e,n){"use strict";(function(t){n("78ef");o(n("66fd"));var e=o(n("7f93"));function o(t){return t&&t.__esModule?t:{default:t}}t(e.default)}).call(this,n("543d")["createPage"])},"7f93":function(t,e,n){"use strict";n.r(e);var o=n("f3d4"),a=n("b140");for(var c in a)"default"!==c&&function(t){n.d(e,t,(function(){return a[t]}))}(c);n("d273");var l,u=n("f0c5"),i=Object(u["a"])(a["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],l);e["default"]=i.exports},"833c":function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o=n("86df"),a=c(n("9036"));function c(t){return t&&t.__esModule?t:{default:t}}var l={onLoad:function(t){var e=this;console.log(t);var n=t.id;if(t.urlArr){var c=JSON.parse(t.urlArr);if(0==c.length)(0,o.get)(a.default.downloadContractTemplate,{contractId:n}).then((function(t){if(200==t.code){console.log(t);var n=t.data.replace("http","https");e.openPdf(n)}}));else if(1==c.length&&(c[0].lastIndexOf(".pdf")>-1||c[0].lastIndexOf(".docx")>-1)){var l=c[0].replace("http","https");this.openPdf(l)}else this.imgList=c,this.isImage=!0}if(t.url){var u=t.url;"null"==u?(0,o.get)(a.default.downloadContractTemplate,{contractId:n}).then((function(t){if(200==t.code){console.log(t);var n=t.data.replace("http","https");e.openPdf(n)}})):u.lastIndexOf(".pdf")>-1||u.lastIndexOf(".docx")>-1?(u=u.replace("http","https"),console.log(u),this.openPdf(u)):(this.imgList=JSON.parse(u),this.isImage=!0)}},data:function(){return{imgList:[],isImage:!1}},methods:{openPdf:function(e){t.downloadFile({url:e,success:function(e){200==e.statusCode&&t.saveFile({tempFilePath:e.tempFilePath,success:function(e){console.log(e),t.showToast({icon:"none",mask:!0,duration:3e3});var n=e.savedFilePath;t.openDocument({filePath:n,showMenu:!0,success:function(){console.log("打开文档成功")}})},fail:function(e){t.showToast({title:"下载失败",icon:"none"})}})}})}}};e.default=l}).call(this,n("543d")["default"])},b140:function(t,e,n){"use strict";n.r(e);var o=n("833c"),a=n.n(o);for(var c in o)"default"!==c&&function(t){n.d(e,t,(function(){return o[t]}))}(c);e["default"]=a.a},d273:function(t,e,n){"use strict";var o=n("d5ab"),a=n.n(o);a.a},d5ab:function(t,e,n){},f3d4:function(t,e,n){"use strict";var o;n.d(e,"b",(function(){return a})),n.d(e,"c",(function(){return c})),n.d(e,"a",(function(){return o}));var a=function(){var t=this,e=t.$createElement;t._self._c},c=[]}},[["22cf","common/runtime","common/vendor"]]]);
\ No newline at end of file
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesA/Contracts/attachment/attachment"],{"22cf":function(t,n,e){"use strict";(function(t){e("78ef");o(e("66fd"));var n=o(e("7f93"));function o(t){return t&&t.__esModule?t:{default:t}}t(n.default)}).call(this,e("543d")["createPage"])},"4fd7":function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return o}));var a=function(){var t=this,n=t.$createElement;t._self._c},i=[]},"7f93":function(t,n,e){"use strict";e.r(n);var o=e("4fd7"),a=e("b140");for(var i in a)"default"!==i&&function(t){e.d(n,t,(function(){return a[t]}))}(i);e("d273");var c,l=e("f0c5"),s=Object(l["a"])(a["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],c);n["default"]=s.exports},"833c":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o=e("86df"),a=i(e("9036"));function i(t){return t&&t.__esModule?t:{default:t}}var c={onLoad:function(t){var n=this;console.log(t);var e,i=t.id;if(t.urlArr)if(console.log("options.urlArr===",t.urlArr),t.urlArr.indexOf(",")>=0?e=t.urlArr.split(","):(e=[],e.push(t.urlArr)),0==e.length)(0,o.get)(a.default.downloadContractTemplate,{contractId:i}).then((function(t){if(200==t.code){console.log(t);var e=t.data.replace("http","https");n.openPdf(e)}}));else if(1==e.length&&(e[0].lastIndexOf(".pdf")>-1||e[0].lastIndexOf(".docx")>-1)){var c=e[0].replace("http","https");this.openPdf(c)}else this.imgList=e,this.isImage=!0;if(t.url){var l=t.url;"null"==l?(0,o.get)(a.default.downloadContractTemplate,{contractId:i}).then((function(t){if(200==t.code){console.log(t);var e=t.data.replace("http","https");n.openPdf(e)}})):l.lastIndexOf(".pdf")>-1||l.lastIndexOf(".docx")>-1?(l=l.replace("http","https"),console.log(l),this.openPdf(l)):(l.indexOf(",")>=0?this.imgList=l.split(","):(this.imgList=[],this.imgList.push(l)),this.isImage=!0)}},data:function(){return{imgList:[],isImage:!1}},methods:{openPdf:function(n){t.downloadFile({url:n,success:function(n){200==n.statusCode&&t.saveFile({tempFilePath:n.tempFilePath,success:function(n){console.log(n),t.showToast({icon:"none",mask:!0,duration:3e3});var e=n.savedFilePath;t.openDocument({filePath:e,showMenu:!0,success:function(){console.log("打开文档成功")}})},fail:function(n){t.showToast({title:"下载失败",icon:"none"})}})}})}}};n.default=c}).call(this,e("543d")["default"])},b140:function(t,n,e){"use strict";e.r(n);var o=e("833c"),a=e.n(o);for(var i in o)"default"!==i&&function(t){e.d(n,t,(function(){return o[t]}))}(i);n["default"]=a.a},d273:function(t,n,e){"use strict";var o=e("d5ab"),a=e.n(o);a.a},d5ab:function(t,n,e){}},[["22cf","common/runtime","common/vendor"]]]);
\ No newline at end of file

unpackage/dist/dev/mp-weixin/pages/CompanyInfo/CompanyDetails/CompanyDetails.js

@@ -331,6 +331,10 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
+
+
 
 
 
@@ -559,6 +563,10 @@ var _fun = __webpack_require__(/*! ../../../static/util/fun.js */ 50);function _
 //
 //
 //
+//
+//
+//
+//
 var _default = { onLoad: function onLoad(options) {var that = this;this.enterpriseId = options.id;this.getEnterpriseCertificationDetail(this.enterpriseId);(0, _fun.get)(_api.default.getIndustryList).then(function (res) {if (res.code == 200) {var data = res.data;that.industryName = res.data[0].industryName;var arr = data.filter(function (item) {return item.type == that.type;});}});}, data: function data() {return { tab: 1, //tab切换
       enterpriseId: '', //企业id
       companydata: {}, //企业基本信息

unpackage/dist/dev/mp-weixin/pagesA/Contracts/attachment/attachment.js

@@ -154,8 +154,16 @@ var _api = _interopRequireDefault(__webpack_require__(/*! @/static/util/api.js *
 //
 //
 var _default = { onLoad: function onLoad(options) {var _this = this;console.log(options);var id = options.id;if (options.urlArr) {// 如果是电客开局
-      var arr = JSON.parse(options.urlArr);if (arr.length == 0) {// 如果没有附件
-        (0, _fun.get)(_api.default.downloadContractTemplate, { contractId: id }).
+      console.log('options.urlArr===', options.urlArr);var arr;if (options.urlArr.indexOf(',') >= 0) {arr = options.urlArr.split(',');
+      } else {
+        arr = [];
+        arr.push(options.urlArr);
+      }
+
+      if (arr.length == 0) {
+        // 如果没有附件
+        (0, _fun.get)(_api.default.downloadContractTemplate, {
+          contractId: id }).
         then(function (res) {
           if (res.code == 200) {
             console.log(res);
@@ -195,7 +203,13 @@ var _default = { onLoad: function onLoad(options) {var _this = this;console.log(
       } else {
         // 如果是图片
         // this.imgList.push(url)
-        this.imgList = JSON.parse(url);
+        if (url.indexOf(',') >= 0) {
+          this.imgList = url.split(',');
+        } else {
+          this.imgList = [];
+          this.imgList.push(url);
+        }
+
         this.isImage = true;
       }
     }