فهرست منبع

增加工程收款消息

pengyh 1 سال پیش
والد
کامیت
f98f7a3c80

+ 6 - 4
src/layout/components/Navbar.vue

@@ -64,7 +64,7 @@
             <el-radio-group size="small" v-model="messageType" @change="getList">
               <el-badge :is-dot="isDot1" class="item">
                 <el-radio-button
-                  :label="['WBI', 'WBK', 'CRE_ORDER', 'SEND_MALL', 'RP_MALL', 'CR_SALES']">系统消息</el-radio-button>
+                  :label="['WBI', 'WBK', 'CRE_ORDER', 'SEND_MALL', 'RP_MALL', 'CR_SALES', 'ENGIN_PAY_ORDER']">系统消息</el-radio-button>
               </el-badge>
               <el-badge :is-dot="isDot2" class="item">
                 <el-radio-button :label="['NOTICE']">平台公告</el-radio-button>
@@ -218,7 +218,7 @@ export default {
       isShow: false,
       isOpen: true,
       checked: false,
-      messageType: ['WBI', 'WBK', 'CRE_ORDER', 'SEND_MALL', 'RP_MALL', 'CR_SALES'],
+      messageType: ['WBI', 'WBK', 'CRE_ORDER', 'SEND_MALL', 'RP_MALL', 'CR_SALES', 'ENGIN_PAY_ORDER'],
       messageData: [],
       dateType: '',
       readFlag: '',
@@ -272,7 +272,8 @@ export default {
           CRE_ORDER: '创建工单',
           SEND_MALL: '商城订单发货',
           RP_MALL: '商城订单维权',
-          CR_SALES: '订单支付成功'
+          CR_SALES: '订单支付成功',
+		  ENGIN_PAY_ORDER: '工程收款单'
         }
         return MAP[val]
       }
@@ -286,7 +287,8 @@ export default {
           CRE_ORDER: 'workOrderPool',
           SEND_MALL: 'order_detail',
           RP_MALL: 'order_refund_detail',
-          CR_SALES: (paidType == 'M' ? 'auxiliarySalesOrder' : paidType == 'P' ? 'attachmentSalesOrder' : paidType == 'YB' ? 'orderSettleManag' : paidType == 'MALL' ? 'order_detail' : '')
+          CR_SALES: (paidType == 'M' ? 'auxiliarySalesOrder' : paidType == 'P' ? 'attachmentSalesOrder' : paidType == 'YB' ? 'orderSettleManag' : paidType == 'MALL' ? 'order_detail' : ''),
+		  ENGIN_PAY_ORDER: 'projectCollectionManagement'
         }
         return MAP[val]
       }

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

@@ -768,6 +768,7 @@ export default {
 
     printOrderId: '',
 		payQrcode: JSON.parse(localStorage.getItem('greemall_user')).payQrcode,
+		billTitle: JSON.parse(localStorage.getItem('greemall_user')).billTitle,//打印名称
     }
   },
   computed: {
@@ -1615,7 +1616,7 @@ export default {
 			return `
 	   <div style="font-family:'黑体';font-size: 16px;">
 			<div style="display: flex;justify-content: center;align-items: center;position: relative;">
-				<h1 style="text-align:center;margin: 10px 0;">${data.companyWechatName}销售单</h1>
+				<h1 style="text-align:center;margin: 10px 0;">${this.billTitle?this.billTitle:data.companyWechatName}销售单</h1>
 				<div style="position: absolute;right:0;">共 ${length}页 第 ${page+1} 页</div>
 			</div>
 		  <div style="display: flex;justify-content: space-between;">

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

@@ -42,6 +42,9 @@
           </el-date-picker>
           <el-button type="primary" @click="saveTime()">保存</el-button>
         </el-form-item>
+		<el-form-item label="打印单名称" prop="billTitle">
+		  <el-input v-model="step1Form.billTitle" placeholder="请输入"></el-input>
+		</el-form-item>
         <el-form-item label="辅材配件权限" prop="moduleMaterialPart">
           <el-switch v-model="step1Form.moduleMaterialPart" active-color="#13ce66" inactive-color="#ff4949">
           </el-switch>
@@ -416,6 +419,7 @@ export default {
         confirmPassword: '', // 确认密码
         companyExpireTime: '',
         moduleMaterialPart: '',
+				billTitle: '',
         moduleYb: '',
         moduleWb: '',
       },
@@ -548,6 +552,7 @@ export default {
         this.step1Form.password = '************';
         this.step1Form.companyExpireTime = res.data.companyExpireTime
         this.step1Form.moduleMaterialPart = res.data.moduleMaterialPart
+				this.step1Form.billTitle = res.data.billTitle
         this.step1Form.moduleYb = res.data.moduleYb
         this.step1Form.moduleWb = res.data.moduleWb
 
@@ -687,6 +692,7 @@ export default {
         // adminUserId: this.id,
         companyWechatId: this.companyWechatId,
         moduleMaterialPart: this.step1Form.moduleMaterialPart,
+				billTitle: this.step1Form.billTitle,
         moduleYb: this.step1Form.moduleYb,
         moduleWb: this.step1Form.moduleWb,
       }