Explorar el Código

Merge branch 'deploy' of http://git.chelingzhu.com/chelingzhu-web/zxyj-admin-html into deploy

lilei hace 4 años
padre
commit
d11dcec5c1

+ 2 - 1
src/views/equipmentManage/network/equipmentModal.vue

@@ -138,7 +138,7 @@ export default {
       ],
       equipmentData: [],
       typeList: [], //  箱体类型
-      isLoading: true  //  加载状态
+      isLoading: true //  加载状态
     }
   },
   methods: {
@@ -277,6 +277,7 @@ export default {
         this.resultData = null //  设备搜索结果
         this.noData = 0
         this.isFocus = false //  搜索框是否获取焦点
+        this.isLoading = true
         this.equipmentData = []
         this.getDeviceType()
       }

+ 3 - 3
src/views/equipmentManage/network/network.vue

@@ -16,7 +16,7 @@
           </a-col>
           <a-col :span="6">
             <a-form-item label="网点名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-              <a-input id="network-name" allowClear :maxLength="30" v-model="queryParam.name" placeholder="请输入网点名称" />
+              <a-input id="network-queryWord" allowClear :maxLength="30" v-model="queryParam.queryWord" placeholder="请输入网点名称" />
             </a-form-item>
           </a-col>
           <a-col :span="6">
@@ -104,7 +104,7 @@ export default {
       queryParam: {
         beginDate: null, // 开始时间
         endDate: null, // 结束时间
-        name: '', //  网点名称
+        queryWord: '', //  网点名称
         provinceCode: null, //  省
         cityCode: null, // 市
         districtCode: null // 区
@@ -172,7 +172,7 @@ export default {
     handleReset () {
       this.queryParam.beginDate = null
       this.queryParam.endDate = null
-      this.queryParam.name = ''
+      this.queryParam.queryWord = ''
       this.queryParam.provinceCode = null
       this.queryParam.cityCode = null
       this.queryParam.districtCode = null

+ 17 - 11
src/views/power/OperateJournal/OperateJournal.vue

@@ -17,7 +17,7 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="操作人"><a-input allowClear v-model.trim="searchData.queryWord" :maxLength="30" placeholder="请输入" id="OperateJournal-queryWord"/></a-form-item>
+              <a-form-item label="操作人"><a-input allowClear v-model.trim="queryParam.queryWord" :maxLength="30" placeholder="请输入" id="OperateJournal-queryWord"/></a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-button style="margin-right: 10px;" type="primary" @click="$refs.table.refresh(true)" id="OperateJournal-refreshTable">查询</a-button>
@@ -56,7 +56,7 @@ export default {
         name: 'OperateJournal'
       }),
       time: [moment(moment().startOf('day').valueOf()).format(this.dateFormat), moment(moment().valueOf()).format(this.dateFormat)],
-      searchData: {
+      queryParam: {
         beginDate: null, // 查询的开始时间
         endDate: null, // 查询的结束时间
         queryWord: '' // 操作人
@@ -92,9 +92,15 @@ export default {
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        this.searchData.beginDate == null ? (this.searchData.beginDate = getDate.getToday().starttime) : null
-        this.searchData.endDate == null ? (this.searchData.endDate = getDate.getToday().endtime) : null
-        return journalList(Object.assign(parameter, this.searchData)).then(res => {
+		  const searchData = Object.assign(parameter, this.queryParam)
+		  if (this.time && this.time.length) {
+		    searchData.beginDate = moment(this.time[0]).format('YYYY-MM-DD HH:mm:ss')
+		    searchData.endDate = moment(this.time[1]).format('YYYY-MM-DD HH:mm:ss')
+		  } else {
+		    searchData.beginDate = ''
+		    searchData.endDate = ''
+		  }
+        return journalList(searchData).then(res => {
           const no = (res.data.data.pageNo - 1) * res.data.data.pageSize
           for (let i = 0; i < res.data.data.list.length; i++) {
             const _item = res.data.data.list[i]
@@ -109,15 +115,15 @@ export default {
     moment,
     // 操作时间change
     onChange (dates, dateStrings) {
-      this.searchData.beginDate = dateStrings[0]
-      this.searchData.endDate = dateStrings[1]
+      this.queryParam.beginDate = dateStrings[0]
+      this.queryParam.endDate = dateStrings[1]
     },
     // 重置
     resetForm () {
-      this.searchData.beginDate = getDate.getToday().starttime
-      this.searchData.endDate = getDate.getToday().endtime
-      this.time = [moment(getDate.getToday().starttime, this.dateFormat), moment(getDate.getToday().endtime, this.dateFormat)]
-      this.searchData.queryWord = ''
+      this.queryParam.beginDate = getDate.getToday().starttime
+      this.queryParam.endDate = getDate.getToday().endtime
+      this.time = [moment(moment().startOf('day').valueOf()).format(this.dateFormat), moment(moment().valueOf()).format(this.dateFormat)]
+      this.queryParam.queryWord = ''
       this.$refs.table.refresh(true)
     }
   }

+ 2 - 2
src/views/userInfo/LdDetails.vue

@@ -4,7 +4,7 @@
       <a-form layout="inline" v-bind="formItemLayout" @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="48">
           <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
                 id="LdDetails-queryOrderDate"
                 :disabledDate="disabledDate"
@@ -78,7 +78,7 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '下单时间', dataIndex: 'createDate', width: 200, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 200, align: 'center' },
         { title: '类型', dataIndex: 'changeTypeDictValue', width: 200, align: 'center' },
         { title: '原因', dataIndex: 'operateTypeDictValue', width: 200, align: 'center' },
         { title: '乐豆变动', dataIndex: 'changeNum', width: 200, align: 'center' },

+ 2 - 2
src/views/userInfo/userManageList.vue

@@ -11,8 +11,8 @@
           <a-col :span="6">
             <a-form-item label="乐豆余额" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <div class="input-number">
-                <a-input-number id="releaseRecordList-inputNumber" v-model="queryParam.currentGoldMin" :min="1" @change="onChange" />-
-                <a-input-number id="inputNumber" v-model="queryParam.currentGoldMax" :min="1" @change="onChange" />
+                <a-input-number id="releaseRecordList-inputNumber" v-model="queryParam.currentGoldMin" :min="0" @change="onChange" />-
+                <a-input-number id="inputNumber" v-model="queryParam.currentGoldMax" :min="0" @change="onChange" />
               </div>
             </a-form-item>
           </a-col>