zhangdan 4 years ago
parent
commit
9a2e3da3ab

+ 13 - 1
src/api/userInfo.js

@@ -2,7 +2,19 @@ import { axios } from '@/utils/request'
 
 
 /* 商品分类 */
 /* 商品分类 */
 
 
-// 列表
+// 用户列表
+export const customerList = (params) => {
+  const url = `customer/query/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+
+// 乐豆详情
 export const customerGoldLogDetail = (params) => {
 export const customerGoldLogDetail = (params) => {
   const url = `customerGoldLog/query/${params.pageNo}/${params.pageSize}`
   const url = `customerGoldLog/query/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageNo

+ 33 - 29
src/views/businessManage/userManage/userManage.vue

@@ -31,14 +31,14 @@
               <a-select
               <a-select
                 placeholder="请选择"
                 placeholder="请选择"
                 allowClear
                 allowClear
-                v-model="queryParam.officialPartnerNo"
+                v-model="queryParam.orgCode"
                 :showSearch="true"
                 :showSearch="true"
                 option-filter-prop="children"
                 option-filter-prop="children"
                 :filter-option="filterOption"
                 :filter-option="filterOption"
                 @focus="handleFocus"
                 @focus="handleFocus"
                 @blur="handleBlur"
                 @blur="handleBlur"
                 @change="handleChange">
                 @change="handleChange">
-                <a-select-option v-for="item in optionData" :key="item.officialPartnerNo" :value="item.officialPartnerNo">{{ item.name }}</a-select-option>
+                <a-select-option v-for="item in optionData" :key="item.orgCode" :value="item.orgCode">{{ item.name }}</a-select-option>
               </a-select>
               </a-select>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
@@ -99,7 +99,7 @@
           @click="delect(record)"/>
           @click="delect(record)"/>
       </span>
       </span>
     </s-table>
     </s-table>
-    <userModal :visible="showModal" @refresh="$refs.table.refresh(true)" :data="itemData" @close="showModal = false"></userModal>
+    <userModal :visible="showModal" @refresh="$refs.table.refresh(true)" :itemId="itemId" @close="cancel"></userModal>
   </a-card>
   </a-card>
 </template>
 </template>
 
 
@@ -130,10 +130,10 @@ export default {
         name: '',
         name: '',
         phone: '',
         phone: '',
         loginFlag: '',
         loginFlag: '',
-        officialPartnerNo: undefined
+        orgCode: undefined
       },
       },
       showModal: false,
       showModal: false,
-      itemData: {}, // 编辑行数据
+      itemId: null, // 编辑行id
 	  optionData: [],
 	  optionData: [],
       // 表头
       // 表头
       columns: [{
       columns: [{
@@ -162,24 +162,24 @@ export default {
       },
       },
 	  {
 	  {
 	    title: '合作商',
 	    title: '合作商',
-	    dataIndex: 'phone',
+	    dataIndex: 'org.name',
 	    width: '100',
 	    width: '100',
 	    align: 'center'
 	    align: 'center'
 	  },
 	  },
-	  {
-	    title: '超级管理员',
-	    width: '100',
-	    align: 'center',
-	    scopedSlots: {
-	      customRender: 'status'
-	    }
-	  },
-      {
-        title: '角色',
-        width: '100',
-        align: 'center',
-        dataIndex: 'roleNames'
-      },
+	  // {
+	  //   title: '超级管理员',
+	  //   width: '100',
+	  //   align: 'center',
+	  //   scopedSlots: {
+	  //     customRender: 'status'
+	  //   }
+	  // },
+      // {
+      //   title: '角色',
+      //   width: '100',
+      //   align: 'center',
+      //   dataIndex: 'roleNames'
+      // },
       {
       {
         title: '状态',
         title: '状态',
         width: '100',
         width: '100',
@@ -231,6 +231,10 @@ export default {
 	      option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
 	      option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
 	    )
 	    )
 	  },
 	  },
+	  cancel () {
+	    this.itemId = null
+	    this.showModal = false
+	  },
 	  // 获取合作商数据
 	  // 获取合作商数据
 	  getSellerList () {
 	  getSellerList () {
 		  sellerList().then(res => {
 		  sellerList().then(res => {
@@ -255,7 +259,7 @@ export default {
       this.queryParam.name = ''
       this.queryParam.name = ''
       this.queryParam.phone = '',
       this.queryParam.phone = '',
       this.queryParam.loginFlag = ''
       this.queryParam.loginFlag = ''
-	   this.queryParam.officialPartnerNo = undefined
+	   this.queryParam.orgCode = undefined
       this.refreshTable()
       this.refreshTable()
     },
     },
     // 重置密码
     // 重置密码
@@ -289,17 +293,17 @@ export default {
         }
         }
       })
       })
     },
     },
