1.修复大中型-我的订单-更多搜索条件

2.修复新增开票信息变成修改的bug
3.修复大中型和资产开票表单日期选择器慢一天的bug
4.资产结算项目新增查询开票信息，以及对多条开票信息的处理(待完善)

src/components/MoreSearchBar/index.vue

@@ -37,7 +37,7 @@
                         </el-select>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="3" :span="6" style="margin-right: 8px;">
-                        <el-input v-if="clientName" v-model="listQuery.clientName" placeholder="委托人" clearable >
+                        <el-input v-if="clientName" v-model="listQuery.clientName" placeholder="客户经理" clearable >
                         </el-input>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="3" :span="6">

src/views/assets/myOrderList.vue

@@ -176,7 +176,9 @@
                                 实收款分配
                             </el-button>
                             <el-button type="text" size="mini"
-                                @click="openFinanceInvoiceDialog(row.orderFundId)">申请开票</el-button>
+                                @click="openFinanceInvoiceDialog(row.orderFundId)">
+                                申请开票
+                            </el-button>
                             <!-- <el-button v-if="row.currentNodeCode === 'REPORT_OUT_APPLY'" type="text"
                             @click="canceladdRepertoryOutWarehouse(row)">
                             撤销出库申请 
@@ -423,7 +425,7 @@
                         <el-form-item label="计划开票日期：" prop="planMakeDate"
                             :rules="{ required: true, message: '计划开票日期不能为空', trigger: 'blur' }" label-width="140px"
                             class="postInfo-container-item">
-                            <el-date-picker v-model="invoice.planMakeDate" type="date" placeholder="选择日期"
+                            <el-date-picker v-model="invoice.planMakeDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"
                                 style="width:206px">
                             </el-date-picker>
                         </el-form-item>

src/views/assets/orderDetail.vue

@@ -901,7 +901,7 @@
             </el-col>
           </el-row>
           <el-row class="row-style">
-            <el-col :xs="24" :sm="12" :lg="12" :span="6"">
+            <el-col :xs="24" :sm="12" :lg="12" :span="6">
                         <el-form-item label=" 产权持有人：" prop="theHolder" label-width="200px"
               class="postInfo-container-item">
               <el-input v-model="targetForm.theHolder" class="filter-item" style="width: 100%" />

src/views/finance/invoiceCheck.vue

@@ -194,7 +194,7 @@
                 class="postInfo-container-item"
               >
                 <el-date-picker
-                  v-model="invoice.realMakeDate" type="date" placeholder="选择日期" style="width:206px">
+                  v-model="invoice.realMakeDate" type="date" placeholder="选择日期"  value-format="yyyy-MM-dd" style="width:206px">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -469,7 +469,12 @@ export default {
       })
     },
     businessTypeAlias(code){
-      return '大中型'
+      if (code === 'ASSET_BUSINESS') {
+        return '资产'
+      }
+      if (code === 'MAJOR_BUSINESS') {
+        return '大中型'
+      }
     },
     openMakeDialog(row){
       this.newInvoiceDialog= true;
@@ -494,6 +499,8 @@ export default {
                 return;
             }
             this.invoice.state = '已开票';
+            this.invoice.checkerId = this.$store.getters.userInfo.id;
+            this.invoice.makerId = this.$store.getters.userInfo.id;
             this.$api.financeInvoice.edit(this.invoice).then(res=>{
               if (res.code === 200 && res.data){
                 this.$notify({

src/views/finance/settleAssets.vue

@@ -119,19 +119,19 @@
                                 <span>{{ row.evaluateAmount }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="开票日期" align="center">
+                        <el-table-column prop="invoiceUser" align="center" show-overflow-tooltip>
                             <template slot-scope="{row}">
-                                <span>{{ row.invoiceDate }}</span>
+                                <span v-for="(item, index) in row.invoices">{{ item.invoiceUser }} <br> </span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="开票人" align="center">
+                        <el-table-column prop="invoiceNo" label="发票号" align="center" show-overflow-tooltip>
                             <template slot-scope="{row}">
-                                <span>{{ row.invoiceUser }}</span>
+                                <span v-for="(item, index) in row.invoices">{{ item.invoiceNo }} <br> </span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="发票号" align="center">
+                        <el-table-column prop="invoiceDate" label="开票日期" align="center" show-overflow-tooltip>
                             <template slot-scope="{row}">
-                                <span>{{ row.invoiceNo }}</span>
+                                <span v-for="(item, index) in row.invoices">{{ item.invoiceDate }} <br> </span>
                             </template>
                         </el-table-column>
                     </parentTable>

src/views/major/myOrder.vue

@@ -10,7 +10,7 @@
           :page-query="{ 'couldEdit': true, 'couldBack': true }" />
         <MoreSearchBar business="MAJOR_BUSINESS" @fliterSearch="fliterSearch" @resetParams="resetParams"
           :listQuery="listQuery" :nodeCode="false" :financial="false" :clientManager="false" :businessObjectType="false"
-          :department="false"></MoreSearchBar>
+          :department="false" :clientName="false"></MoreSearchBar>
       </template>
       <parentTable :data="pageData.records" slot="table" style="width: 100%;">
         <el-table-column label="订单名称" align="center" show-overflow-tooltip width='300'>
@@ -193,7 +193,7 @@
             <el-form-item label="计划开票日期：" prop="planMakeDate"
               :rules="{ required: true, message: '计划开票日期不能为空', trigger: 'blur' }" label-width="140px"
               class="postInfo-container-item">
-              <el-date-picker v-model="invoice.planMakeDate" type="date" placeholder="选择日期" style="width:206px">
+              <el-date-picker v-model="invoice.planMakeDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" style="width:206px">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -877,7 +877,26 @@ export default {
       })
     },
     cleanFinanceInvoiceForm() {
-
+      this.$refs.invoice.resetFields();
+      this.invoice = {
+        id: null,
+        orderFundId: this.invoice.orderFundId,
+        title: null,
+        type: null,
+        taxNo: null,
+        planAmount: null,
+        planMakeDate: null,
+        bankName: null,
+        bankAccount: null,
+        bankAddress: null,
+        bankTel: null,
+        makeItem: null,
+        itemQuantity: null,
+        itemUnit: null,
+        taxRate: null,
+        taxAmount: null,
+        remark: null
+      }
     },
     invoiceDetail(id) {
       this.$api.financeInvoice.detail(id).then(res => {