【新增】1.零售单的弃审，2.修改bug

src/api/supply/retail.js

@@ -27,6 +27,15 @@ export function closeData(params) {
   })
 }
 
+// 弃审
+export function abandonData(params) {
+  return request({
+    url: '/retail/abandon',
+    method: 'post',
+    params
+  })
+}
+
 // 审批
 export function examineData(params) {
   return request({

src/views/supply/engin/components/home_form.vue

@@ -375,8 +375,8 @@ export default {
         jxsNum: [{ required: true, message: '请输入经销商编码', trigger: 'blur' }],
         jxsName: [{ required: true, message: '请输入经销商名称', trigger: 'blur' }],
         loginNum: [{ required: true, message: '请输入工程登录编号', trigger: 'blur' }],
-        enginName: [{ required: true, message: '请输入工程项目名称', trigger: 'blur' }],
-        loginType: [{ required: true, message: '请输入工程登录类型', trigger: 'blur' }],
+        // enginName: [{ required: true, message: '请输入工程项目名称', trigger: 'blur' }],
+        // loginType: [{ required: true, message: '请输入工程登录类型', trigger: 'blur' }],
         company: [{ required: true, message: '请输入使用单位', trigger: 'blur' }],
         saleType: [{ required: true, message: '请选择销售类型', trigger: 'change' }],
         // contactMan: [{ required: true, message: '请输入联系人', trigger: 'blur' }],

src/views/supply/retail/retail_list.vue

@@ -1,65 +1,36 @@
 <template>
   <div class="app-container">
-    <div
-      v-show="!isShowDetail && !isShowForm && !isShowExamine && !isShowReturn"
-    >
+    <div v-show="!isShowDetail && !isShowForm && !isShowExamine && !isShowReturn">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <el-form
-          ref="screenForm"
-          :model="screenForm"
-          label-width="70px"
-          size="small"
-          label-position="left"
-        >
+        <el-form ref="screenForm" :model="screenForm" label-width="70px" size="small" label-position="left">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item prop="status" label-width="0">
-                <el-radio-group
-                  v-model="screenForm.status"
-                  size="medium"
-                  @change="getList()"
-                >
+                <el-radio-group v-model="screenForm.status" size="medium" @change="getList()">
                   <el-radio-button label="">全部</el-radio-button>
-                  <el-radio-button
-                    v-for="(item, index) in statusList"
-                    :key="index"
-                    :label="item.value"
-                    >{{ item.label }}</el-radio-button
-                  >
+                  <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
                 </el-radio-group>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="订单号" prop="orderNum">
-                <el-input
-                  v-model="screenForm.orderNum"
-                  placeholder="请输入订单号"
-                ></el-input>
+                <el-input v-model="screenForm.orderNum" placeholder="请输入订单号"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="货品名称" prop="goodsName">
-                <el-input
-                  v-model="screenForm.goodsName"
-                  placeholder="请输入货品名称"
-                ></el-input>
+                <el-input v-model="screenForm.goodsName" placeholder="请输入货品名称"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="规格型号" prop="model">
-                <el-input
-                  v-model="screenForm.model"
-                  placeholder="请输入规格型号"
-                ></el-input>
+                <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经销商" prop="jxsName">
-                <el-input
-                  v-model="screenForm.jxsName"
-                  placeholder="请输入经销商"
-                ></el-input>
+                <el-input v-model="screenForm.jxsName" placeholder="请输入经销商"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -68,39 +39,28 @@
                   v-model="screenForm.date"
                   type="datetimerange"
                   range-separator="至"
-                  style="width: 100%"
+                  style="width: 100%;"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                >
+                  end-placeholder="结束日期">
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="制表人" prop="zbMan">
-                <el-input
-                  v-model="screenForm.zbMan"
-                  placeholder="请输入制表人"
-                ></el-input>
+                <el-input v-model="screenForm.zbMan" placeholder="请输入制表人"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="审核人" prop="shMan">
-                <el-input
-                  v-model="screenForm.shMan"
-                  placeholder="请输入审核人"
-                ></el-input>
+                <el-input v-model="screenForm.shMan" placeholder="请输入审核人"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :xs="24" :sm="12" :lg="6" class="tr">
               <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm"
-                  >清空</el-button
-                >
-                <el-button size="small" type="primary" @click="submitScreenForm"
-                  >搜索</el-button
-                >
+                <el-button size="small" @click="resetScreenForm">清空</el-button>
+                <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -110,274 +70,78 @@
       <div class="mymain-container">
         <div class="btn-group clearfix">
           <div class="fl">
-            <el-button
-              size="small"
-              type="primary"
-              icon="el-icon-plus"
-              @click="toForm()"
-              v-if="$checkBtnRole('add', $route.meta.roles)"
-              >新增</el-button
-            >
+            <el-button size="small" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">新增</el-button>
           </div>
           <div class="fr">
             <ExportButton :exUrl="'retail/export'" :exParams="exParams" />
           </div>
         </div>
         <div class="table">
-          <el-table
-            v-loading="listLoading"
-            :data="dataList"
-            element-loading-text="Loading"
-            border
-            fit
-            highlight-current-row
-            stripe
-          >
+          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
             <!-- <el-table-column align="center" label="提货进度" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-progress :text-inside="true" :stroke-width="26" :percentage="((scope.row.hasSendQty * 100) / (scope.row.totalQty * 100)) || 0"></el-progress>
               </template>
             </el-table-column> -->
-            <el-table-column
-              align="center"
-              label="审核状态"
-              prop="examineStatus"
-              min-width="100"
-              show-overflow-tooltip
-            >
+            <el-table-column align="center" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.examineStatus | statusFilter }}
+                {{scope.row.examineStatus | statusFilter}}
               </template>
             </el-table-column>
-            <el-table-column
-              align="center"
-              label="开票状态"
-              prop="isInvoicing"
-              min-width="100"
-              show-overflow-tooltip
-            >
+            <el-table-column align="center" label="开票状态" prop="isInvoicing" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.isInvoicing ? "已开票" : "未开票" }}
+                {{scope.row.isInvoicing ? '已开票':'未开票'}}
               </template>
             </el-table-column>
