04-29

package.json

@@ -50,6 +50,7 @@
     "element-ui": "2.13.2",
     "file-saver": "2.0.1",
     "fuse.js": "3.4.4",
+    "jquery": "^3.6.0",
     "js-beautify": "1.10.2",
     "js-cookie": "2.2.0",
     "jsencrypt": "3.0.0-rc.1",

src/views/backstage/banner/index.vue

@@ -63,7 +63,7 @@
         </template>
       </el-table-column>
       <el-table-column label="链接" align="center" prop="link" />
-      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="创建时间" align="center" prop="createdTime" />
       <el-table-column label="启用/停用" align="center" >
         <template slot-scope="scope">
           <el-switch
@@ -144,6 +144,8 @@
 <script>
 import { listBanner, getBanner, delBanner, addBanner, updateBanner, exportBanner,changeStatus } from "@/api/backstage/banner";
 import { getToken } from "@/utils/auth";
+import dayjs from 'dayjs';
+
 export default {
   name: "Banner",
   data() {
@@ -209,6 +211,15 @@ export default {
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/common/upload"
       },
+      //dataFormat: function(row){
+        //let data = row.createTime;
+        //if (data ===null) {
+         // return '';
+        //}
+        //console.log(data);
+        //console.log(new Date(data))
+       // return dayjs(data).format('YYYY-MM-DD HH:mm:ss');
+     // }
     };
   },
   created() {

src/views/backstage/hospital/index.vue

@@ -457,7 +457,7 @@ export default {
         }
        
         this.open = true;
-        this.title = "修改【请填写功能名称】";
+        this.title = "修改医院信息";
       });
     },
     /** 提交按钮 */

src/views/backstage/order/index.vue

@@ -469,9 +469,9 @@ export default {
             cancelButtonText: "取消",
             type: "warning"
         }).then(function() {
-            this.getList();
             return handleRefund(row.id,5);
         }).then(() => {
+            this.getList();
             this.msgSuccess("操作成功");
         }).catch(function() {
         });

src/views/backstage/package/add.vue

@@ -107,13 +107,19 @@
       
             <el-col :span="6">
                 <el-form-item label="可约时间" prop="reducibleStartDate">
-                    <el-date-picker @change="handleDate" v-model="form.reducibleStartDate" placeholder="选择开始日期" value-format="yyyy-MM-dd">
+                    <el-date-picker @change="handleDate" v-model="form.reducibleStartDate" 
+                    placeholder="选择开始日期" value-format="yyyy-MM-dd"
+                    :picker-options="pickerOptions"
+                    >
                     </el-date-picker>
                 </el-form-item>
            </el-col>
             <el-col :span="6">
                 <el-form-item label="-" prop="reducibleEndDate" >
-                    <el-date-picker @change="handleDate" v-model="form.reducibleEndDate" placeholder="选择结束日期" value-format="yyyy-MM-dd">
+                    <el-date-picker @change="handleDate" v-model="form.reducibleEndDate" 
+                    placeholder="选择结束日期" value-format="yyyy-MM-dd"
+                    :picker-options="pickerOptions"
+                    >
                     </el-date-picker>
                 </el-form-item>
             </el-col>
@@ -144,9 +150,9 @@
 
                     <div style="width:100%;height: 100%;" @click="dateOnClick(data)">
                         <div v-for="item in scheduleList" :key="item.date">
-                        <div v-if="data.day == item.date && item.isDelete!=1">
-                            可约
-                        </div>
+                            <div v-if="data.day == item.date && item.isDelete!=1">
+                                可约
+                            </div>
                         </div>
                         <div class="spandate">{{ data.day.slice(-2)}}</div>
                     </div>
@@ -441,20 +447,6 @@
                     trigger: "blur"
                 },
             ],
