Merge branch 'master' into zyj

# Conflicts:
#	src/views/oilFinalStatement/oilFinalStatementListInfo.vue

src/components/autocomplete/index.vue

@@ -11,15 +11,6 @@
     @clear="list = []"
     @change="change"
   >
-    <!-- <template v-if="labelIsMore">
-      <el-option
-        v-for="(item, index) in list"
-        :key="item.id + index"
-        :label="item[config.labelKey[0]] + '(' + item[config.labelKey[1]] + '-' + item[config.labelKey[2]] + ')'"
-        :value="item[config.valueKey]"
-      >
-      </el-option>
-    </template> -->
     <template>
       <el-option v-for="(item, index) in list" :key="index" :label="labelHandler(item)" :value="item[config.valueKey]"> </el-option>
     </template>
@@ -33,17 +24,17 @@ export default {
     config: Object
     // config: {
     //   serveTarget: {}, // 远程搜索接口
-    //   autocompleteKey: "", //远程搜索接口参数名
-    //   labelKey: [] || '', //接口返回数据label
-    //   valueKey: "", //接口返回数据id
-    //   querykey: "", //查询接口参数名
-    //   echoId:'', //
+    //   autocompleteKey: "" || {}, // 远程搜索接口参数名
+    //   labelKey: "" || [], // 接口返回数据label
+    //   valueKey: "", // 接口返回数据id
+    //   querykey: "", // 查询接口参数名
+    //   echoId: "", // 用于回显的id
+    //   echoName: "", // 用于回显的name
     // },
   },
   data() {
     return {
       text: '',
-      // labelIsMore: false,
       list: [],
       isDisabled: false
     }
@@ -51,7 +42,6 @@ export default {
   watch: {
     'config.echoId': {
       handler(nval, oval) {
-        console.log('nvalnvalnvalnvalnval', nval)
         this.list = []
         let type = this.$utils.typeJudgment(this.config.echoName)
         if (nval && ['String'].includes(type)) {
@@ -77,18 +67,22 @@ export default {
   created() {
     let { labelKey } = this.config
     let type = this.$utils.typeJudgment(labelKey)
-    // if (type === 'Array') {
-    // this.labelIsMore = true
-    // }
+    // 重构labelHandler
     this.labelHandler = this.labelHandler(type)
-    // console.log(this.labelHandler())
   },
   methods: {
     labelHandler(type) {
       if (type === 'Array') {
         return item => {
           return this.config.labelKey.reduce((prev, cur) => {
-            prev += /^[^0-9a-zA-Z]/.test(cur) ? cur : item[cur]
+            let type = this.$utils.typeJudgment(cur)
+            let _function =
+              type != 'Function'
+                ? item => {
+                    return /^[^0-9a-zA-Z]/.test(cur) ? cur : item[cur]
+                  }
+                : cur
+            prev += _function(item)
             return prev
           }, '')
         }
@@ -99,7 +93,6 @@ export default {
     },
     // 远程搜索
     remoteMethod(query) {
-      console.log('query', query)
       if (query !== '') {
         this.loading = true
         let type = this.$utils.typeJudgment(this.config.autocompleteKey)

src/utils/index.js

@@ -17,32 +17,35 @@ export function parseTime(time) {
   }
   const formatRes = {
     y: date.getFullYear(),
-    M: date.getMonth() + 1,
-    d: date.getDate(),
-    h: date.getHours(),
-    m: date.getMinutes(),
-    s: date.getSeconds(),
+    M: (date.getMonth() + 1 + '').padStart(2, 0),
+    d: (date.getDate() + '').padStart(2, 0),
+    h: (date.getHours() + '').padStart(2, 0),
+    m: (date.getMinutes() + '').padStart(2, 0),
+    s: (date.getSeconds() + '').padStart(2, 0),
     week: ['日', '一', '二', '三', '四', '五', '六'][date.getDay()]
   }
-  formatRes.M < 10 && (formatRes.M = '0' + formatRes.M)
-  formatRes.d < 10 && (formatRes.d = '0' + formatRes.d)
-  formatRes.h < 10 && (formatRes.h = '0' + formatRes.h)
-  formatRes.m < 10 && (formatRes.m = '0' + formatRes.m)
-  formatRes.s < 10 && (formatRes.s = '0' + formatRes.s)
+  // formatRes.M < 10 && (formatRes.M = '0' + formatRes.M)
+  // formatRes.d < 10 && (formatRes.d = '0' + formatRes.d)
+  // formatRes.h < 10 && (formatRes.h = '0' + formatRes.h)
+  // formatRes.m < 10 && (formatRes.m = '0' + formatRes.m)
+  // formatRes.s < 10 && (formatRes.s = '0' + formatRes.s)
   return formatRes
 }
 
 // 防抖
 export function debounce(fn, delay) {
   let timer = null
-  return function () {
+  function _implementer(...args) {
     if (timer) clearTimeout(timer)
     let _this = this
-    let _arguments = arguments
     timer = setTimeout(function () {
-      fn.apply(_this, _arguments)
+      fn.call(_this, ...args)
     }, delay)
   }
+  _implementer.cancel = () => {
+    clearTimeout(timer)
+  }
+  return _implementer
 }
 // 车牌校验
 export function isLicensePlate(number) {

src/views/oilFinalStatement/oilFinalStatementAddList.vue

@@ -197,7 +197,7 @@
         </el-row>
         <div :span="24" style="margin-top: 50px; text-align: center; width: 100%">
           <el-divider style="width: 100%"></el-divider>
-          <div style="display: flex; justify-content: end; width: 90%; margin: 0 auto">
+          <div style="display: flex; justify-content: flex-end; width: 90%; margin: 0 auto">
             <el-button @click="close" size="mini">取消</el-button>
             <el-button size="mini" type="primary" :disabled="!setWait" @click="addList">确认提交</el-button>
           </div>
@@ -625,7 +625,7 @@ export default {
   /* flex: 1; */
   display: flex;
   align-items: center;
-  justify-content: end;
+  justify-content: flex-end;
   font-size: 16px;
 }
 

src/views/oilFinalStatement/oilFinalStatementListInfo.vue

@@ -181,11 +181,8 @@
   </div>
 </template>
 <script>
-import { imgCompress } from '@/utils'
 import internalCompanyApi from '@/api/user/internalCompany'
-import utils from '@/utils/encode'
-import { mapGetters } from 'vuex'
-const JSESSIONID = utils.uuid()
+
 export default {
   filters: {},
   props: {
@@ -197,7 +194,6 @@ export default {
   data() {
     return {
       tableHeight: document.documentElement.clientHeight - 470 - 55,
-      imgCompress,
       companyList: [],
       roleList: [],
       roleTypeList: [],