-            <el-table-column
-              align="center"
-              label="订单号"
-              prop="id"
-              min-width="200"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="订单日期"
-              prop="theTime"
-              min-width="120"
-              show-overflow-tooltip
-            >
+            <el-table-column align="center" label="订单号" prop="id" min-width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="订单日期" prop="theTime" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 <div>
-                  <span>{{ scope.row.theTime | dateToDayFilter }}</span>
-                  <el-button
-                    type="text"
-                    icon="el-icon-edit"
-                    style="padding: 0; margin-left: 6px"
-                    @click="editDate(scope.row)"
-                  ></el-button>
+                  <span>{{scope.row.theTime | dateToDayFilter}}</span>
+                  <el-button type="text" icon="el-icon-edit" style="padding: 0; margin-left: 6px" @click="editDate(scope.row)" ></el-button>
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              align="center"
-              label="销售类型"
-              prop="saleTypeName"
-              min-width="100"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="货品名称"
-              prop="materialName"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="规格型号"
-              prop="specification"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="计量单位"
-              prop="unit"
-              min-width="100"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="是否直调"
-              prop="isDirectTransfer"
-              min-width="100"
-              show-overflow-tooltip
-            >
+            <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="货品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="计量单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.isDirectTransfer ? "是" : "否" }}
+                {{scope.row.isDirectTransfer ? '是':'否'}}
               </template>
             </el-table-column>
-            <el-table-column
-              align="center"
-              label="总数量"
-              prop="qty"
-              min-width="100"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="直调数量"
-              prop="directTransferQty"
-              min-width="100"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="出库数量"
-              prop="hasSendQty"
-              min-width="100"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="可退数量"
-              prop="refundableQty"
-              min-width="100"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="单价"
-              prop="price"
-              min-width="100"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="金额"
-              prop="payAmount"
-              min-width="100"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="返利类型"
-              prop="customerWalletName2"
-              min-width="120"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="返利金额"
-              prop="rebateAmount"
-              min-width="100"
-              show-overflow-tooltip
-            >
+            <el-table-column align="center" label="总数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="出库数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="可退数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="金额" prop="payAmount" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="返利类型" prop="customerWalletName2" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="返利金额" prop="rebateAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                <div>{{ scope.row.rebateAmount }}</div>
-                <div>(实际：{{ scope.row.payRebateAmount }})</div>
+                <div>{{scope.row.rebateAmount}}</div>
+                <div>(实际：{{scope.row.payRebateAmount}})</div>
               </template>
             </el-table-column>
-            <el-table-column
-              align="center"
-              label="格力折扣"
-              prop="totalDiscAmount"
-              min-width="100"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="制表人"
-              prop="createName"
-              min-width="100"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="制表日期"
-              prop="createTime"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="审核人"
-              prop="examineName"
-              min-width="100"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="审核日期"
-              prop="examineTime"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="操作"
-              width="180"
-              fixed="right"
-            >
+            <el-table-column align="center" label="格力折扣" prop="totalDiscAmount" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="制表人" prop="createName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="审核人" prop="examineName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="审核日期" prop="examineTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="操作" width="180" fixed="right">
               <template slot-scope="scope">
