更新打印接口

admin-ui/src/api/order/clothItem.js

@@ -138,3 +138,27 @@ export function reFlowCloth(orderClothItemId) {
         params: { orderClothItemId: orderClothItemId }
     })
 }
+
+// 充值打印
+export function printRecharge(id) {
+    return request({
+        url: `/mapi/recharge/order/print/${id}`,
+        method: 'get',
+    })
+}
+
+// 洗衣打印
+export function printCloth(id) {
+    return request({
+        url: `/mapi/order/cloth/print/${id}`,
+        method: 'get',
+    })
+}
+
+// 商品打印
+export function printGoods(id) {
+    return request({
+        url: `/mapi/order/goods/print/${id}`,
+        method: 'get',
+    })
+}

admin-ui/src/components/payStatusPopup/index.vue

@@ -124,7 +124,7 @@
 
 <script>
 import { getLodop } from '@/utils/lodopUtils'
-import { getClothItem, listOrderClothItem } from '@/api/order/clothItem'
+import { getClothItem, listOrderClothItem, printCloth } from '@/api/order/clothItem'
 import { getMemberInfoById } from '@/api/app/user'
 import { clothOrderPay, getOrderPayResult } from '@/api/order/cloth'
 import { getUserProfile } from "@/api/system/user";
@@ -191,7 +191,7 @@ export default {
         this.payType = 2
       } else {
         this.payType = 2
-        this.getUserInfo(info.appUserId)
+        this.getUserInfoData(info.appUserId)
       }
       this.show = true
     },
@@ -229,7 +229,7 @@ export default {
           this.payType = 2
         } else {
           this.payType = 2
-          this.getUserInfo(info.appUserId)
+          this.getUserInfoData(info.appUserId)
         }
         this.pay()
 
@@ -327,26 +327,8 @@ export default {
         return 
       }
       console.log(this.pointerList, p_name)
