前端

src/views/contractManagement/futuresPurchaseContract.vue

@@ -4,6 +4,7 @@
 		<BaseHeaderLayout :leftSpan="8">
 			<template slot="left">
 				<ws-button type="primary" @click="handleAdd()"
+<<<<<<< HEAD
 					v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`"><img width="13" height="13"
 						style="
               vertical-align: text-top;
@@ -11,6 +12,9 @@
               top: 0px;
               left: -4px;
             " src="../../../public/img/header-add.png" alt="" />添加</ws-button>
+=======
+					v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`">添加</ws-button>
+>>>>>>> 6a5cb802b60691d2a30e6e649249ab1c9595632c
 				<ws-button @click="exportlist()" v-hasPermission="
             `contractManagement.buyContract.buyContractInfo.view`
           ">导出</ws-button>
@@ -347,7 +351,7 @@
 					.toPromise()
 					.then((response) => {
 						for (var i = 0; i < response.records.length; i++) {
-							if (response.records[i].addressUrl != null && response.records[i].addressUrl != "") {
+							if (response.records[i].addressUrl != null && response.records[i].addressUrl != '') {
 								response.records[i].addressUrlArray =
 									response.records[i].addressUrl.split(',')
 							} else {

src/views/contractManagement/futuresSalesContract.vue

@@ -4,13 +4,7 @@
 		<BaseHeaderLayout :leftSpan="8">
 			<template slot="left">
 				<ws-button type="primary" @click="handleAdd()"
-					v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`"><img width="13" height="13"
-						style="
-              vertical-align: text-top;
-              position: relative;
-              top: 0px;
-              left: -4px;
-            " src="../../../public/img/header-add.png" alt="" />添加</ws-button>
+					v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`">添加</ws-button>
 				<ws-button @click="exportlist()" v-hasPermission="
             `contractManagement.buyContract.buyContractInfo.view`
           ">导出</ws-button>
@@ -359,7 +353,7 @@
 					.toPromise()
 					.then((response) => {
 						for (var i = 0; i < response.records.length; i++) {
-							if (response.records[i].addressUrl != null && response.records[i].addressUrl != "") {
+							if (response.records[i].addressUrl != null && response.records[i].addressUrl != '') {
 								response.records[i].addressUrlArray =
 									response.records[i].addressUrl.split(',')
 							} else {

src/views/contractManagement/purchaseContract.vue

@@ -5,13 +5,7 @@
 		<BaseHeaderLayout :leftSpan="8">
 			<template slot="left">
 				<ws-button type="primary" @click="handleAdd()"
-					v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`"><img width="13" height="13"
-						style="
-              vertical-align: text-top;
-              position: relative;
-              top: 0px;
-              left: -4px;
-            " src="../../../public/img/header-add.png" alt="" />添加</ws-button>
+					v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`">添加</ws-button>
 				<ws-button @click="exportlist()" v-hasPermission="
             `contractManagement.buyContract.buyContractInfo.view`
           ">导出</ws-button>

src/views/contractManagement/salesContract.vue

@@ -6,12 +6,7 @@
 			<template slot="left">
 				<ws-button type="primary" @click="handleAdd()" v-hasPermission="
             `contractManagement.salesContract.salesContractInfo.add`
-          "><img width="13" height="13" style="
-              vertical-align: text-top;
-              position: relative;
-              top: 0px;
-              left: -4px;
-            " src="../../../public/img/header-add.png" alt="" />添加</ws-button>
+          ">添加</ws-button>
 				<ws-button @click="exportlist()" v-hasPermission="
             `contractManagement.salesContract.salesContractInfo.view`"
           >导出</ws-button
@@ -467,7 +462,7 @@
 					.then((response) => {
 						for (var i = 0; i < response.records.length; i++) {
 							if (response.records[i].addressUrl != null) {
-								if (response.records[i].addressUrl != "") {
+								if (response.records[i].addressUrl != '') {
 									response.records[i].addressUrlArray =
 										response.records[i].addressUrl.split(',')
 								}