-                <el-button
-                  type="text"
-                  @click="toForm(scope.row)"
-                  v-if="
-                    $checkBtnRole('edit', $route.meta.roles) &&
-                    scope.row.examineStatus === 'SAVE'
-                  "
-                  >编辑</el-button
-                >
-                <el-button
-                  type="text"
-                  @click="toExamine(scope.row)"
-                  v-if="
-                    $checkBtnRole('examine', $route.meta.roles) &&
-                    scope.row.examineStatus === 'WAIT'
-                  "
-                  >审批</el-button
-                >
-                <el-button
-                  type="text"
-                  @click="toReturn(scope.row)"
-                  v-if="
-                    $checkBtnRole('examine', $route.meta.roles) &&
-                    scope.row.examineStatus === 'OK'
-                  "
-                  >退订</el-button
-                >
-                <el-button type="text" @click="toDetail(scope.row)"
-                  >详情</el-button
-                >
-                <el-popconfirm
-                  style="margin-left: 10px"
-                  title="确定申请吗？"
-                  @onConfirm="handleSubmit(scope.row.id)"
-                  v-if="
-                    $checkBtnRole('apply', $route.meta.roles) &&
-                    scope.row.examineStatus === 'SAVE'
-                  "
-                >
+                <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles) && scope.row.examineStatus === 'SAVE'">编辑</el-button>
+                <el-button type="text" @click="toExamine(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">审批</el-button>
+                <el-popconfirm style="margin-left: 10px;" title="确定弃审吗？" @onConfirm="handleAbandon(scope.row.id)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >
+                  <el-button slot="reference" type="text">弃审</el-button>
+                </el-popconfirm>
+                <el-button type="text" @click="toReturn(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'">退订</el-button>
+                <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
+                <el-popconfirm style="margin-left: 10px;" title="确定申请吗？" @onConfirm="handleSubmit(scope.row.id)" v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'SAVE'" >
                   <el-button slot="reference" type="text">申请</el-button>
                 </el-popconfirm>
-                <el-popconfirm
-                  style="margin-left: 10px"
-                  title="确定关闭吗？"
-                  @onConfirm="handleClose(scope.row.id)"
-                  v-if="
-                    $checkBtnRole('examine', $route.meta.roles) &&
-                    !scope.row.closeTime
-                  "
-                >
+                <el-popconfirm style="margin-left: 10px;" title="确定关闭吗？" @onConfirm="handleClose(scope.row.id)" v-if="$checkBtnRole('examine', $route.meta.roles) && !scope.row.closeTime" >
                   <el-button slot="reference" type="text">关闭</el-button>
                 </el-popconfirm>
               </template>
@@ -394,50 +158,31 @@
             :page-sizes="[10, 20, 30, 50]"
             :page-size="10"
             layout="total, sizes, prev, pager, next, jumper"
-            :total="listTotal"
-          >
+            :total="listTotal">
           </el-pagination>
         </div>
       </div>
     </div>
 
-    <EditDateDialog
-      :isShow.sync="isShowEditDateDialog"
-      :dateForm.sync="dateForm"
-    />
+    <EditDateDialog :isShow.sync="isShowEditDateDialog" :dateForm.sync="dateForm" />
+
+    <RetailDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
+    <RetailForm :listItem="queryItem" v-if="isShowForm" @backListFormDetail="backList" />
+    <RetailExamine :listItem="queryItem" v-if="isShowExamine" @backListFormDetail="backList" />
+    <RetailReturn :listItem="queryItem" v-if="isShowReturn" @backListFormDetail="backList" />
 
-    <RetailDetail
-      :listItem="queryItem"
-      v-if="isShowDetail"
-      @backListFormDetail="backList"
-    />
-    <RetailForm
-      :listItem="queryItem"
-      v-if="isShowForm"
-      @backListFormDetail="backList"
-    />
-    <RetailExamine
-      :listItem="queryItem"
-      v-if="isShowExamine"
-      @backListFormDetail="backList"
-    />
-    <RetailReturn
-      :listItem="queryItem"
-      v-if="isShowReturn"
-      @backListFormDetail="backList"
-    />
   </div>
 </template>
 
 <script>
-import { getList, closeData, submitData, editData } from "@/api/supply/retail";
+import { getList, closeData, submitData, editData, abandonData } from "@/api/supply/retail";
 import RetailDetail from "@/views/supply/retail/components/retail_detail";
 import RetailForm from "@/views/supply/retail/components/retail_form";
 import RetailExamine from "@/views/supply/retail/components/retail_examine";
 import RetailReturn from "@/views/supply/retail/components/retail_return";
 import EditDateDialog from "@/components/Common/edit-date-dialog";
 