-      getStore(this.orderInfo.orgId).then(res => {
-        console.log("AAA", res,  this.pointerInfo)
-        this.pointerInfo.sysOrg = res.data
-        // this.pointerInfo.orgName = res.data.name
-        this.pointerInfo.memberPrice = this.appUserInfo.rechargeBalance
-        this.pointerInfo.orderClothPrice = this.orderInfo.orderClothPrice
-        this.pointerInfo.planSendToUserTime = this.orderInfo.planSendToUserTime
-        this.pointerInfo.contactName = this.orderInfo.contactName
-        this.pointerInfo.contactPhone = this.orderInfo.contactPhone
-        this.pointerInfo.payType = this.orderInfo.payType
-        this.pointerInfo.payTimeType = this.orderInfo.payTimeType
-        this.pointerInfo.payAmount = this.orderInfo.payAmount
-        console.log(this.appUserInfo)
-        if (this.appUserInfo.defaultAddress) {
-          this.pointerInfo.province = this.appUserInfo.defaultAddress.province
-          this.pointerInfo.city = this.appUserInfo.defaultAddress.city
-          this.pointerInfo.area = this.appUserInfo.defaultAddress.area
-          this.pointerInfo.address = this.appUserInfo.defaultAddress.address
-          this.pointerInfo.addressDetail = this.appUserInfo.defaultAddress.addressDetail
-        }
+      
+
         if (type == 0) {
           this.collectClothPrinter(this.LODOP, this.pointerInfo, p_name)
         } else {
@@ -354,26 +336,41 @@ export default {
         }
 
         // this.show = false CL1108946378974957568
-      })
 
      
     },
 
     // 获取打印数据
     getClothItemInfo(data) {
-      getClothItem(data.id).then((res) => {
+      // getClothItem
+      printCloth(data.id).then((res) => {
         if (res) {
+          console.log('打印数据', res)
+          if (this.getUserInfo().userType == '02') {
+                const obj = {
+                    name: this.getUserInfo().storeName,
+                    contactPhone: this.getUserInfo().phonenumber,
+                    user: this.getUserInfo().nickName,
+                }
+                // row.sysOrg = obj
+                res.data.sysOrg = obj
+            }
           this.pointerInfo = res.data
-          listOrderClothItem({ pageSize: 99999, pageNum: 1, orderNo: data.orderNo }).then((res) => {
-            console.log(res)
-            this.pointerInfo.orderClothDetails = res.rows
-          })
+         
+          // getStore(this.pointerInfo.orgId).then(res => {
+            // console.log("AAA", res,  this.pointerInfo)
+            // this.pointerInfo.sysOrg = res.data
+          // })
+          // listOrderClothItem({ pageSize: 99999, pageNum: 1, orderNo: data.orderNo }).then((res) => {
+          //   console.log(res)
+          //   this.pointerInfo.orderClothDetails = res.rows
+          // })
         }
       })
     },
 
     // 获取用户信息
-    getUserInfo(id) {
+    getUserInfoData(id) {
       getMemberInfoById({
         appUserId: id
       }).then((response) => {

admin-ui/src/utils/index.js

@@ -437,8 +437,7 @@ export function exchangeClothPrinter(LODOP, data, lodopName) {
    // 开始绘制虚线
   LODOP.ADD_PRINT_LINE(80, 10, 80, 295, 1, 1);
   LODOP.ADD_PRINT_TEXT(90, 10, 200, 20, `订单号：${data.orderNo}`);
-  let date = formatDate(new Date().getTime(), 1)
-  LODOP.ADD_PRINT_TEXT(110, 10, 300, 20, `打印日期：${date}`);
+  LODOP.ADD_PRINT_TEXT(110, 10, 300, 20, `打印日期：${data.createTime}`);
   LODOP.ADD_PRINT_LINE(130, 10, 130, 295, 1, 1);
   let type = ''
   if (data.rechargeType == '3') {
@@ -474,13 +473,14 @@ export function exchangeClothPrinter(LODOP, data, lodopName) {
   LODOP.ADD_PRINT_TEXT(200, 10, 300, 20, `支付方式：${payType}`);
   LODOP.ADD_PRINT_TEXT(220, 10, 300, 20, `订单备注：${data.remark?data.remark:''}`);
   LODOP.ADD_PRINT_LINE(240, 10, 240, 295, 1, 1);
-  LODOP.ADD_PRINT_TEXT(250, 10, 300, 20, `会员余额：${data.memberPrice || 0}`);
-  LODOP.ADD_PRINT_TEXT(270, 10, 300, 20, `本次充值：${data.rechargeAmount + data.giveAmount + data.welfareAmount}元`);
-  LODOP.ADD_PRINT_TEXT(290, 10, 300, 20, `会员余额：${(data.memberPrice || 0) + data.rechargeAmount + data.giveAmount + data.welfareAmount}元`);
+  LODOP.ADD_PRINT_TEXT(250, 10, 300, 20, `会员余额：${data.memberBeforeBalance || 0}`);
+  LODOP.ADD_PRINT_TEXT(270, 10, 300, 20, `本次充值：${data.memberChangeAmount || 0}元`);
+  LODOP.ADD_PRINT_TEXT(290, 10, 300, 20, `会员余额：${(data.memberAfterBalance || 0)}元`);
   LODOP.ADD_PRINT_LINE(310, 10, 310, 295, 1, 1);
-  LODOP.ADD_PRINT_TEXT(320, 10, 300, 20, `会员电话：${data.contactPhone || ''}`);
-  LODOP.ADD_PRINT_TEXT(340, 10, 300, 20, `会员姓名：${data.contactName || ''}`);
-  LODOP.ADD_PRINT_TEXT(360, 10, 300, 20, `会员地址：${data.contactAddress}`);
+  LODOP.ADD_PRINT_TEXT(320, 10, 300, 20, `会员电话：${data.appUserInfoVO.contactPhone || ''}`);
+  LODOP.ADD_PRINT_TEXT(340, 10, 300, 20, `会员姓名：${data.appUserInfoVO.contactName || ''}`);
+  let address = `会员地址：${data.appUserInfoVO.province || ''}${ data.appUserInfoVO.city|| ''}${ data.appUserInfoVO.area|| ''}${ data.appUserInfoVO.address|| ''}${ data.appUserInfoVO.addressDetail|| ''}`
+  LODOP.ADD_PRINT_TEXT(360, 10, 300, 20, address);
 
   LODOP.ADD_PRINT_TEXT(400, 10, 300, 20, `联系电话：${data.sysOrg.contactPhone}`);
   LODOP.ADD_PRINT_TEXT(420, 10, 300, 20, `本店地址：${data.sysOrg.address || ''}`);
@@ -516,9 +516,8 @@ export function collectClothPrinter(LODOP, data, lodopName) {
   LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
 
   LODOP.ADD_PRINT_TEXT(200, 50, 300, 20, `收衣日期：${data.createTime?data.createTime:'--'}`);
-  let planTime = data.planSendClothTime ? data.planSendClothTime : (data.planSendToUserTime || '--')
   
-  LODOP.ADD_PRINT_TEXT(230, 50, 300, 20, `预计取衣时间：${planTime}`);
+  LODOP.ADD_PRINT_TEXT(230, 50, 300, 20, `预计取衣时间：${ data.planSendToUserTime}`);
 
   LODOP.ADD_PRINT_LINE(255, 10, 255, 295, 1, 1);
 
@@ -528,8 +527,8 @@ export function collectClothPrinter(LODOP, data, lodopName) {
 
   const top = 305;
   let height = top
-  for(var i = 0; i < data.orderClothDetails.length; i++) {
-    let item = data.orderClothDetails[i];
+  for(var i = 0; i < data.orderClothItemVOS.length; i++) {
+    let item = data.orderClothItemVOS[i];
     let _name = ''
     item.orderClothColors.forEach(col_n=>{
       _name += '-'+col_n.clothColorName
@@ -552,15 +551,13 @@ export function collectClothPrinter(LODOP, data, lodopName) {
 
   // const height = top + (data.orderClothDetails.length+1)*20;
   // 合计
-  LODOP.ADD_PRINT_TEXT(height + 15, 10, 150, 20, `合计：${data.orderClothDetails.length}件`);
-  let totalPrice = data.totalPrice || data.orderAmount
-  LODOP.ADD_PRINT_TEXT(height + 15, 160, 150, 20, `总金额：${totalPrice}元`);
+  LODOP.ADD_PRINT_TEXT(height + 15, 10, 150, 20, `合计：${data.orderClothCount}件`);
+  LODOP.ADD_PRINT_TEXT(height + 15, 160, 150, 20, `总金额：${data.orderAmount}元`);
 
   LODOP.ADD_PRINT_LINE(height + 35, 10, height + 35, 295, 1, 1);
 
   //金额
   let payTypename = '';
-  let thisPrice = 0
   if (data.payTimeType == 1) {
     payTypename = '取衣付款 '
   } else if(data.payType == '0'){
@@ -571,20 +568,20 @@ export function collectClothPrinter(LODOP, data, lodopName) {
     payTypename = '现金 '
   }else if(data.payType == '3'){
     payTypename = '余额 '
-    thisPrice = data.payAmount
   }
 
 
 
   LODOP.ADD_PRINT_TEXT(height + 45, 10, 150, 20, `付款方式：${payTypename}`);
-  LODOP.ADD_PRINT_TEXT(height + 45, 160, 150, 20, `会员金额：${data.memberPrice?data.memberPrice+'元':''}`);
-  LODOP.ADD_PRINT_TEXT(height + 75, 10, 150, 20, `本次扣款：${thisPrice?thisPrice+'元':'0'}`);
-  LODOP.ADD_PRINT_TEXT(height + 75, 160, 150, 20, `会员余额：${data.memberPrice?data.memberPrice-thisPrice?thisPrice:0 +'元':''}`);
-
-  LODOP.ADD_PRINT_TEXT(height + 105, 10, 150, 20, `客户：${data.contactName || data.appUserName}`);
-  LODOP.ADD_PRINT_TEXT(height + 105, 160, 180, 20, `客户电话：${data.contactPhone || data.appUserPhoneNumber}`);
-  LODOP.ADD_PRINT_TEXT(height + 135, 10, 300, 20, `客户地址：${data.province || ''}${ data.city|| ''}${ data.area|| ''}${ data.address|| ''}${ data.addressDetail|| ''}`);
-  var userHeight = addDynamicText(90, `客户地址：${data.province || ''}${ data.city|| ''}${ data.area|| ''}${ data.address|| ''}${ data.addressDetail|| ''}`)
+  LODOP.ADD_PRINT_TEXT(height + 45, 160, 150, 20, `会员金额：${data.memberBeforeBalance?data.memberBeforeBalance+'元':''}`);
+  LODOP.ADD_PRINT_TEXT(height + 75, 10, 150, 20, `本次扣款：${data.memberChangeAmount?data.memberChangeAmount+'元':'0'}`);
+  LODOP.ADD_PRINT_TEXT(height + 75, 160, 150, 20, `会员余额：${data.memberBeforeBalance?data.memberBeforeBalance +'元':''}`);
+
+  LODOP.ADD_PRINT_TEXT(height + 105, 10, 150, 20, `客户：${data.appUserInfoVO.contactName}`);
+  LODOP.ADD_PRINT_TEXT(height + 105, 160, 180, 20, `客户电话：${data.appUserInfoVO.contactPhone}`);
+  let address = `客户地址：${data.appUserInfoVO.province || ''}${ data.appUserInfoVO.city|| ''}${ data.appUserInfoVO.area|| ''}${ data.appUserInfoVO.address|| ''}${ data.appUserInfoVO.addressDetail|| ''}`
+  LODOP.ADD_PRINT_TEXT(height + 135, 10, 300, 20, address);
+  var userHeight = addDynamicText(90, address)
   height += userHeight
 
   LODOP.ADD_PRINT_LINE(height + 140, 10, height + 140, 295, 1, 1);
@@ -681,6 +678,9 @@ export function sendClothPrinter(LODOP, data, lodopName) {
   LODOP.ADD_PRINT_LINE(480, 10, 480, 295, 1, 1);
   LODOP.ADD_PRINT_TEXT(490, 10, 300, 20, `订单备注：${data.remark?data.remark:''}`);
   LODOP.ADD_PRINT_TEXT(530, 10, 300, 50, `客户签名：`);
+  LODOP.ADD_PRINT_LINE(560, 10, 560, 295, 1, 1);
+  LODOP.ADD_PRINT_TEXT(570, 50, 300, 20, `请仔细阅读店内张贴的取衣凭证注意事项`);
+  LODOP.ADD_PRINT_LINE(590, 10, 590, 295, 1, 1);
 
   if (this.LODOP.SET_PRINTER_INDEXA(lodopName))
   // this.LODOP.PREVIEW(); //打印预览
@@ -767,8 +767,8 @@ export function barCodePrinter(LODOP, data, lodopName){
   //这里3表示纵向打印且纸高“按内容的高度”；800表示纸宽80mm；45表示页底空白4.5mm
   console.log(data)
   const top = 20;
-  for(var i = 0; i < data.orderClothDetails.length; i++) {
-    let item = data.orderClothDetails[i];
+  for(var i = 0; i < data.orderClothItemVOS.length; i++) {
+    let item = data.orderClothItemVOS[i];
     let _name = ''
     item.orderClothColors.forEach(col_n=>{
       _name += '-'+col_n.clothColorName
@@ -937,15 +937,16 @@ export function goodsPrinter(LODOP, data, lodopName) {
 
   LODOP.ADD_PRINT_LINE(height + 85, 10, height + 85, 295, 1, 1);
 
-  LODOP.ADD_PRINT_TEXT(height + 95, 10, 300, 20, `会员金额：${data.memberPrice?data.memberPrice+'元':''}`);
-  LODOP.ADD_PRINT_TEXT(height + 115, 10, 300, 20, `本次扣款：${thisPrice?thisPrice+'元':''}`);
-  // LODOP.ADD_PRINT_TEXT(height + 135, 10, 300, 20, `会员余额：${data.totalPrice?data.totalPrice-thisPrice?thisPrice:0:''}元`);
+  LODOP.ADD_PRINT_TEXT(height + 95, 10, 300, 20, `会员金额：${data.memberBeforeBalance+'元'}`);
+  LODOP.ADD_PRINT_TEXT(height + 115, 10, 300, 20, `本次扣款：${data.memberChangeAmount+'元'}`);
+  LODOP.ADD_PRINT_TEXT(height + 135, 10, 300, 20, `会员余额：${data.memberAfterBalance}元`);
 
   LODOP.ADD_PRINT_LINE(height + 155, 10, height + 155, 295, 1, 1);
 
-  LODOP.ADD_PRINT_TEXT(height + 165, 10, 300, 20, `客户：${data.contactName}`);
-  LODOP.ADD_PRINT_TEXT(height + 185, 10, 300, 20, `客户电话：${data.contactPhone}`);
-  LODOP.ADD_PRINT_TEXT(height + 205, 10, 300, 20, `客户地址：${data.province+data.city+data.area+data.address+data.addressDetail}`);
+  LODOP.ADD_PRINT_TEXT(height + 165, 10, 300, 20, `客户：${data.appUserInfoVO.realName}`);
+  LODOP.ADD_PRINT_TEXT(height + 185, 10, 300, 20, `客户电话：${data.appUserInfoVO.phoneNumber}`);
+  let address = `客户地址：${data.appUserInfoVO.province || ''}${ data.appUserInfoVO.city|| ''}${ data.appUserInfoVO.area|| ''}${ data.appUserInfoVO.address|| ''}${ data.appUserInfoVO.addressDetail|| ''}`
+  LODOP.ADD_PRINT_TEXT(height + 205, 10, 300, 20, address);
 
   LODOP.ADD_PRINT_TEXT(height + 240, 10, 300, 20, `本店地址：${data.sysOrg.address?data.sysOrg.address+data.sysOrg.addressDetail:''}`);
   LODOP.ADD_PRINT_TEXT(height + 260, 10, 300, 20, `联系电话：${data.sysOrg.contactPhone}`);

admin-ui/src/views/order/cloth/collectCloth.vue

@@ -1509,8 +1509,9 @@ export default {
         },
 
         async handleConfirmPay() {
-            // let obj = {"isSpecial":"Y","isAppointment":"N","authCode":"","payType":"2","appUserId":"82034","orderClothItemDTOS":[{"orderClothCraftDTOS":[{"clothCraftId":7,"clothCraftName":"毛毛领","price":20,"isSelect":true}],"orderClothAdjunctDTOS":[{"adjunctId":7,"num":1,"adjunctName":"毛领"}],"orderClothTypeDTOS":[],"clothTypeKeys":[],"specialPrice":0,"clothSpeedMultiple":1,"picNum":0,"isCustomPrice":"N","remark":"","defaultPrice":0,"clothWashModeId":2,"clothWashModeName":"水洗","clothItemId":7168,"id":7168,"name":"文胸","typeId":14,"washId":2,"washName":"水洗","unit":"件","isChangePrice":"N","isCalArea":"N","isSpecial":"N","plusPrice":0,"silkPrice":0,"sheepPrice":0,"childPrice":0,"orderClothColorDTOS":[{"clothColorId":1205,"clothColorName":"银色"}],"clothBrandId":16,"clothBrandName":"耐克","orderClothFlawDTOS":[{"clothFlawId":724,"clothFlawName":"油斑油迹"}],"isHedging":"N","clothSpeedId":1,"index":0,"deductAmount":0,"totalPrice":20,"clothItemName":"文胸"}],"orderCouponDTOS":[],"payTimeType":"0","createById":"105","createBy":"storeAdmin","createTime":"2025-04-10 23:09:18","id":"12","orderNo":"CL1107846939908640768","orderType":"0","orgId":"4","sourceType":"02","factoryId":"1","contactName":"赵策","contactPhone":"13312341234","orderAmount":20,"orderClothPrice":20,"orderClothCount":1,"payAmount":20,"payStatus":"0","orderSource":"OFFLINE","orderStatus":"4","setPriceTime":"2025-04-10 23:09:18","planSendToUserTime":"2025-04-15 23:09:18","takeClothWay":"0","cashDeductAmount":0,"clothSpeedId":"1","clothSpeedName":"普洗","deliveryAmount":0}
-            // this.$refs.payStatusPopup.open(1, obj, this.appUserInfo);
+            // this.$refs.payStatusPopup.open(1, {
+            //     id: 18
+            // }, this.appUserInfo);
             // return
             if (this.orderClothItemDTOS.length == 0) {
                 this.$message.error('请先添加衣服')

admin-ui/src/views/order/cloth/component/cashCloth.vue

@@ -146,6 +146,87 @@
                                         </el-table>
                                     </div>
                                         </el-tab-pane>
+                                        <el-tab-pane label="平台折扣活动" name="1">
+                        <!-- <el-form-item label="折扣" prop="discountCouponId">
+                            <el-select v-model="orderForm.discountCouponId" placeholder="请选择" clearable @change="onDiscountCouponSelect">
+                                <template v-for="(item, i) in discountCouponVOS">
+                                    <el-option :key="i" :label="item.couponTypeTitle + '（' + item.deductAmount * 10 + '折）'" :value="item.id"> </el-option>
+                                </template>
+                            </el-select>
+                        </el-form-item> -->
+                        <el-table :data="discountCouponVOS" style="width: 100%">
+                            <el-table-column label="序号" type="index" align="center" fixed="left" width="80"> </el-table-column>
+                            <el-table-column label="活动名称" align="center" prop="title"> </el-table-column>
+                            <el-table-column label="适用衣服" align="center">
+                                <template slot-scope="scope">
+                                    <span v-if="scope.row.clothScope == 0">全部衣服 折扣{{ getDiscountStr(scope.row.discount * 100) }}</span>
+                                    <div v-if="scope.row.clothScope == 1">
+                                        <div v-for="(item, i) in scope.row.activityClothItemVOList" :key="i">#{{ i + 1 }} {{ item.clothItemName }} 折扣{{ getDiscountStr(item.discount * 100) }}</div>
+                                    </div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="适用支付方式" align="center">
+                                <template slot-scope="scope">
+                                    <span v-if="scope.row.payScope == 0">全部</span>
+                                    <span v-if="scope.row.payScope == 1">现金</span>
+                                    <span v-if="scope.row.payScope == 2">余额</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="可优惠金额(元)" align="center">
+                                <template slot-scope="scope">
+                                    <span>{{ calculateTotalDiscountByActivity(scope.row, scope.row.title) }}</span>
+                                </template>
+                            </el-table-column>
+                            <!-- <el-table-column label="衣服品牌" align="center" prop="name" width="120"> -->
+                            <!-- <template slot-scope="scope"> -->
+                            <!-- <span>{{ scope.row.clothBrandName }}</span> -->
+                            <!-- </template> -->
+                            <!-- </el-table-column> -->
+                            <!-- <el-table-column label="瑕疵" align="center"> -->
+                            <!-- <template slot-scope="scope"> -->
+                            <!-- <span> -->
+                            <!-- <template v-for="(color, index) in scope.row.orderClothFlawDTOS"> -->
+                            <!-- {{ index == 0 ? color.clothFlawName : ',' + color.clothFlawName }} -->
+                            <!-- </template> -->
+                            <!-- </span> -->
+                            <!-- </template> -->
+                            <!-- </el-table-column> -->
+                            <!-- <el-table-column label="洗涤方式" align="center" width="80"> -->
+                            <!-- <template slot-scope="scope"> -->
+                            <!-- <span>{{ scope.row.clothWashModeName }}</span> -->
+                            <!-- </template> -->
+                            <!-- </el-table-column> -->
+                            <!-- <el-table-column label="原价（元）" align="center" prop="totalPrice" width="100" /> -->
+                            <!-- <el-table-column label="抵扣金额（元）" align="center" prop="deductAmount" width="130" /> -->
+                            <!-- <el-table-column label="折扣金额（元）" align="center" width="130">
+                                <template slot-scope="scope">
+                                    <span>{{ parseInt((scope.row.totalPrice - scope.row.deductAmount) * 100 * parseInt(100 - orderForm.discountCoupon.deductAmount * 100)) / 10000 }}</span>
+                                </template>
+                            </el-table-column> -->
+                            <el-table-column label="操作" align="center">
+                                <template slot-scope="scope">
+                                    <el-button type="text" style="color: #67c23a" @click="onSelectActivityItem({})" v-if="activity.id === scope.row.id">不使用</el-button>
+                                    <el-button type="text" @click="onSelectActivityItem(scope.row)" v-else>使用</el-button>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </el-tab-pane>
+                    <el-tab-pane label="现金券" name="2">
+                        <el-form-item label="现金券" prop="cashDeductAmount">
+                            <el-input-number
+                                style="text-align: left"
+                                v-model="orderForm.cashDeductAmount"
+                                placeholder="请输入现金券金额"
+                                :precision="2"
+                                clearable
+                                :controls="false"
+                                :max="(parseInt(calculateTotalPrice() * 100) + parseInt(calculateDeliveryPrice() * 100) - parseInt(calculateTotalDiscountAmountWithoutCashAmount() * 100)) / 100"
+                            />
+                        </el-form-item>
+                        <el-form-item label="是否特殊" prop="isSpecial">
+                            <el-checkbox v-model="orderForm.isSpecial"></el-checkbox>
+                        </el-form-item>
+                    </el-tab-pane>
                                 </el-tabs>
                         </el-card>
                     </div>

admin-ui/src/views/order/cloth/orderList.vue

@@ -298,7 +298,7 @@
 
 <script>
 import { listOrderCloth, refundOrderCloth } from '../../../api/order/cloth'
-import { listOrderClothItem } from '../../../api/order/clothItem'
+import { listOrderClothItem, printCloth } from '../../../api/order/clothItem'
 import { getLodop } from '@/utils/lodopUtils'
 import { allOrg } from '@/api/system/store'
 
@@ -494,23 +494,30 @@ export default {
                 .catch(() => {})
         },
         btn_lodop(row) {
-            // if (this.userInfoVO.userType == '02') {
-            //     const obj = {
-            //         name: this.userInfoVO.storeName,
-            //         contactPhone: this.userInfoVO.phonenumber,
-            //         user: this.userInfoVO.nickName,
-            //     }
-            //     row.sysOrg = obj
-            // }
-
-            this.pointerInfo = row
+            let sysOrg = {}
+            if (this.userInfoVO.userType == '02') {
+                const obj = {
+                    name: this.userInfoVO.storeName,
+                    contactPhone: this.userInfoVO.phonenumber,
+                    user: this.userInfoVO.nickName,
+                }
+                // row.sysOrg = obj
+                sysOrg = obj
+            }
+
+            // this.pointerInfo = row
             console.log(row)
             const _ = this
-            listOrderClothItem({ pageSize: 99999, pageNum: 1, orderNo: row.orderNo }).then((res) => {
-                console.log("AAAAA", res)
-                this.pointerInfo.orderClothDetails = res.rows
+            printCloth(row.id).then(res => {
+                res.data.sysOrg = sysOrg
+                this.pointerInfo = res.data
                 this.pointerType = true
             })
+            // listOrderClothItem({ pageSize: 99999, pageNum: 1, orderNo: row.orderNo }).then((res) => {
+            //     console.log("AAAAA", res)
+            //     this.pointerInfo.orderClothDetails = res.rows
+            //     this.pointerType = true
+            // })
 
             
         },

admin-ui/src/views/order/retailOrder/index.vue

@@ -343,6 +343,7 @@
 import { cancelOrder, getGoods, listGoods, outOrderGoods, refundOrderGoods, rePayOrder, getdeliveryAll, getDeliveryPath } from '@/api/order/goods'
 import { findUserByPhoneNumber, getUser } from '@/api/app/user'
 import { getLodop } from '@/utils/lodopUtils'
+import { printGoods } from '@/api/order/clothItem'
 
 export default {
     name: 'goodsRetailOrder',
@@ -851,7 +852,7 @@ export default {
                 }
             })
 
-            getGoods(row.id).then((res) => {
+            printGoods(row.id).then((res) => {
                 if (this.userInfoVO.userType == '02') {
                     const obj = {
                         name: this.userInfoVO.storeName,

admin-ui/src/views/workbench/workRecharge/index.vue

@@ -331,6 +331,7 @@ import { addOrder, getOrderIsAllPayByOrderNo, getOrderStatusByOrderNo, morePay,
 import { getRechargeTypeRelationActivityInfo } from '@/api/activity/rechargeItem'
 import payStatusPopup from '@/components/payStatusPopup'
 import { getLodop } from '@/utils/lodopUtils'
+import { printRecharge } from '@/api/order/clothItem'
 
 export default {
     name: 'workRecharge',
@@ -747,17 +748,9 @@ export default {
                 }
             }
 
-            getOrder(data.id).then((response) => {
+            printRecharge(data.id).then((response) => {
                 response.data.sysOrg = sysOrg
-                response.data.contactPhone = data.appUserInfo.phoneNumber
-                response.data.contactName = data.appUserInfo.realName
-                response.data.contactAddress = ''
-                if (data.appUserInfo.defaultAddress) {
-                    let defaultAddress = data.appUserInfo.defaultAddress
-                    response.data.contactAddress = `${defaultAddress.province || ''}${ defaultAddress.city|| ''}${ defaultAddress.area|| ''}${ defaultAddress.address|| ''}${ defaultAddress.addressDetail|| ''}`
-                }
                 this.exchangeClothPrinter(data.LODOP, response.data, data.p_name)
-
             })
 
         },