修改

src/App.vue

@@ -178,7 +178,7 @@ export default {
 }
 </script>
 <style>
-  @import "//at.alicdn.com/t/font_635492_corysyogb8g.css";
+  @import "//at.alicdn.com/t/font_635492_cw0nj8x92zc.css";
   @import "./assets/css/Semibold.css";
   @import "./assets/css/global/config.css";
   @import "./assets/css/fileIcon.css";

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1916,7 +1916,7 @@
                       <div v-if="OrderDataList.IsUpdateOrderCommission"
                         @click='EwMsg.OrderId = item.OrderId, EwMsg.ExtraRewardMoney = item.ExtraRewardMoney,EwMsg.ExtraDeductMoney=item.ExtraDeductMoney, OrderMoneyDialog = true'>
                         {{$t('ground.szewaijine')}}</div>
-                      <div @click="SetShouSunClick(item.OrderId,item.GuestNum)">{{$t('ground.shezhissje')}}</div>
+                      <div @click="SetShouSunClick(item.OrderId,item.GuestNum,item)">{{$t('ground.shezhissje')}}</div>
                       <div @click="ZhuiJiaTuanKuan(item.OrderId)" v-if="RBBranchId == 0">{{$t('ground.zjiatk')}}</div>
                       <div @click='deleteItem(item)'>{{$t('system.table_delete')}}</div>
                     </div>
@@ -2024,6 +2024,8 @@
                   <el-tooltip class="item" effect="dark" :content="$t('salesModule.ByB2b')" placement="top"
                     v-show="childItem.IsFormB2B ==1"> <i class="iconfont icon-tiaozheng"
                       style="font-size:22px;color:#297BEF;"></i></el-tooltip>
+                  <el-tooltip class="item" effect="dark" content="小程序订单" placement="top" v-show="childItem.MiniAppUserId>0">
+                    <i class="iconfont icon-xiaochengxu1" style="font-size:24px;color:#297BEF;"></i></el-tooltip>
                 </div>
                 <div class="RL_CreatInfo">{{childItem.CreateBy}}<span v-if="childItem.LeaveStr!=''"
                     style="color:red">({{childItem.LeaveStr}})</span></div>
@@ -2218,7 +2220,7 @@
                         <div v-if="OrderDataList.IsUpdateOrderCommission"
                           @click='EwMsg.OrderId = childItem.OrderId, EwMsg.ExtraRewardMoney = childItem.ExtraRewardMoney,EwMsg.ExtraDeductMoney=childItem.ExtraDeductMoney, OrderMoneyDialog = true'>
                           {{$t('ground.szewaijine')}}</div>
-                        <div @click="SetShouSunClick(childItem.OrderId, childItem.GuestNum)">{{$t('ground.shezhissje')}}
+                        <div @click="SetShouSunClick(childItem.OrderId, childItem.GuestNum, childItem)">{{$t('ground.shezhissje')}}
                         </div>
                         <div v-if="childItem.IsChargeLossOrders==1" @click="setChargeLoss(childItem)">
                           {{$t('salesModule.LossSheet')}}</div>
@@ -2228,7 +2230,7 @@
                         <div @click="importNameOrder(childItem.OrderId)"
                           v-if="OrderDataList.OtherOrderList.length == 1 && subItem.List.length == 1">
                           {{$t('ground.daorulkmd')}}</div>
-                        <div v-if="childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'"
+                        <div v-if="(childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3')&&getDelShow(childItem)"
                           @click='deleteItem(childItem)'>
                           {{$t('system.table_delete')}}
                         </div>
@@ -2643,7 +2645,7 @@
                       <div v-if="OrderDataList.IsUpdateOrderCommission"
                         @click='EwMsg.OrderId = item.OrderId, EwMsg.ExtraRewardMoney = item.ExtraRewardMoney,EwMsg.ExtraDeductMoney=item.ExtraDeductMoney, OrderMoneyDialog = true'>
                         {{$t('ground.szewaijine')}}</div>
-                      <div @click="SetShouSunClick(item.OrderId, item.GuestNum)">{{$t('ground.shezhissje')}}</div>
+                      <div @click="SetShouSunClick(item.OrderId, item.GuestNum ,item)">{{$t('ground.shezhissje')}}</div>
 
                       <div @click="ZhuiJiaTuanKuan(item.OrderId)" v-if="RBBranchId == 0">{{$t('ground.zjiatk')}}</div>
                       <div @click="importNameOrder(item.OrderId)">{{$t('ground.daorulkmd')}}</div>
