Quellcode durchsuchen

增加收款码上传,打印增加收款吗显示

pengyh vor 1 Jahr
Ursprung
Commit
ecef663732

+ 11 - 3
src/views/auxiliaryFittings/salesManagement/attachmentSalesOrder/index.vue

@@ -60,7 +60,8 @@ export default {
 			flag: '',
 			websitList: [],
 			isShowTab: true,
-			orderEnginBaseId: ''
+			orderEnginBaseId: '',
+			payQrcode: JSON.parse(localStorage.getItem('greemall_user')).payQrcode,
 		}
 	},
 	computed: {
@@ -308,7 +309,7 @@ export default {
 		  </div>
 		  <div style="display: flex;justify-content: space-between;font-size: 16px;margin: 10px 0;">
 		  	<div>客户: ${data.workerName}</div>
-		  	<div>摘要: ${data.payType == 'CASH' ? '现金' : '微信'}</div>
+		  	<div>摘要: ${data.payType == 'CASH' ? '现金' : data.payType == 'WECHAT' ? '微信': '工程支付'}</div>
 		  </div>
 		  <div style="display: flex;justify-content: space-between;font-size: 16px;margin-bottom: 10px;">
 		  	<div>联系电话: ${data.workerMobile}</div>
@@ -355,7 +356,14 @@ export default {
 			<div>业务员: </div>
 			<div>签收人: </div>
 		  </div>
-		  ${websitHtml}
+		  <div style="display: flex;justify-content: space-between;">
+		  	<div>
+		  		${websitHtml}
+		  	</div>
+		  	${data.payType == 'CASH'?`<div style="">
+		  		<img style="width: 80px;height: 80px;" src="${this.payQrcode}"/>
+		  	</div>`:''}
+		  </div>
 	      <div style="margin:100px 0 0 0">
 	        <div></div>
 	      </div>

+ 11 - 3
src/views/auxiliaryFittings/salesManagement/auxiliarySalesOrder/index.vue

@@ -60,7 +60,8 @@ export default {
 			flag: '',
 			websitList: [],
 			isShowTab: true,
-			orderEnginBaseId: ''
+			orderEnginBaseId: '',
+			payQrcode: JSON.parse(localStorage.getItem('greemall_user')).payQrcode,
 		}
 	},
 	computed: {
@@ -306,7 +307,7 @@ export default {
 		  </div>
 		  <div style="display: flex;justify-content: space-between;font-size: 16px;margin: 10px 0;">
 		  	<div>客户: ${data.workerName}</div>
-		  	<div>摘要: ${data.payType == 'CASH' ? '现金' : '微信'}</div>
+		  	<div>摘要: ${data.payType == 'CASH' ? '现金' : data.payType == 'WECHAT' ? '微信': '工程支付'}</div>
 		  </div>
 		  <div style="display: flex;font-size: 16px;margin-bottom: 10px;">
 		  	<div>联系电话: ${data.workerMobile}</div>
@@ -352,7 +353,14 @@ export default {
 			<div>业务员: </div>
 			<div>签收人: </div>
 		  </div>
-		  ${websitHtml}
+		  <div style="display: flex;justify-content: space-between;">
+			<div>
+				${websitHtml}
+			</div>
+			${data.payType == 'CASH'?`<div style="">
+				<img style="width: 80px;height: 80px;" src="${this.payQrcode}"/>
+			</div>`:''}
+		  </div>
 	      <div style="margin:100px 0 0 0">
 	        <div></div>
 	      </div>

+ 7 - 1
src/views/mallManagement/order/order_list/index.vue

@@ -768,7 +768,8 @@ export default {
 		joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode,
 		orderDetailId: '',
 
-    printOrderId: ''
+    printOrderId: '',
+		payQrcode: JSON.parse(localStorage.getItem('greemall_user')).payQrcode,
     }
   },
   computed: {
@@ -1666,6 +1667,11 @@ export default {
 			<div>业务员: ${data.saleName || ''}</div>
 			<div>签收人: </div>
 		  </div>
+				<div style="display: flex;justify-content: flex-end;">
+					${data.payTypeId == 'CASH'?`<div style="">
+						<img style="width: 80px;height: 80px;" src="${this.payQrcode}"/>
+					</div>`:''}
+				</div>
 	      <div style="margin:100px 0 0 0">
 	        <div></div>
 	      </div>

+ 27 - 0
src/views/setting/organizationManagement/tenantDetails/index.vue

@@ -300,6 +300,26 @@
             <span>建议尺寸:400*400</span>
           </div>
         </el-form-item>
+				<el-form-item label="收款二维码" prop="imgUrl">
+				  <div class="images">
+				    <div class="main-img">
+				      <div class="img" v-if="qrcode3_url" @mouseover="qrcode3_hover = true;" @mouseout="qrcode3_hover = false;">
+				        <el-image ref="qrcode3" :src="qrcode3_url" :preview-src-list="[qrcode3_url]"
+				          style="width: 120px; height: 120px" fit="contain"></el-image>
+				        <div class="mask" v-show="qrcode3_hover">
+				          <i class="el-icon-zoom-in" @click="previewImage('qrcode3')"></i>
+				          <i class="el-icon-upload2" @click="uploadImage('qrcode3')"></i>
+				        </div>
+				      </div>
+				      <div class="add" v-else @click="uploadImage('qrcode3')">
+				        <i class="el-icon-plus avatar-uploader-icon"></i>
+				      </div>
+				    </div>
+				  </div>
+				  <div class="tips">
+				    <span>建议尺寸:400*400</span>
+				  </div>
+				</el-form-item>
       </el-form>
     </div>
     <div class="page-footer">
@@ -414,6 +434,8 @@ export default {
       qrcode1_hover: false,
       qrcode2_url: '',
       qrcode2_hover: false,
+			qrcode3_url: '',
+			qrcode3_hover: false,
 
       resetFormVisible: false,
       resetForm: {
@@ -534,6 +556,7 @@ export default {
         this.img3_url = res.data.minLogo3;
         this.qrcode1_url = res.data.qrcode1;
         this.qrcode2_url = res.data.qrcode2;
+				this.qrcode3_url = res.data.payQrcode;
 
         this.step3Form.enterpriseId = res.data.corpId;
         this.step3Form.listSecret = res.data.secret2;
@@ -776,11 +799,15 @@ export default {
       if (!this.qrcode2_url) {
         return this.$errorMsg('请上传公众号图片');
       }
+			if (!this.qrcode3_url) {
+			  return this.$errorMsg('请上传收款二维码图片');
+			}
       this.formLoading = true;
       let params = {
         adminUserId: this.id,
         qrcode1: this.qrcode1_url,
         qrcode2: this.qrcode2_url,
+		payQrcode: this.qrcode3_url,
         companyWechatId: this.companyWechatId
       }
       editAccount(params).then(res => {