瀏覽代碼

1. 优化

MONSTER-ygh 3 月之前
父節點
當前提交
d73f034151

+ 1 - 1
.env.production

@@ -16,7 +16,7 @@ VUE_APP_BASE_IMAGE = /stage-api/file/statics
 VUE_APP_UPLOAD_IMAGE = '/thirdapi/upload/single/minio'
 
 # 打印地址
-VUE_APP_PRINT_URL = 'https://zebra.dev.dazesoft.cn/zebra/card/print/io/upload'
+VUE_APP_PRINT_URL = 'http://localhost:8088/zebra/card/print/io/upload'
 
 # 部署的URL
 # 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 为 /admin。

+ 11 - 3
src/myComponents/qqMap.vue

@@ -28,7 +28,10 @@
         initMap(params) {
             //定义地图中心点坐标
              // 经纬度解析类回调函数
-            
+            console.log("params===",params)
+            let lat = params.lat||39.916527
+            let lng = params.lng||116.397128
+            console.log("params===",params,lat,lng)
             let center = new TMap.LatLng(params.lat||39.916527, params.lng||116.397128)
             //定义map变量,调用 TMap.Map() 构造函数创建地图
             this.map = new TMap.Map(this.$refs.mapBox, {
@@ -38,11 +41,12 @@
                 rotation: 45    //设置地图旋转角度
             });
             this.geocoder = new TMap.service.Geocoder()
-            if(params.lat) {
+            if(params.lat&&params.lng) {
                 this.setMakerLayer(params,false)
             }
             //监听点击事件添加marker
             this.map.on("click", (evt) => {
+
                 this.setMakerLayer(evt.latLng)
                 this.geocoder.getAddress({ location: evt.latLng }).then((result) => {
                     console.log("result===",result.result.address)
@@ -57,6 +61,10 @@
             });
         },
         setMakerLayer(params,type){
+            console.log("params111===",params)
+            let lat = params.lat||39.916527
+            let lng = params.lng||116.397128
+            console.log("params111===",params,lat,lng)
             if(type) {
                 let center = new TMap.LatLng(params.lat||39.916527, params.lng||116.397128)
                 this.map.setCenter(center);
@@ -70,7 +78,7 @@
                     map: this.map
                 })
                 this.markerLayer.add({
-                    position: params
+                    position: new TMap.LatLng(params.lat,params.lng)
                 });
             }
             

+ 2 - 2
src/views/tourism/membershipManagement/physicalCard/formBox/printForm.vue

@@ -233,12 +233,12 @@ export default {
         let cardImgBackFile = await this.captureCanvas('myElement1')
         let cardFontBackFilee = await this.captureCanvas('styleInfo_fm')
         const formData = new FormData();
-        formData.append("ip", '172.16.90.128');
+        formData.append("ip", this.form.printIp);
         formData.append("cardImgFrontFile", cardImgFrontFile);
         formData.append("cardFontFrontFile", null);
         formData.append("cardImgBackFile", cardImgBackFile);
         formData.append("cardFontBackFile", cardFontBackFilee);
-        let res1 = await fetch(process.env.VUE_APP_PRINT_URL, {  
+        let res1 = await fetch(this.form.printServerUrl, {  
           method: 'POST', // 或者 'GET'  
           // headers: { 
           //   'Content-Type': 'multipart/form-data' //携带参数为json

+ 22 - 17
src/views/tourism/orderManagement/cateringOrders/cateringOrders.vue

@@ -4,7 +4,7 @@
         <!--用户数据-->
         <el-col :span="24" :xs="24">
             <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-                <el-form-item label="订单编号:" prop="id">
+                <el-form-item label="订单编号" prop="id">
                     <el-input
                         v-model="queryParams.id"
                         placeholder="请输入订单编号"
@@ -13,7 +13,7 @@
                         @keyup.enter.native="handleQuery"
                     />
                 </el-form-item>
-                <el-form-item label="归属门店:" prop="merchantName">
+                <el-form-item label="归属门店" prop="merchantName">
                     <el-input
                         v-model="queryParams.merchantName"
                         placeholder="请输入归属门店"
@@ -22,7 +22,7 @@
                         @keyup.enter.native="handleQuery"
                     />
                 </el-form-item>
-                <el-form-item label="联系电话:" prop="memberMobile" label-width="110px">
+                <el-form-item label="联系电话" prop="memberMobile" label-width="110px">
                     <el-input
                         v-model="queryParams.memberMobile"
                         placeholder="请输入联系电话"
@@ -170,6 +170,15 @@
                     v-if="scope.row.orderStatus == 3"
                   >拒单</el-button>
                 </span>
+                <span v-hasPermi="configPermi.cancel" style="margin-left: 10px;display: inline-block;">
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-document-delete"
+                    @click="cancekOrderFun(scope.row)"
+                    v-if="scope.row.orderStatus == 0 || scope.row.orderStatus == 3"
+                  >取消订单</el-button>
+                </span>
               </template>
             </el-table-column>
           </el-table>
@@ -187,6 +196,8 @@
       <detailsBox ref="detailsBox" @refresh="getList"></detailsBox>
       <!-- 发货  -->
       <repastOrderAccept ref="repastOrderAccept" @refresh="getList"></repastOrderAccept>
+      <!-- 关闭订单 -->
+      <cancelBox ref="cancelBox" @refresh="getList" />
     </div>
   </template>
 
@@ -197,10 +208,11 @@
     } from "@/api/CURD";
   import detailsBox from "./detailsBox/cateringOrdersDetails.vue"
   import repastOrderAccept from "./formBox/repastOrderAccept.vue";
+  import cancelBox from "./formBox/cancel.vue";
   export default {
     name: "User",
     dicts: ['tourism_ticketOrders_source','tourism_ticketOrders_status','tourism_ticketOrders_payStatus','tourism_ticketOrders_payWay'],
-    components: {detailsBox,repastOrderAccept},
+    components: {detailsBox,repastOrderAccept,cancelBox},
     data() {
       return {
         title: "餐饮订单",// 通用标题
@@ -211,6 +223,7 @@
           upload: [''],// 导入权限
           export: ['orderManagement:cateringOrders:export'],// 导出权限
           repastOrderAccept: ['orderManagement:cateringOrders:repastOrderAccept'],
+          cancel: ['orderManagement:cateringOrders:cancel'],
         },
         configUrl: {
           list: '/order/orderInfo/repastOrderList', // 列表地址
@@ -341,19 +354,11 @@
           this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", {...row})
         }
       },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const goodsId = row.goodsId || this.ids;
-        this.$modal.confirm('是否确认删除数据项?').then( () => {
-          return delTableParamsApi(this.configUrl.delect,{
-            goodsId: goodsId
-          });
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch((e) => {
-          console.error("删除失败====",e)
-        });
+      /** 取消订单  */
+      cancekOrderFun(row){
+        if(this.$refs.cancelBox) {
+          this.$refs.cancelBox.initData(this.title + '驳回', 'EDIT',{...row})
+        }
       },
       /** 导出按钮操作 */
       handleExport() {

+ 303 - 0
src/views/tourism/orderManagement/cateringOrders/formBox/cancel.vue

@@ -0,0 +1,303 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="40%"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="form-dialog-box"
+    v-loading="loading"
+    :element-loading-text="loadingText"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0)">
+      <div
+        v-loading="loading"
+        :element-loading-text="''"
+        element-loading-spinner="''"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+        >
+        <el-form :model="form" ref="form" :rules="rules" label-width="130px">
+          <el-form-item 
+          label="驳回原因" 
+          prop="remark">
+            <el-input 
+            style="width: 350px;"
+             v-model="form.remark" 
+             placeholder="请输入驳回原因" 
+             maxlength="150" 
+             show-word-limit 
+             type="textarea"
+            :rows="6"
+             />
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <span slot="footer" class="dialog-footer" v-if="formStatus==1">
+      <el-button @click="cancel">取消</el-button>
+      <el-button
+        type="primary"
+        @click="submitForm"
+        :loading="loading"
+        element-loading-text="提交中..."
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+      > 
+        {{ loading ? '提交中...' : '确认' }}
+      </el-button>
+    </span>
+    <!-- 添加或修改对话框 End -->
+  </el-dialog>
+</template>
+
+<script>
+import { 
+  addTableApi,
+  listTableApi
+ } from '@/api/CURD'
+export default {
+  name: "repastOrderAccept",
+  data() {
+    return {
+      title: "",
+      activeName: 'first',
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式(需要请求详情)
+      open: false,
+      loading: false,
+      loadingText: "拼命加载数据中...",
+      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
+      configUrl: {
+        cancel: '/order/orderInfo/cancel'
+      },
+      form: {
+        id: undefined,
+      },
+      rules: {
+        remark: [{ required: false, message: "请输入驳回原因", trigger: ["change","blur"] }],
+      },
+      scenicAreaProducts: [],// 景点产品关联
+
+      //  上传文件
+      actionUrl: process.env.VUE_APP_BASE_API + process.env.VUE_APP_UPLOAD_IMAGE,
+      actionUrlLoading: false,
+    };
+  },
+  methods: {
+    async initData(title , model,row){
+      this.title = title
+      this.open = true
+      this.loadingText = "拼命加载数据中..."
+      this.loading = true
+      this.actionUrlLoading = false
+      this.model = model
+      this.formStatus = 0
+      if(model=='ADD') { // 新增
+        this.$set(this,'form',{
+          ...row,
+        })
+        this.formStatus = 1
+      }else if(model=='EDIT') { // 新增
+        let obj = {
+          id: row.id,
+          remark: ''
+        }
+        this.$set(this,'form',obj)
+        this.formStatus = 1
+      }
+      this.loading = false
+      this.$nextTick(()=>{
+        if(this.$refs["form"]) {
+          this.$refs["form"].clearValidate();
+        }
+      })
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.loadingText = "取消订单中..."
+          this.loading = true
+          let params = JSON.parse(JSON.stringify(this.form))
+          listTableApi(this.configUrl.cancel,{
+            orderId: params.id,
+            closeReason: params.remark,
+          }).then(response => {
+              this.$modal.msgSuccess("取消成功");
+              this.loading = false
+              this.open = false;
+              this.$emit('refresh')
+          }).catch(()=>{
+              this.$message.error("取消失败!!!");
+              this.loading = false
+          })
+        }
+      });
+    },
+    /**
+     * 重置
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    reset() {
+      if(this.$refs["form"]) {
+        this.$refs["form"].clearValidate();
+      }
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.reset();
+      this.open = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.form-dialog-box {
+  padding: 0 30px;
+  padding: 0 30px;
+  min-height: 30vh;
+  max-height: 65vh;
+  overflow-y: auto;
+  >div {
+    width: 100%;
+    min-height: 30vh;
+  }
+  .form-title {
+    padding: 0 0 10px 0;
+    span {
+      display: flex;
+      color: rgba(65,80,88,1);
+      font-size: 16px;
+      font-family: SourceHanSansSC;
+      font-weight: 700;
+      line-height: 23px;
+      border-left: 4px solid rgb(22, 132, 252);
+      padding-left: 10px;
+    }
+    
+  }
+  ::v-deep .ql-editor {
+    height: 400px;
+  }
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+.el-table{
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+
+.area-container {
+  min-height: 400px;
+}
+
+::v-deep .area-wrap-city.el-cascader {
+  line-height: normal;
+  .el-input {
+    cursor: pointer;
+    width: 100% !important;
+    height: 28px !important;
+    .el-input__inner {
+      display: none !important;
+    }
+    span.el-input__suffix {
+      position: inherit !important;
+      i.el-input__icon {
+        line-height: inherit;
+        margin-left: 5px;
+      }
+    }
+
+    .el-input__wrapper {
+      box-shadow: none;
+      input {
+        display: none;
+      }
+    }
+  }
+
+  .el-cascader__tags {
+    display: none;
+  }
+}
+
+.area-city-popper {
+  .el-cascader-panel {
+    .el-scrollbar.el-cascader-menu {
+      .el-cascader-menu__wrap.el-scrollbar__wrap {
+        height: 315px;
+      }
+    }
+  }
+}
+
+::v-deep .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  ::v-deep .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  ::v-deep .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 100px;
+    height: 100px;
+    line-height: 100px;
+    text-align: center;
+  }
+  ::v-deep .avatar {
+    width: 100px;
+    height: 100px;
+    display: block;
+  }
+</style>
+<style>
+.custom-class-box {
+  z-index: 999999 !important;
+}
+</style>