开票审批页面优化

src/views/finance/fundList.vue

@@ -98,14 +98,14 @@
             <i v-else style="font-size:20px; color:RGB(255,106,106)" class="el-icon-warning"></i>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="250" >
+        <el-table-column label="操作" align="center" width="150" >
           <template slot-scope="{row}">
-              <PermissionButton menu-code="_views_claim_list" class-name="filter-item" type="primary"
-              :page-jump="false" round size="mini" @click="clamiList(row.id,row.notClaimAmount,row.payer,row.amount)" />
-              <PermissionButton menu-code="_views_real_fund_edit" class-name="filter-item" type="warning"
-              :page-jump="false" round size="mini" @click="detail(row.id)" />
-              <PermissionButton menu-code="_views_real_fund_remove" class-name="filter-item" type="danger"
-              :page-jump="false" round size="mini" @click="remove(row.id)" />
+              <PermissionButton menu-code="_views_claim_list" class-name="filter-item" type="text"
+              :page-jump="false"  @click="clamiList(row.id,row.notClaimAmount,row.payer,row.amount)" />
+              <PermissionButton menu-code="_views_real_fund_edit" class-name="filter-item" type="text"
+              :page-jump="false"  @click="detail(row.id)" />
+              <PermissionButton menu-code="_views_real_fund_remove" class-name="filter-item" type="text"
+              :page-jump="false"  @click="remove(row.id)" />
           </template>
         </el-table-column>
       </parentTable>
@@ -346,6 +346,7 @@ export default {
         current: 1,
         size: 20,
         descs: 'id',
+        notFinished:true
       }
       this.getList()
     },

src/views/finance/invoiceCheck.vue

