Procházet zdrojové kódy

Merge branch 'deploy' of chelingzhu-web/qhsxKx-admin-html into master

lilei před 4 roky
rodič
revize
cf922c151e
36 změnil soubory, kde provedl 428 přidání a 467 odebrání
  1. 1 1
      .env
  2. 1 1
      .env.preview
  3. binární
      src/assets/noPic.jpg
  4. 1 1
      src/store/modules/user.js
  5. 17 18
      src/utils/request.js
  6. 4 5
      src/views/CarWashManagement/CarWashManagement.vue
  7. 14 11
      src/views/CarWashManagement/DetailsCarWashModal.vue
  8. 2 4
      src/views/CardVoucherAuth/role/menuModal.vue
  9. 2 1
      src/views/CardVoucherAuth/role/roleList.vue
  10. 2 2
      src/views/CardVoucherAuth/role/roleModal.vue
  11. 1 0
      src/views/CardVoucherAuth/user/userList.vue
  12. 3 6
      src/views/CardVoucherAuth/user/userModal.vue
  13. 1 1
      src/views/CouponSendAuth/role/menuModal.vue
  14. 2 2
      src/views/CouponSendAuth/role/roleList.vue
  15. 1 1
      src/views/CouponSendAuth/role/roleModal.vue
  16. 0 1
      src/views/CouponSendAuth/user/userList.vue
  17. 50 26
      src/views/CouponSendAuth/user/userModal.vue
  18. 14 7
      src/views/Order/OrderCenter.vue
  19. 13 15
      src/views/Order/OrderDetailModal.vue
  20. 4 6
      src/views/bnSetting/menu/adminMenus.vue
  21. 2 12
      src/views/bnSetting/menu/childModal.vue
  22. 4 20
      src/views/bnSetting/menu/storeMenus.vue
  23. 4 6
      src/views/bnSetting/menusAuth.vue
  24. 1 2
      src/views/power/dataDictionary/codeItemModal.vue
  25. 1 3
      src/views/power/dataDictionary/codeModal.vue
  26. 262 270
      src/views/power/dataDictionary/dataDictionary.vue
  27. 2 7
      src/views/power/menu/childModal.vue
  28. 4 8
      src/views/power/menu/menu.vue
  29. 2 4
      src/views/power/role/menuModal.vue
  30. 2 1
      src/views/power/role/roleList.vue
  31. 2 5
      src/views/power/role/roleModal.vue
  32. 1 0
      src/views/power/user/userList.vue
  33. 2 8
      src/views/power/user/userModal.vue
  34. 1 1
      src/views/user/ChangePwd.vue
  35. 3 9
      src/views/user/Login.vue
  36. 2 2
      vue.config.js

+ 1 - 1
.env

@@ -1,5 +1,5 @@
 NODE_ENV=production
 VUE_APP_PREVIEW=false
-VUE_APP_API_BASE_URL=http://carwash.zyucgj.com/cw-admin/
+VUE_APP_API_BASE_URL=https://carwash.zyucgj.com/cw-admin/
 VUE_APP_VERSION=V1.0.1
 VUE_APP_PRO_NAME=洗车机运营管理平台

+ 1 - 1
.env.preview

@@ -1,5 +1,5 @@
 NODE_ENV=production
 VUE_APP_PREVIEW=true
-VUE_APP_API_BASE_URL=http://carwash.test.zyucgj.com/cw-admin/
+VUE_APP_API_BASE_URL=https://carwash.test.zyucgj.com/cw-admin/
 VUE_APP_VERSION=V1.0.1
 VUE_APP_PRO_NAME=洗车机运营管理平台-pro

binární
src/assets/noPic.jpg


+ 1 - 1
src/store/modules/user.js

