zhangdan %!s(int64=4) %!d(string=hai) anos
pai
achega
4430565cb7

+ 48 - 23
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,14 +151,30 @@ 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) {
           values.formData.roleIds = values.formData.roleIds.join(',')
-          saveUser(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData)).then(res => {
+          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')
@@ -206,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) {
@@ -246,9 +271,9 @@ export default {
 }
 </script>
 
-<style >
-  .modalBox{
-  }
+<style>
+  .modalBox {}
+
   .ant-modal-footer {
     display: none;
   }

+ 2 - 3
src/views/Order/OrderDetailModal.vue

@@ -65,7 +65,7 @@
           <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>
+                <span>{{ orderDetailData.orderCoupons ? orderDetailData.orderCoupons[0].couponTitle : '--' }}</span>
               </a-form-item>
             </a-col>
             <a-col :span="8">
@@ -74,8 +74,7 @@
                   <div class="imgBox">
                     <div>
                       <img v-if="orderDetailData.beginImage" class="imgCar" :src="orderDetailData.beginImage" alt="" @click="isShowBeginImageModal=true">
-                      <!-- <div v-else-if="orderDetailData.beginImage">{{ orderDetailData.beginImage }}</div> -->
-                      <div v-else-if="!orderDetailData.beginImage" class="imgCar">--</div>
+                      <div v-if="!orderDetailData.beginImage" class="imgCar">--</div>
                     </div>
                     <div>洗车前</div>
                   </div>