sunlupeng 1 year ago
parent
commit
8ef9478061

+ 3 - 2
src/views/exchangeManage/exchangeList.vue

@@ -179,8 +179,8 @@
 
 
             <div v-if="detailData.orderType == 0 || detailData.orderType == 4" slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="complete(0)">确认</el-button>
-                <el-button type="danger" @click="complete(1)">作废</el-button>
+                <el-button type="primary" @click="complete(0)">同意</el-button>
+                <el-button type="danger" @click="complete(1)">驳回</el-button>
             </div>
         </el-dialog>
 
@@ -347,6 +347,7 @@ export default {
             }).catch(() => {})
         },
         handleClick(id, tag) {
+            this.comment = '';
             this.dialogStatus = tag;
             this.getDetail(id);
             this.dialogVisible = true;

+ 1 - 1
src/views/giftManage/giftList.vue

@@ -43,7 +43,7 @@
             </el-table-column>
             <el-table-column align="center" min-width="100px" label="可兑换库存量" prop="stock">
             </el-table-column>
-            <el-table-column align="center" min-width="150px" label="兑换方式" prop="deliveryName">
+            <el-table-column align="center" min-width="150px" label="兑换方式" prop="deliveryTypeName">
             </el-table-column>
             <el-table-column align="center" min-width="100px" label="礼品所在地" prop="location">
             </el-table-column>

+ 1 - 1
src/views/goodsManage/goodsList.vue

@@ -45,7 +45,7 @@
             </el-table-column>
             <el-table-column align="center" min-width="100px" label="可兑换库存量" prop="stock">
             </el-table-column>
-            <el-table-column align="center" min-width="150px" label="兑换方式" prop="deliveryName">
+            <el-table-column align="center" min-width="150px" label="兑换方式" prop="deliveryTypeName">
             </el-table-column>
             <el-table-column align="center" min-width="100px" label="商品所在地" prop="location">
             </el-table-column>