@@ -41,7 +41,7 @@ const user = {
       return new Promise((resolve, reject) => {
         login(userInfo).then(res => {
           console.log(res, 'login success')
-          if (res.userid) {
+          if (res && res.userid) {
             Vue.ls.set('hasError', 0)
             commit('SET_TOKEN', res.userid)
             commit('SET_NAME', { name: res.userNameCN, welcome: welcome() })

+ 17 - 18
src/utils/request.js

@@ -54,26 +54,25 @@ service.interceptors.request.use(config => {
 
 // response interceptor
 service.interceptors.response.use((response) => {
-  console.log(response, 'responseresponseresponse')
-  if (response.data.status == '-1') {
-    notification.destroy()
-    notification.error({
-      message: '提示',
-      description: response.data.message
-    })
-    setTimeout(function () {
-      store.dispatch('Logout').then(() => {
-        window.location.reload()
+  console.log(response, response.data.status, 'responseresponseresponse')
+  if (window.location.pathname != '/user/login') {
+    if (response.data.status == '900') {
+      notification.destroy()
+      notification.error({
+        message: '提示',
+        description: response.data.message
       })
-    }, 2000)
-  }
-  if ((response.data.status == '900') && window.location.pathname != '/user/login') {
-    notification.destroy()
-    notification.error({
-      message: '提示',
-      description: response.data.message
-    })
+    }
+  } else {
+    if (response.data.status == '500') {
+      notification.destroy()
+      notification.error({
+        message: '提示',
+        description: response.data.message
+      })
+    }
   }
+
   return response.data
 }, err)
 

+ 4 - 5
src/views/CarWashManagement/CarWashManagement.vue

@@ -67,7 +67,7 @@
         <a-tooltip placement="left" overlayClassName="btn-cont">
           <template slot="title">
             <div class="btn-set-cont">
-              <p class="set-sub-btn normal" @click="setStoreUpdateStatus(record, 'OPEN')" v-if="record.deviceStatus.split(',')[0] != 'PAUSE' && record.businessStatus != 'OPEN'">
+              <p class="set-sub-btn normal" @click="setStoreUpdateStatus(record, 'OPEN')" v-if="record.businessStatus != 'OPEN'">
                 <a-icon type="check-circle" class="icon" />
                 正常营业
               </p>
@@ -78,16 +78,15 @@
               <p
                 class="set-sub-btn soon"
                 @click="setStoreUpdateStatus(record, 'TO_BE_OPENED')"
-                v-if="record.deviceStatus.split(',')[0] != 'PAUSE' && record.businessStatus != 'TO_BE_OPENED'"
+                v-if="record.businessStatus != 'TO_BE_OPENED'"
               >
                 <a-icon type="play-circle" class="icon" />
                 即将开业
               </p>
             </div>
           </template>
-          <a-icon type="setting" title="设置" v-if="record.deviceStatus.split(',')[0] != 'PAUSE'" :style="{ fontSize: '20px', color: '#19be6b', padding: '0 10px' }" />
+          <a-icon type="setting" title="设置" :style="{ fontSize: '20px', color: '#19be6b', padding: '0 10px' }" />
         </a-tooltip>
-        <a-icon type="setting" title="设置" v-if="record.deviceStatus.split(',')[0] == 'PAUSE'" @click="tooltipSet" :style="{ fontSize: '20px', color: '#19be6b', padding: '0 10px' }" />
         <a-icon type="edit" title="编辑" @click="modalHandle('edit', record)" :style="{ fontSize: '20px', color: '#1890FF', padding: '0 10px' }" />
         <a-icon type="eye" title="查看详情" @click="modalHandle('details', record)" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" />
         <a-icon type="delete" title="删除" @click="deviceValidStatus('del', record)" :style="{ fontSize: '20px', color: 'red', padding: '0 10px' }" />
@@ -258,7 +257,7 @@ export default {
           this.$message.success(res.message)
           this.$refs.table.refresh(true)
         } else {
-          this.$message.success(res.message)
+          this.$message.error(res.message)
         }
       })
     },

+ 14 - 11
src/views/CarWashManagement/DetailsCarWashModal.vue

@@ -18,7 +18,7 @@
         </a-col>
         <a-col :span="12" class="item-cont">
           <p class="item-label">网点名称:</p>
-          <p class="item-main">{{ carWashInfo.name }}</p>
+          <p class="item-main">{{ carWashInfo.name || '-' }}</p>
         </a-col>
         <a-col :span="12" class="item-cont">
           <p class="item-label">地址:</p>
@@ -26,12 +26,13 @@
         </a-col>
         <a-col :span="12" class="item-cont">
           <p class="item-label">详细地址:</p>
-          <p class="item-main">{{ carWashInfo.addrDetail }}</p>
+          <p class="item-main">{{ carWashInfo.addrDetail || '-' }}</p>
         </a-col>
         <a-col :span="12" class="item-cont">
           <p class="item-label">设备ID:</p>
           <p class="item-main">
             <a-tag color="blue" v-if="carWashInfo.deviceVOList">{{ carWashInfo.deviceVOList[0].deviceNo }}</a-tag>
+            <span v-else>-</span>
           </p>
         </a-col>
         <a-col :span="12" class="item-cont">
@@ -42,11 +43,11 @@
         </a-col>
         <a-col :span="12" class="item-cont">
           <p class="item-label">经度:</p>
-          <p class="item-main">{{ carWashInfo.lng }}</p>
+          <p class="item-main">{{ carWashInfo.lng || '-' }}</p>
         </a-col>
         <a-col :span="12" class="item-cont">
           <p class="item-label">纬度:</p>
-          <p class="item-main">{{ carWashInfo.lat }}</p>
+          <p class="item-main">{{ carWashInfo.lat || '-' }}</p>
         </a-col>
         <a-col :span="12" class="item-cont">
           <p class="item-label">服务类型:</p>
@@ -69,11 +70,11 @@
         </a-col>
         <a-col :span="24" class="item-cont">
           <p class="item-label">路段指引:</p>
-          <p :class="['item-main', carWashInfo.guidance ? 'guidance-con' : '']" v-html="carWashInfo.guidance"></p>
+          <p :class="['item-main', carWashInfo.guidance ? 'guidance-con' : '']" v-html="carWashInfo.guidance || '-'"></p>
         </a-col>
         <a-col :span="24" class="item-cont">
           <p class="item-label">温馨提示:</p>
-          <p class="item-main">{{ carWashInfo.reminder }}</p>
+          <p class="item-main">{{ carWashInfo.reminder || '-' }}</p>
         </a-col>
         <a-col :span="24" class="item-cont">
           <p class="item-label">现场照片:</p>
@@ -122,7 +123,7 @@ export default {
       isShow: this.openModal, //  弹框是否展示
       labelList: [], //  网点标签
       isPicModal: false, //  现场照片  弹框是否展示
-      pic: '', //  现场照片  路径
+      pic: require('@/assets/noPic.jpg'), //  现场照片  路径
       carWashInfo: {}, //  网点信息
       serviceType: [], //  服务类型
       storeItemPriceDTOList: [], //  时段价格
@@ -142,9 +143,9 @@ export default {
               // 获取当前设备图片
               deviceImage({ deviceNo: res.data.deviceVOList[0].deviceNo }).then(results => {
                 if (results.status == 200) {
-                  this.pic = results.data
+                  this.pic = results.data || require('@/assets/noPic.jpg')
                 } else {
-                  this.pic = ''
+                  this.pic = require('@/assets/noPic.jpg')
                 }
               })
               this.setVal()
@@ -275,12 +276,14 @@ export default {
     .small-pic{
       display: block;
       cursor: zoom-in;
-      width: 300px;
+      width: 200px;
+      border: 1px solid #e8e8e8;
     }
   }
   .pic{
     display: block;
     max-width: 100%;
-    margin: 0 auto;
+    margin: 40px auto 50px;
+    border: 1px solid #e8e8e8;
   }
 </style>

+ 2 - 4
src/views/CardVoucherAuth/role/menuModal.vue

@@ -83,14 +83,14 @@ export default {
           }
           const arr = this.checkedData.join(',')
           addMenuPower({ id: this.id, menuIds: arr }).then(res => {
-            if (res.status + '' === '200') {
+            if (res.status == 200) {
               this.$message.success(res.message ? res.message : '保存成功')
               this.$emit('refresh')
               setTimeout(function () {
                 _this.cancel()
               }, 300)
             } else {
-              // this.$message.error(res.message)
+              this.$message.error(res.message)
             }
           })
         }
@@ -132,8 +132,6 @@ export default {
       }
     }
   },
-  mounted () {
-  },
   beforeCreate () {
     this.form = this.$form.createForm(this, { name: 'menuModal' })
   },

+ 2 - 1
src/views/CardVoucherAuth/role/roleList.vue

@@ -197,9 +197,10 @@ export default {
         flag: record.isEnable ? '1' : '0'
       }
       updateEnableStatus(_data).then(res => {
-        if (res.status + '' === '200') {
+        if (res.status == 200) {
           this.$message.success('修改成功')
         } else {
+          this.$message.error(res.message)
           record.isEnable = !record.isEnable
         }
       })

+ 2 - 2
src/views/CardVoucherAuth/role/roleModal.vue

@@ -100,14 +100,14 @@ export default {
       this.form.validateFields((err, values) => {
         if (!err) {
           saveRolePower(Object.assign(this.formData, values.formData)).then(res => {
-            if (res.status + '' === '200') {
+            if (res.status == 200) {
               this.$message.success(res.message ? res.message : '保存成功')
               this.$emit('refresh')
               setTimeout(function () {
                 _this.cancel()
               }, 300)
             } else {
-              // this.$message.error(res.message)
+              this.$message.error(res.message)
             }
           })
         }

+ 1 - 0
src/views/CardVoucherAuth/user/userList.vue

@@ -220,6 +220,7 @@ export default {
         if (res.status + '' === '200') {
           this.$message.success('修改成功')
         } else {
+          this.$message.error(res.message)
           record.loginFlag = !record.loginFlag
         }
       })

+ 3 - 6
src/views/CardVoucherAuth/user/userModal.vue

@@ -156,7 +156,6 @@ export default {
       this.clear()
       this.$emit('close')
     },
-
     // 保存提交
     handleSubmit () {
       const _this = this
@@ -164,14 +163,14 @@ export default {
         if (!err) {
           values.formData.roleNames = values.formData.roleNames.join(',')
           saveUserPower(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData)).then(res => {
-            if (res.status + '' === '200') {
+            if (res.status == 200) {
               this.$message.success(res.message ? res.message : '保存成功')
               this.$emit('refresh')
               setTimeout(function () {
                 _this.cancel()
               }, 300)
             } else {
-              // this.$message.error(res.message)
+              this.$message.error(res.message)
             }
           })
         }
@@ -201,18 +200,16 @@ export default {
       this.formData.sex = ''
       this.formData.remarks = ''
     },
-
     // 获取角色列表接口
     getRoleList () {
       getRoleList().then(res => {
-        if (res.status + '' === '200') {
+        if (res.status == 200) {
           this.roleList = res.data
         } else {
           this.$message.warning(res.message)
         }
       })
     }
-
   },
   mounted () {
     this.getRoleList()

+ 1 - 1
src/views/CouponSendAuth/role/menuModal.vue

@@ -92,7 +92,7 @@ export default {
                 _this.cancel()
               }, 300)
             } else {
-              // this.$message.error(res.message)
+              this.$message.error(res.message)
             }
           })
         }

+ 2 - 2
src/views/CouponSendAuth/role/roleList.vue

@@ -154,7 +154,6 @@ export default {
         }
       })
     },
-
     // 删除
     delect (row) {
       const _this = this
@@ -190,9 +189,10 @@ export default {
         flag: record.isEnable ? '1' : '0'
       }
       changeRoleStatus(_data).then(res => {
-        if (res.status + '' === '200') {
+        if (res.status == 200) {
           this.$message.success('修改成功')
         } else {
+          this.$message.error(res.message)
           record.isEnable = !record.isEnable
         }
       })

+ 1 - 1
src/views/CouponSendAuth/role/roleModal.vue

@@ -107,7 +107,7 @@ export default {
                 _this.cancel()
               }, 300)
             } else {
-              // this.$message.error(res.message)
+              this.$message.error(res.message)
             }
           })
         }

+ 0 - 1
src/views/CouponSendAuth/user/userList.vue

@@ -162,7 +162,6 @@ export default {
         pageNo: 1,
         pageSize: 1000
       }).then(res => {
-        console.log(res, '-----------')
         if (res.status == 200) {
           this.storeOptionData = res.data.list || []
         } else {

+ 50 - 26
src/views/CouponSendAuth/user/userModal.vue

@@ -10,8 +10,7 @@
                 placeholder="请输入用户名称"
                 v-decorator="['formData.name', {
                   initialValue: formData.name,
-                  rules: [{ required: true, message: '请输入用户名称!' },{pattern:'^[^<|>]{1,20}$',message:'请输入不含<或>的字符,最多20个字符'}] }]"
-              />
+                  rules: [{ required: true, message: '请输入用户名称!' },{pattern:'^[^<|>]{1,20}$',message:'请输入不含<或>的字符,最多20个字符'}] }]" />
             </a-form-item>
           </a-col>
           <a-col :span="12">
@@ -22,8 +21,7 @@
                 :maxLength="11"
                 v-decorator="['formData.mobile', {
                   initialValue: formData.mobile,
-                  rules: [{ required: true, message: '请输入手机号码!' },{pattern:/^[1][0-9]{10}$/, message: '请输入正确的手机号码!'}] }]"
-              />
+                  rules: [{ required: true, message: '请输入手机号码!' },{pattern:/^[1][0-9]{10}$/, message: '请输入正确的手机号码!'}] }]" />
             </a-form-item>
           </a-col>
         </a-row>