-    getBizStr (storeBizList) {
-      const str = []
-      storeBizList.forEach(item => {
-        str.push(item.bizTypeName)
-      })
-      return str.join(',')
-    },
+    // getBizStr (storeBizList) {
+    //   const str = []
+    //   storeBizList.forEach(item => {
+    //     str.push(item.bizTypeName)
+    //   })
+    //   return str.join(',')
+    // },
     handleEdit (row) {
     handleEdit (row) {
       console.log(row, 'row')
       console.log(row, 'row')
+	  this.itemId = row.id
       this.showModal = true
       this.showModal = true
-      this.itemData = row
     },
     },
     // 修改状态
     // 修改状态
     changeFlagHandle (text, record) {
     changeFlagHandle (text, record) {

+ 92 - 84
src/views/businessManage/userManage/userModal.vue

@@ -62,9 +62,9 @@
                 placeholder="请选择"
                 placeholder="请选择"
                 allowClear
                 allowClear
                 v-decorator="[
                 v-decorator="[
-                  'formData.officialPartnerNo',
+                  'formData.orgCode',
                   {
                   {
-                    initialValue: formData.officialPartnerNo,
+                    initialValue: formData.orgCode,
                     rules: [{ required: true, message: '请选择!' }] },
                     rules: [{ required: true, message: '请选择!' }] },
                 ]"
                 ]"
                 :showSearch="true"
                 :showSearch="true"
@@ -73,7 +73,7 @@
                 @focus="handleFocus"
                 @focus="handleFocus"
                 @blur="handleBlur"
                 @blur="handleBlur"
                 @change="handleChange">
                 @change="handleChange">
-                <a-select-option v-for="item in optionData" :key="item.officialPartnerNo" :value="item.officialPartnerNo">{{ item.name }}</a-select-option>
+                <a-select-option v-for="item in optionData" :key="item.orgCode" :value="item.orgCode">{{ item.name }}</a-select-option>
               </a-select>
               </a-select>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
@@ -99,7 +99,7 @@
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <!-- 状态 -->
           <!-- 状态 -->
-          <a-col :span="12">
+          <!-- <a-col :span="12">
             <a-form-item label="是否为超级管理员" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
             <a-form-item label="是否为超级管理员" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
               <a-radio-group
               <a-radio-group
                 name="radioGroup"
                 name="radioGroup"
@@ -116,10 +116,10 @@
               </a-radio-group>
               </a-radio-group>
 
 
             </a-form-item>
             </a-form-item>
-          </a-col>
+          </a-col> -->
         </a-row>
         </a-row>
 
 
-        <a-row :gutter="24">
+        <!-- <a-row :gutter="24">
           <a-col :span="24">
           <a-col :span="24">
             <a-form-item label="角色" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
             <a-form-item label="角色" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
               <a-select
               <a-select
@@ -145,7 +145,7 @@
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
 
 
-        </a-row>
+        </a-row> -->
         <a-row :gutter="24">
         <a-row :gutter="24">
           <a-col :span="24">
           <a-col :span="24">
             <a-form-item label="备注" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
             <a-form-item label="备注" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
@@ -180,7 +180,7 @@
 
 
 <script>
 <script>
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
-import { sellerList, getRoleList, saveUserPower } from '@/api/userManage.js'
+import { sellerList, saveUserPower, slelerDetails } from '@/api/userManage.js'
 export default {
 export default {
   name: 'UserModal',
   name: 'UserModal',
   components: {
   components: {
@@ -191,11 +191,9 @@ export default {
       type: Boolean,
       type: Boolean,
       default: false
       default: false
     },
     },
-    data: {
-      type: Object,
-      default: function () {
-        return {}
-      }
+    itemId: {
+      type: String,
+      default: ''
     }
     }
   },
   },
   data () {
   data () {
@@ -204,16 +202,15 @@ export default {
       isshow: this.visible,
       isshow: this.visible,
       formLayout: 'horizontal',
       formLayout: 'horizontal',
       form: this.$form.createForm(this, { name: 'miniForm' }),
       form: this.$form.createForm(this, { name: 'miniForm' }),
-      roleList: [],
       optionData: [],
       optionData: [],
       formData: {
       formData: {
-        roleNames: undefined, // 角色
+        // roleNames: undefined, // 角色
         name: '',
         name: '',
         loginFlag: '', // 活动状态
         loginFlag: '', // 活动状态
         phone: '',
         phone: '',
         sex: '',
         sex: '',
         remarks: '',
         remarks: '',
-        officialPartnerNo: undefined
+        orgCode: undefined
       }
       }
 
 
     }
     }
@@ -246,29 +243,63 @@ export default {
 			  }
 			  }
 		  })
 		  })
 	  },
 	  },
+	  getPageInfo () {
+	    slelerDetails({
+	      id: this.itemId
+	    }).then(res => {
+	      if (res.status == 200) {
+			  console.log(res, '-------------返回数据')
+	        this.form.setFieldsValue({ 'formData': res.data })
+          // this.formData.loginFlag = Number(this.formData.loginFlag)
+          // formData.loginFlag = formData.loginFlag + '' === '1'
+	        // this.form.setFieldsValue({ 'formData.name': res.data.name })
+	        // this.form.setFieldsValue({ 'formData.contactName': res.data.contactName })
+	        // this.form.setFieldsValue({ 'formData.simpleName': res.data.simpleName })
+	        // this.form.setFieldsValue({ 'formData.contactPhone': res.data.contactPhone })
+	        // this.form.setFieldsValue({ 'formData.remarks': res.data.remarks })
+	      }
+	    })
+	  },
     // 保存提交
     // 保存提交
     handleSubmit () {
     handleSubmit () {
       const _this = this
       const _this = this
       this.form.validateFields((err, values) => {
       this.form.validateFields((err, values) => {
-        console.log(values, 'values222')
-        if (!err) {
-          values.formData.roleNames = values.formData.roleNames.join(',')
-          console.log(values.formData, ' formData.type222222222')
-          console.log(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData))
-          saveUserPower(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData)).then(res => {
-            console.log(res, 'res--save')
-            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)
-            }
-          })
-        }
+		  if (!err) {
+		    const formData = Object.assign({}, this.formData, values.formData)
+          formData.id = _this.itemId
+		    saveUserPower(formData).then(res => {
+		      console.log(res, 'rrrrrrrrr')
+		      if (res.status == 200) {
+		        _this.$message.success(res.message)
+              _this.$emit('refresh')
+		        setTimeout(function () {
+		          _this.isshow = false
+		        }, 300)
+		      }
+		    })
+		  }
       })
       })
