doum
16 小时以前 6e996f74553e1418531e119ae9d5fd1630ea28d4
经销商管理
已修改3个文件
72 ■■■■■ 文件已修改
admin/src/components/business/OperaGoodsOrderDetail.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaOrderRefundWindow.vue 66 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/goodsorder.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaGoodsOrderDetail.vue
@@ -16,7 +16,6 @@
          <div style="text-align: right;">
            <div class="header-red-btn" v-if="info.status == 0 || info.status == 1" @click="$refs.OperaOrderCancelWindow.open('取消订单', info)">取消订单</div>
            <div class="header-red-btn" v-if="info.status == 3" @click="$refs.OperaOrderRefundWindow.open('订单退款', info)">订单退款</div>
            <div class="header-blue-btn" @click="showChangeRecord">变更记录</div>
          </div>
      </div>
      <div class="info-item">
@@ -55,6 +54,7 @@
          <div  class="header-b">快递信息</div>
          <div class="header-blue-btn" v-if="info.status==1 && info.receiveType!=1"  @click="$refs.operaShipmentsWindow.open('发货',info)">发货</div>
          <div class="header-blue-btn" v-if="info.status==2 && info.receiveType!=1"  @click="$refs.operaShipmentsWindow.open('快递变更',info)">快递变更</div>
          <div class="header-blue-btn" @click="showChangeRecord">快递变更记录</div>
        </div>
        <div class="info-item"  >
          <div class="info-item-a">收货人:<span class="el-icon-user">{{info.linkname}}</span></div>
admin/src/components/business/OperaOrderRefundWindow.vue
@@ -42,7 +42,7 @@
      <div class="info-item"  >
        <div class="info-item-a">积分抵扣:<span v-if="(info.integral||0)>0">-¥{{(info.integral||0).toFixed(2) +'  '}}使用{{(info.useIntegral||0)}}积分抵扣¥{{(info.integral||0).toFixed(2) +'  '}}元</span></div>
        <div class="info-item-a">优惠券:<span v-if="(info.couponPrice||0)>0">-¥{{(info.couponPrice||0).toFixed(2) +'  '}} 使用{{info.couponName}}</span></div>
        <div class="info-item-a">经销商结算:<span> ¥{{(info.totalPrice||0).toFixed(2)}}</span></div>
        <div class="info-item-a">经销商结算:<span style="margin-right: 10px;"> ¥{{(info.shopSettlement||0).toFixed(2)}}</span>({{info.shopName}})</div>
      </div>
      <div class="info-item"  >
        <div class="info-item-a">实付金额:<span class="red"> ¥{{(info.price||0).toFixed(2)}}</span></div>
@@ -53,32 +53,32 @@
        <div  class="header-b">退款内容</div>
        <div class="info-item"  >
          <el-form :model="form" ref="form" label-width="120px" label-suffix=":"  :rules="rules" inline>
            <el-form-item label="退款金额" prop="price" style="display: block;">
              <el-input type="number"  v-model="form.price" placeholder="请输入退款金额" v-trim>  <template slot="append"> 元</template>  </el-input>
            <el-form-item label="退款金额" prop="money" style="display: block;">
              <el-input type="number"  v-model="form.money" placeholder="请输入退款金额" v-trim>  <template slot="append"> 元</template>  </el-input>
              <span class="tip-warn" style="margin-bottom: 30px;font-size: 14px;">   <i class="el-icon-warning"></i>
              提示:当前订单最多可退金额为<span class="red">{{(info.price||0).toFixed(2)}}</span></span>
            </el-form-item>
            <div style="display:flex;">
              <el-form-item label="退还" prop="refundInfo"  style="display: inline;">
                <el-checkbox style="border: none;" v-model="checked1" label="退还客户优惠券" border></el-checkbox>
                <el-checkbox style="border: none;" v-model="form.returnUseCouponStatus" label="退还客户优惠券" border></el-checkbox>
              </el-form-item>
              <el-form-item label="" prop="refundInfo"  style="display: inline;">
                <el-checkbox style="border: none"  v-model="checked1" label="退还客户积分" border></el-checkbox>
                <el-checkbox style="border: none"  v-model="form.returnUseIntegralStatus" label="退还客户积分" border></el-checkbox>
              </el-form-item>
            </div>
            <div style="display:flex;">
              <el-form-item label="扣除" prop="refundInfo"  style="display: inline;">
                <el-checkbox style="border: none"  v-model="checked1" label="扣除经销商已结算金额" border></el-checkbox>
                <el-checkbox style="border: none"  v-model="form.returnShopSettlementStatus" label="扣除经销商已结算金额" border></el-checkbox>
              </el-form-item>
              <el-form-item label="" prop="refundInfo"  style="display: inline;">
                <el-checkbox style="border: none"  v-model="checked1" label="扣除已返客户积分" border></el-checkbox>
                <el-checkbox style="border: none"  v-model="form.returnIntegralStatus" label="扣除已返客户积分" border></el-checkbox>
              </el-form-item>
              <el-form-item label="" prop="refundInfo"  style="display: inline;">
                <el-checkbox style="border: none"  v-model="checked1" label="扣除已返经销商积分" border></el-checkbox>
                <el-checkbox style="border: none"  v-model="form.returnShopIntegralStatus" label="扣除已返经销商积分" border></el-checkbox>
              </el-form-item>
            </div>
            <el-form-item label="备注" prop="refundInfo"  style="display: block;">
              <el-input type="textarea" :autosize="{ minRows: 4, maxRows:4 }" style="width: 500px;" v-model="form.cancelInfo" placeholder="请输入取消说明"  v-trim/>
            <el-form-item label="备注" prop="remark"  style="display: block;">
              <el-input type="textarea" :autosize="{ minRows: 4, maxRows:4 }" style="width: 500px;" v-model="form.remark" placeholder="请输入取消说明"  v-trim/>
            </el-form-item>
          </el-form>
        </div>
