Merge remote-tracking branch 'origin/main'

fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/xml/PrintDeviceInfoMapper.xml

@@ -142,7 +142,7 @@
     <select id="getInfoByStoreId" resultType="com.fuint.business.printer.entity.PrintDeviceInfo">
         select
             id,machine_code,msign,device_name,user_id,app_key,app_secret,app_public_key,platform_public_key,access_token,payment,create_time,update_time,create_by,update_by,store_id ,acquiesce       from print_device_info
-        where store_id = #{storeId} and acquiesce = true limit 1
+        where store_id = #{storeId} and acquiesce = 0 order by create_time ASC limit 1
     </select>
 
     <!--新增所有列-->

fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue

@@ -186,7 +186,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <div style="color: #fe8c4a" size="mini"
+                <div style="color: #fe8c4a" size="mini" class="makeupticket"
                      @click="getOrdersInfo(scope.row.id)"
                      type="text" plain round
                 >详情
@@ -195,13 +195,13 @@
                 <!--                           @click="getOrdersInfo2(scope.row.id)"-->
                 <!--                           type="text" plain round>详情2-->
                 <!--                </el-button>-->
-                <div style="color: #fe8c4a" size="mini"
+                <div style="color: #fe8c4a" size="mini" class="makeupticket"
                      v-if="scope.row.status === 'paid'"
                      @click="patchwork(scope.row)"
                      type="text" plain round
                 >补打小票
                 </div>
-                <div style="color: #fe8c4a" size="mini"
+                <div style="color: #fe8c4a" size="mini" class="makeupticket"
                      v-if="scope.row.status === 'paid'"
                      @click="refHandleRefund(scope.row.id)"
                      type="text" plain round
@@ -1024,13 +1024,14 @@ export default {
         if (order.oilCardAmount) {
           oilCardAmount += order.oilCardAmount
         }
+        console.log(22222222222)
         let o = {
           oilName: this.getName(this.oilNameList, order.oils) + "-" + this.getName1(this.oilGunList, order.oilGunNum),
           amount: order.orderAmount.toString(),
           // amount : order.oilPayAmount.toString(),
           oilNum: order.oilNum.toString(),
-          payUser:order.payUser.toString(),
-          orderNo:order.orderNo.toString()
+          payUser:order.payUser,
+          orderNo:order.orderNo
         }
         oilOrderR.push(o)
       })