Merge pull request 'master-dev' (#136) from master-dev into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/136

src/views/emis/EmisBaseTools/BaseInvoiceInfoFullNamePicker.vue

@@ -0,0 +1,131 @@
+<template>
+   <el-select
+      style="width:100%"
+      ref="selectRef"
+      filterable
+      clearable
+      remote
+      :remote-method="remoteDebounce"
+      v-model="svalue"
+      :placeholder="placeholder"
+      auto-complete="new-password"
+
+      :disabled="disabled"
+
+      @blur="onBlur"
+      @change="onChange"
+      @click.native="onClick"
+      @visible-change="reverseArrow"
+      >
+        <el-option v-for="item in optionItems" :key="item.companyName" :label="item.companyName" :value="item.companyName" ></el-option>
+    </el-select>
+</template>
+<script>
+  import emitter from 'element-ui/src/mixins/emitter';
+  import { listEmisBaseInvoiceInfo } from "@/api/emis/emisBaseInvoiceInfo";
+
+  import { debounce} from "@/utils/custom";
+
+  export default {
+    name: "BaseInvoiceInfoPicker",
+    mixins: [emitter],
+    props: {
+      value: {
+        type: [String],
+        required: false
+      },
+      placeholder:{
+        type: [String],
+        required: false
+      },
+      disabled:{
+        type: [Boolean],
+        required: false
+      },
+
+    },
+    data() {
+      return {
+        svalue: this.value,
+        optionItems: [],
+
+        // 缺省值
+        defaultItems: null,
+        countryMap:new Map()
+      };
+    },
+    watch: {
+      value(newVal,oldVal) {
+        // 逻辑 有初始值先查询初值
+        // if(this.value!=null){
+
+          this.svalue=this.value;
+          this.queryData(null,this.svalue);
+        // }
+      },
+    },
+    created() {
+      if(this.svalue!=null){
+          this.queryData(null,this.svalue);
+      }
+    },
+    mounted(){
+      let rulesDom = this.$refs["selectRef"].$el.querySelector(".el-input .el-input__suffix .el-input__suffix-inner .el-input__icon"); // 找到dom
+      rulesDom.classList.add("el-icon-arrow-up"); // 对dom新增class
+    },
+    methods: {
+      onClick(){
+        // 第一次点击时需要初始化
+        if(!this.defaultItems){
+          this.queryData(null,null);
+        }else{
+          this.optionItems = [...this.defaultItems];
+        }
+      },
+      onBlur(val){
+        this.$emit("input", this.svalue);
+        this.dispatch('ElFormItem', 'el.form.blur');
+      },
+      onChange() {
+          this.$emit("input", this.svalue);
+          let itemData = this.optionItems.find(item => item.comCode == this.svalue);
+          this.$emit("change",itemData);
+          this.$emit("onChange",itemData);
+          this.dispatch('ElFormItem', 'el.form.change', [this.svalue]);
+      },
+      remoteDebounce(val,key){
+        debounce(this.queryData(val,key),1000);
+      },
+      queryData(val,key) {
+        this.optionItems=[];
+        let queryParams = {
+          pageNum:1,
+          pageSize:10,
+          companyName:val
+        };
+        listEmisBaseInvoiceInfo(queryParams).then(response => {
+          //处理返回数据 按照 companyName 去重
+          let uniqueMap = new Map();
+          response.rows.forEach(item => {
+            uniqueMap.set(item.companyName, item);
+          });
+          this.optionItems = [...uniqueMap.values()];
+          // 初始值存储
+          if(key==null && val==null){
+            this.defaultItems=[...this.optionItems]
+          }
+        });
+      },
+      reverseArrow(flag) {
+        let rulesDom = this.$refs["selectRef"].$el.querySelector(
+          ".el-input .el-input__suffix .el-input__suffix-inner .el-input__icon"
+        ); // 找到dom
+        if (flag) {
+          rulesDom.classList.add("is-reverse"); // 对dom新增class
+        } else {
+          rulesDom.classList.remove("is-reverse"); // 对dom新增class
+        }
+      },
+    }
+  };
+</script>

src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue

@@ -86,7 +86,7 @@
         />
       </el-form-item>
       <el-form-item label="开票主体" prop="salerCompanyName">
-        <BaseInvoiceInfoPicker v-model="queryParams.salerCompanyName" :placeholder="$t('开票主体')"  isInitiated="true" :disabled="false"></BaseInvoiceInfoPicker>
+        <BaseInvoiceInfoFullNamePicker v-model="queryParams.salerCompanyName" :placeholder="$t('开票主体')"  isInitiated="true" :disabled="false"></BaseInvoiceInfoFullNamePicker>
       </el-form-item>
       <!-- <el-form-item label="发票号" prop="params.invoiceNo">
         <el-input
@@ -296,10 +296,10 @@ import OpenBillForm from '@/views/emis/emisSettleInvoiceRecord/OpenBillForm';
 import { listEmisSettleInvoiceChRecord } from "@/api/emis/emisSettleInvoiceChRecord";
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
 import {timeFormat , isOverOneMonth} from '@/utils/dateUtils'
-import BaseInvoiceInfoPicker from '@/views/emis/EmisBaseTools/BaseInvoiceInfoPicker.vue';
+import BaseInvoiceInfoFullNamePicker from '@/views/emis/EmisBaseTools/BaseInvoiceInfoFullNamePicker.vue';
 export default {
   name: "CenterInvoiceHasOpenPanel",
-  components: { elDateAdvPicker,OpenBillForm,BaseInvoiceInfoPicker },
+  components: { elDateAdvPicker,OpenBillForm,BaseInvoiceInfoFullNamePicker },
   props: {
       invoiceStatus:{
         type: [String,Number],

src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue

@@ -90,7 +90,7 @@
             />
       </el-form-item>
       <el-form-item label="开票主体" prop="salerCompanyName">
-        <BaseInvoiceInfoPicker v-model="queryParams.salerCompanyName" :placeholder="$t('开票主体')"  isInitiated="true" :disabled="false"></BaseInvoiceInfoPicker>
+        <BaseInvoiceInfoFullNamePicker v-model="queryParams.salerCompanyName" :placeholder="$t('开票主体')"  isInitiated="true" :disabled="false"></BaseInvoiceInfoFullNamePicker>
       </el-form-item>
       <el-form-item label="发票延期" prop="blDelay">
         <el-select clearable v-model="queryParams.blDelay" :placeholder="$t('发票延期')"  filterable style="width:100%">
@@ -241,7 +241,7 @@
           <el-tag v-if="scope.row.blDelay=='1'" type="success">延期</el-tag>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('发票延期操作人')" align="center" prop="delayOpManCode" min-width="150" />
+      <el-table-column :label="$t('发票延期操作人')" align="center" prop="delayOpManName" min-width="150" />
       <el-table-column :label="$t('发票延期操作时间')" align="center" prop="delayOpDate" min-width="150" />
       <el-table-column :label="$t('开票主体')" align="center" prop="salerCompanyName" min-width="150" />
         <!-- <el-tag v-if="scope.row.paymentStatus=='2'" type="warning">部分收款</el-tag> -->
@@ -312,10 +312,10 @@ import OpenBillForm from '@/views/emis/emisSettleInvoiceRecord/OpenBillForm';
 import { listEmisSettleInvoiceChRecord } from "@/api/emis/emisSettleInvoiceChRecord";
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
 import {timeFormat} from '@/utils/dateUtils'
-import BaseInvoiceInfoPicker from '@/views/emis/EmisBaseTools/BaseInvoiceInfoPicker.vue';
+import BaseInvoiceInfoFullNamePicker from '@/views/emis/EmisBaseTools/BaseInvoiceInfoFullNamePicker.vue';
 export default {
   name: "CenterInvoiceRecordDealListPanel",
-  components: { elDateAdvPicker,OpenBillForm,BaseInvoiceInfoPicker },
+  components: { elDateAdvPicker,OpenBillForm,BaseInvoiceInfoFullNamePicker },
   props: {
       invoiceStatus:{
         type: [String,Number],
@@ -780,6 +780,16 @@ export default {
             return '部分收款';
           }
         }
+        // 延期
+        if (j === 'blDelay') {
+          let blDelay = v[j];
+          if (blDelay == 0) {
+            return '未延期';
+          }
+          else if (blDelay == 1) {
+            return '已延期';
+          }
+        }
         return v[j]
       }))
     },