浏览代码

康年堂需求113,114:套餐管理列表取消展示字段,新增新字段展示,修改销售订单、商城订单中退款功能的提示词

csy 16 小时之前
父节点
当前提交
ff8e48e15e
共有 2 个文件被更改,包括 30 次插入28 次删除
  1. 2 2
      src/views/hisStore/components/productOrder.vue
  2. 28 26
      src/views/hisStore/storeProductPackage/index.vue

+ 2 - 2
src/views/hisStore/components/productOrder.vue

@@ -21,7 +21,7 @@
           <el-button size="mini" @click="finishOrder()" >确认收货</el-button>
         </div>
         <div class="operate-button-container" v-if="order.status==1||order.status==2"  v-hasPermi="['store:storeOrder:refundOrderMoney']"  >
-          <el-button size="mini" @click="refundOrderMoney()" >退款</el-button>
+          <el-button size="mini" @click="refundOrderMoney()" >申请退款</el-button>
         </div>
         <div class="operate-button-container"  v-hasPermi="['store:storeOrder:express']"  >
           <el-button size="mini" @click="showExpress()">查看物流</el-button>
@@ -752,7 +752,7 @@ export default {
     },
     refundOrderMoney(){
         var that=this;
-        this.$confirm('确认退款', "警告", {
+        this.$confirm('确认提交申请退款', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 28 - 26
src/views/hisStore/storeProductPackage/index.vue

@@ -120,26 +120,26 @@
               <el-tag prop="cateId" v-for="(item, index) in cateOptions"    v-if="scope.row.cateId==item.dictValue">{{item.dictLabel}}</el-tag>
           </template>
       </el-table-column>
-      <el-table-column label="所属公司" align="center" width="220px">
-        <template slot-scope="scope">
-          <div v-if="scope.row.companyIds">
-            <el-tag
-              v-for="company in companyOptions.filter(company => {
-          if (!scope.row.companyIds) return false;
-          const ids = scope.row.companyIds.split(',').map(id => id.trim());
-          return ids.includes(String(company.companyId));
-        })"
-              :key="company.companyId"
-              size="small"
-              style="margin: 2px;"
-            >
-              {{ company.companyName }}
-            </el-tag>
-          </div>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="所属公司" align="center" width="220px">-->
+<!--        <template slot-scope="scope">-->
+<!--          <div v-if="scope.row.companyIds">-->
+<!--            <el-tag-->
+<!--              v-for="company in companyOptions.filter(company => {-->
+<!--          if (!scope.row.companyIds) return false;-->
+<!--          const ids = scope.row.companyIds.split(',').map(id => id.trim());-->
+<!--          return ids.includes(String(company.companyId));-->
+<!--        })"-->
+<!--              :key="company.companyId"-->
+<!--              size="small"-->
+<!--              style="margin: 2px;"-->
+<!--            >-->
+<!--              {{ company.companyName }}-->
+<!--            </el-tag>-->
+<!--          </div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="标题" align="center" prop="title" show-overflow-tooltip />
-      <el-table-column label="描述" align="center" prop="descs" show-overflow-tooltip />
+<!--      <el-table-column label="描述" align="center" prop="descs" show-overflow-tooltip />-->
       <el-table-column label="原价" align="center"  >
           <template slot-scope="scope">
               <div  v-if="scope.row.money!=null"  >
@@ -154,14 +154,14 @@
               </div>
           </template>
       </el-table-column>
-       <el-table-column label="支付类型" align="center" prop="payType" width="150px" >
-          <template slot-scope="scope">
-              <el-tag prop="payType" v-for="(item, index) in storePayTypeOptions"    v-if="scope.row.payType==item.dictValue">{{item.dictLabel}}</el-tag>
-          </template>
-      </el-table-column>
+<!--       <el-table-column label="支付类型" align="center" prop="payType" width="150px" >-->
+<!--          <template slot-scope="scope">-->
+<!--              <el-tag prop="payType" v-for="(item, index) in storePayTypeOptions"    v-if="scope.row.payType==item.dictValue">{{item.dictLabel}}</el-tag>-->
+<!--          </template>-->
+<!--      </el-table-column>-->
 
-      <el-table-column label="限购次数" align="center" prop="limitCount" />
-      <el-table-column label="赠送积分" align="center" prop="integral" />
+<!--      <el-table-column label="限购次数" align="center" prop="limitCount" />-->
+<!--      <el-table-column label="赠送积分" align="center" prop="integral" />-->
       <el-table-column label="排序" align="center" prop="sort" />
       <!-- <el-table-column label="所属部门" align="center" prop="deptName" /> -->
       <el-table-column label="状态" align="center" prop="status" >
@@ -169,6 +169,8 @@
               <el-tag prop="status" v-for="(item, index) in statusOptions"    v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>
           </template>
       </el-table-column>
+       <el-table-column label="创建日期" align="center" prop="createTime" />
+       <el-table-column label="更新日期" align="center" prop="updateTime" />
 
       <el-table-column label="操作" align="center" fixed="right" width="120px" class-name="small-padding fixed-width">
         <template slot-scope="scope">