-let that;
+let that
 export default {
   components: {
     RetailDetail,
@@ -448,9 +193,9 @@ export default {
   },
   filters: {
     statusFilter(val) {
-      let obj = that.statusList.find((o) => o.value == val);
-      return obj ? obj.label : "";
-    },
+      let obj = that.statusList.find(o => o.value == val);
+      return obj ? obj.label : ''
+    }
   },
   data() {
     return {
@@ -459,22 +204,21 @@ export default {
       listTotal: 0, // 列表总数
       dataList: null, // 列表数据
       listLoading: false, // 列表加载loading
-      screenForm: {
-        // 筛选表单数据
-        orderNum: "",
-        goodsName: "",
-        model: "",
-        jxsName: "",
-        date: "",
-        zbMan: "",
-        shMan: "",
-        status: "",
+      screenForm: { // 筛选表单数据
+        orderNum: '',
+        goodsName: '',
+        model: '',
+        jxsName: '',
+        date: '',
+        zbMan: '',
+        shMan: '',
+        status: '',
       },
       statusList: [
-        { label: "已保存", value: "SAVE" },
-        { label: "待审核", value: "WAIT" },
-        { label: "审核通过", value: "OK" },
-        { label: "审核驳回", value: "FAIL" },
+        { label: '已保存', value: 'SAVE' },
+        { label: '待审核', value: 'WAIT' },
+        { label: '审核通过', value: 'OK' },
+        { label: '审核驳回', value: 'FAIL' },
       ],
 
       queryItem: {},
@@ -486,9 +230,9 @@ export default {
       editId: null,
       isShowEditDateDialog: false,
       dateForm: {
-        date: "",
+        date: '',
       },
-    };
+    }
   },
 
   computed: {
@@ -499,12 +243,12 @@ export default {
         materialName: this.screenForm.goodsName,
         specification: this.screenForm.model,
         customer: this.screenForm.jxsName,
-        startTime: this.screenForm.date ? this.screenForm.date[0] : "",
-        endTime: this.screenForm.date ? this.screenForm.date[1] : "",
+        startTime: this.screenForm.date ? this.screenForm.date[0] : '',
+        endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         createBy: this.screenForm.zbMan,
         examineBy: this.screenForm.shMan,
         type: 1, // 1:普通零售单，2:政策零售单
-      };
+      }
     },
   },
 
@@ -529,8 +273,8 @@ export default {
         materialName: this.screenForm.goodsName,
         specification: this.screenForm.model,
         customer: this.screenForm.jxsName,
-        startTime: this.screenForm.date ? this.screenForm.date[0] : "",
-        endTime: this.screenForm.date ? this.screenForm.date[1] : "",
+        startTime: this.screenForm.date ? this.screenForm.date[0] : '',
+        endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         createBy: this.screenForm.zbMan,
         examineBy: this.screenForm.shMan,
         type: 1, // 1:普通零售单，2:政策零售单
@@ -539,7 +283,7 @@ export default {
         this.dataList = res.data.records;
         this.listTotal = res.data.total;
         this.listLoading = false;
-      });
+      })
     },
 
     // 提交筛选表单
@@ -588,8 +332,8 @@ export default {
 
     // 进入退订
     toReturn(item) {
-      if (item.refundableQty < 1) {
-        return this.$errorMsg("可退数量为0");
+      if(item.refundableQty < 1) {
+        return this.$errorMsg('可退数量为0');
       }
       this.queryItem = item;
       this.isShowReturn = true;
@@ -605,18 +349,26 @@ export default {
 
     // 关闭
     handleClose(id) {
-      closeData({ id }).then((res) => {
+      closeData({id}).then(res => {
         this.$successMsg();
         this.getList();
-      });
+      })
+    },
+
+    // 弃审
+    handleAbandon(id) {
+      abandonData({id}).then(res => {
+        this.$successMsg();
+        this.getList();
+      })
     },
 
     // 申请
     handleSubmit(id) {
-      submitData({ id }).then((res) => {
+      submitData({id}).then(res => {
         this.$successMsg();
         this.getList();
-      });
+      })
     },
 
     // 打开 修改订单日期
@@ -630,15 +382,17 @@ export default {
     submitDateForm() {
       editData({
         id: this.editId,
-        theTime: this.dateForm.date + " 00:00:00",
-      }).then((res) => {
+        theTime: this.dateForm.date + ' 00:00:00',
+      }).then(res => {
         this.isShowEditDateDialog = false;
         this.getList();
-        this.$successMsg("修改成功");
-      });
+        this.$successMsg('修改成功');
+      })
     },
-  },
-};
+  }
+}
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+
+</style>

src/views/supply/return/return_list.vue

@@ -71,7 +71,7 @@
             <el-table-column align="center" label="经销商" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="价税合计" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="价税合计" prop="payAmount" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="无税金额" prop="noTotalAmount" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="无税单价" prop="afterTaxPrice" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="数量" prop="num" min-width="100" show-overflow-tooltip></el-table-column>