@@ -108,16 +108,20 @@
      info: {},
      shopInfo: {},
      rules: {
        price: [
        money: [
          { required: true, message: '请输入退款金额', tigger: 'blur' }
        ]
      },
      // 搜索
      form: {
        id: '',
        checked1:false,
        price: 0,
        type: null
        orderId: '',
        money: null,
        returnShopIntegralStatus: false,
        returnIntegralStatus: false,
        returnShopSettlementStatus: false,
        returnUseIntegralStatus: false,
        returnUseCouponStatus: false,
        remark: ''
      }
    }
  },
@@ -143,21 +147,46 @@
      this.title = title
      this.visible = true
      this.info = info || {}
      this.form.price = ''
      this.form = {
        orderId: info.id,
        money: null,
        returnShopIntegralStatus: false,
        returnIntegralStatus: false,
        returnShopSettlementStatus: false,
        returnUseIntegralStatus: false,
        returnUseCouponStatus: false,
        remark: ''
      }
      if (this.info.distributionShopId != null) {
        this.loadInfo()
      }
    },
    doSubmit () {
    },
    confirm () {
      this.$refs.form.validate((valid) => {
        if (!valid) {
          return
        }
        this.$dialog.messageWaring(`确定进行退款该订单:${this.info.code}?`)
        var msg = `确定对订单【${this.info.code}】进行退款操作吗?`
        if (this.form.returnShopSettlementStatus && (this.info.shopSettlement || 0) > 0 && (this.info.shopSettlement || 0) > (this.shopInfo.amount || 0)) {
          msg = '经销商余额不足,' + msg
        }
        this.$dialog.messageWaring(msg)
          .then(() => {
            this.isWorking = true
            this.api.orderRefund(this.form)
            this.api.orderRefund({
              orderId: this.form.id,
              money: this.form.money,
              returnShopIntegralStatus: this.form.returnShopIntegralStatus ? 1 : 0,
              returnIntegralStatus: this.form.returnIntegralStatus ? 1 : 0,
              returnShopSettlementStatus: this.form.returnShopSettlementStatus ? 1 : 0,
              returnUseIntegralStatus: this.form.returnUseIntegralStatus ? 1 : 0,
              returnUseCouponStatus: this.form.returnUseCouponStatus ? 1 : 0,
              remark: this.form.remark
            })
              .then(() => {
                this.visible = false
                this.$tip.apiSuccess('退款成功')
@@ -169,7 +198,6 @@
                this.isWorking = false
              })
          })
        // 调用新建接口
      })
    }
admin/src/views/business/goodsorder.vue
@@ -163,11 +163,11 @@
import OperaOrderMarkWindow from '@/components/business/OperaOrderMarkWindow'
import OperaOrderCancelWindow from '@/components/business/OperaOrderCancelWindow'
import OperaGoodsOrderDetail from '@/components/business/OperaGoodsOrderDetail'
import OperaOrderRefundWindow from "@/components/business/OperaOrderRefundWindow";
import OperaOrderRefundWindow from '@/components/business/OperaOrderRefundWindow'
export default {
  name: 'Goodsorder',
  extends: BaseTable,
  components: {OperaOrderRefundWindow, TableLayout, Pagination, OperaShipmentsWindow, OperaOrderMarkWindow, OperaGoodsOrderDetail,OperaOrderCancelWindow },
  components: { OperaOrderRefundWindow, TableLayout, Pagination, OperaShipmentsWindow, OperaOrderMarkWindow, OperaGoodsOrderDetail, OperaOrderCancelWindow },
  data () {
    return {
      status: '10',