+      // const _this = this
+      // this.form.validateFields((err, values) => {
+      //   console.log(values, 'values222')
+      //   if (!err) {
+      //     // values.formData.roleNames = values.formData.roleNames.join(',')
+      //     console.log(values.formData, ' formData.type222222222')
+      //     console.log(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData))
+      //     saveUserPower(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData)).then(res => {
+      //       console.log(res, 'res--save')
+      //       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)
+      //       }
+      //     })
+      //   }
+      // })
     },
     },
     // 取消
     // 取消
     handleCancel () {
     handleCancel () {
@@ -277,30 +308,30 @@ export default {
     clear () {
     clear () {
       this.form.resetFields()
       this.form.resetFields()
       delete this.formData.id
       delete this.formData.id
-      this.formData.roleNames = []
+      // this.formData.roleNames = []
       this.formData.name = ''
       this.formData.name = ''
       this.formData.loginFlag = ''
       this.formData.loginFlag = ''
       this.formData.phone = ''
       this.formData.phone = ''
       this.formData.sex = ''
       this.formData.sex = ''
       this.formData.remarks = ''
       this.formData.remarks = ''
-	  this.formData.officialPartnerNo = undefined
-    },
+	  this.formData.orgCode = undefined
+    }
 
 
     // 获取角色列表接口
     // 获取角色列表接口
-    getRoleList () {
-      getRoleList().then(res => {
-        console.log(res, 'res--role')
-        if (res.status + '' === '200') {
-          this.roleList = res.data
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    }
+    // getRoleList () {
+    //   getRoleList().then(res => {
+    //     console.log(res, 'res--role')
+    //     if (res.status + '' === '200') {
+    //       this.roleList = res.data
+    //     } else {
+    //       this.$message.warning(res.message)
+    //     }
+    //   })
+    // }
 
 
   },
   },
   mounted () {
   mounted () {
-    this.getRoleList()
+    // this.getRoleList()
     this.getSellerList()
     this.getSellerList()
   },
   },
   beforeCreate () {
   beforeCreate () {
@@ -310,44 +341,21 @@ export default {
     visible (newValue, oldValue) {
     visible (newValue, oldValue) {
       this.isshow = newValue
       this.isshow = newValue
     },
     },
-    isshow (newValue, oldValue) {
-      if (newValue) {
-        if (this.data.id) { // 编辑
-          this.titleText = '编辑用户'
-          this.formData = Object.assign({}, this.data)
-          delete this.formData.no
-          let roleNames = this.formData.roleNames
-          console.log(roleNames, 'roleNames')
-          if (roleNames) {
-            roleNames = roleNames.split(',')
-            console.log(roleNames, 'roleNames22')
-            const arr = []
-            console.log(this.roleList, 'this.roleList')
-
-            roleNames.map(item => {
-              const row = this.roleList.find(a => {
-                return a.name == item
-              })
-              if (row) {
-                arr.push(row.id)
-              }
-            })
-
-            console.log(arr, 'arrs')
-            this.formData.roleNames = arr
-          } else {
-            this.formData.roleNames = []
-          }
-
-          this.formData.loginFlag = Number(this.formData.loginFlag)
-          // this.formData.sex = Number(this.formData.sex)
-          console.log(this.formData, 'this.formData')
-        } else {
-          this.titleText = '新增用户'
-        }
+    isshow (val) {
+      if (!val) {
+		  this.$emit('close')
       } else {
       } else {
-        this.cancel()
+        this.form.resetFields()
       }
       }
+    },
+    itemId (newValue, oldValue) {
+	  console.log(newValue, '----------id')
+	  if (newValue && this.isshow) {
+	    this.titleText = '编辑'
+	    this.getPageInfo(newValue)
+	  } else {
+	  this.titleText = '新增用户'
+	  }
     }
     }
   }
   }
 }
 }

+ 27 - 11
src/views/releaseRecord/releaseRecordList.vue

@@ -7,21 +7,22 @@
             <a-form-item label="投递时间:" :label-col="{ span: 7 }" :wrapper-col="{ span: 17}">
             <a-form-item label="投递时间:" :label-col="{ span: 7 }" :wrapper-col="{ span: 17}">
               <a-range-picker
               <a-range-picker
                 style="width:100%"
                 style="width:100%"
-                id="PaySettlementRecords-queryOrderDate"
+                id="releaseRecordList-queryOrderDate"
                 :disabledDate="disabledDate"
                 :disabledDate="disabledDate"
                 v-model="queryOrderDate"
                 v-model="queryOrderDate"
-                format="YYYY-MM-DD"
+                :format="dateFormat"
                 :placeholder="['开始时间', '结束时间']" />
                 :placeholder="['开始时间', '结束时间']" />
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :span="6">
           <a-col :span="6">
             <a-form-item label="设备编号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
             <a-form-item label="设备编号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <a-input id="shopOrder-srcDeviceCode" allowClear :maxLength="30" v-model=" queryParam.srcDeviceCode " placeholder="请输入设备编号" />
+              <a-input id="releaseRecordList-srcDeviceCode" allowClear :maxLength="30" v-model=" queryParam.srcDeviceCode " placeholder="请输入设备编号" />
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :span="6">
           <a-col :span="6">
             <a-form-item label="网点名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
             <a-form-item label="网点名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
               <a-select
               <a-select
+                id="releaseRecordList-stationNo"
                 placeholder="请选择"
                 placeholder="请选择"
                 allowClear
                 allowClear
                 v-model="queryParam.stationNo"
                 v-model="queryParam.stationNo"
@@ -36,14 +37,14 @@
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :span="6">
           <a-col :span="6">
-            <a-button class="handle-btn serach-btn" id="shopOrder-btn-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-            <a-button class="handle-btn" type="" id="shopOrder-btn-reset" @click="handleReset">重置</a-button>
+            <a-button class="handle-btn serach-btn" id="releaseRecordList-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+            <a-button class="handle-btn" type="" id="releaseRecordList-reset" @click="handleReset">重置</a-button>
           </a-col>
           </a-col>
         </a-row>
         </a-row>
         <a-row :gutter="48">
         <a-row :gutter="48">
           <a-col :span="6">
           <a-col :span="6">
             <a-form-item label="用户账号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
             <a-form-item label="用户账号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <a-input id="shopOrder-customerMobile" allowClear :maxLength="11" v-model=" queryParam.customerMobile" placeholder="请输入用户账号" />
+              <a-input id="releaseRecordList-customerMobile" allowClear :maxLength="11" v-model=" queryParam.customerMobile" placeholder="请输入用户账号" />
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
         </a-row>
         </a-row>
@@ -69,7 +70,7 @@
         <span v-if="record.rubbishType=='PAPER'">{{ record.rubbishWeight }}</span>
         <span v-if="record.rubbishType=='PAPER'">{{ record.rubbishWeight }}</span>
         <span v-else>0</span>
         <span v-else>0</span>
         </span></template>
         </span></template>
-      <template slot="therr" slot-scope="text, record">
+      <template slot="three" slot-scope="text, record">
         <span v-if="record.rubbishType=='PLASTIC'">{{ record.rubbishWeight }}</span>
         <span v-if="record.rubbishType=='PLASTIC'">{{ record.rubbishWeight }}</span>
         <span v-else>0</span>
         <span v-else>0</span>
       </template>
       </template>
@@ -81,6 +82,10 @@
         <span v-if="record.rubbishType=='RUBBISH'">{{ record.rubbishWeight }}</span>
         <span v-if="record.rubbishType=='RUBBISH'">{{ record.rubbishWeight }}</span>
         <span v-else>0</span>
         <span v-else>0</span>
       </template>
       </template>
+      <template slot="six" slot-scope="text, record">
+        <span v-if="record.rubbishType=='MET_PLA'">{{ record.rubbishWeight }}</span>
+        <span v-else>0</span>
+      </template>
     </s-table>
     </s-table>
   </a-card>
   </a-card>
 
 
@@ -90,6 +95,7 @@
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
 import { getDeliveryLogList, getDeliveryLogTotal, stationList } from '@/api/releaseRecord.js'
 import { getDeliveryLogList, getDeliveryLogTotal, stationList } from '@/api/releaseRecord.js'
 import moment from 'moment'
 import moment from 'moment'
+import getDate from '@/libs/getDate.js'
 export default {
 export default {
   components: { STable, VSelect },
   components: { STable, VSelect },
   data () {
   data () {
@@ -99,7 +105,12 @@ export default {
         labelCol: { span: 4 },
         labelCol: { span: 4 },
         wrapperCol: { span: 16 }
         wrapperCol: { span: 16 }
       },
       },
-      queryOrderDate: undefined,
+	  // 将默认当天时间日期回显在时间选择框中
+	  queryOrderDate: [
+	    moment(getDate.getRecentday().starttime, this.dateFormat),
+	    moment(getDate.getRecentday().endtime, this.dateFormat)
+	  ],
+	  dateFormat: 'YYYY-MM-DD',
       // 查询参数
       // 查询参数
       queryParam: {
       queryParam: {
         beginDate: null, // 开始时间
         beginDate: null, // 开始时间
@@ -123,9 +134,10 @@ export default {
 				  children: [
 				  children: [
             { title: '废旧衣物', width: 200, align: 'center', scopedSlots: { customRender: 'one' } },
             { title: '废旧衣物', width: 200, align: 'center', scopedSlots: { customRender: 'one' } },
             { title: '废旧纸张', width: 200, align: 'center', scopedSlots: { customRender: 'two' } },
             { title: '废旧纸张', width: 200, align: 'center', scopedSlots: { customRender: 'two' } },
-            { title: '废旧塑料', width: 200, align: 'center', scopedSlots: { customRender: 'therr' } },
+            { title: '废旧塑料', width: 200, align: 'center', scopedSlots: { customRender: 'three' } },
             { title: '废旧金属', width: 200, align: 'center', scopedSlots: { customRender: 'four' } },
             { title: '废旧金属', width: 200, align: 'center', scopedSlots: { customRender: 'four' } },
-            { title: '有害垃圾', width: 200, align: 'center', scopedSlots: { customRender: 'five' } }
+            { title: '有害垃圾', width: 200, align: 'center', scopedSlots: { customRender: 'five' } },
+            { title: '废旧金属/塑料', width: 200, align: 'center', scopedSlots: { customRender: 'six' } }
 				  ]
 				  ]
         }
         }
 
 
@@ -228,7 +240,11 @@ export default {
     },
     },
     // 重置
     // 重置
     handleReset () {
     handleReset () {
-      this.queryOrderDate = undefined
+      // this.queryOrderDate = undefined
+	  this.queryOrderDate = [
+	    moment(getDate.getRecentday().starttime, this.dateFormat),
+	    moment(getDate.getRecentday().endtime, this.dateFormat)
+	  ],
       this.queryParam.customerMobile = ''
       this.queryParam.customerMobile = ''
       this.queryParam.srcDeviceCode = ''
       this.queryParam.srcDeviceCode = ''
       this.queryParam.stationNo = undefined
       this.queryParam.stationNo = undefined

+ 2 - 2
src/views/shopSetting/addGoodsClassModal.vue

@@ -48,8 +48,8 @@
             allowClear />
             allowClear />
         </a-form-item>
         </a-form-item>
         <a-form-item :wrapper-col="{ span: 12, offset: 6}" style="text-align: center;">
         <a-form-item :wrapper-col="{ span: 12, offset: 6}" style="text-align: center;">
-          <a-button type="primary" html-type="submit" id="bannerSetting-submit" style="margin-right: 15px">保存</a-button>
-          <a-button @click="isShow=false" style="margin-left: 15px" id="bannerSetting-close">取消</a-button>
+          <a-button type="primary" html-type="submit" id="addGoodsClassModal-submit" style="margin-right: 15px">保存</a-button>
+          <a-button @click="isShow=false" style="margin-left: 15px" id="addGoodsClassModal-close">取消</a-button>
         </a-form-item>
         </a-form-item>
       </a-form>
       </a-form>
     </a-modal>
     </a-modal>

+ 3 - 3
src/views/shopSetting/goodsClass.vue

@@ -11,7 +11,7 @@
           </a-col>
           </a-col>
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
             <a-button style="margin-right: 10px;" type="primary" @click="$refs.table.refresh(true)" id="goodsClass-refresh">查询</a-button>
             <a-button style="margin-right: 10px;" type="primary" @click="$refs.table.refresh(true)" id="goodsClass-refresh">查询</a-button>
-            <a-button type="" @click="resetForm" id="OperateJournal-resetForm">重置</a-button>
+            <a-button type="" @click="resetForm" id="goodsClass-resetForm">重置</a-button>
           </a-col>
           </a-col>
         </a-row>
         </a-row>
       </a-form>
       </a-form>
@@ -37,7 +37,7 @@
         <a-icon
         <a-icon
           v-if="$hasPermissions('B_goodsClass_edit') && record.state==0"
           v-if="$hasPermissions('B_goodsClass_edit') && record.state==0"
           type="edit"
           type="edit"
-          id="bannerSetting-handleEdit"
+          id="goodsClass-handleEdit"
           title="编辑"
           title="编辑"
           class="actionBtn icon-blues"
           class="actionBtn icon-blues"
           @click="handleEdit(record)" />
           @click="handleEdit(record)" />
@@ -48,7 +48,7 @@
           v-hasPermission="'B_goodsClass_enable'"
           v-hasPermission="'B_goodsClass_enable'"
           checkedChildren="启用"
           checkedChildren="启用"
           unCheckedChildren="禁用"
           unCheckedChildren="禁用"
-          id="bannerSetting-changeFlagHandle"
+          id="goodsClass-changeFlagHandle"
           :checked="record.state == 1 ? true : false"
           :checked="record.state == 1 ? true : false"
           @change="changeFlagHandle(text, record)" />
           @change="changeFlagHandle(text, record)" />
       </span>
       </span>

+ 5 - 5
src/views/shopSetting/supplier.vue

@@ -5,11 +5,11 @@
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="48">
         <a-row :gutter="48">
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
-            <a-form-item label="供应商名称" :label-col="{ span: 3 }" :wrapper-col="{ span: 12 }"><a-input allowClear v-model.trim="searchData.name" :maxLength="30" placeholder="请输入" id="OperateJournal-name"/></a-form-item>
+            <a-form-item label="供应商名称" :label-col="{ span: 3 }" :wrapper-col="{ span: 12 }"><a-input allowClear v-model.trim="searchData.name" :maxLength="30" placeholder="请输入" id="supplier-name"/></a-form-item>
           </a-col>
           </a-col>
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
-            <a-button style="margin-right: 10px;" type="primary" @click="$refs.table.refresh(true)" id="OperateJournal-refreshTable">查询</a-button>
-            <a-button type="" @click="resetForm" id="OperateJournal-resetForm">重置</a-button>
+            <a-button style="margin-right: 10px;" type="primary" @click="$refs.table.refresh(true)" id="supplier-refreshTable">查询</a-button>
+            <a-button type="" @click="resetForm" id="supplier-resetForm">重置</a-button>
           </a-col>
           </a-col>
         </a-row>
         </a-row>
       </a-form>
       </a-form>
@@ -33,7 +33,7 @@
         <a-icon
         <a-icon
           v-if="$hasPermissions('B_supplier_edit') && record.state==0"
           v-if="$hasPermissions('B_supplier_edit') && record.state==0"
           type="edit"
           type="edit"
-          id="bannerSetting-handleEdit"
+          id="supplier-handleEdit"
           title="编辑"
           title="编辑"
           class="actionBtn icon-blues"
           class="actionBtn icon-blues"
           @click="handleEdit(record)" />
           @click="handleEdit(record)" />
@@ -44,7 +44,7 @@
           v-hasPermission="'B_supplier_enable'"
           v-hasPermission="'B_supplier_enable'"
           checkedChildren="启用"
           checkedChildren="启用"
           unCheckedChildren="禁用"
           unCheckedChildren="禁用"
-          id="bannerSetting-changeFlagHandle"
+          id="supplier-changeFlagHandle"
           :checked="record.state == 1 ? true : false"
           :checked="record.state == 1 ? true : false"
           @change="changeFlagHandle(text, record)"
           @change="changeFlagHandle(text, record)"
         />
         />

+ 5 - 6
src/views/userInfo/LdDetails.vue

@@ -6,8 +6,7 @@
           <a-col :span="6">
           <a-col :span="6">
             <a-form-item label="下单时间" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
             <a-form-item label="下单时间" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <a-range-picker
               <a-range-picker
-                style="width:100%"
-                id="PaySettlementRecords-queryOrderDate"
+                id="LdDetails-queryOrderDate"
                 :disabledDate="disabledDate"
                 :disabledDate="disabledDate"
                 v-model="queryOrderDate"
                 v-model="queryOrderDate"
                 format="YYYY-MM-DD"
                 format="YYYY-MM-DD"
@@ -19,7 +18,7 @@
               <v-select
               <v-select
                 v-model="queryParam.changeType"
                 v-model="queryParam.changeType"
                 ref="changeType"
                 ref="changeType"
-                id="shopOrder-status"
+                id="LdDetails-status"
                 code="GOLD_CHANGE_TYPE"
                 code="GOLD_CHANGE_TYPE"
                 placeholder="请选择订单状态"
                 placeholder="请选择订单状态"
                 allowClear></v-select>
                 allowClear></v-select>
@@ -30,15 +29,15 @@
               <v-select
               <v-select
                 v-model="queryParam.operateType"
                 v-model="queryParam.operateType"
                 ref="operateType"
                 ref="operateType"
-                id="shopOrder-status"
+                id="LdDetails-status"
                 code="GOLD_OPERATE_TYPE"
                 code="GOLD_OPERATE_TYPE"
                 placeholder="请选择"
                 placeholder="请选择"
                 allowClear></v-select>
                 allowClear></v-select>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :span="6">
           <a-col :span="6">
-            <a-button class="handle-btn serach-btn" id="shopOrder-btn-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-            <a-button class="handle-btn" type="" id="shopOrder-btn-reset" @click="handleReset">重置</a-button>
+            <a-button class="handle-btn serach-btn" id="LdDetails-btn-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+            <a-button class="handle-btn" type="" id="LdDetails-btn-reset" @click="handleReset">重置</a-button>
           </a-col>
           </a-col>
         </a-row>
         </a-row>
       </a-form>
       </a-form>

+ 8 - 16
src/views/userInfo/editLdNumModal.vue

@@ -11,19 +11,17 @@
         <a-form-item label="乐豆变动量" :label-col="{ span: 7 }" :wrapper-col="{ span: 12 }">
         <a-form-item label="乐豆变动量" :label-col="{ span: 7 }" :wrapper-col="{ span: 12 }">
           <div class="input-number">
           <div class="input-number">
             <v-select
             <v-select
-              style="width: 100px;"
               v-decorator="[
               v-decorator="[
                 'formData.orderStatus',
                 'formData.orderStatus',
                 { initialValue: formData.orderStatus, rules: [{ required: true, message: '请输入负责人手机号!' },] }
                 { initialValue: formData.orderStatus, rules: [{ required: true, message: '请输入负责人手机号!' },] }
               ]"
               ]"
               ref="orderStatus"
               ref="orderStatus"
-              id="shopOrder-status"
+              id="editLdNumModal-status"
               code="GOLD_CHANGE_TYPE"
               code="GOLD_CHANGE_TYPE"
               placeholder="请选择"
               placeholder="请选择"
               allowClear></v-select>
               allowClear></v-select>
             <a-input
             <a-input
-              style="width:200px;"
-              id="addSupplierModal-contactPhone"
+              id="editLdNumModal-contactPhone"
               :maxLength="11"
               :maxLength="11"
               v-decorator="[
               v-decorator="[
                 'formData.contactPhone',
                 'formData.contactPhone',
@@ -41,14 +39,14 @@
               { initialValue: formData.orderStatus, rules: [{ required: true, message: '请输入负责人手机号!' },] }
               { initialValue: formData.orderStatus, rules: [{ required: true, message: '请输入负责人手机号!' },] }
             ]"
             ]"
             ref="orderStatus"
             ref="orderStatus"
-            id="shopOrder-status"
+            id="editLdNumModal-status"
             code="GOLD_OPERATE_TYPE"
             code="GOLD_OPERATE_TYPE"
             placeholder="请选择"
             placeholder="请选择"
             allowClear></v-select>
             allowClear></v-select>
         </a-form-item>
         </a-form-item>
         <a-form-item label="详情" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
         <a-form-item label="详情" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
           <a-textarea
           <a-textarea
-            id="user-add-remarks"
+            id="editLdNumModal-remarks"
             :maxLength="500"
             :maxLength="500"
             v-decorator="[
             v-decorator="[
               'formData.remarks',
               'formData.remarks',
@@ -61,8 +59,8 @@
             autosize />
             autosize />
         </a-form-item>
         </a-form-item>
         <a-form-item :wrapper-col="{ span: 12, offset: 6}" style="text-align: center;">
         <a-form-item :wrapper-col="{ span: 12, offset: 6}" style="text-align: center;">
-          <a-button type="primary" html-type="submit" id="addSupplierModal-submit" style="margin-right: 15px">保存</a-button>
-          <a-button @click="isShow=false" style="margin-left: 15px" id="addSupplierModal-close">取消</a-button>
+          <a-button type="primary" html-type="submit" id="editLdNumModal-submit" style="margin-right: 15px">保存</a-button>
+          <a-button @click="isShow=false" style="margin-left: 15px" id="editLdNumModal-close">取消</a-button>
         </a-form-item>
         </a-form-item>
       </a-form>
       </a-form>
     </a-modal>
     </a-modal>
@@ -172,14 +170,8 @@ export default {
 		display: flex;
 		display: flex;
 		width: 100%;
 		width: 100%;
 	}
 	}
-	.ant-row{
-		.ant-form-item{
-			.ant-col{
-				.ant-form-item-control-wrapper{
-					width: 70%;
-				}
-			}
-		}
+	.ant-col .ant-col-12 .ant-form-item-control-wrapper{
+		width: 70%;
 	}
 	}
 
 
 </style>
 </style>

+ 3 - 3
src/views/userInfo/editUserPhoneModal.vue

@@ -10,7 +10,7 @@
       <a-form id="components-form-demo-validate-other" ref="form" :form="form" @submit="handleSubmit">
       <a-form id="components-form-demo-validate-other" ref="form" :form="form" @submit="handleSubmit">
         <a-form-item label="手机号码" :label-col="{ span: 7 }" :wrapper-col="{ span: 12 }">
         <a-form-item label="手机号码" :label-col="{ span: 7 }" :wrapper-col="{ span: 12 }">
           <a-input
           <a-input
-            id="addSupplierModal-contactPhone"
+            id="editUserPhoneModal-contactPhone"
             :maxLength="11"
             :maxLength="11"
             v-decorator="[
             v-decorator="[
               'formData.contactPhone',
               'formData.contactPhone',
@@ -20,8 +20,8 @@
             allowClear />
             allowClear />
         </a-form-item>
         </a-form-item>
         <a-form-item :wrapper-col="{ span: 12, offset: 6}" style="text-align: center;">
         <a-form-item :wrapper-col="{ span: 12, offset: 6}" style="text-align: center;">
-          <a-button type="primary" html-type="submit" id="addSupplierModal-submit" style="margin-right: 15px">保存</a-button>
-          <a-button @click="isShow=false" style="margin-left: 15px" id="addSupplierModal-close">取消</a-button>
+          <a-button type="primary" html-type="submit" id="editUserPhoneModal-submit" style="margin-right: 15px">保存</a-button>
+          <a-button @click="isShow=false" style="margin-left: 15px" id="editUserPhoneModal-close">取消</a-button>
         </a-form-item>
         </a-form-item>
       </a-form>
       </a-form>
     </a-modal>
     </a-modal>

+ 24 - 13
src/views/userInfo/userManageList.vue

@@ -5,22 +5,20 @@
         <a-row :gutter="48">
         <a-row :gutter="48">
           <a-col :span="6">
           <a-col :span="6">
             <a-form-item label="用户手机" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
             <a-form-item label="用户手机" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-              <a-input id="shopOrder-contactPhone" allowClear :maxLength="11" v-model="queryParam.contactPhone" placeholder="请输入用户手机" />
+              <a-input id="releaseRecordList-contactPhone" allowClear :maxLength="11" v-model="queryParam.contactPhone" placeholder="请输入用户手机" />
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :span="6">
           <a-col :span="6">
             <a-form-item label="乐豆余额" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
             <a-form-item label="乐豆余额" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <div class="input-number">
               <div class="input-number">
                 <a-input-number
                 <a-input-number
-                  id="inputNumber"
+                  id="releaseRecordList-inputNumber"
                   v-model="queryParam.value1"
                   v-model="queryParam.value1"
                   :min="1"
                   :min="1"
-                  :max="10"
                   @change="onChange" />-<a-input-number
                   @change="onChange" />-<a-input-number
                     id="inputNumber"
                     id="inputNumber"
                     v-model="queryParam.value2"
                     v-model="queryParam.value2"
                     :min="1"
                     :min="1"
-                    :max="10"
                     @change="onChange"
                     @change="onChange"
                   />
                   />
               </div>
               </div>
@@ -31,22 +29,22 @@
               <v-select
               <v-select
                 v-model="queryParam.orderStatus"
                 v-model="queryParam.orderStatus"
                 ref="orderStatus"
                 ref="orderStatus"
-                id="shopOrder-status"
+                id="releaseRecordList-status"
                 code="SETTLE_STATUS_ALL"
                 code="SETTLE_STATUS_ALL"
                 placeholder="请选择订单状态"
                 placeholder="请选择订单状态"
                 allowClear></v-select>
                 allowClear></v-select>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :span="6">
           <a-col :span="6">
-            <a-button class="handle-btn serach-btn" id="shopOrder-btn-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-            <a-button class="handle-btn" type="" id="shopOrder-btn-reset" @click="handleReset">重置</a-button>
+            <a-button class="handle-btn serach-btn" id="releaseRecordList-btn-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+            <a-button class="handle-btn" type="" id="releaseRecordList-btn-reset" @click="handleReset">重置</a-button>
           </a-col>
           </a-col>
         </a-row>
         </a-row>
       </a-form>
       </a-form>
     </div>
     </div>
     <a-divider />
     <a-divider />
     <div class="table-operator">
     <div class="table-operator">
-      <a-button class="export-btn" id="shopOrder-btn-export" type="" :loading="loading" @click="handleExport">导出</a-button>
+      <a-button class="export-btn" id="releaseRecordList-btn-export" type="" :loading="loading" @click="handleExport">导出</a-button>
     </div>
     </div>
     <s-table
     <s-table
       ref="table"
       ref="table"
@@ -66,17 +64,16 @@
       <!--启用禁用 -->
       <!--启用禁用 -->
       <span slot="state" slot-scope="text, record">
       <span slot="state" slot-scope="text, record">
         <a-switch
         <a-switch
-          v-hasPermission="'B_goodsClass_enable'"
           checkedChildren="启用"
           checkedChildren="启用"
           unCheckedChildren="禁用"
           unCheckedChildren="禁用"
-          id="bannerSetting-changeFlagHandle"
+          id="releaseRecordList-changeFlagHandle"
           :checked="record.state == 1 ? true : false"
           :checked="record.state == 1 ? true : false"
           @change="changeFlagHandle(text, record)" />
           @change="changeFlagHandle(text, record)" />
       </span>
       </span>
       <!-- 操作 -->
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
       <template slot="action" slot-scope="text, record">
-        <a-button id="shopOrder-handleView" type="link" @click="handleUser(record)">用户详情</a-button>
-        <a-button id="shopOrder-handleView" type="link" @click="handleLd(record)">乐豆明细</a-button>
+        <a-button id="releaseRecordList-handleUser" type="link" @click="handleUser(record)">用户详情</a-button>
+        <a-button id="releaseRecordList-handleLd" type="link" @click="handleLd(record)">乐豆明细</a-button>
       </template>
       </template>
     </s-table>
     </s-table>
   </a-card>
   </a-card>
@@ -121,6 +118,19 @@ export default {
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
+        //     if ((this.queryParam.value1 && this.queryParam.value2) && (this.queryParam.value1 >= this.queryParam.value2)) {
+        //       this.$message.error('请输入正确的查询范围!')
+		  // return
+        //     } else if (!this.queryParam.value1 || !this.queryParam.value2) {
+        //       this.$message.error('请输入正确的查询范围!')
+		  // return
+        //     }
+        //     if (this.queryParam.value1 && this.queryParam.value2) {
+        //       if (this.queryParam.value1 >= this.queryParam.value2) {
+        //         this.$message.error('请输入正确的查询范围!')
+        //       }
+		  // return
+        //     }
         // return getTenantsList(Object.assign(parameter, this.queryParam)).then(res => {
         // return getTenantsList(Object.assign(parameter, this.queryParam)).then(res => {
         //   if (res.status == 200) {
         //   if (res.status == 200) {
         //     const no = (res.data.pageNo - 1) * res.data.pageSize
         //     const no = (res.data.pageNo - 1) * res.data.pageSize
@@ -187,7 +197,8 @@ export default {
       //   moment(getDate.getToday().endtime, this.dateFormat)
       //   moment(getDate.getToday().endtime, this.dateFormat)
       // ]
       // ]
       this.queryParam.contactPhone = ''
       this.queryParam.contactPhone = ''
-      this.queryParam.orderNo = ''
+      this.queryParam.value1 = ''
+	  this.queryParam.value2 = ''
       this.queryParam.orderStatus = null
       this.queryParam.orderStatus = null
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },