فهرست منبع

修改提示信息

zhangdan 4 سال پیش
والد
کامیت
953c471301

+ 0 - 321
src/views/Order/OrderCenter.vue

@@ -1,321 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 搜索条件 -->
-    <div class="orderCenter-searchForm">
-      <a-form ref="searchForm">
-        <a-row :gutter="48">
-          <a-col :span="8">
-            <a-form-item label="创建时间" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
-              <a-range-picker v-model="time" :format="dateFormat" :placeholder="['开始时间','结束时间']" @change="onChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item label="网点名称" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <a-select placeholder="请选择" allowClear v-model="storeId" mode="multiple">
-                <a-select-option v-for="item in storeOptionData" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item label="单号" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <a-input v-model.trim="searchForm.orderNo" placeholder="请输入" allowClear/>
-            </a-form-item>
-          </a-col>
-          <a-col :span="4">
-            <a-button style="margin-right: 10px;" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-            <a-button type="" @click="resetForm">重置</a-button>
-          </a-col>
-        </a-row>
-        <a-row :gutter="48">
-          <a-col :span="8">
-            <a-form-item label="服务项目" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
-              <a-select placeholder="请选择" allowClear v-model="searchForm.itemId">
-                <a-select-option v-for="item in itemOptionData" :key="item.id" :value="item.id">{{ item.itemName }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item label="手机号码" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <a-input v-model.trim="searchForm.customerMobile" placeholder="请输入" allowClear maxLength="11" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item label="状态" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <v-select v-model="searchForm.orderStatus" ref="orderStatus" code="ORDER_STATUS" placeholder="请选择" allowClear></v-select>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 合计 -->
-    <div class="total" >
-      <a-icon type="info-circle" class="iconImg"/>
-      <strong>合计:</strong><span v-model="countHJ">{{countHJ}} 单</span><strong style="margin-left: 15px;">实收:</strong><span v-model="incomeHJ">{{incomeHJ}} 元</span>
-    </div>
-    <!-- 列表 -->
-    <s-table ref="table" size="default" :showPagination="false" :rowKey="(record) => record.id" :columns="columns" :data="loadData" bordered>
-      <!-- 状态 -->
-      <span slot="orderStatus" slot-scope="text, record">
-        {{ $refs.orderStatus.getNameByCode(text) }}
-      </span>
-      <!-- 实收金额 -->
-      <span slot="paymentAmount" slot-scope="text, record">
-        <template v-if=" record.payStatus == 'PAID' ">{{ record.paymentAmount }}</template>
-        <template v-else-if=" record.payStatus != 'PAID' ">{{ 0 }}</template>
-      </span>
-      <!-- 操作 -->
-      <span slot="action" slot-scope="text, record">
-        <!-- <a-button type="primary" @click="openDetailModal=true">查看</a-button> -->
-        <a-button type="primary" @click="seeDetail(record)">查看</a-button>
-        <!-- 本期暂不做 -->
-        <!-- <a-button type="danger" @click="refund(record)">退款</a-button> -->
-      </span>
-    </s-table>
-    <!-- 查看详情弹窗 -->
-    <order-detail-modal 
-      :openModal="openDetailModal"
-      :nowId="detailId"
-      @close="openDetailModal=false"/> 
-  </a-card>
-</template>
-
-<script>
-  import { STable, VSelect } from '@/components'
-  import getDate from '../../libs/getDate.js'
-  import { orderCenterList, itemList, storeList } from '../../api/order.js'
-  import OrderDetailModal from './OrderDetailModal.vue'
-  import moment from 'moment'
-  export default {
-    name:'OrderCenter',
-    components: {
-      STable,
-      VSelect,
-      OrderDetailModal
-    },
-    data() {
-      return {
-        storeId: [],        // 网点名称
-        // 查询参数
-        searchForm: {
-          beginDate: null,    // 创建的开始时间
-          endDate: null,      // 创建的结束时间
-          storeIdList: [],        // 网点名称
-          orderNo: '',        // 单号
-          itemId:'',          // 服务项目
-          customerMobile:'',  // 手机号码
-          orderStatus:''      // 状态
-        },
-        pageNo:1,             // 列表当前页
-        pageSize:10,          // 列表当前页码
-        countHJ:'40',
-        incomeHJ:'2000',
-        itemOptionData:[],    // 服务项目数据
-        storeOptionData:[],   // 网点名称数据
-        openDetailModal:false,   // 查看详情弹窗 默认关闭
-        detailId:null,          // 初始化id
-        time: [
-          moment(getDate.getToday().starttime, this.dateFormat),
-					moment(getDate.getToday().endtime, this.dateFormat)
-        ],
-        dateFormat: 'YYYY-MM-DD',
-        columns: [{
-            title: '下单时间',
-            dataIndex: 'orderTime',
-            minWidth: '40',
-            align: 'center'
-          },
-          {
-            title: '单号',
-            dataIndex: 'orderNo',
-            minWidth: '40',
-            align: 'center'
-          },
-          {
-            title: '网点名称',
-            dataIndex: 'storeName',
-            minWidth: '40',
-            align: 'center'
-          },
-          {
-            title: '服务项目',
-            dataIndex: 'itemName',
-            minWidth: '40',
-            align: 'center'
-          },
-          {
-            title: '手机号码',
-            dataIndex: 'customerMobile',
-            minWidth: '40',
-            align: 'center'
-          },
-          {
-            title: '应收(¥)',
-            dataIndex: 'payableAmount',
-            minWidth: '40',
-            align: 'center'
-          },
-          {
-            title: '实收(¥)',
-            dataIndex: 'paymentAmount',
-            minWidth: '40',
-            align: 'center',
-            scopedSlots: {
-              customRender: 'paymentAmount'
-            }
-
-          },
-          // {
-          //   title: '优惠(¥)',
-          //   dataIndex: 'couponAmount',
-          //   minWidth: '40',
-          //   align: 'center'
-          // },
-          {
-            title: '状态',
-            dataIndex: 'orderStatus',
-            minWidth: '40',
-            align: 'center',
-            scopedSlots: {
-              customRender: 'orderStatus'
-            }
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            minWidth: '40',
-            align: 'center',
-            scopedSlots: {
-              customRender: 'action'
-            }
-
-          }
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          // console.log(this.searchForm.storeId)
-          this.searchForm.beginDate == null ? this.searchForm.beginDate = getDate.getToday().starttime : null
-          this.searchForm.endDate == null ? this.searchForm.endDate = getDate.getToday().endtime : null
-          this.searchForm.storeIdList = this.storeId 
-          // console.log(this.searchForm.storeId)
-          return orderCenterList(Object.assign(parameter, this.searchForm)).then(res => {
-            console.log(res,'0000000000000000000')
-            if (res.status == 200) {
-              // const no = (res.data.pageNo - 1) * res.data.pageSize
-              // for (let i = 0; i < res.data.list.length; i++) {
-              //   const _item = res.data.list[i]
-              //   _item.no = no + i + 1
-              //   _item.status = _item.status + '' === '1'
-              // }
-              return res.data.list
-            }
-          })
-        }
-      }
-    },
-    methods: {
-      moment,
-      // 创建时间change
-      onChange(dates, dateStrings) {
-        if ((dates, dateStrings)) {
-          this.searchForm.beginDate = dateStrings[0]
-          this.searchForm.endDate = dateStrings[1]
-        }
-        console.log(this.searchForm.beginDate, this.searchForm.endDate)
-      },
-      // 获取服务项目数据
-      getItemListData(){
-        itemList({pageNo:this.pageNo,pageSize:this.pageSize}).then(res=>{
-          console.log(res,'-----------')
-          if(res.status == 200){
-            this.itemOptionData = res.data.list
-          }
-        })
-      },
-      // 获取网点名称数据
-      getStoreListData(){
-        storeList({pageNo:this.pageNo,pageSize:this.pageSize}).then(res=>{
-          console.log(res,'-----------')
-          if(res.status == 200){
-            this.storeOptionData = res.data.list
-          }
-        })
-      },
-      // 合计
-      getTotal(){},
-      // 查看详情--跳转到对应的详情页
-      seeDetail(record) {
-        // this.$router.push({name: 'OrderDetail',query: {id: record.id}
-        // })
-        this.detailId = record.id
-        this.openDetailModal = true
-        console.log(this.detailId)
-      },
-      // 退款---暂不做
-      // refund(row) {
-      //   const _this = this
-      //   this.$confirm({
-      //     title: '警告',
-      //     content: '确认退款后 款项将通过原渠道退回 且不可撤回,确认退款?',
-      //     okText: '确定',
-      //     cancelText: '取消',
-      //     // onOk() {
-      //     // 	deleteItem({
-      //     // 		id: row.id
-      //     // 	}).then(res => {
-      //     // 		if (res.status == 200) {
-      //     // 			_this.$message.success('退款成功')
-      //     // 			_this.$refs.table.refresh()
-      //     // 		}
-      //     // 	})
-      //     // }
-      //   })
-      // },
-      // 重置
-      resetForm() {
-        this.searchForm.beginDate = getDate.getToday().starttime
-        this.searchForm.endDate = getDate.getToday().endtime
-        this.time = [
-        	moment(getDate.getToday().starttime, this.dateFormat),
-        	moment(getDate.getToday().endtime, this.dateFormat)
-        	]
-        this.storeId = []
-        this.searchForm.storeIdList = []
-        this.searchForm.orderNo = ''
-        this.searchForm.itemId = ''
-        this.searchForm.customerMobile = ''
-        this.searchForm.orderStatus = ''
-        // this.$refs.searchForm.resetFields()
-        this.$refs.table.refresh()
-      }
-    },
-    beforeRouteEnter (to, from, next) {
-      next(vm => {
-        vm.getItemListData()
-        vm.resetForm()
-        vm.getStoreListData()
-      })
-    }
-  }
-</script>
-<style lang="less">
-  .orderCenter-searchForm{
-    // 搜索框的下间距
-    .ant-form-item{
-      margin-bottom: 10px;
-    }
-  }
-  // 合计
-  .total {
-    margin:15px 0 25px;
-    width:100%;
-    background-color: #e6f7ff;
-    border: 1px solid #91d5ff;
-    padding: 8px 15px 8px 27px;
-    border-radius: 4px;
-    .iconImg{
-      color: #1890FF;
-      margin-right: 10px;
-    }
-  }
-  
-</style>

+ 0 - 161
src/views/Order/OrderDetailModal.vue

@@ -1,161 +0,0 @@
-<template>
-  <a-modal title="查看详情" :footer="null" :width="1100" :destroyOnClose="true" @cancel="isShow=false" v-model="isShow">
-    <v-select ref="orderStatus" code="ORDER_STATUS" placeholder="请选择" allowClear v-show="false"></v-select>
-    <div class="orderDetail-content">
-      <a-form>
-        <a-row :gutter="24">
-          <a-col :span="8">
-            <a-form-item label="下单时间" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <span>{{orderDetailData.orderTime}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="单号" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <span>{{orderDetailData.orderNo}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="门店名称" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <span>{{orderDetailData.storeName}}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="8">
-            <a-form-item label="服务名称" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <span>{{orderDetailData.itemName}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="手机号码" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <span>{{orderDetailData.customerMobile}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="状态" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <span>{{orderDetailData.orderStatus}}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="8">
-            <a-form-item label="应付(¥)" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <span>{{orderDetailData.payableAmount}} 元</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="实付(¥)" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <span v-if=" orderDetailData.payStatus == 'PAID' ">{{orderDetailData.paymentAmount}} 元</span>
-              <span v-else-if=" orderDetailData.payStatus != 'PAID' ">{{ 0 }} 元</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="洗车照片" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <div style="display: flex;">
-                <!-- <div>
-                  <div style="border: 1px solid #eee;overflow: hidden;padding: 8px 0 0 8px; margin-right: 20px;">
-                    <Upload :file-list="" :fileSize="0.25" listType="picture-card">
-                    </Upload>
-                  </div>
-                  <div style="text-align: center;">洗车前</div>
-                </div>
-                <div>
-                  <div style="border: 1px solid #eee;overflow: hidden;padding: 8px 0 0 8px;">
-                    <Upload :file-list="" :fileSize="0.25" listType="picture-card">
-                    </Upload>
-                  </div>
-                  <div style="text-align: center;">洗车后</div>
-                </div> -->
-              </div>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <!-- <a-col :span="8">
-            <a-form-item label="优惠(¥)" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <span>{{'-'}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="优惠券名称" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <span>{{"-"}}</span>
-            </a-form-item>
-          </a-col> -->
-        </a-row>
-        <a-row style="text-align: center;margin-top: 100px;">
-          <a-col>
-            <a-form-item>
-              <a-button type="default" @click="isShow=false" >返回列表</a-button>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </a-modal>
-</template>
-
-<script>
-  import { Upload, VSelect } from '@/components'
-  import { orderDetail } from '../../api/order.js'
-  export default {
-    components: { Upload, VSelect },
-    name:'OrderDetailModal',
-    props: {
-      openModal: {  //  弹框是否展示
-        type: Boolean,
-        default: false
-      },
-      nowId:{
-        type: Number,
-        default: null 
-      }
-    },
-    data() {
-      return {
-        orderDetailData:[],
-        isShow: this.openModal,
-      }
-    },
-    methods: {
-      // // 查看详情
-      // getOrderDetail(){
-      //   orderDetail()
-      // },
-    },
-    watch: {
-      //  父页面传过来的弹框状态
-      openModal (newValue, oldValue) {
-        this.isShow = newValue
-      },
-      nowId(newValue, oldValue){
-        console.log(newValue)
-        if(newValue){
-          orderDetail({id:newValue}).then(res=>{
-            console.log(res,'------------')
-            if(res.status == 200){
-              setTimeout(() => {
-              	res.data.orderStatus = this.$refs.orderStatus.getNameByCode(res.data.orderStatus)
-              }, 100)
-              this.orderDetailData = res.data
-            }
-          })
-        }
-      },
-      //  重定义的弹框状态
-      isShow (val){
-        if (!val){
-          this.$emit('close')
-        }
-      }
-    },
-  }
-</script>
-<style lang="less">
-  .orderDetail-content .ant-form-inline .ant-form-item {
-    margin-bottom: 20px;
-  }
-  /* 去掉上传图片组件原有的删除按钮 */
-  :global(.anticon-delete) {
-    display: none;
-  }
-</style>

+ 1 - 2
src/views/power/dataDictionary/codeItemModal.vue

@@ -238,7 +238,7 @@ export default {
                 _this.cancel()
               }, 300)
             } else {
-              // this.$message.error(res.message)
+              this.$message.error(res.message)
             }
           })
         }
@@ -290,7 +290,6 @@ export default {
         if (this.data.id) { // 编辑
           this.titleText = '编辑字典项'
           this.formData = Object.assign({}, this.data)
-
           delete this.formData.no
           this.formData.isEnable = Number(this.formData.isEnable)
           console.log(this.formData, 'this.formData')

+ 1 - 2
src/views/power/dataDictionary/codeModal.vue

@@ -132,7 +132,7 @@ export default {
                 _this.cancel()
               }, 300)
             } else {
-              // this.$message.warning(res.message)
+              this.$message.warning(res.message)
             }
           })
         }
@@ -177,7 +177,6 @@ export default {
         if (this.data.id) { // 编辑
           this.formData.titleText = '编辑字典'
           this.formData = Object.assign({}, this.data)
-
           delete this.formData.no
           this.formData.isEnable = Number(this.formData.isEnable)
           console.log(this.formData, 'this.formData')

+ 3 - 1
src/views/power/job/jobs.vue

@@ -248,7 +248,7 @@ export default {
               this.visible = false
               this.$refs.table.refresh(true)
             } else {
-              // this.$message.warning(res.message)
+              this.$message.warning(res.message)
             }
             this.loading = false
           })
@@ -289,6 +289,8 @@ export default {
             if (res.status === '200') {
               that.$message.success('删除成功')
               that.$refs.table.refresh()
+            } else {
+              that.$message.success('删除失败, 请稍后重试')
             }
           })
         }