@@ -2975,7 +2977,7 @@
 
     <el-dialog custom-class='w600' :title="$t('ground.xgddssje')" :visible.sync="shousunDialog"
       :SetShouSunGuestNum="SetShouSunGuestNum" center>
-      <commonShouSun ref="childShou" :Type="1" @closeShouSun="closeShouSunDialog" @getList="getList"></commonShouSun>
+      <commonShouSun ref="childShou" :Type="1" :MiniAppUserId="MiniAppUserId" :MyIsChargeLossOrders="MyIsChargeLossOrders" @closeShouSun="closeShouSunDialog" @getList="getList"></commonShouSun>
     </el-dialog>
 
 
@@ -3568,7 +3570,9 @@
           Remark:'',
           IsLoss:1, //是否受损 1是2否
           LossMoney:'' //收损金额
-        }
+        },
+        MiniAppUserId:0, 
+        MyIsChargeLossOrders:0
       };
     },
     components: {
@@ -3744,9 +3748,11 @@
         this.shousunDialog = false;
       },
       //点击设置收损
-      SetShouSunClick(OrderId, GuestNum) {
+      SetShouSunClick(OrderId, GuestNum, obj) {
         this.shousunDialog = true;
         this.SetShouSunGuestNum = GuestNum
+        this.MiniAppUserId = obj.MiniAppUserId;
+        this.MyIsChargeLossOrders = obj.IsChargeLossOrders;
         this.$nextTick(() => {
           this.$refs.childShou.getShouSunList(OrderId);
         })
@@ -4090,8 +4096,19 @@
         });
 
       },
-
+      //判断是否显示取消按钮
+      getDelShow(obj){
+        if(obj.MiniAppUserId>0&&obj.Income>0){
+          return false
+        }else{
+          return true
+        }
+      },
       deleteItem(obj) {
+        if(obj.IsChargeLossOrders==1){
+          this.Error('小程序订单已设为收损，无法取消；');
+          return
+        }
         this.$confirm(this.$t('tips.shifouquxiao'), this.$t('tips.tips'), {
             confirmButtonText: this.$t('pub.sureBtn'),
             cancelButtonText: this.$t('pub.cancelBtn'),
@@ -5743,6 +5760,7 @@
       },
       //op确认取消
       opSureAudit(){
+         this.$message('数据保存中...');
          this.apipost('sellorder_post_SetAuditUserApplyForCancel', this.OpSureMsg , res => {
             if (res.data.resultCode == 1) {
               this.Success(res.data.message);

src/components/commonPage/commonShouSun.vue

@@ -109,8 +109,16 @@
                         <span class="totalRemarkSpan">
                             {{$t('ground.quanbujineshezhi')}}
                         </span>
+                        <div style="margin-top:43px;text-align:left;padding-left:20px;color:red;">
+                            <span v-if="MiniAppUserId>0&&MyIsChargeLossOrders==1">
+                                注：小程序订单已收损，无法再次修改收损金额， 如需修改请联系管理员；
+                            </span>
+                            <span v-if="MiniAppUserId>0&&MyIsChargeLossOrders==0">
+                                注：保存后会自动创建小程序退款单据，请注意核实；
+                            </span>
+                        </div>
                         <input type="button" class="normalBtn" @click="closeDialog()" :value="$t('pub.cancelBtn')" />
-                        <input type="button" class="normalBtn" @click="setShouSun()" :value="$t('pub.saveBtn')" />
+                        <input type="button" class="normalBtn" v-if="getShow()"  @click="setShouSun()" :value="$t('pub.saveBtn')" />
                     </td>
                 </tr>
             </tfoot>
@@ -119,7 +127,7 @@
 </template>
 <script>
   export default {
-    props: ["Type", "SetShouSunGuestNum"],
+    props: ["Type", "SetShouSunGuestNum","MiniAppUserId","MyIsChargeLossOrders"],
     data() {
       return {
           dataList:[],
@@ -156,6 +164,14 @@
       closeDialog() {
         this.$emit("closeShouSun");
       },
+      //判断是否显示确定按钮
+      getShow(){
+          if(this.MiniAppUserId>0&&this.MyIsChargeLossOrders==1){
+              return false
+          }else{
+              return true
+          }
+      },
       //保存
       setShouSun(){
         let msg={
@@ -193,7 +209,7 @@
       }
     },
     mounted() {
-       
+
     }
   };
 </script>