-            reducibleStartDate:[
-                {
-                    required: true,
-                    validator: validateStartTime,
-                    trigger: "blur"
-                },
-            ],
-            reducibleEndDate:[
-                {
-                    required: true,
-                    validator: validateEndTime,
-                    trigger: "blur"
-                },
-            ],
             reducibleNum:[
                 {
                     required: true,
@@ -502,6 +494,13 @@
             // 上传的地址
             url: process.env.VUE_APP_BASE_API + "/common/upload"
         },
+        pickerOptions:{
+            //禁用当前日期之前的日期
+            disabledDate(time) {
+                //Date.now()是javascript中的内置函数，它返回自1970年1月1日00:00:00 UTC以来经过的毫秒数。
+                return time.getTime() < Date.now() - 8.64e7;
+            },
+        },
       }
     },
     created() {
@@ -528,7 +527,6 @@
     },
     /* 页面初始化执行方法：此方法可写同步方法，有先后加载顺序的逻辑建议用同步方法 */
     mounted() {
-
     },
     methods: {
         getPackage(){
@@ -829,15 +827,27 @@
                             if(type){
                                 this.form.type=type.split(',');
                             }
-                            this.msgSuccess("修改成功");
-                            this.getPackage();
+                            if(response.code==200){
+                                this.msgSuccess("修改成功");
+                                this.getPackage();
+                            }
+                        }).catch(err => {
+                            if(type){
+                                this.form.type=type.split(',');
+                            }
                         });
                     } else {
                         addPackage(this.form).then(response => {
                             if(type){
                                 this.form.type=type.split(',');
                             }
-                            this.msgSuccess("新增成功");
+                            if(response.code==200){
+                                this.msgSuccess("新增成功");
+                            }
+                        }).catch(err => {
+                            if(type){
+                                this.form.type=type.split(',');
+                            }
                         });
                     }
                 }

src/views/backstage/service/edit.vue

@@ -457,12 +457,16 @@
             });
         },
         submitItemForm() {
-            this.repeatItemSubmit=true
+            this.repeatItemSubmit=true;
             setTimeout(()=>{
                 this.repeatItemSubmit = false   //点击一次时隔两秒后才能再次点击
-            },2000)
+            },2000);
             this.$refs["itemForm"].validate(valid => {
                 if (valid) {
+                    if(this.itemForm.number<0){
+                        this.msgError("服务项目次数不能小于0");
+                        return;
+                    }
                     if(!this.itemModify){
                         this.itemList.push(this.itemForm);
                     }

src/views/backstage/service/index.vue

@@ -144,6 +144,7 @@
             icon="el-icon-edit"
             @click="handleRecommend(scope.row)"
             v-hasPermi="['backstage:service:edit']"
+            v-if="scope.row.status == '0'"
           >设为推荐</el-button>
           <el-button
             size="mini"

src/views/backstage/serviceOrder/index.vue

@@ -113,7 +113,7 @@
       <el-table-column label="电话" align="center" prop="phone" />
       <el-table-column label="证件类型" align="center" prop="cardType" />
       <el-table-column label="证件号码" align="center" prop="cardId" />
-      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="创建时间" align="center" prop="createdTime" />
       <el-table-column label="订单金额" align="center" prop="amount" />
       <el-table-column label="订单来源" align="center" prop="orderSource" />
       <el-table-column label="订单状态" align="center" prop="status" >
@@ -123,6 +123,7 @@
           <span v-if="scope.row.status == 3">待体检</span>
           <span v-if="scope.row.status == 4">退款审核中</span>
           <span v-if="scope.row.status == 5">已取消</span>
+          <span v-if="scope.row.status == 7">拒绝退款</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -423,7 +424,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有套餐订单?', "警告", {
+      this.$confirm('是否确认导出所有增值服务订单?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -442,9 +443,9 @@ export default {
             cancelButtonText: "取消",
             type: "warning"
         }).then(function() {
-            this.getList();
             return handleRefund(row.id,5);
         }).then(() => {
+            this.getList();
             this.msgSuccess("操作成功");
         }).catch(function() {
         });

src/views/system/role/index.vue

@@ -569,7 +569,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const roleIds = row.roleId || this.ids;
-      this.$confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?', "警告", {
+      this.$confirm('是否确认删除该角色?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

vue.config.js

@@ -55,7 +55,7 @@ module.exports = {
       alias: {
         '@': resolve('src')
       }
-    }
+    },
   },
   chainWebpack(config) {
     config.plugins.delete('preload') // TODO: need test