@@ -41,17 +41,17 @@
             <span>{{ businessTypeAlias(row.businessType) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="订单名称" align="center" width="300" show-overflow-tooltip>
+        <el-table-column label="订单名称" align="center" width="250" show-overflow-tooltip>
           <template slot-scope="{row}">
             <span>{{ row.orderName }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="订单号" align="center" width="200">
+        <el-table-column label="订单号" align="center" width="120">
           <template slot-scope="{row}">
             <span>{{ row.orderId }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="发票抬头" align="center">
+        <el-table-column label="发票抬头" align="center" width="250" show-overflow-tooltip>
           <template slot-scope="{row}">
             <span>{{ row.title }}</span>
           </template>
@@ -86,7 +86,7 @@
             <span>{{ row.applyName }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="申请时间" align="center" width="250">
+        <el-table-column label="申请时间" align="center">
           <template slot-scope="{row}">
             <span>{{ row.created }}</span>
           </template>
@@ -96,10 +96,10 @@
             <span style="color:red;font-weight:bold">{{ row.state }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="150" fixed="right">
+        <el-table-column label="操作" align="center" >
           <template slot-scope="{row}">
-              <PermissionButton  menu-code="_views_make_invoice_check" class-name="filter-item" type="success"
-              :page-jump="false" round size="mini" @click="openMakeDialog(row)" />
+              <PermissionButton  menu-code="_views_make_invoice_check" class-name="filter-item" type="text"
+              :page-jump="false"  @click="openMakeDialog(row)" />
           </template>
         </el-table-column>
       </parentTable>
@@ -108,12 +108,12 @@
       <el-form ref="invoice" :model="invoice" >
         <el-divider content-position="left">开票信息</el-divider>
           <el-row>
-            <el-col :xs="24" :sm="12" :lg="6" :span="6">
+            <el-col :xs="24" :sm="12" :lg="12" :span="6">
               <el-form-item
                 label="发票抬头："
                 :rules="{required: true, message: '发票抬头不能为空', trigger: 'blur'}"
                 prop="title"
-                label-width="140px"
+                label-width="180px"
                 class="postInfo-container-item"
               >
                 <el-input v-model.trim="invoice.title" class="filter-item" readonly disabled />
@@ -124,10 +124,10 @@
                 label="发票类型："
                 :rules="{required: true, message: '发票类型不能为空', trigger: 'blur'}"
                 prop="type"
-                label-width="140px"
+                label-width="180px"
                 class="postInfo-container-item"
               >
-                <el-select v-model="invoice.type"  style="width:206px" readonly disabled>
+                <el-select v-model="invoice.type"  style="width:100%" readonly disabled>
                   <el-option label="普票" value="普票"></el-option> 
                   <el-option label="专票" value="专票"></el-option> 
                 </el-select>
@@ -138,7 +138,7 @@
                 label="税号："
                 :rules="{required: true, message: '税号不能为空', trigger: 'blur'}"
                 prop="taxNo"
-                label-width="140px"
+                label-width="180px"
                 class="postInfo-container-item"
               >
                 <el-input v-model.trim="invoice.taxNo" class="filter-item" readonly disabled />
@@ -146,19 +146,19 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :xs="24" :sm="12" :lg="6" :span="6">
+            <el-col :xs="24" :sm="12" :lg="8" :span="6">
               <el-form-item
                 label="计划开票金额(元):"
                 prop="planAmount"
                 :rules="{required: true, message: '使用权面积不能为空', trigger: 'blur'}"
-                label-width="140px"
+                label-width="180px"
                 class="postInfo-container-item"
               >
               <el-input-number :precision="2" :min="0" :value-on-clear="0" v-model.number="invoice.planAmount" type="number"  readonly disabled
-                style="width:206px" class="filter-item" />
+                style="width:100%" class="filter-item" />
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6" :span="6">
+            <el-col :xs="24" :sm="12" :lg="8" :span="6">
               <el-form-item
                 label="计划开票日期："
                 prop="planMakeDate"
@@ -167,25 +167,25 @@
                 class="postInfo-container-item"
               >
                 <el-date-picker
-                  v-model="invoice.planMakeDate" type="date" placeholder="选择日期" style="width:206px" readonly disabled>
+                  v-model="invoice.planMakeDate" type="date" placeholder="选择日期" style="width:100%" readonly disabled>
                 </el-date-picker>
               </el-form-item>
             </el-col>
           </el-row> 
           <el-row>
-            <el-col :xs="24" :sm="12" :lg="6" :span="6">
+            <el-col :xs="24" :sm="12" :lg="8" :span="6">
               <el-form-item
                 label="实开金额："
                 :rules="{required: true, message: '实际开票金额不能为空', trigger: 'blur'}"
                 prop="realAmount"
-                label-width="140px"
+                label-width="180px"
                 class="postInfo-container-item"
               >
               <el-input-number :precision="2" :min="0" :value-on-clear="0" v-model.number="invoice.realAmount" type="number" 
-                style="width:206px" class="filter-item" />
+                style="width:100%" class="filter-item" />
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6" :span="6">
+            <el-col :xs="24" :sm="12" :lg="8" :span="6">
               <el-form-item
                 label="实开日期："
                 prop="realMakeDate"
@@ -194,11 +194,11 @@
                 class="postInfo-container-item"
               >
                 <el-date-picker
-                  v-model="invoice.realMakeDate" type="date" placeholder="选择日期"  value-format="yyyy-MM-dd" style="width:206px">
+                  v-model="invoice.realMakeDate" type="date" placeholder="选择日期"  value-format="yyyy-MM-dd" style="width:100%">
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6" :span="6">
+            <el-col :xs="24" :sm="12" :lg="8" :span="6">
               <el-form-item
                 label="全额收款："
                 prop="isPayAll"
@@ -211,17 +211,17 @@
             </el-col>
           </el-row> 
           <el-row>
-            <el-col :xs="24" :sm="12" :lg="6" :span="6">
+            <el-col :xs="24" :sm="12" :lg="8" :span="6">
               <el-form-item
                 label="业务类型："
                 prop="businessType"
-                label-width="140px"
+                label-width="180px"
                 class="postInfo-container-item"
               >
                 <el-input :value="businessTypeAlias(invoice.businessType)" class="filter-item" readonly disabled />
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-col :xs="24" :sm="12" :lg="8" :span="6">
               <el-form-item
                 label="报告号："
                 prop="reprotNo"
@@ -234,21 +234,21 @@
           </el-row>
         <el-divider content-position="left">银行信息</el-divider>
           <el-row>
-            <el-col :xs="24" :sm="12" :lg="6" :span="6">
+            <el-col :xs="24" :sm="12" :lg="12" :span="6">
               <el-form-item
                 label="开户行："
                 prop="bankName"
-                label-width="140px"
+                label-width="180px"
                 class="postInfo-container-item"
               >
                 <el-input v-model.trim="invoice.bankName" class="filter-item" />
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6" :span="6">
+            <el-col :xs="24" :sm="12" :lg="12" :span="6">
               <el-form-item
                 label="银行账号："
                 prop="bankAccount"
-                label-width="140px"
+                label-width="180px"
                 class="postInfo-container-item"
               >
               <el-input v-model.trim="invoice.bankAccount" class="filter-item" />
@@ -256,21 +256,21 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :xs="24" :sm="12" :lg="6" :span="6">
+            <el-col :xs="24" :sm="12" :lg="12" :span="6">
               <el-form-item
                 label="地址："
                 prop="bankAddress"
-                label-width="140px"
+                label-width="180px"
                 class="postInfo-container-item"
               >
                 <el-input v-model.trim="invoice.bankAddress" class="filter-item" />
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6" :span="6">
+            <el-col :xs="24" :sm="12" :lg="12" :span="6">
               <el-form-item
                 label="电话："
                 prop="bankTel"
-                label-width="140px"
+                label-width="180px"
                 class="postInfo-container-item"
               >
               <el-input v-model.trim="invoice.bankTel" class="filter-item" />
@@ -283,7 +283,7 @@
               <el-form-item
                 label="开票项目："
                 prop="makeItem"
-                label-width="140px"
+                label-width="180px"
                 class="postInfo-container-item"
               >
                 <el-input v-model.trim="invoice.makeItem" class="filter-item" />
@@ -293,7 +293,7 @@
               <el-form-item
                 label="项目数量:"
                 prop="itemQuantity"
-                label-width="140px"
+                label-width="180px"
                 class="postInfo-container-item"
               >
               <el-input v-model.trim="invoice.itemQuantity" class="filter-item" />
@@ -303,7 +303,7 @@
               <el-form-item
                 label="计量单位："
                 prop="itemUnit"
-                label-width="140px"
+                label-width="180px"
                 class="postInfo-container-item"
               >
               <el-input v-model.trim="invoice.itemUnit" class="filter-item" placeholder="个/套/箱/次/斤/公斤/..."/>
@@ -315,31 +315,31 @@
               <el-form-item
                 label="税点："
                 prop="taxRate"
-                label-width="140px"
+                label-width="180px"
                 class="postInfo-container-item"
               >
               <el-input-number :precision="2" :min="0" :value-on-clear="0" v-model.number="invoice.taxRate" type="number" 
-                style="width:206px" class="filter-item" />
+                style="width:100%" class="filter-item" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6" :span="6">
               <el-form-item
                 label="税额:"
                 prop="taxAmount"
-                label-width="140px"
+                label-width="180px"
                 class="postInfo-container-item"
               >
               <el-input-number :precision="2" :min="0" :value-on-clear="0" v-model.number="invoice.taxAmount" type="number" 
-                style="width:206px" class="filter-item" />
+                style="width:100%" class="filter-item" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :xs="24" :sm="12" :lg="18" :span="6">
+            <el-col :xs="24" :sm="12" :lg="24" :span="6">
               <el-form-item
                 label="备注："
                 prop="remark"
-                label-width="140px"
+                label-width="180px"
                 class="postInfo-container-item"
               >
                 <el-input v-model.trim="invoice.remark" type="textarea" class="filter-item" />

src/views/major/detail.vue

@@ -3350,21 +3350,22 @@
   /deep/.createLinkman {
       border-radius: 10px;
     }
-    .qr-code-div{
-  border-radius:10px;
-  background-color: RGB(245,245,245); 
-  width: 180px; 
-  height: 180px; 
-  position:absolute;
+.qr-code-div{
+      background-color: RGB(245, 245, 245);
+  width: 150px;
+  height: 150px;
+  position: absolute;
   display: flex;
   justify-content: center;
   align-items: center;
 }
 .qr-code{
-  width: 180px; 
-  height: 180px; 
+  width: 150px;
+  height: 150px;
   z-index: 999;
-  }
+  border: 1px #919398 solid;
+  border-radius: 5px;
+}
 .qr-code-div:hover {
   cursor: pointer;
   // background-color:RGB(220,220,220); 

src/views/major/myOrder.vue

@@ -123,7 +123,8 @@
     <el-dialog :visible.sync="makeInvoiceListDialog" width="90%" center custom-class="doWarehouseClass">
       <el-button type="danger" round @click="openNewInvoiceDialog">新增开票</el-button>
       <div style="margin-top:30px;">
-        <el-table :data="invoiceData" stripe style="width: 100%">
+        <el-table :data="invoiceData" stripe :header-row-style="{ color: '#333333', 'font-size': '14px' }" border
+        style="width: 100%; margin-top:20px;font-size: 14px;">
           <el-table-column align="center" prop="title" label="发票抬头" width="180">
           </el-table-column>
           <el-table-column align="center" prop="taxNo" label="税号" width="180">
@@ -131,6 +132,9 @@
           <el-table-column align="center" prop="type" label="发票类型">
           </el-table-column>
           <el-table-column align="center" prop="state" label="开票状态">
+            <template slot-scope="{row}">
+              <span :style="stateStyle(row.state)">{{ row.state }}</span>
+            </template>
           </el-table-column>
           <el-table-column align="center" prop="planAmount" label="计划开票金额">
           </el-table-column>
@@ -148,6 +152,7 @@
             <template slot-scope="{row}">
               <el-button v-if="row.state !== '已开票'" @click="invoiceDetail(row.id)" type="text" size="small">修改</el-button>
               <el-button @click="cancellation(row.id)" type="text" size="small">作废</el-button>
+              <el-button @click="copyInvoice(row)" type="text" size="small">复制</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -158,7 +163,7 @@
       <el-form ref="invoice" :model="invoice">
         <el-divider content-position="left">开票信息</el-divider>
         <el-row>
-          <el-col :xs="24" :sm="12" :lg="6" :span="6">
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
             <el-form-item label="发票抬头：" :rules="{ required: true, message: '发票抬头不能为空', trigger: 'blur' }" prop="title"
               label-width="140px" class="postInfo-container-item">
               <el-input v-model.trim="invoice.title" class="filter-item" />
@@ -167,7 +172,7 @@
           <el-col :xs="24" :sm="12" :lg="6" :span="6">
             <el-form-item label="发票类型：" :rules="{ required: true, message: '发票类型不能为空', trigger: 'blur' }" prop="type"
               label-width="140px" class="postInfo-container-item">
-              <el-select v-model="invoice.type" style="width:206px">
+              <el-select v-model="invoice.type" style="width:100%">
                 <el-option label="普票" value="普票"></el-option>
                 <el-option label="专票" value="专票"></el-option>
               </el-select>
@@ -178,12 +183,12 @@
               :rules="{ required: true, message: '使用权面积不能为空', trigger: 'blur' }" label-width="140px"
               class="postInfo-container-item">
               <el-input-number :precision="2" :min="0" :value-on-clear="0" v-model.number="invoice.planAmount"
-                type="number" style="width:206px" class="filter-item" />
+                type="number" style="width:100%" class="filter-item" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :xs="24" :sm="12" :lg="6" :span="6">
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
             <el-form-item label="税号：" :rules="{ required: true, message: '税号不能为空', trigger: 'blur' }" prop="taxNo"
               label-width="140px" class="postInfo-container-item">
               <el-input v-model.trim="invoice.taxNo" class="filter-item" />
@@ -193,14 +198,14 @@
             <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="选择日期" value-format="yyyy-MM-dd" style="width:206px">
+              <el-date-picker v-model="invoice.planMakeDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" style="width:100%">
               </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
         <el-divider content-position="left">银行信息</el-divider>
         <el-row>
-          <el-col :xs="24" :sm="12" :lg="6" :span="6">
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
             <el-form-item label="开户行：" prop="bankName" label-width="140px" class="postInfo-container-item">
               <el-input v-model.trim="invoice.bankName" class="filter-item" />
             </el-form-item>
@@ -212,7 +217,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :xs="24" :sm="12" :lg="6" :span="6">
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
             <el-form-item label="地址：" prop="bankAddress" label-width="140px" class="postInfo-container-item">
               <el-input v-model.trim="invoice.bankAddress" class="filter-item" />
             </el-form-item>
@@ -813,7 +818,6 @@ export default {
       this.makeInvoiceListDialog = true;
       if (orderFundId) {
         this.invoice.orderFundId = orderFundId;
-        this.invoice.productionFundId = productionFundId;
         this.getFinanceInvoiceList();
       }
     },
@@ -879,7 +883,7 @@ export default {
       })
     },
     cleanFinanceInvoiceForm() {
-      this.$refs.invoice.resetFields();
+      // this.$refs.invoice.resetFields();
       this.invoice = {
         id: null,
         orderFundId: this.invoice.orderFundId,
@@ -1228,6 +1232,22 @@ export default {
       }
       this.getList();
     },
+    stateStyle(state){
+        if (state==='已开票'){
+          return 'color:green'
+        }else{
+          return 'color:red'
+        }
+    },
+    copyInvoice(row){
+        this.invoice = row;
+        this.invoice.id = null;
+        this.invoice.state = null;
+        this.invoice.reason = null;
+        this.invoice.created = null;
+        this.invoice.modified = null;
+        this.newInvoiceDialog = true;
+    }
   },
 
 }

src/views/major/todoDetail.vue

@@ -1284,7 +1284,7 @@
             v-if="currentNode.nodeCode === 'INITIAL_PRICE' || currentNode.nodeCode === 'REVIEW_QUOTATION' || hanlderType() === '查看'">
             <el-divider content-position="left">【土地】定价信息</el-divider>
             <el-row>
-              <el-col :xs="24" :sm="12" :lg="14" :span="6">
+              <el-col :xs="24" :sm="12" :lg="24" :span="6">
                 <el-form-item label="评估方法：" prop="eMethods"
                   :rules="{ required: true, message: '评估方法不能为空', trigger: 'blur' }" label-width="160px"
                   :class="['postInfo-container-item', 'task-class']">
@@ -3569,10 +3569,9 @@ export default {
 }
 
 .qr-code-div {
-  border-radius: 10px;
   background-color: RGB(245, 245, 245);
-  width: 180px;
-  height: 180px;
+  width: 150px;
+  height: 150px;
   position: absolute;
   display: flex;
   justify-content: center;
@@ -3580,9 +3579,11 @@ export default {
 }
 
 .qr-code {
-  width: 180px;
-  height: 180px;
+  width: 150px;
+  height: 150px;
   z-index: 999;
+  border: 1px #919398 solid;
+  border-radius: 5px;
 }
 
 .qr-code-div:hover {