UI微调

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

@@ -248,7 +248,7 @@ export default {
 
     close() {
       const _ = this
-      if (this.type == 1) {
+      if (this.type == 1 || this.type == 6) {
         // this.$confirm('是否关闭打印操作？')
         //   .then(() => {
             _.show = false
@@ -275,18 +275,18 @@ export default {
       if (this.type == 4) {
         _.show = false
       }
-      if (this.type == 6) {
-        // if (!this.hidePointer) {
-        //   this.$confirm('是否关闭打印操作？')
-        //   .then(() => {
-            _.show = false
-            _.$emit('close')
-          // })
-        //   .catch(() => { })
-        // } else {
-        //   _.show = false
-        // }
-      }
+      // if (this.type == 6) {
+      //   // if (!this.hidePointer) {
+      //   //   this.$confirm('是否关闭打印操作？')
+      //   //   .then(() => {
+      //       _.show = false
+      //       _.$emit('close')
+      //     // })
+      //   //   .catch(() => { })
+      //   // } else {
+      //   //   _.show = false
+      //   // }
+      // }
     },
 
     confirm() {

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

@@ -1572,7 +1572,8 @@ export default {
                 }
             }
             // console.log('specialPrice:' + specialPrice)
-            return specialPrice
+            let num = Math.round(specialPrice * 100) / 100
+            return num
         },
         calculateClothName(index) {
             var clothName = this.orderClothItemDTOS[index].name
@@ -1587,7 +1588,8 @@ export default {
             for (let i = 0; i < this.orderClothItemDTOS.length; i++) {
                 price += this.calculateClothSpecialPrice(i) + this.orderClothItemDTOS[i].defaultPrice
             }
-            return price
+            let num = Math.round(price * 100) / 100
+            return num
         },
         //</editor-folder>
 

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

@@ -923,9 +923,9 @@ export default {
         // 处理支付成功
         handlePaySuccess() {
             // 通知父组件支付成功，但不关闭收银台
-            this.$emit('onPaySuccess', {
-                keepDialogOpen: true
-            });
+            // this.$emit('onPaySuccess', {
+            //     keepDialogOpen: true
+            // });
         },
         // 处理确认
         handleConfirm(orderInfo) {

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

@@ -14,15 +14,16 @@
                     <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable style="width: 180px">
                         <el-option key="5" label="待入厂" value="5" />
                         <el-option key="6" label="清洗中" value="6" />
-                        <el-option key="7" label="已上挂" value="7" />
-                        <el-option key="8" label="待送衣" value="8" />
-                        <el-option key="9" label="送衣中" value="9" />
-                        <el-option key="11" label="已完成" value="11" />
-                      <el-option key="-1" label="已取消" value="-1" />
+                        <el-option key="7" label="已出厂" value="7" />
+                        <el-option key="8" label="已到店" value="8" />
+                        <!-- <el-option key="9" label="待送衣" value="9" />
+                        <el-option key="10" label="送衣中" value="10" /> -->
+                        <el-option key="12" label="已完成" value="12" />
+                        <el-option key="-1" label="已取消" value="-1" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="订单条码" prop="orderNo">
-                    <el-input v-model="queryParams.orderNo" placeholder="请输入订单条码" clearable style="width: 200px" @keyup.enter.native="handleQuery">
+                <el-form-item label="订单编码" prop="orderNo">
+                    <el-input v-model="queryParams.orderNo" placeholder="请输入订单编码" clearable style="width: 200px" @keyup.enter.native="handleQuery">
                         <i slot="prefix" class="el-input__icon el-icon-document"></i>
                     </el-input>
                 </el-form-item>
@@ -114,7 +115,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="退款状态" align="center" width="200">
+        <el-table-column label="退款状态" align="center" width="100">
           <template slot-scope="scope">
             <div class="status-group">
               <dict-tag :options="dict.type.goods_order_refund_status" :value="scope.row.refundStatus" />
@@ -133,7 +134,7 @@
           <template slot-scope="scope">
             <el-button type="text" icon="el-icon-s-order" size="mini" @click="handleDetail(scope.row)"> 订单详情 </el-button>
             <el-button type="text" icon="el-icon-printer" size="mini" @click="btn_lodop(scope.row)" v-if="userInfoVO.userType != '00'"> 打印订单 </el-button>
-            <el-button type="text" icon="el-icon-close" size="mini" @click="handleClose(scope.row)" v-if="scope.row.refundStatus == '0' && scope.row.orderStatus != '10' && scope.row.orderStatus != '11' && scope.row.orderStatus != '4'"> 撤销 </el-button>
+            <el-button type="text" icon="el-icon-close" size="mini" @click="handleClose(scope.row)" v-if="scope.row.refundStatus == '0' && (scope.row.orderStatus == '0' || scope.row.orderStatus == '1' || scope.row.orderStatus == '2'  || scope.row.orderStatus == '5' )"> 撤销 </el-button>
           </template>
         </el-table-column>
       </Page>

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

@@ -90,8 +90,8 @@
                         </template>
                         <template v-else>
                             <el-button type="text" size="mini" icon="el-icon-box" @click="handleDetail(scope.row)">取衣</el-button>
-                            <el-button v-if="scope.row.orderStatus == '8' || scope.row.orderStatus == '9'" type="text" size="mini" icon="el-icon-user" @click="selectDeliveryMan(scope)"> 分配派送员 </el-button>
-                            <el-button v-if="scope.row.orderStatus == '9'" type="text" size="mini" icon="el-icon-check" @click="confirmSend(scope)"> 确认送达 </el-button>
+                            <el-button v-if="(scope.row.orderStatus == '8' || scope.row.orderStatus == '9') && scope.row.sendClothWay == 1" type="text" size="mini" icon="el-icon-user" @click="selectDeliveryMan(scope)"> 分配派送员 </el-button>
+                            <el-button v-if="scope.row.orderStatus == '9' && scope.row.sendClothWay == 1" type="text" size="mini" icon="el-icon-check" @click="confirmSend(scope)"> 确认送达 </el-button>
                         </template>
                     </template>
                 </el-table-column>
@@ -560,7 +560,7 @@ export default {
                 this.$message.error('请先选择配送员')
                 return
             }
-            setSendDelivery({ deliveryManId: this.selectDeliveryForm.deliveryManId, orderId: this.orderDetail.id }).then((res) => {
+            setSendDelivery({ deliveryManId: this.selectDeliveryForm.deliveryManId, orderNo: this.orderDetail.orderNo }).then((res) => {
                 this.$message.success('设置成功')
                 this.deliveryOpen = false
                 this.getList()