@@ -39,7 +37,8 @@
                     initialValue: formData.sex,
                     rules: [{ required: true, message: '请选择性别!' }] },
                 ]"
-                allowClear ></v-select>
+                allowClear>
+              </v-select>
 
             </a-form-item>
           </a-col>
@@ -48,6 +47,11 @@
             <a-form-item label="所在网点" :label-col="{ span:8 }" :wrapper-col="{ span:16}">
               <a-select
                 placeholder="请选择"
+                show-search
+                option-filter-prop="children"
+                @focus="handleFocus"
+                @blur="handleBlur"
+                @change="handleChange"
                 allowClear
                 v-decorator="[
                   'formData.storeId',
@@ -72,14 +76,8 @@
                 ]"
                 mode="multiple"
                 style="width: 100%"
-                placeholder="请选择角色"
-              >
-                <a-select-option
-                  v-for="item in roleList"
-                  :key="item.id"
-                  :disabled="item.isEnable == '0' ? true : false"
-                >{{ item.name }}</a-select-option
-                >
+                placeholder="请选择角色">
+                <a-select-option v-for="item in roleList" :key="item.id" :disabled="item.isEnable == '0' ? true : false">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -98,12 +96,19 @@
 </template>
 
 <script>
-import { STable, VSelect } from '@/components'
-import { getRoleList, saveUser } from '@/api/send-coupon-user.js'
+import {
+  STable,
+  VSelect
+} from '@/components'
+import {
+  getRoleList,
+  saveUser
+} from '@/api/send-coupon-user.js'
 export default {
   name: 'UserModal',
   components: {
-    STable, VSelect
+    STable,
+    VSelect
   },
   props: {
     visible: {
@@ -128,7 +133,9 @@ export default {
       titleText: '添加用户',
       isshow: this.visible,
       formLayout: 'horizontal',
-      form: this.$form.createForm(this, { name: 'miniForm' }),
+      form: this.$form.createForm(this, {
+        name: 'miniForm'
+      }),
       roleList: [],
       formData: {
         roleIds: undefined, // 角色
@@ -144,23 +151,38 @@ export default {
       this.clear()
       this.$emit('close')
     },
-
+    // 适用网点搜索下拉
+    handleChange (value) {
+      console.log(`selected ${value}`)
+    },
+    handleBlur () {
+      console.log('blur')
+    },
+    handleFocus () {
+      console.log('focus')
+    },
+    filterOption (input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    },
     // 保存提交
     handleSubmit () {
       const _this = this
       this.form.validateFields((err, values) => {
         if (!err) {
-          console.log(values)
           values.formData.roleIds = values.formData.roleIds.join(',')
-          saveUser(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData)).then(res => {
-            if (res.status + '' === '200') {
+          saveUser(Object.assign({
+            id: this.data.id ? this.data.id : ''
+          }, values.formData)).then(res => {
+            if (res.status == 200) {
               this.$message.success(res.message ? res.message : '保存成功')
               this.$emit('refresh')
               setTimeout(function () {
                 _this.cancel()
               }, 300)
             } else {
-              // this.$message.error(res.message)
+              this.$message.error(res.message)
             }
           })
         }
@@ -207,7 +229,9 @@ export default {
     this.getRoleList()
   },
   beforeCreate () {
-    this.form = this.$form.createForm(this, { name: 'miniForm' })
+    this.form = this.$form.createForm(this, {
+      name: 'miniForm'
+    })
   },
   watch: {
     visible (newValue, oldValue) {
@@ -247,9 +271,9 @@ export default {
 }
 </script>
 
-<style >
-  .modalBox{
-  }
+<style>
+  .modalBox {}
+
   .ant-modal-footer {
     display: none;
   }

+ 14 - 7
src/views/Order/OrderCenter.vue

@@ -70,6 +70,11 @@
         <template v-if=" record.payStatus == 'PAID' ">{{ record.paymentAmount }}</template>
         <template v-else-if=" record.payStatus != 'PAID' ">{{ 0 }}</template>
       </span>
+      <!-- 优惠 -->
+      <span slot="couponAmount" slot-scope="text, record">
+        <template v-if=" record.orderStatus != 'CANCELED' ">{{ record.couponAmount }}</template>
+        <template v-else-if=" record.orderStatus == 'CANCELED' ">{{ 0 }}</template>
+      </span>
       <!-- 操作 -->
       <span slot="action" slot-scope="text, record">
         <a-button type="primary" @click="seeDetail(record)">查看</a-button>
@@ -164,6 +169,15 @@ export default {
         minWidth: '40',
         align: 'center'
       },
+      {
+        title: '优惠(¥)',
+        dataIndex: 'couponAmount',
+        minWidth: '40',
+        align: 'center',
+        scopedSlots: {
+          customRender: 'couponAmount'
+        }
+      },
       {
         title: '实收(¥)',
         dataIndex: 'paymentAmount',
@@ -174,12 +188,6 @@ export default {
         }
 
       },
-      // {
-      //   title: '优惠(¥)',
-      //   dataIndex: 'couponAmount',
-      //   minWidth: '40',
-      //   align: 'center'
-      // },
       {
         title: '状态',
         dataIndex: 'orderStatus',
@@ -215,7 +223,6 @@ export default {
       }
     }
   },
-
   methods: {
     moment,
     // 创建时间change

+ 13 - 15
src/views/Order/OrderDetailModal.vue

@@ -56,6 +56,18 @@
                 <span v-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}">
+                <span>{{ orderDetailData.orderCoupons ? orderDetailData.couponAmount : 0 }} 元</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.orderCoupons ? orderDetailData.orderCoupons[0].couponTitle : '--' }}</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;">
@@ -73,23 +85,10 @@
                     </div>
                     <div>洗车后</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>
@@ -168,13 +167,12 @@ export default {
           id: newValue
         }).then(res => {
           // console.log(res, '------------')
+          this.orderDetailData = res.data
           if (res.status == 200) {
             setTimeout(() => {
               res.data.orderStatus = this.$refs.orderStatus.getNameByCode(res.data.orderStatus)
             }, 500)
           }
-          this.orderDetailData = res.data
-          // console.log(this.orderDetailData, '---')
         })
       }
     },

+ 4 - 6
src/views/bnSetting/menu/adminMenus.vue

@@ -378,6 +378,8 @@ export default {
             if (res.status == 200) {
               _this.$message.success('删除成功')
               _this.getMenuList()
+            } else {
+              _this.$message.error(res.message)
             }
           }).catch(() => {
             _this.$message.success('删除失败, 请稍后重试')
@@ -394,12 +396,12 @@ export default {
           console.log(values.formData, ' formData.type222222222')
           saveMenu(Object.assign({ id: this.formData.id }, values.formData)).then(res => {
             console.log(res, 'res--save')
-            if (res.status + '' === '200') {
+            if (res.status == 200) {
               this.$message.success(res.message ? res.message : '保存成功')
               _this.getMenuList()
               _this.clear()
             } else {
-              // this.$message.warning(res.message)
+              this.$message.error(res.message)
             }
           })
         }
@@ -408,7 +410,6 @@ export default {
     handleCancel () {
       this.clear()
     }
-
   },
   mounted () {
   },
@@ -419,9 +420,6 @@ export default {
     next(vm => {
       vm.getMenuList()
     })
-  },
-  watch: {
-
   }
 }
 </script>

+ 2 - 12
src/views/bnSetting/menu/childModal.vue

@@ -241,28 +241,24 @@ export default {
       this.clear()
       this.$emit('close')
     },
-
     selectChange (val) {
       this.formData.type = val
-      console.log(val)
     },
     // 保存提交
     handleSubmit () {
       const _this = this
       this.form.validateFields((err, values) => {
         if (!err) {
-          console.log(values.formData, ' formData.type222222222')
           const saveRequest = this.parentType == 'store' ? saveMdMenu : saveMenu
           saveRequest(Object.assign(this.formData, values.formData)).then(res => {
-            console.log(res, 'res--save')
-            if (res.status + '' === '200') {
+            if (res.status == 200) {
               this.$message.success(res.message ? res.message : '保存成功')
               this.$emit('refresh')
               setTimeout(function () {
                 _this.cancel()
               }, 300)
             } else {
-              // this.$message.warning(res.message)
+              this.$message.error(res.message)
             }
           })
         }
@@ -300,9 +296,6 @@ export default {
       this.formData.code = ''
       this.formData.permission = ''
     }
-
-  },
-  mounted () {
   },
   beforeCreate () {
     this.form = this.$form.createForm(this, { name: 'childModal' })
@@ -316,7 +309,6 @@ export default {
         if (this.data.id) { // 添加子菜单
           this.titleText = '添加子菜单'
           this.disabled = false
-          console.log(this.data, 'this.data')
           this.formData.parentId = this.data.id
           this.parentTitle = this.data.name
         } else { // 添加顶菜单
@@ -333,8 +325,6 @@ export default {
 </script>
 
 <style >
-  .modalBox{
-  }
   .ant-modal-footer {
     display: none;
   }

+ 4 - 20
src/views/bnSetting/menu/storeMenus.vue

@@ -269,7 +269,6 @@ export default {
     },
 
     onSelect (selectedKeys, info) {
-      console.log('onSelect', info)
       this.selectedKeys = selectedKeys
       if (info.selected) {
         const data = info.selectedNodes[0].data.props
@@ -292,7 +291,6 @@ export default {
           status: data.status,
           isLeaf: !(isLeaf && isLeaf.length)
         }
-
         this.selectedMenu = this.formData.name
         this.formData.status = Number(this.formData.status)
         this.formData.chainOrgUse = Number(this.formData.chainOrgUse)
@@ -309,7 +307,6 @@ export default {
         this.dataList.push({ key, title: key })
         node.scopedSlots = { title: 'title' }
         node.slots = { icon: node.type == '0' ? 'file' : 'pushpin' }
-
         if (node.children) {
           this.generateList(node.children)
         }
@@ -348,10 +345,8 @@ export default {
     // 获取菜单树列表
     getMdMenuList () {
       getMdMenuList().then(res => {
-        console.log(res, 'res1111111')
         if (res.status == 200) {
           this.treeData = res.data
-          console.log(this.treeData, 'this.treeData')
         }
       })
     },
@@ -395,14 +390,12 @@ export default {
       this.formData.permission = ''
       this.formData.isLeaf = true
     },
-
     // 删除数据
     delect () {
       if (!this.selectedKeys.length) {
         return this.$message.warning('您还未选择要删除的数据')
       }
       const _this = this
-      console.log(_this.formData.id, '_this.formData.id')
       this.$confirm({
         title: '警告',
         content: `确定要删除您选择的 ${_this.formData.name} 的数据吗?`,
@@ -415,6 +408,8 @@ export default {
             if (res.status == 200) {
               _this.$message.success('删除成功')
               _this.getMdMenuList()
+            } else {
+              _this.$message.error(res.message)
             }
           }).catch(() => {
             _this.$message.success('删除失败, 请稍后重试')
@@ -422,21 +417,18 @@ export default {
         }
       })
     },
-
     // 保存提交
     handleSubmit () {
       const _this = this
       this.form.validateFields((err, values) => {
         if (!err) {
-          console.log(values.formData, ' formData.type222222222')
           saveMdMenu(Object.assign({ id: this.formData.id }, values.formData)).then(res => {
-            console.log(res, 'res--save')
-            if (res.status + '' === '200') {
+            if (res.status == 200) {
               this.$message.success(res.message ? res.message : '保存成功')
               _this.getMdMenuList()
               _this.clear()
             } else {
-              // this.$message.warning(res.message)
+              _this.$message.error(res.message)
             }
           })
         }
@@ -445,9 +437,6 @@ export default {
     handleCancel () {
       this.clear()
     }
-
-  },
-  mounted () {
   },
   beforeCreate () {
     this.form = this.$form.createForm(this, { name: 'menu' })
@@ -456,9 +445,6 @@ export default {
     next(vm => {
       vm.getMdMenuList()
     })
-  },
-  watch: {
-
   }
 }
 </script>
@@ -468,7 +454,6 @@ export default {
     width: 6px;
     height: 6px ;
   }
-
   .menu-box::-webkit-scrollbar-thumb{
     width: 6px;
     height: 6px ;
@@ -476,7 +461,6 @@ export default {
     -webkit-box-shadow: inset 0 0 2px #d1d1d1;
     background: #e4e4e4;
   }
-
   .textCount{
     border: 1px solid #91d5ff;
     background-color: #e6f7ff;

+ 4 - 6
src/views/bnSetting/menusAuth.vue

@@ -124,22 +124,20 @@ export default {
     // 保存单店
     ddSave (pars) {
       saveDdMouldMenu(pars).then(res => {
-        console.log(res, 'res--save')
-        if (res.status + '' === '200') {
+        if (res.status == 200) {
           this.$message.success(res.message ? res.message : '保存成功')
         } else {
-          // this.$message.warning(res.message)
+          this.$message.error(res.message)
         }
       })
     },
     // 保存连锁
     lsSave (pars) {
       saveLsMouldMenu(pars).then(res => {
-        console.log(res, 'res--save')
-        if (res.status + '' === '200') {
+        if (res.status == 200) {
           this.$message.success(res.message ? res.message : '保存成功')
         } else {
-          // this.$message.warning(res.message)
+          this.$message.error(res.message)
         }
       })
     }

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

@@ -228,7 +228,6 @@ export default {
       this.form.validateFields((err, values) => {
         console.log(values, 'values222')
         if (!err) {
-          console.log(values.formData, ' formData.type222222222')
           saveLookUpItem(Object.assign(this.formData, values.formData)).then(res => {
             console.log(res, 'res--save')
             if (res.status + '' === '200') {
@@ -238,7 +237,7 @@ export default {
                 _this.cancel()
               }, 300)
             } else {
-              // this.$message.error(res.message)
+              this.$message.error(res.message)
             }
           })
         }

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

@@ -122,9 +122,7 @@ export default {
       const _this = this
       this.form.validateFields((err, values) => {
         if (!err) {
-          console.log(values.formData, ' formData.type222222222')
           saveLookUp(Object.assign(this.formData, values.formData)).then(res => {
-            console.log(res, 'res--save')
             if (res.status + '' === '200') {
               this.$message.success(res.message ? res.message : '保存成功')
               this.$emit('refresh')
@@ -132,7 +130,7 @@ export default {
                 _this.cancel()
               }, 300)
             } else {
-              // this.$message.warning(res.message)
+              this.$message.error(res.message)
             }
           })
         }

+ 262 - 270
src/views/power/dataDictionary/dataDictionary.vue

@@ -3,26 +3,26 @@
     <a-row :gutter="24">
       <!-- 左侧字典列表 -->
       <a-col :span="6">
-        <a-row :gutter="24">        
-             <!-- <a-button style="margin-right: 10px;" type="primary" icon="plus" @click="addCode">添加字典</a-button> -->   
-              <a-button style="margin-right: 10px;" type="primary" icon="plus" @click="editCode">编辑字典</a-button>
-             <!-- <a-select style="width: 110px" placeholder="更多操作" allowClear >
+        <a-row :gutter="24">
+          <!-- <a-button style="margin-right: 10px;" type="primary" icon="plus" @click="addCode">添加字典</a-button> -->
+          <a-button style="margin-right: 10px;" type="primary" icon="plus" @click="editCode">编辑字典</a-button>
+          <!-- <a-select style="width: 110px" placeholder="更多操作" allowClear >
                <a-select-option @click="editCode" value="编辑字典">编辑字典</a-select-option>
                <a-select-option @click="delectCode" value="删除字典">删除字典</a-select-option>
-             </a-select> -->              
+             </a-select> -->
         </a-row>
-        <a-row :gutter="24"  class="textCount">
+        <a-row :gutter="24" class="textCount">
           <a-icon type="info-circle" style="color: #1890FF;margin-right: 10px;" />
-          <span>当前选择:<span style="color: #40a9ff;font-weight: 600;">{{selectedMenu}}</span><span v-if="selectedKey.length" class="imgSize" @click="cancelSel">取消选择</span></span>
+          <span>当前选择:<span style="color: #40a9ff;font-weight: 600;">{{ selectedMenu }}</span><span v-if="selectedKey.length" class="imgSize" @click="cancelSel">取消选择</span></span>
         </a-row>
         <a-row :gutter="24" >
           <a-input-search v-model="code" placeholder="输入编码类别/名称 搜索字典" style="width: 100%" @search="getCodeList" />
         </a-row>
         <a-row :gutter="24" >
-         <a-menu class="menu-box" style="border-right: 0;max-height: 650px;overflow: auto;" v-model="selectedKey" >
-              <a-menu-item  style="margin-bottom: 0px;height: 30px; line-height: 30px;" v-for="(item,index) in codeList" :key="index" :value="item">{{item.name}}</a-menu-item>            
-            </a-menu>
-            <span v-if="noData" style="line-height: 50px; font-weight: 600;">暂无数据</span>
+          <a-menu class="menu-box" style="border-right: 0;max-height: 650px;overflow: auto;" v-model="selectedKey" >
+            <a-menu-item style="margin-bottom: 0px;height: 30px; line-height: 30px;" v-for="(item,index) in codeList" :key="index" :value="item">{{ item.name }}</a-menu-item>
+          </a-menu>
+          <span v-if="noData" style="line-height: 50px; font-weight: 600;">暂无数据</span>
         </a-row>
       </a-col>
       <!-- 右侧数据列表 -->
@@ -36,16 +36,18 @@
                     <a-input allowClear v-model="queryParam.dispName" placeholder="请输入数据名称"/>
                   </a-form-item>
                 </a-col>
-          
+
                 <a-col :md="6" :sm="24">
                   <a-form-item label="状态">
-                    <a-select allowClear v-model="queryParam.isEnable"
-                              placeholder="请选择"
+                    <a-select
+                      allowClear
+                      v-model="queryParam.isEnable"
+                      placeholder="请选择"
                     >
-                      <a-select-option  :value = '1'>
+                      <a-select-option :value="1">
                       </a-select-option>
-                      <a-select-option  :value = '0'>
+                      <a-select-option :value="0">
                       </a-select-option>
                     </a-select>
@@ -67,7 +69,7 @@
             <!-- <a-button type="" icon="delete" @click="delectAll">批量删除</a-button> -->
             <a-button type="" icon="reload" @click="$refs.table.refresh(true)">刷新数据</a-button>
           </div>
-         <!-- <div  class="textCount">
+          <!-- <div  class="textCount">
             <a-icon type="info-circle" style="color: #1890FF;margin-right: 10px;" />
             <span>已选择<span style="color: #40a9ff;font-weight: 600;margin-left: 10px;">{{selectedNum}}项</span><span class="imgSize">清空</span></span>
           </div> -->
@@ -78,7 +80,7 @@
             :columns="columns"
             :data="loadData"
             bordered
-          >         
+          >
             <span slot="action" slot-scope="text, record">
               <template>
                 <a class="action-button" @click="handleEdit(record)">修改</a>
@@ -87,7 +89,7 @@
             </span>
           </s-table>
         </div>
-        
+
       </a-col>
     </a-row>
     <codeModal :visible="showCodeModal" :data="codeData" @refresh="getCodeList" @close="showCodeModal = false"></codeModal>
@@ -96,272 +98,262 @@
 </template>
 
 <script>
-  import { STable, VSelect } from '@/components'
-  import codeModal from './codeModal.vue'
-  import codeItemModal from './codeItemModal.vue'
-  import { listLookUp, delLookUp, getLookUpItem, delLookUpItem } from '@/api/lookup.js'
-  export default {
-    name: 'dataDictionary',
-    components: {
-      STable, VSelect, codeModal, codeItemModal
-    },
-    props: {},
-    data () {
-       // const rowSelection = {
-       //    onChange: (selectedRowKeys, selectedRows) => {
-       //      console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
-       //    },
-       //    onSelect: (record, selected, selectedRows) => {
-       //      this.selectedNum = selectedRows.length
-       //      console.log(record,'record')
-       //      console.log(selectedRows,'selectedRows')
-       //    },
-       //    onSelectAll: (selected, selectedRows, changeRows) => {
-       //      this.selectedNum = selectedRows.length
-       //      console.log(selected, selectedRows, changeRows)
-       //    }
-       //  }
-      return {
-        // 查询参数
-        queryParam: {
-          dispName: '',
-          isEnable: undefined,
-          lookupCode: ''
+import { STable, VSelect } from '@/components'
+import codeModal from './codeModal.vue'
+import codeItemModal from './codeItemModal.vue'
+import { listLookUp, delLookUp, getLookUpItem, delLookUpItem } from '@/api/lookup.js'
+export default {
+  name: 'DataDictionary',
+  components: {
+    STable, VSelect, codeModal, codeItemModal
+  },
+  props: {},
+  data () {
+    // const rowSelection = {
+    //    onChange: (selectedRowKeys, selectedRows) => {
+    //      console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
+    //    },
+    //    onSelect: (record, selected, selectedRows) => {
+    //      this.selectedNum = selectedRows.length
+    //      console.log(record,'record')
+    //      console.log(selectedRows,'selectedRows')
+    //    },
+    //    onSelectAll: (selected, selectedRows, changeRows) => {
+    //      this.selectedNum = selectedRows.length
+    //      console.log(selected, selectedRows, changeRows)
+    //    }
+    //  }
+    return {
+      // 查询参数
+      queryParam: {
+        dispName: '',
+        isEnable: undefined,
+        lookupCode: ''
+      },
+      noData: false,
+      code: '', // 根据输入编码类别/名称搜索字典
+      selectedNum: '',
+      selectedKey: [], // 选中的字典编码项
+      selectedMenu: '',
+      formLayout: 'horizontal',
+      form: this.$form.createForm(this, { name: 'miniForm' }),
+      codeList: [],
+      showCodeModal: false,
+      showItemCodeModal: false,
+      codeData: {}, // 编辑字典行数据
+      itemCodeData: {},
+      // 表头
+      columns: [
+        {
+          title: '序号',
+          dataIndex: 'no',
+          width: '40',
+          align: 'center'
+        },
+        {
+          title: '名称',
+          dataIndex: 'dispName',
+          width: '100',
+          align: 'center'
+        },
+        {
+          title: '项编码',
+          dataIndex: 'code',
+          width: '100',
+          align: 'center'
         },
-        noData: false, 
-        code: '', // 根据输入编码类别/名称搜索字典
-        selectedNum: '',
-        selectedKey: [], // 选中的字典编码项
-        selectedMenu: '',
-        formLayout: 'horizontal',
-        form: this.$form.createForm(this, { name: 'miniForm' }),
-        codeList: [],
-        showCodeModal: false,
-        showItemCodeModal: false,
-        codeData: {}, // 编辑字典行数据
-        itemCodeData: {}, 
-          // 表头
-          columns: [
-            {
-              title: '序号',
-              dataIndex: 'no',
-              width: '40',
-              align: 'center'
-            },
-            {
-              title: '名称',
-              dataIndex: 'dispName',
-              width: '100',
-              align: 'center'
-            },
-            {
-              title: '项编码',
-              dataIndex: 'code',
-              width: '100',
-              align: 'center'
-            },
-            {
-              title: '排序值',
-              dataIndex: 'sort',
-              width: '100',
-              align: 'center'
-            },
-            {
-              title: '是否启用',
-              width: '100',
-              align: 'center',
-              dataIndex: 'isEnable',
-              customRender: function(text) {
-                if (text == 1) {
-                  return '启用'
-                } else {
-                  return '禁用'
-                }
-              }
-            },
-            {
-              title: '创建时间',
-              dataIndex: 'createDate',
-              width: '120',
-              align: 'center'
-            },
-            {
-              title: '备注',
-              dataIndex: 'remarks',
-              width: '100',
-              align: 'center'
-            },
-            {
-              title: '操作',
-              width: '100',
-              align: 'center',
-              scopedSlots: { customRender: 'action' }
+        {
+          title: '排序值',
+          dataIndex: 'sort',
+          width: '100',
+          align: 'center'
+        },
+        {
+          title: '是否启用',
+          width: '100',
+          align: 'center',
+          dataIndex: 'isEnable',
+          customRender: function (text) {
+            if (text == 1) {
+              return '启用'
+            } else {
+              return '禁用'
             }
-          ],
-          // 加载数据方法 必须为 Promise 对象
-          loadData: parameter => {
-            console.log(parameter, 'parameter')
-              
-            return getLookUpItem(Object.assign(parameter, this.queryParam)).then(res => {
-              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.isEnable = _item.isEnable + '' === '1'
-              }
-              return res.data
-            })
-          },
-          optionAlertShow: false
+          }
+        },
+        {
+          title: '创建时间',
+          dataIndex: 'createDate',
+          width: '120',
+          align: 'center'
+        },
+        {
+          title: '备注',
+          dataIndex: 'remarks',
+          width: '100',
+          align: 'center'
+        },
+        {
+          title: '操作',
+          width: '100',
+          align: 'center',
+          scopedSlots: { customRender: 'action' }
         }
-    },
-    methods: {
-     
-      // 获取字典列表
-      getCodeList () {
-        console.log({code:this.code})
-        listLookUp({code:this.code}).then(res => {
-          console.log(res, 'res1111111')
-          if (res.status == 200) {
-            this.codeList = res.data
-            this.noData = false
-            if (!res.data.length) {
-              this.noData = true
-            }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        return getLookUpItem(Object.assign(parameter, this.queryParam)).then(res => {
+          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.isEnable = _item.isEnable + '' === '1'
           }
+          return res.data
         })
       },
-     // 添加字典
-     addCode () {
-       this.showCodeModal = true
-       this.codeData = {}
-     },
-     // 编辑字典
-     editCode () {
-       if (!this.selectedKey.length) {
-        return this.$message.warning('您还未选择要编辑的字典');
-       }
-       this.showCodeModal = true
-       this.codeData = this.codeList[this.selectedKey]
-     },
-     // 删除字典
-     delectCode () {
-       if (!this.selectedKey.length) {
-        return this.$message.warning('您还未选择要删除的字典');
-       }
-       let _this = this
-       let id = this.codeList[this.selectedKey].id
-       this.$confirm({
-         title: '警告',
-         content: `确定要删除 ${this.codeList[this.selectedKey].name} 吗?`,
-         okText: '确定',
-         cancelText: '取消',
-         onOk () {
-           delLookUp({
-             id: id
-           }).then(res => {
-             if (res.status == 200) {
-               _this.$message.success('删除成功')
-               _this.getCodeList()
-             }
-           }).catch(() => {
-             _this.$message.success('删除失败, 请稍后重试')
-           })
-         }
-       })
-     },
+      optionAlertShow: false
+    }
+  },
+  methods: {
+    // 获取字典列表
+    getCodeList () {
+      listLookUp({ code: this.code }).then(res => {
+        if (res.status == 200) {
+          this.codeList = res.data
+          this.noData = false
+          if (!res.data.length) {
+            this.noData = true
+          }
+        }
+      })
+    },
+    // 添加字典
+    addCode () {
+      this.showCodeModal = true
+      this.codeData = {}
+    },
+    // 编辑字典
+    editCode () {
+      if (!this.selectedKey.length) {
+        return this.$message.warning('您还未选择要编辑的字典')
+      }
+      this.showCodeModal = true
+      this.codeData = this.codeList[this.selectedKey]
+    },
+    // 删除字典
+    delectCode () {
+      if (!this.selectedKey.length) {
+        return this.$message.warning('您还未选择要删除的字典')
+      }
+      const _this = this
+      const id = this.codeList[this.selectedKey].id
+      this.$confirm({
+        title: '警告',
+        content: `确定要删除 ${this.codeList[this.selectedKey].name} 吗?`,
+        okText: '确定',
+        cancelText: '取消',
+        onOk () {
+          delLookUp({
+            id: id
+          }).then(res => {
+            if (res.status == 200) {
+              _this.$message.success('删除成功')
+              _this.getCodeList()
+            } else {
+              _this.$message.error(res.message)
+            }
+          }).catch(() => {
+            _this.$message.success('删除失败, 请稍后重试')
+          })
+        }
+      })
+    },
     // 字典 取消选择
     cancelSel () {
       this.selectedKey = []
       this.selectedMenu = ''
     },
-    
-     // 新增数据
-     openCodeItemModal () {
-       if (!this.selectedKey.length) {
-        return this.$message.warning('请先选择一个字典类别');
-       }
-       this.showItemCodeModal = true
-       this.itemCodeData = {lookupCode:this.codeList[this.selectedKey].code}
-     },   
-     
-     // 批量删除数据
-      delectAll () {
-        if (!this.selectedNum) {
-         return this.$message.warning('您还未选择要删除的数据');
-        }
-        let _this = this
-        this.$confirm({
-          title: '警告',
-          content: `确定要删除您选择的这${this.selectedNum}条数据吗?`,
-          okText: '确定',
-          cancelText: '取消',
-          onOk () {
-            // delectUserPower({
-            //   id: row.id
-            // }).then(res => {
-            //   if (res.status == 200) {
-            //     _this.$message.success('删除成功')
-            //     _this.$refs.table.refresh()
-            //   }
-            // }).catch(() => {
-            //   _this.$message.success('删除失败, 请稍后重试')
-            // })
-          }
-        })
-      },
-      // 删除
-      delect (row) { 
-        let _this = this
-        this.$confirm({
-          title: '警告',
-          content: '确定要删除吗?',
-          okText: '确定',
-          cancelText: '取消',
-          onOk () {
-            delLookUpItem({
-              id: row.id
-            }).then(res => {
-              console.log(res, 'res1111')
-              if (res.status == 200) {
-                _this.$message.success('删除成功')
-                _this.$refs.table.refresh()
-              }
-            }).catch(() => {
-              _this.$message.success('删除失败, 请稍后重试')
-            })
-          }
-        })
-      },
-      handleEdit (row) {
-        console.log(row, 'row')
-        this.showItemCodeModal = true
-        this.itemCodeData = row 
-      },
-      
-    },
-    mounted () {
-    },
-    beforeCreate () {
-      this.form = this.$form.createForm(this, { name: 'miniForm' })
+    // 新增数据
+    openCodeItemModal () {
+      if (!this.selectedKey.length) {
+        return this.$message.warning('请先选择一个字典类别')
+      }
+      this.showItemCodeModal = true
+      this.itemCodeData = { lookupCode: this.codeList[this.selectedKey].code }
     },
-    beforeRouteEnter (to, from, next) {
-      next(vm => {
-        vm.getCodeList()
+    // 批量删除数据
+    delectAll () {
+      if (!this.selectedNum) {
+        return this.$message.warning('您还未选择要删除的数据')
+      }
+      const _this = this
+      this.$confirm({
+        title: '警告',
+        content: `确定要删除您选择的这${this.selectedNum}条数据吗?`,
+        okText: '确定',
+        cancelText: '取消',
+        onOk () {
+          // delectUserPower({
+          //   id: row.id
+          // }).then(res => {
+          //   if (res.status == 200) {
+          //     _this.$message.success('删除成功')
+          //     _this.$refs.table.refresh()
+          //   }
+          // }).catch(() => {
+          //   _this.$message.success('删除失败, 请稍后重试')
+          // })
+        }
       })
     },
-    watch: {
-      selectedKey(newValue, oldValue) {
-        console.log(newValue, 'newValue')
-        if (newValue.length) {
-          
-          this.selectedMenu = this.codeList[this.selectedKey].name + " " + '(' + this.codeList[this.selectedKey].code + ')'
-          this.queryParam.lookupCode = this.codeList[this.selectedKey].code
-          this.$refs.table.refresh(true)
+    // 删除
+    delect (row) {
+      const _this = this
+      this.$confirm({
+        title: '警告',
+        content: '确定要删除吗?',
+        okText: '确定',
+        cancelText: '取消',
+        onOk () {
+          delLookUpItem({
+            id: row.id
+          }).then(res => {
+            if (res.status == 200) {
+              _this.$message.success('删除成功')
+              _this.$refs.table.refresh()
+            } else {
+              _this.$message.error(res.message)
+            }
+          }).catch(() => {
+            _this.$message.success('删除失败, 请稍后重试')
+          })
         }
-      }
+      })
     },
+    handleEdit (row) {
+      this.showItemCodeModal = true
+      this.itemCodeData = row
+    }
+  },
+  beforeCreate () {
+    this.form = this.$form.createForm(this, { name: 'miniForm' })
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.getCodeList()
+    })
+  },
+  watch: {
+    selectedKey (newValue, oldValue) {
+      if (newValue.length) {
+        this.selectedMenu = this.codeList[this.selectedKey].name + ' ' + '(' + this.codeList[this.selectedKey].code + ')'
+        this.queryParam.lookupCode = this.codeList[this.selectedKey].code
+        this.$refs.table.refresh(true)
+      }
+    }
   }
+}
 </script>
 
 <style scoped>
@@ -369,7 +361,7 @@
     width: 6px;
     height: 6px ;
   }
-  
+
   .menu-box::-webkit-scrollbar-thumb{
     width: 6px;
     height: 6px ;
@@ -377,7 +369,7 @@
     -webkit-box-shadow: inset 0 0 2px #d1d1d1;
     background: #e4e4e4;
   }
- 
+
   .textCount{
     border: 1px solid #91d5ff;
     background-color: #e6f7ff;

+ 2 - 7
src/views/power/menu/childModal.vue

@@ -215,17 +215,15 @@ export default {
       const _this = this
       this.form.validateFields((err, values) => {
         if (!err) {
-          console.log(values.formData, ' formData.type222222222')
           saveYyMenu(Object.assign(this.formData, values.formData)).then(res => {
-            console.log(res, 'res--save')
-            if (res.status + '' === '200') {
+            if (res.status == '200') {
               this.$message.success(res.message ? res.message : '保存成功')
               this.$emit('refresh')
               setTimeout(function () {
                 _this.cancel()
               }, 300)
             } else {
-              // this.$message.warning(res.message)
+              _this.$message.error(res.message)
             }
           })
         }
@@ -261,9 +259,6 @@ export default {
       this.formData.code = ''
       this.formData.permission = ''
     }
-
-  },
-  mounted () {
   },
   beforeCreate () {
     this.form = this.$form.createForm(this, { name: 'childModal' })

+ 4 - 8
src/views/power/menu/menu.vue

@@ -269,7 +269,6 @@ export default {
       this.showChildModal = true
       this.parentData = {}
     },
-
     //  取消选择
     cancelSel () {
       this.selectedKeys = []
@@ -293,14 +292,12 @@ export default {
       this.formData.permission = ''
       this.formData.isLeaf = true
     },
-
     // 删除数据
     delect () {
       if (!this.selectedKeys.length) {
         return this.$message.warning('您还未选择要删除的数据')
       }
       const _this = this
-      console.log(_this.formData.id, '_this.formData.id')
       this.$confirm({
         title: '警告',
         content: `确定要删除您选择的 ${_this.formData.name} 的数据吗?`,
@@ -313,6 +310,8 @@ export default {
             if (res.status == 200) {
               _this.$message.success('删除成功')
               _this.getYyMenuList()
+            } else {
+              this.$message.error(res.message)
             }
           }).catch(() => {
             _this.$message.success('删除失败, 请稍后重试')
@@ -320,20 +319,18 @@ export default {
         }
       })
     },
-
     // 保存提交
     handleSubmit () {
       const _this = this
       this.form.validateFields((err, values) => {
         if (!err) {
           saveYyMenu(Object.assign({ id: this.formData.id }, values.formData)).then(res => {
-            console.log(res, 'res--save')
-            if (res.status + '' === '200') {
+            if (res.status == 200) {
               this.$message.success(res.message ? res.message : '保存成功')
               _this.getYyMenuList()
               _this.clear()
             } else {
-              // this.$message.warning(res.message)
+              _this.$message.error(res.message)
             }
           })
         }
@@ -342,7 +339,6 @@ export default {
     handleCancel () {
       this.clear()
     }
-
   },
   beforeCreate () {
     this.form = this.$form.createForm(this, { name: 'menu' })

+ 2 - 4
src/views/power/role/menuModal.vue

@@ -85,14 +85,14 @@ export default {
           }
           const arr = this.checkedData.join(',')
           addMenuPower({ id: this.id, menuIds: arr }).then(res => {
-            if (res.status + '' === '200') {
+            if (res.status == 200) {
               this.$message.success(res.message ? res.message : '保存成功')
               this.$emit('refresh')
               setTimeout(function () {
                 _this.cancel()
               }, 300)
             } else {
-              // this.$message.error(res.message)
+              this.$message.error(res.message)
             }
           })
         }
@@ -134,8 +134,6 @@ export default {
       }
     }
   },
-  mounted () {
-  },
   beforeCreate () {
     this.form = this.$form.createForm(this, { name: 'menuModal' })
   },

+ 2 - 1
src/views/power/role/roleList.vue

@@ -197,9 +197,10 @@ export default {
         flag: record.isEnable ? '1' : '0'
       }
       updateEnableStatus(_data).then(res => {
-        if (res.status + '' === '200') {
+        if (res.status == 200) {
           this.$message.success('修改成功')
         } else {
+          this.$message.error(res.message)
           record.isEnable = !record.isEnable
         }
       })

+ 2 - 5
src/views/power/role/roleModal.vue

@@ -93,21 +93,20 @@ export default {
       this.clear()
       this.$emit('close')
     },
-
     // 保存提交
     handleSubmit () {
       const _this = this
       this.form.validateFields((err, values) => {
         if (!err) {
           saveRolePower(Object.assign(this.formData, values.formData)).then(res => {
-            if (res.status + '' === '200') {
+            if (res.status == 200) {
               this.$message.success(res.message ? res.message : '保存成功')
               this.$emit('refresh')
               setTimeout(function () {
                 _this.cancel()
               }, 300)
             } else {
-              // this.$message.error(res.message)
+              this.$message.error(res.message)
             }
           })
         }
@@ -135,8 +134,6 @@ export default {
       this.formData.remarks = ''
     }
 
-  },
-  mounted () {
   },
   beforeCreate () {
     this.form = this.$form.createForm(this, { name: 'roleModal' })

+ 1 - 0
src/views/power/user/userList.vue

@@ -221,6 +221,7 @@ export default {
         if (res.status + '' === '200') {
           this.$message.success('修改成功')
         } else {
+          this.$message.error(res.message)
           record.loginFlag = !record.loginFlag
         }
       })

+ 2 - 8
src/views/power/user/userModal.vue

@@ -156,7 +156,6 @@ export default {
       this.clear()
       this.$emit('close')
     },
-
     // 保存提交
     handleSubmit () {
       const _this = this
@@ -164,14 +163,14 @@ export default {
         if (!err) {
           values.formData.roleNames = values.formData.roleNames.join(',')
           saveUserPower(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData)).then(res => {
-            if (res.status + '' === '200') {
+            if (res.status == 200) {
               this.$message.success(res.message ? res.message : '保存成功')
               this.$emit('refresh')
               setTimeout(function () {
                 _this.cancel()
               }, 300)
             } else {
-              // this.$message.error(res.message)
+              this.$message.error(res.message)
             }
           })
         }
@@ -201,7 +200,6 @@ export default {
       this.formData.sex = ''
       this.formData.remarks = ''
     },
-
     // 获取角色列表接口
     getRoleList () {
       getRoleList().then(res => {
@@ -212,7 +210,6 @@ export default {
         }
       })
     }
-
   },
   mounted () {
     this.getRoleList()
@@ -246,7 +243,6 @@ export default {
           } else {
             this.formData.roleNames = []
           }
-
           this.formData.loginFlag = Number(this.formData.loginFlag)
         } else {
           this.titleText = '添加用户'
@@ -260,8 +256,6 @@ export default {
 </script>
 
 <style >
-  .modalBox{
-  }
   .ant-modal-footer {
     display: none;
   }

+ 1 - 1
src/views/user/ChangePwd.vue

@@ -123,7 +123,7 @@ export default {
               _this.$message.success('修改成功, 请重新登录')
               _this.logout()
             } else {
-              // _this.$message.error(res.message)
+              _this.$message.error(res.message)
             }
           })
         }

+ 3 - 9
src/views/user/Login.vue

@@ -190,10 +190,8 @@ export default {
         customActiveKey,
         Login
       } = this
-
       state.loginBtn = true
       const validateFieldsKey = customActiveKey === 'tab1' ? ['username', 'password', 'rememberMe'] : ['mobile', 'captcha']
-
       validateFields(validateFieldsKey, { force: true }, (err, values) => {
         if (!err) {
           const loginParams = { ...values }
@@ -201,9 +199,9 @@ export default {
           loginParams[!state.loginType ? 'email' : 'username'] = values.username
           loginParams.password = values.password
           console.log(loginParams, 'loginParams')
-          Login(loginParams)
-            .then((res) => this.loginSuccess(res))
-            .catch(err => this.requestFailed(err))
+          Login(loginParams).then((res) => {
+            this.loginSuccess(res)
+          }).catch(err => this.requestFailed(err))
             .finally(() => {
               state.loginBtn = false
             })
@@ -217,11 +215,9 @@ export default {
     getCaptcha (e) {
       e.preventDefault()
       const { form: { validateFields }, state } = this
-
       validateFields(['mobile'], { force: true }, (err, values) => {
         if (!err) {
           state.smsSendBtn = true
-
           const interval = window.setInterval(() => {
             if (state.time-- <= 0) {
               state.time = 60
@@ -229,7 +225,6 @@ export default {
               window.clearInterval(interval)
             }
           }, 1000)
-
           const hide = this.$message.loading('验证码发送中..', 0)
           getSmsCaptcha({ mobile: values.mobile }).then(res => {
             setTimeout(hide, 2500)
@@ -258,7 +253,6 @@ export default {
       })
     },
     loginSuccess (res) {
-      console.log(res)
       // check res.homePage define, set $router.push name res.homePage
       // Why not enter onComplete
       this.$router.push({ name: 'index' }, () => {

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://carwash.test.zyucgj.com/cw-admin/',
-        // target: 'http://192.168.16.102:8101/cw-admin/',
         // target: 'http://carwash.test.zyucgj.com/cw-admin/',
+        // target: 'http://192.168.16.102:8101/cw-admin/',
+        target: 'https://carwash.test.zyucgj.com/cw-admin/',
         ws: false,
         changeOrigin: true,
         pathRewrite: {