Browse Source

Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-web

GouGengquan 11 months ago
parent
commit
7489189279

+ 2 - 2
src/components/MoreSearchBar/index.vue

@@ -2,7 +2,7 @@
     <div>
         <div class="bar-container">
             <el-row>
-                <el-col :xs="24" :sm="12" :lg="6" :span="6" style="margin-right: 8px;"> 
+                <el-col :xs="24" :sm="12" :lg="4" :span="6" style="margin-right: 8px;"> 
                     <el-input v-if="keyword" v-model="listQuery.keyword" placeholder="关键字搜索..." clearable>
                     </el-input>
                 </el-col>
@@ -18,7 +18,7 @@
                             value-format="yyyy-MM-dd">
                         </el-date-picker>
                     </el-col>
-                <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                <el-col :xs="24" :sm="12" :lg="9" :span="6">
                     <el-button class="filter-item"  type="success" @click="searchList" round>搜索
                     </el-button>
                     <el-button class="filter-item" round type="info" @click="resetSearch()">重置

+ 208 - 139
src/views/assets/myOrderList.vue

@@ -175,10 +175,7 @@
                                 @click="openAllotProductionDialog(row)">
                                 实收款分配
                             </el-button>
-                            <el-button type="text" size="mini"
-                                @click="openFinanceInvoiceDialog(row.orderFundId, row.productionFundId)">
-                                申请开票
-                            </el-button>
+                            <el-button type="text" size="mini" @click="openFinanceInvoiceDialog(row.orderFundId,row.productionFundId,row.realAmount,row.customerName,row.customerSubName)">申请开票</el-button>
                             <!-- <el-button v-if="row.currentNodeCode === 'REPORT_OUT_APPLY'" type="text"
                             @click="canceladdRepertoryOutWarehouse(row)">
                             撤销出库申请 
@@ -386,121 +383,187 @@
                 </el-table>
             </div>
         </el-dialog>
-        <el-dialog :visible.sync="newInvoiceDialog" width="75%" center custom-class="doWarehouseClass" @closed="cleanFinanceInvoiceForm()">
-            <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-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" />
-                        </el-form-item>
-                    </el-col>
-                    <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-option label="普票" value="普票"></el-option>
-                                <el-option label="专票" value="专票"></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                        <el-form-item label="待开金额(元):" prop="planAmount"
-                            :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" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :xs="24" :sm="12" :lg="6" :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" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                        <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>
-                        </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-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>
-                    </el-col>
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                        <el-form-item label="银行账号:" prop="bankAccount" label-width="140px" class="postInfo-container-item">
-                            <el-input v-model.trim="invoice.bankAccount" class="filter-item" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :xs="24" :sm="12" :lg="6" :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>
-                    </el-col>
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                        <el-form-item label="电话:" prop="bankTel" label-width="140px" class="postInfo-container-item">
-                            <el-input v-model.trim="invoice.bankTel" class="filter-item" />
-                        </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-form-item label="开票项目:" prop="makeItem" label-width="140px" class="postInfo-container-item">
-                            <el-input v-model.trim="invoice.makeItem" class="filter-item" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                        <el-form-item label="项目数量:" prop="itemQuantity" label-width="140px" class="postInfo-container-item">
-                            <el-input v-model.trim="invoice.itemQuantity" class="filter-item" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                        <el-form-item label="计量单位:" prop="itemUnit" label-width="140px" class="postInfo-container-item">
-                            <el-input v-model.trim="invoice.itemUnit" class="filter-item" placeholder="个/套/箱/次/斤/公斤/..." />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                        <el-form-item label="税点:" prop="taxRate" label-width="140px" 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" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                        <el-form-item label="税额:" prop="taxAmount" label-width="140px" 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" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :xs="24" :sm="12" :lg="18" :span="6">
-                        <el-form-item label="备注:" prop="remark" label-width="140px" class="postInfo-container-item">
-                            <el-input v-model.trim="invoice.remark" type="textarea" class="filter-item" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="newInvoiceDialog = false">取 消</el-button>
-                <el-button type="primary" @click="saveInvoice()">确 定</el-button>
-            </span>
-        </el-dialog>
+        <el-dialog :visible.sync="newInvoiceDialog" width="55%" top="10vh" center custom-class="doWarehouseClass"
+      @closed="cleanFinanceInvoiceForm">
+      <el-form ref="invoice" :model="invoice">
+        <el-divider content-position="left">开票信息</el-divider>
+        <el-row>
+          <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" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :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:100%">
+                <el-option label="普票" value="普票"></el-option>
+                <el-option label="专票" value="专票"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        
+        </el-row>
+        <el-row>
+          <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" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <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:100%">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="待开金额(元):" prop="planAmount"
+              :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:100%" class="filter-item" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="是否收款:" label-width="140px"
+              class="postInfo-container-item">
+              <el-radio-group :value="invoice.realPayAmount?'已收款':'未收款'">
+                <el-radio label="已收款"></el-radio>
+                <el-radio label="未收款"></el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="开票项目:" prop="makeItem" label-width="140px" class="postInfo-container-item">
+              <el-input v-model.trim="invoice.makeItem" class="filter-item" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="项目数量:" prop="itemQuantity" label-width="140px" class="postInfo-container-item">
+              <el-input v-model.trim="invoice.itemQuantity" class="filter-item" />
+            </el-form-item>
+          </el-col>
+         
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="计量单位:" prop="itemUnit" label-width="140px" class="postInfo-container-item">
+              <el-input v-model.trim="invoice.itemUnit" class="filter-item" placeholder="个/套/箱/次/斤/公斤/..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="24" :span="6">
+            <el-form-item label="备注:" prop="remark" label-width="140px" class="postInfo-container-item">
+              <el-input v-model.trim="invoice.remark" type="textarea" :autosize="{ minRows: 5, maxRows: 8}"  class="filter-item" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-divider content-position="left">银行信息</el-divider>
+        <el-row>
+          <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>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6" :span="6">
+            <el-form-item label="银行账号:" prop="bankAccount" label-width="140px" class="postInfo-container-item">
+              <el-input v-model.trim="invoice.bankAccount" class="filter-item" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <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>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6" :span="6">
+            <el-form-item label="电话:" prop="bankTel" label-width="140px" class="postInfo-container-item">
+              <el-input v-model.trim="invoice.bankTel" class="filter-item" />
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <!-- <el-divider content-position="left">发票信息</el-divider>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="发票号码:" prop="ticketNo" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.ticketNo" class="filter-item"  readonly disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="实开金额(元):" prop="realAmount" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.realAmount" class="filter-item" readonly disabled/>
+            </el-form-item>
+          </el-col>
+         
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="申请日期:" prop="created" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.created" class="filter-item" readonly disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="实开日期:" prop="realMakeDate" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.realMakeDate" class="filter-item" readonly disabled/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="订单类型:" prop="businessType" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.businessType" class="filter-item" readonly disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="开票人:" prop="applyName" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.applyName" class="filter-item" readonly disabled/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="订单编号:" prop="orderId" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.orderId" class="filter-item" readonly disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="产品号:" prop="productionNo" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.productionNo" class="filter-item" readonly disabled/>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+       
+        <!-- <el-row>
+          <el-col :xs="24" :sm="12" :lg="6" :span="6">
+            <el-form-item label="税点:" prop="taxRate" label-width="140px" 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" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6" :span="6">
+            <el-form-item label="税额:" prop="taxAmount" label-width="140px" 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" />
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+       
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="newInvoiceDialog = false">取 消</el-button>
+        <el-button type="primary" @click="saveInvoice()">确 定</el-button>
+      </span>
+    </el-dialog>
     </div>
 </template>
 
@@ -606,25 +669,28 @@ export default {
             },
             invoiceData: [],
             invoice: {
-                id: null,
-                orderFundId: null,
-                productionFundId: null,
-                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
-            },
+        id: null,
+        orderFundId: null,
+        productionFundId: null,
+        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,
+        realPayAmount:null,
+        realAmount:null,
+        realMakeDate:null
+      },
             makeInvoiceListDialog: false,
             newInvoiceDialog: false
         }
@@ -1040,7 +1106,8 @@ export default {
                 }
             })
         },
-        openFinanceInvoiceDialog(orderFundId, productionFundId) {
+        openFinanceInvoiceDialog(orderFundId, productionFundId,realAmount,clientName,clientSubName) {
+            console.log(orderFundId,realAmount,clientName,clientSubName)
             if (!orderFundId) {
                 this.$notify({
                     title: '提示',
@@ -1054,6 +1121,8 @@ export default {
             if (orderFundId) {
                 this.invoice.orderFundId = orderFundId;
                 this.invoice.productionFundId = productionFundId;
+                this.invoice.realPayAmount = realAmount;
+                this.invoice.title = clientName+clientSubName;
                 this.getFinanceInvoiceList();
             }
         },

+ 32 - 22
src/views/complex/index.vue

@@ -388,14 +388,14 @@
               <div class="left-content">
                 <parentTable v-loading="listLoading" :data="personalTodoList" stripe border :isBoard=450
                   style="width: 100%">
-                  <el-table-column label="坐落" align="center" width="200" show-overflow-tooltip>
+                  <el-table-column label="项目编号" align="center" width="140">
                     <template slot-scope="{row}">
-                      <span>{{ row.location }}</span>
+                      <span>{{ row.orderId }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column label="项目编号" align="center" width="140">
+                  <el-table-column label="坐落" align="center" width="200" show-overflow-tooltip>
                     <template slot-scope="{row}">
-                      <span>{{ row.orderId }}</span>
+                      <span>{{ row.location }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="当前节点" align="center" width="130">
@@ -408,49 +408,59 @@
                       <span>{{ row.handlerName }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column label="面积" align="center" width="130">
+                  <el-table-column label="最新备注" align="center" width="130" show-overflow-tooltip>
                     <template slot-scope="{row}">
-                      <span>{{ row.acreage? row.acreage : '-' }}</span>
+                      <span>{{ row.comments?row.comments:'-' }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column label="单价" align="center" width="130">
+                  <el-table-column label="客户名称" align="center" width="130">
                     <template slot-scope="{row}">
-                      <span>{{ row.price? row.price : '-' }}</span>
+                      <span>{{ row.clientName?row.clientName:'-' }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column label="总价" align="center" width="130">
+                  <el-table-column label="业务来源" align="center" width="130">
                     <template slot-scope="{row}">
-                      <span>{{ row.amount? row.amount : '-' }}</span>
+                      <span>{{ row.clientSubName?row.clientSubName:'-' }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column label="客户名称" align="center" width="130">
+                  <el-table-column label="联系人" align="center" width="130">
                     <template slot-scope="{row}">
-                      <span>{{ row.clientName == null ? '-' : row.clientName }}</span>
+                      <span>{{ row.contactName?row.contactName:'-' }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column label="业务来源" align="center" width="130">
+                  <el-table-column label="联系人电话" align="center" width="130">
                     <template slot-scope="{row}">
-                      <span>{{ row.clientSubName }}</span>
+                      <span>{{ row.contactTel?row.contactTel:'-' }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column label="中介" align="center" width="130">
+                  <el-table-column label="委托人" align="center" width="130">
                     <template slot-scope="{row}">
-                      <span>{{ row.agent == null ? '-' : row.agent }}</span>
+                      <span>{{ row.bailorA?row.bailorA:(row.bailorB?row.bailorB:'-')}}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column label="联系人" align="center" width="130">
+                  <el-table-column label="委托人电话" align="center" width="130">
                     <template slot-scope="{row}">
-                      <span>{{ row.contactName }}</span>
+                      <span>{{ row.bailorATel?row.bailorATel:(row.bailorBTel?row.bailorBTel:'-')}}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column label="联系人电话" align="center" width="130">
+                  <el-table-column label="面积" align="center" width="130">
                     <template slot-scope="{row}">
-                      <span>{{ row.contactTel }}</span>
+                      <span>{{ row.acreage? row.acreage : '-' }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column label="委托人" align="center">
+                  <el-table-column label="单价" align="center" width="130">
                     <template slot-scope="{row}">
-                      <span>{{ row.bailorA }}{{ row.bailorB }}</span>
+                      <span>{{ row.price? row.price : '-' }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="总价" align="center" width="130">
+                    <template slot-scope="{row}">
+                      <span>{{ row.amount? row.amount : '-' }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="中介" align="center" width="130">
+                    <template slot-scope="{row}">
+                      <span>{{ row.agent == null ? '-' : row.agent }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="客户经理" align="center">

+ 3 - 0
src/views/finance/invoiceCheck.vue

@@ -475,6 +475,9 @@ export default {
       if (code === 'MAJOR_BUSINESS') {
         return '大中型'
       }
+      if (code === 'PERSONAL_BUSINESS') {
+        return '个贷'
+      }
     },
     openMakeDialog(row){
       this.newInvoiceDialog= true;

+ 6 - 3
src/views/major/list.vue

@@ -10,12 +10,12 @@
       <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;" @sortTable="sortTable" >
         <el-table-column label="项目名称" align="center" width="300">
           <template slot-scope="{row}">
-            <span>{{ row.productionName==null?row.name: row.productionName }}</span>
+            <span class = "enableClick" @click="orderDetail(row)">{{ row.productionName==null?row.name: row.productionName }}</span>
           </template>
         </el-table-column>
         <el-table-column label="订单号" align="center" width="150" >
           <template slot-scope="{row}">
-            <span>{{ row.orderId }}</span>
+            <span class = "enableClick" @click="orderDetail(row)">{{ row.orderId }}</span>
           </template>
         </el-table-column>
         <el-table-column label="价值意见书号" align="center" width="280" prop="statementNo" sortable>
@@ -220,5 +220,8 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
- 
+  .enableClick:hover{
+    color:#1890ff;
+    cursor: pointer;
+ }
 </style>

+ 104 - 33
src/views/major/myOrder.vue

@@ -88,7 +88,7 @@
               <el-button type="text" size="small" @click="openAllotProductionDialog(row)">实收款分配</el-button>
             </div>
             <div>
-              <el-button type="text" size="small" @click="openFinanceInvoiceDialog(row.orderFundId)">申请开票</el-button>
+              <el-button type="text" size="small" @click="openFinanceInvoiceDialog(row.orderFundId,row.realAmount,row.clienteleName,row.clienteleSubName)">申请开票</el-button>
               <el-button type="text" size="small" @click="productionList(row.id)">产品包</el-button>
             </div>
           </template>
@@ -158,7 +158,7 @@
         </el-table>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="newInvoiceDialog" width="75%" center custom-class="doWarehouseClass"
+    <el-dialog :visible.sync="newInvoiceDialog" width="55%" top="10vh" center custom-class="doWarehouseClass"
       @closed="cleanFinanceInvoiceForm">
       <el-form ref="invoice" :model="invoice">
         <el-divider content-position="left">开票信息</el-divider>
@@ -169,7 +169,7 @@
               <el-input v-model.trim="invoice.title" 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="发票类型:" :rules="{ required: true, message: '发票类型不能为空', trigger: 'blur' }" prop="type"
               label-width="140px" class="postInfo-container-item">
               <el-select v-model="invoice.type" style="width:100%">
@@ -178,14 +178,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :lg="6" :span="6">
-            <el-form-item label="待开金额(元):" prop="planAmount"
-              :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:100%" class="filter-item" />
-            </el-form-item>
-          </el-col>
+        
         </el-row>
         <el-row>
           <el-col :xs="24" :sm="12" :lg="12" :span="6">
@@ -194,7 +187,7 @@
               <el-input v-model.trim="invoice.taxNo" 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="planMakeDate"
               :rules="{ required: true, message: '计划开票日期不能为空', trigger: 'blur' }" label-width="140px"
               class="postInfo-container-item">
@@ -203,7 +196,53 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-divider content-position="left">银行信息</el-divider>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="待开金额(元):" prop="planAmount"
+              :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:100%" class="filter-item" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="是否收款:" label-width="140px"
+              class="postInfo-container-item">
+              <el-radio-group :value="invoice.realPayAmount?'已收款':'未收款'">
+                <el-radio label="已收款"></el-radio>
+                <el-radio label="未收款"></el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="开票项目:" prop="makeItem" label-width="140px" class="postInfo-container-item">
+              <el-input v-model.trim="invoice.makeItem" class="filter-item" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="项目数量:" prop="itemQuantity" label-width="140px" class="postInfo-container-item">
+              <el-input v-model.trim="invoice.itemQuantity" class="filter-item" />
+            </el-form-item>
+          </el-col>
+         
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="计量单位:" prop="itemUnit" label-width="140px" class="postInfo-container-item">
+              <el-input v-model.trim="invoice.itemUnit" class="filter-item" placeholder="个/套/箱/次/斤/公斤/..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="24" :span="6">
+            <el-form-item label="备注:" prop="remark" label-width="140px" class="postInfo-container-item">
+              <el-input v-model.trim="invoice.remark" type="textarea" :autosize="{ minRows: 5, maxRows: 8}"  class="filter-item" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-divider content-position="left">银行信息</el-divider>
         <el-row>
           <el-col :xs="24" :sm="12" :lg="12" :span="6">
             <el-form-item label="开户行:" prop="bankName" label-width="140px" class="postInfo-container-item">
@@ -227,26 +266,59 @@
               <el-input v-model.trim="invoice.bankTel" class="filter-item" />
             </el-form-item>
           </el-col>
+        </el-row> -->
+        <!-- <el-divider content-position="left">发票信息</el-divider>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="发票号码:" prop="ticketNo" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.ticketNo" class="filter-item"  readonly disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="实开金额(元):" prop="realAmount" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.realAmount" class="filter-item" readonly disabled/>
+            </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-form-item label="开票项目:" prop="makeItem" label-width="140px" class="postInfo-container-item">
-              <el-input v-model.trim="invoice.makeItem" class="filter-item" />
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="申请日期:" prop="created" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.created" class="filter-item" readonly disabled/>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :lg="6" :span="6">
-            <el-form-item label="项目数量:" prop="itemQuantity" label-width="140px" class="postInfo-container-item">
-              <el-input v-model.trim="invoice.itemQuantity" class="filter-item" />
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="实开日期:" prop="realMakeDate" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.realMakeDate" class="filter-item" readonly disabled/>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :lg="6" :span="6">
-            <el-form-item label="计量单位:" prop="itemUnit" label-width="140px" class="postInfo-container-item">
-              <el-input v-model.trim="invoice.itemUnit" class="filter-item" placeholder="个/套/箱/次/斤/公斤/..." />
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="订单类型:" prop="businessType" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.businessType" class="filter-item" readonly disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="开票人:" prop="applyName" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.applyName" class="filter-item" readonly disabled/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="订单编号:" prop="orderId" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.orderId" class="filter-item" readonly disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="产品号:" prop="productionNo" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.productionNo" class="filter-item" readonly disabled/>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+       
+        <!-- <el-row>
           <el-col :xs="24" :sm="12" :lg="6" :span="6">
             <el-form-item label="税点:" prop="taxRate" label-width="140px" class="postInfo-container-item">
               <el-input-number :precision="2" :min="0" :value-on-clear="0" v-model.number="invoice.taxRate" type="number"
@@ -259,14 +331,8 @@
                 type="number" style="width:206px" class="filter-item" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :xs="24" :sm="12" :lg="18" :span="6">
-            <el-form-item label="备注:" prop="remark" label-width="140px" class="postInfo-container-item">
-              <el-input v-model.trim="invoice.remark" type="textarea" class="filter-item" />
-            </el-form-item>
-          </el-col>
-        </el-row>
+        </el-row> -->
+       
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="newInvoiceDialog = false">取 消</el-button>
@@ -615,7 +681,10 @@ export default {
         itemUnit: null,
         taxRate: null,
         taxAmount: null,
-        remark: null
+        remark: null,
+        realPayAmount:null,
+        realAmount:null,
+        realMakeDate:null
       },
       outWarehouse: {
         id: null,
@@ -805,7 +874,7 @@ export default {
         }
       })
     },
-    openFinanceInvoiceDialog(orderFundId) {
+    openFinanceInvoiceDialog(orderFundId,realAmount,clientName,clientSubName) {
       if (!orderFundId) {
         this.$notify({
           title: '提示',
@@ -818,6 +887,8 @@ export default {
       this.makeInvoiceListDialog = true;
       if (orderFundId) {
         this.invoice.orderFundId = orderFundId;
+        this.invoice.realPayAmount = realAmount;
+        this.invoice.title = clientName+clientSubName;
         this.getFinanceInvoiceList();
       }
     },

+ 6 - 3
src/views/major/todoList.vue

@@ -36,12 +36,12 @@
       <parentTable  :data="pageData.records" slot="table" style="width: 100%;" @sortTable="sortTable">
         <el-table-column label="项目名称" align="center" width="300" >
           <template slot-scope="{row}">
-            <span>{{ row.productionName==null?row.orderName: row.productionName }}</span>
+            <span class="enableClick" @click="toDetail(row)">{{ row.productionName==null?row.orderName: row.productionName }}</span>
           </template>
         </el-table-column>
         <el-table-column label="订单号" align="center" width="150">
           <template slot-scope="{row}">
-            <span>{{ row.orderId }}</span>
+            <span class="enableClick" @click="toDetail(row)">{{ row.orderId }}</span>
           </template>
         </el-table-column>
         <el-table-column label="价值意见书号" align="center" width="280" prop="statementNo" sortable>
@@ -327,5 +327,8 @@ export default {
 
 </script>
 <style lang="scss" scoped>
-
+ .enableClick:hover{
+    color:#1890ff;
+    cursor: pointer;
+ }
 </style>

+ 517 - 3
src/views/personal/myOrder.vue

@@ -83,9 +83,11 @@
             {{ row.created }}
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="130" align="center">
+        <el-table-column fixed="right" label="操作" width="200" align="center">
           <template slot-scope="{row}">
             <el-button type="text" size="small" @click="orderDetail(row)">详情</el-button>
+            <el-button type="text" size="small" @click="openShouldAmountDialog(row)">应收款</el-button>
+            <el-button type="text" size="small" @click="openFinanceInvoiceDialog(row.orderFundId,row.realAmount,row.clientName,row.clientSubName)">申请开票</el-button>
             <el-button type="text" size="small" @click="productionList(row.id)">产品包</el-button>
           </template>
         </el-table-column>
@@ -322,6 +324,250 @@
         <el-button type="primary" @click="doApplyOut()">确 定</el-button>
       </span>
     </el-dialog>
+    <el-dialog :visible.sync="shouldAmountDialog" width="35%" center top="35vh" custom-class="doWarehouseClass"
+      @closed="cleanData">
+      <el-form ref="fund" :model="fund" style="margin-left:40px">
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="24" :span="12">
+            <el-form-item label="应收款金额(元):" prop="shouldAmount" label-width="160px" class="postInfo-container-item"
+              :rules="{ required: true, message: '应收款金额不能为空', trigger: 'blur' }">
+              <el-input-number :precision="2" :min="null" :value-on-clear="0" v-model.number="fund.shouldAmount"
+                type="number" style="width:300px" class="filter-item" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="24" :span="12">
+            <el-form-item label="备注:" prop="remark" label-width="160px" class="postInfo-container-item">
+              <el-input style="width:300px" type="textarea" v-model="fund.remark"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="shouldAmountDialog = false">取 消</el-button>
+        <el-button type="primary" @click="saveShouldAmount()">确 定</el-button>
+      </span>
+    </el-dialog>
+    <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 :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">
+          </el-table-column>
+          <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>
+          <el-table-column align="center" prop="planMakeDate" label="计划开票日期">
+          </el-table-column>
+          <el-table-column align="center" prop="realAmount" label="实际开票金额">
+          </el-table-column>
+          <el-table-column align="center" prop="realMakeDate" label="实际开票日期">
+          </el-table-column>
+          <el-table-column align="center" prop="reason" label="驳回/作废原因">
+          </el-table-column>
+          <el-table-column align="center" prop="remark" label="备注">
+          </el-table-column>
+          <el-table-column fixed="right" label="操作" width="200" align="center">
+            <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>
+      </div>
+    </el-dialog>
+    <el-dialog :visible.sync="newInvoiceDialog" width="55%" top="10vh" center custom-class="doWarehouseClass"
+      @closed="cleanFinanceInvoiceForm">
+      <el-form ref="invoice" :model="invoice">
+        <el-divider content-position="left">开票信息</el-divider>
+        <el-row>
+          <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" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :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:100%">
+                <el-option label="普票" value="普票"></el-option>
+                <el-option label="专票" value="专票"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        
+        </el-row>
+        <el-row>
+          <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" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <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:100%">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="待开金额(元):" prop="planAmount"
+              :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:100%" class="filter-item" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="是否收款:" label-width="140px"
+              class="postInfo-container-item">
+              <el-radio-group :value="invoice.realPayAmount?'已收款':'未收款'">
+                <el-radio label="已收款"></el-radio>
+                <el-radio label="未收款"></el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="开票项目:" prop="makeItem" label-width="140px" class="postInfo-container-item">
+              <el-input v-model.trim="invoice.makeItem" class="filter-item" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="项目数量:" prop="itemQuantity" label-width="140px" class="postInfo-container-item">
+              <el-input v-model.trim="invoice.itemQuantity" class="filter-item" />
+            </el-form-item>
+          </el-col>
+         
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="计量单位:" prop="itemUnit" label-width="140px" class="postInfo-container-item">
+              <el-input v-model.trim="invoice.itemUnit" class="filter-item" placeholder="个/套/箱/次/斤/公斤/..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="24" :span="6">
+            <el-form-item label="备注:" prop="remark" label-width="140px" class="postInfo-container-item">
+              <el-input v-model.trim="invoice.remark" type="textarea" :autosize="{ minRows: 5, maxRows: 8}"  class="filter-item" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-divider content-position="left">银行信息</el-divider>
+        <el-row>
+          <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>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6" :span="6">
+            <el-form-item label="银行账号:" prop="bankAccount" label-width="140px" class="postInfo-container-item">
+              <el-input v-model.trim="invoice.bankAccount" class="filter-item" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <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>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6" :span="6">
+            <el-form-item label="电话:" prop="bankTel" label-width="140px" class="postInfo-container-item">
+              <el-input v-model.trim="invoice.bankTel" class="filter-item" />
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <!-- <el-divider content-position="left">发票信息</el-divider>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="发票号码:" prop="ticketNo" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.ticketNo" class="filter-item"  readonly disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="实开金额(元):" prop="realAmount" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.realAmount" class="filter-item" readonly disabled/>
+            </el-form-item>
+          </el-col>
+         
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="申请日期:" prop="created" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.created" class="filter-item" readonly disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="实开日期:" prop="realMakeDate" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.realMakeDate" class="filter-item" readonly disabled/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="订单类型:" prop="businessType" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.businessType" class="filter-item" readonly disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="开票人:" prop="applyName" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.applyName" class="filter-item" readonly disabled/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="订单编号:" prop="orderId" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.orderId" class="filter-item" readonly disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="产品号:" prop="productionNo" label-width="140px" class="postInfo-container-item">
+              <el-input :value="invoice.productionNo" class="filter-item" readonly disabled/>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+       
+        <!-- <el-row>
+          <el-col :xs="24" :sm="12" :lg="6" :span="6">
+            <el-form-item label="税点:" prop="taxRate" label-width="140px" 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" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6" :span="6">
+            <el-form-item label="税额:" prop="taxAmount" label-width="140px" 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" />
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+       
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="newInvoiceDialog = false">取 消</el-button>
+        <el-button type="primary" @click="saveInvoice()">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -372,7 +618,47 @@ export default {
         remark:null,
         realAmount:null
       },
-      outApllyList:[]
+      fund: {
+        id: null,
+        businessType: null,
+        orderName: null,
+        orderId: null,
+        shouldAmount: null,
+        remark: null,
+        businessType: null,
+        businessId: null,
+        businessSubId: null,
+        productionFundId: null,
+        evaluateAmount: null
+      },
+      outApllyList:[],
+      shouldAmountDialog:false,
+      makeInvoiceListDialog:false,
+      invoice: {
+        id: null,
+        orderFundId: null,
+        productionFundId: null,
+        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,
+        realPayAmount:null,
+        realAmount:null,
+        realMakeDate:null
+      },
+      newInvoiceDialog:false,
+      invoiceData: [],
     }
   },
   created() {
@@ -481,7 +767,6 @@ export default {
           let taskRecordDTO = new Object();
           taskRecordDTO.recordId = this.taskId;
           taskRecordDTO.taskData = this.outWarehouse;
-          console.log(this.outWarehouse);
           this.$api.productionOutWarehouse.add(taskRecordDTO).then(res=>{
             if (res.code === 200 && res.data){
               this.$notify({
@@ -554,6 +839,235 @@ export default {
       this.outWarehouse.businessType = 'PERSONAL_BUSINESS';
       this.outWarehouse.businessId = businessId;
       this.outWarehouseDialog = true;
+    },
+    openFinanceInvoiceDialog(orderFundId,realAmount,clientName,clientSubName) {
+      if (!orderFundId) {
+        this.$notify({
+          title: '提示',
+          message: '请先完善应收款,再操作。',
+          type: 'info',
+          duration: 2000
+        });
+        return;
+      }
+      this.makeInvoiceListDialog = true;
+      if (orderFundId) {
+        this.invoice.orderFundId = orderFundId;
+        this.invoice.realPayAmount = realAmount;
+        this.invoice.title = clientName+clientSubName;
+        this.getFinanceInvoiceList();
+      }
+    },
+    openShouldAmountDialog(row) {
+      this.shouldAmountDialog = true;
+      this.fund.id = row.orderFundId;
+      this.fund.businessType = 'PERSONAL_BUSINESS';
+      this.fund.businessId = row.id;
+      this.fund.shouldAmount = row.shouldAmount;
+      this.fund.remark = row.remark;
+      this.fund.orderId = row.orderId;
+      this.fund.orderName = row.orderName;
+    },
+    cleanData() {
+      this.fund.shouldAmount = null;
+      this.fund.id = null;
+      this.fund.businessType = null;
+      this.fund.remark = null;
+      this.fund.businessType = null;
+      this.fund.businessId = null;
+      this.fund.businessSubId = null;
+      this.fund.productionFundId = null;
+      this.fund.remark = null;
+      this.fund.evaluateAmount = null
+    },
+    saveShouldAmount() {
+      this.$refs.fund.validate(valid => {
+        if (valid) {
+          if (this.fund.id) {
+            this.$api.orderFund.edit(this.fund).then(res => {
+              if (res.code === 200 && res.data) {
+                this.$notify({
+                  title: '成功',
+                  message: '订单应收款已完善',
+                  type: 'success',
+                  duration: 1000
+                });
+                this.getPage();
+                this.shouldAmountDialog = false;
+              } else {
+                this.$notify({
+                  title: '失败',
+                  message: '订单应收款保存错误',
+                  type: 'error',
+                  duration: 1000
+                });
+              }
+            })
+          } else {
+            this.$api.orderFund.add(this.fund).then(res => {
+              if (res.code === 200 && res.data) {
+                this.$notify({
+                  title: '成功',
+                  message: '订单应收款已完善',
+                  type: 'success',
+                  duration: 1000
+                });
+                this.getPage();
+                this.shouldAmountDialog = false;
+              } else {
+                this.$notify({
+                  title: '失败',
+                  message: '订单应收款保存错误',
+                  type: 'error',
+                  duration: 1000
+                });
+              }
+            })
+          }
+        }
+      })
+    },
+    openNewInvoiceDialog() {
+      if (!this.invoice.orderFundId) {
+        this.$notify({
+          title: '提示',
+          message: '申请开票前,请先完善应收款金额。',
+          type: 'info',
+          duration: 2000
+        });
+        return;
+      } else {
+        this.newInvoiceDialog = true;
+
+      }
+    },
+    getFinanceInvoiceList() {
+      this.$api.financeInvoice.getList(this.invoice.orderFundId,this.invoice.productionFundId).then(res => {
+        if (res.code === 200) {
+          this.invoiceData = res.data
+        }
+      })
+    },
+    cleanFinanceInvoiceForm() {
+      // this.$refs.invoice.resetFields();
+      this.invoice = {
+        id: null,
+        orderFundId: this.invoice.orderFundId,
+        productionFundId: this.invoice.productionFundId,
+        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
+      }
+    },
+    saveInvoice() {
+      this.$refs.invoice.validate(valid => {
+        if (valid) {
+          if (this.invoice.id) {
+            this.$api.financeInvoice.edit(this.invoice).then(res => {
+              if (res.code === 200 && res.data) {
+                this.$notify({
+                  title: '成功',
+                  message: '开票申请修改成功',
+                  type: 'success',
+                  duration: 2000
+                });
+                this.getFinanceInvoiceList();
+                this.newInvoiceDialog = false;
+              } else {
+                this.$notify({
+                  title: '失败',
+                  message: '开票申请修改失败',
+                  type: 'error',
+                  duration: 2000
+                });
+              }
+            })
+          } else {
+            this.$api.financeInvoice.add(this.invoice).then(res => {
+              if (res.code === 200 && res.data) {
+                this.$notify({
+                  title: '成功',
+                  message: '开票申请提交成功',
+                  type: 'success',
+                  duration: 2000
+                });
+                this.getFinanceInvoiceList();
+                this.newInvoiceDialog = false;
+              } else {
+                this.$notify({
+                  title: '失败',
+                  message: '开票申请提交失败',
+                  type: 'error',
+                  duration: 2000
+                });
+              }
+            })
+          }
+        }
+      })
+    },
+    stateStyle(state){
+        if (state==='已开票'){
+          return 'color:green'
+        }else{
+          return 'color:red'
+        }
+    },
+    invoiceDetail(id) {
+      this.$api.financeInvoice.detail(id).then(res => {
+        if (res.code === 200) {
+          this.invoice = res.data;
+        }
+      })
+      this.newInvoiceDialog = true;
+    },
+    cancellation(id) {
+      this.$confirm('请确认是否作废此开票?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+        center: true
+      }).then(() => {
+        this.$api.financeInvoice.cancellation(id).then(res => {
+          if (res.code === 200 && res.data) {
+            this.$notify({
+              title: '成功',
+              message: '开票已作废',
+              type: 'success',
+              duration: 2000
+            });
+            this.getFinanceInvoiceList();
+          } else {
+            this.$notify({
+              title: '失败',
+              message: '开票作废失败',
+              type: 'error',
+              duration: 2000
+            });
+          }
+        })
+      })
+    },
+    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;
     }
   },
   

+ 25 - 18
src/views/personal/pendingList.vue

@@ -7,8 +7,7 @@
       <template slot="left">
         <MoreSearchBar business="PERSONAL_BUSINESS" :nodes="personalNodes"  @fliterSearch="fliterSearch" @resetParams="resetParams" :listQuery="listQuery">
           <template v-slot:otherButton>
-            <el-button class="filter-item" round @click="showAllLabel()">显示全部字段
-            </el-button>
+            <el-button class="filter-item" round @click="showAllLabel()">显示全部列</el-button>
           </template>
         </MoreSearchBar>
       </template>
@@ -23,7 +22,7 @@
             <span class="enableClick" @click="orderDetail(row)">{{ row.location }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="当前节点" align="center" width="130" v-if="!hiddenLabels.includes('currentNodeName')" prop="currentNodeName">
+        <el-table-column label="当前节点" align="center" width="130"  v-if="!hiddenLabels.includes('currentNodeName')" prop="currentNodeName">
           <template slot-scope="{row}">
             <span>{{ row.currentNodeName }}</span>
           </template>
@@ -33,54 +32,59 @@
             <span>{{ row.handlerName }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="最新备注" align="center" width="150" v-if="!hiddenLabels.includes('comments')" prop="comments">
+          <template slot-scope="{row}">
+            <span>{{ row.comments?row.comments:'-' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="面积" align="center" width="130" v-if="!hiddenLabels.includes('acreage')" prop="acreage">
           <template slot-scope="{row}">
-            <span>{{ row.acreage?row.acreage:'--' }}</span>
+            <span>{{ row.acreage? row.acreage: '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="单价" align="center" width="130" v-if="!hiddenLabels.includes('price')" prop="price">
           <template slot-scope="{row}">
-            <span>{{ row.price?row.price:'--' }}</span>
+            <span>{{ row.price? row.price: '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="总价" align="center" width="130" v-if="!hiddenLabels.includes('amount')" prop="amount">
           <template slot-scope="{row}">
-            <span>{{ row.amount?row.amount:'--' }}</span>
+            <span>{{ row.amount? row.amount: '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="客户名称" align="center" width="130" v-if="!hiddenLabels.includes('clientName')" prop="clientName">
           <template slot-scope="{row}">
-            <span>{{ row.clientName==null?'--': row.clientName }}</span>
+            <span>{{ row.clientName?row.clientName:'-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="业务来源" align="center" width="130" v-if="!hiddenLabels.includes('clientSubName')" prop="clientSubName">
           <template slot-scope="{row}">
-            <span>{{ row.clientSubName }}</span>
+            <span>{{ row.clientSubName?row.clientSubName:'-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="中介" align="center" width="130" v-if="!hiddenLabels.includes('agent')" prop="agent">
           <template slot-scope="{row}">
-            <span>{{ row.agent==null?'--': row.agent }}</span>
+            <span>{{ row.agent?ow.agent:'-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="联系人" align="center" width="130" v-if="!hiddenLabels.includes('contactName')" prop="contactName">
           <template slot-scope="{row}">
-            <span>{{ row.contactName}}</span>
+            <span>{{ row.contactName?row.contactName:'-'}}</span>
           </template>
         </el-table-column>
         <el-table-column label="联系人电话" align="center" width="130" v-if="!hiddenLabels.includes('contactTel')" prop="contactTel">
           <template slot-scope="{row}">
-            <span>{{ row.contactTel }}</span>
+            <span>{{ row.contactTel?row.contactTel:'-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="委托人" align="center" v-if="!hiddenLabels.includes('bailorA')" prop="bailorA">
           <template slot-scope="{row}">
-            <span>{{ row.bailorA}}{{ row.bailorB}}</span>
+            <span>{{ row.bailorA?row.bailorA:(row.bailorB?row.bailorB:'-')}}</span>
           </template>
         </el-table-column>
         <el-table-column label="委托人电话" align="center" width="130" v-if="!hiddenLabels.includes('bailoraTel')" prop="bailoraTel">
           <template slot-scope="{row}">
-            <span>{{ row.bailoraTel===null?row.bailorbTel:row.bailoraTel }}</span>
+            <span>{{ row.bailorATel?row.bailorATel:(row.bailorBTel?row.bailorBTel:'-')}}</span>
           </template>
         </el-table-column>
         <el-table-column label="客户经理" align="center" v-if="!hiddenLabels.includes('clientManager')" prop="clientManager">
@@ -90,17 +94,17 @@
         </el-table-column>
         <el-table-column label="实勘人" align="center" width="130" v-if="!hiddenLabels.includes('outwardStaffName')" prop="outwardStaffName">
           <template slot-scope="{row}">
-            <span>{{ row.outwardStaffName?row.outwardStaffName:'--' }}</span>
+            <span>{{ row.outwardStaffName? row.outwardStaffName: '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="内业人员" align="center" width="130" v-if="!hiddenLabels.includes('inwardStaffName')" prop="inwardStaffName">
           <template slot-scope="{row}">
-            <span>{{ row.inwardStaffName }}</span>
+            <span>{{ row.inwardStaffName?row.inwardStaffName:'-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="定价人员" align="center" width="130" v-if="!hiddenLabels.includes('pricingStaffName')" prop="pricingStaffName">
           <template slot-scope="{row}">
-            <span>{{ row.pricingStaffName?row.pricingStaffName:'--' }}</span>
+            <span>{{ row.pricingStaffName?row.pricingStaffName:'-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="下单时间" align="center" width="110" v-if="!hiddenLabels.includes('created')" prop="created">
@@ -108,6 +112,11 @@
             {{ row.created }}
           </template>
         </el-table-column>
+        <el-table-column label="节点生成时间" align="center" width="110" v-if="!hiddenLabels.includes('nodeTime')" prop="nodeTime" >
+          <template slot-scope="{row}">
+            {{ row.nodeTime }}
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" width="80" fixed="right">
           <template slot-scope="{row}">
             <el-button type="text" @click="orderDetail(row)">详情</el-button>
@@ -148,7 +157,6 @@ export default {
         endDate:null
       },
       personalNodes:[],
-      currentNodeName:false,
       hiddenLabels:[]
     }
   },
@@ -224,7 +232,6 @@ export default {
 <style lang="scss" scoped>
  .enableClick:hover{
     color:#1890ff;
-    font-weight: bold;
     cursor: pointer;
  }
 </style>

+ 1 - 1
src/views/personal/todoDetail.vue

@@ -387,7 +387,7 @@
             </el-col>
             <el-col :xs="12" :sm="12" :lg="6" :span="6">
               <el-form-item label="打印二维码:" prop="validateCode" label-width="140px" class="postInfo-container-item">
-                <a @mouseenter="showQrCode('http://47.108.172.52:81/test/code/2024/08/05/川友土预2024080001号.png')">出入库二维码</a> <a @mouseenter="showQrCode('http://47.108.172.52:81/test/code/2024/08/05/川友土预2024080001号_validate.png')" style="margin-left: 5px">验证二维码</a>
+                <a @mouseenter="showQrCode(target.qrCode)">出入库二维码</a> <a @mouseenter="showQrCode(target.validateCode)" style="margin-left: 5px">验证二维码</a>
                 <div class="qr-code-div">
                   <img id="validateCode" class="qr-code" :src="qrCodeUrl" alt="未定价" @click="printQR()"/>
                 </div>

+ 52 - 35
src/views/personal/todoList.vue

@@ -8,108 +8,114 @@
         <MoreSearchBar business="PERSONAL_BUSINESS" :nodes="personalNodes" :handlerName="false" @fliterSearch="fliterSearch" 
         @resetParams="resetParams" :listQuery="listQuery">
           <template v-slot:otherButton>
-            <PermissionButton menu-code="_views_personal_batch_allot" class-name="filter-item" type="danger" icon="el-icon-paperclip"
-             :page-jump="false" round  @click="openBatchAllotDialog()"/>
+              <el-button class="filter-item" round @click="showAllLabel()">显示全部列</el-button>
+              <PermissionButton menu-code="_views_personal_batch_allot" class-name="filter-item" type="danger" icon="el-icon-paperclip"
+              :page-jump="false" round  @click="openBatchAllotDialog()"/>
           </template>
         </MoreSearchBar>
       </template>
-      <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;">
-        <el-table-column label="项目编号" align="center" width="150" >
+      <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;" @headerClick="switchHeader">
+        <el-table-column label="项目编号" align="center" width="150" v-if="!hiddenLabels.includes('orderId')" prop="orderId" >
           <template slot-scope="{row}">
             <span class="enableClick" @click="orderDetail(row)">{{ row.orderId }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="坐落" align="center" width="300" >
+        <el-table-column label="坐落" align="center" width="300" v-if="!hiddenLabels.includes('location')" prop="location">
           <template slot-scope="{row}">
             <span class="enableClick" @click="orderDetail(row)">{{ row.location }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="当前节点" align="center" width="130">
+        <el-table-column label="当前节点" align="center" width="130"  v-if="!hiddenLabels.includes('currentNodeName')" prop="currentNodeName">
           <template slot-scope="{row}">
             <span>{{ row.nodeName }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="处理人" align="center" width="130">
+        <el-table-column label="处理人" align="center" width="130" v-if="!hiddenLabels.includes('handlerName')" prop="handlerName">
           <template slot-scope="{row}">
             <span>{{ row.handlerName }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="面积" align="center" width="130">
+        <el-table-column label="最新备注" align="center" width="150" v-if="!hiddenLabels.includes('comments')" prop="comments">
+          <template slot-scope="{row}">
+            <span>{{ row.comments?row.comments:'-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="面积" align="center" width="130" v-if="!hiddenLabels.includes('acreage')" prop="acreage">
           <template slot-scope="{row}">
             <span>{{ row.acreage? row.acreage: '-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="单价" align="center" width="130">
+        <el-table-column label="单价" align="center" width="130" v-if="!hiddenLabels.includes('price')" prop="price">
           <template slot-scope="{row}">
             <span>{{ row.price? row.price: '-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="总价" align="center" width="130">
+        <el-table-column label="总价" align="center" width="130" v-if="!hiddenLabels.includes('amount')" prop="amount">
           <template slot-scope="{row}">
             <span>{{ row.amount? row.amount: '-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="客户名称" align="center" width="130">
+        <el-table-column label="客户名称" align="center" width="130" v-if="!hiddenLabels.includes('clientName')" prop="clientName">
           <template slot-scope="{row}">
-            <span>{{ row.clientName==null?'-': row.clientName }}</span>
+            <span>{{ row.clientName?row.clientName:'-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="业务来源" align="center" width="130">
+        <el-table-column label="业务来源" align="center" width="130" v-if="!hiddenLabels.includes('clientSubName')" prop="clientSubName">
           <template slot-scope="{row}">
-            <span>{{ row.clientSubName }}</span>
+            <span>{{ row.clientSubName?row.clientSubName:'-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="中介" align="center" width="130">
+        <el-table-column label="中介" align="center" width="130" v-if="!hiddenLabels.includes('agent')" prop="agent">
           <template slot-scope="{row}">
-            <span>{{ row.agent==null?'-': row.agent }}</span>
+            <span>{{ row.agent?row.agent:'-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="联系人" align="center" width="130">
+        <el-table-column label="联系人" align="center" width="130" v-if="!hiddenLabels.includes('contactName')" prop="contactName">
           <template slot-scope="{row}">
-            <span>{{ row.contactName}}</span>
+            <span>{{ row.contactName?row.contactName:'-'}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="联系人电话" align="center" width="130">
+        <el-table-column label="联系人电话" align="center" width="130" v-if="!hiddenLabels.includes('contactTel')" prop="contactTel">
           <template slot-scope="{row}">
-            <span>{{ row.contactTel }}</span>
+            <span>{{ row.contactTel?row.contactTel:'-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="委托人" align="center">
+        <el-table-column label="委托人" align="center" v-if="!hiddenLabels.includes('bailorA')" prop="bailorA">
           <template slot-scope="{row}">
-            <span>{{ row.bailorA}}{{ row.bailorB}}</span>
+            <span>{{ row.bailorA ==null?(row.bailorB?row.bailorB:'-'):row.bailorA}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="委托人电话" align="center" width="130">
+        <el-table-column label="委托人电话" align="center" width="130" v-if="!hiddenLabels.includes('bailoraTel')" prop="bailoraTel">
           <template slot-scope="{row}">
-            <span>{{ row.bailorATel===null?row.bailorBTel:row.bailorATel }}</span>
+            <span>{{ row.bailorATel==null?(row.bailorBTel?row.bailorBTel:'-'):row.bailorATel }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="客户经理" align="center">
+        <el-table-column label="客户经理" align="center" v-if="!hiddenLabels.includes('clientManager')" prop="clientManager">
           <template slot-scope="{row}">
             <span>{{ row.clientManager }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="实勘人" align="center" width="130">
+        <el-table-column label="实勘人" align="center" width="130" v-if="!hiddenLabels.includes('outwardStaffName')" prop="outwardStaffName">
           <template slot-scope="{row}">
             <span>{{ row.outwardStaffName? row.outwardStaffName: '-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="内业人员" align="center" width="130">
+        <el-table-column label="内业人员" align="center" width="130" v-if="!hiddenLabels.includes('inwardStaffName')" prop="inwardStaffName">
           <template slot-scope="{row}">
-            <span>{{ row.inwardStaffName }}</span>
+            <span>{{ row.inwardStaffName?row.inwardStaffName:'-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="定价人员" align="center" width="130">
+        <el-table-column label="定价人员" align="center" width="130" v-if="!hiddenLabels.includes('pricingStaffName')" prop="pricingStaffName">
           <template slot-scope="{row}">
-            <span>{{ row.pricingStaffName }}</span>
+            <span>{{ row.pricingStaffName?row.pricingStaffName:'-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="下单时间" align="center" width="110" >
+        <el-table-column label="下单时间" align="center" width="110" v-if="!hiddenLabels.includes('created')" prop="created">
           <template slot-scope="{row}">
             {{ row.created }}
           </template>
         </el-table-column>
-        <el-table-column label="节点生成时间" align="center" width="110"  >
+        <el-table-column label="节点生成时间" align="center" width="110" v-if="!hiddenLabels.includes('nodeCreated')" prop="nodeCreated" >
           <template slot-scope="{row}">
             {{ row.nodeCreated }}
           </template>
@@ -202,7 +208,7 @@ import Breadcrumb from '@/components/Breadcrumb'
 import PermissionButton from '@/components/PermissionButton/PermissionButton'
 import MoreSearchBar from '@/components/MoreSearchBar'
 import TransferDialog from '@/components/TaskTransferDialog'
-import { getCookie } from '@/utils/auth'
+import { getCookie,setCookie,removeCookie } from '@/utils/auth'
 
 export default {
   name: 'personalTodoList',
@@ -241,7 +247,8 @@ export default {
       allotOrderData: { records: [] },
       outwardUsers:[],
       batchOrders:[],
-      orderKeyword:null
+      orderKeyword:null,
+      hiddenLabels:[]
     }
 
   },
@@ -257,6 +264,9 @@ export default {
     }
   },
   created() {
+    if (getCookie("personalTodoList-hiddenLabels")!=undefined){
+      this.hiddenLabels = JSON.parse(getCookie("personalTodoList-hiddenLabels"))
+    }
     this.getPage();
     this.getNodeEnum();
   },
@@ -390,6 +400,14 @@ export default {
         this.$message.error('取消分单');
       });
       
+    },
+    switchHeader(data){
+      this.hiddenLabels.push(data);
+      setCookie("personalTodoList-hiddenLabels",this.hiddenLabels);
+    },
+    showAllLabel(){
+      removeCookie("personalTodoList-hiddenLabels");
+      location.reload();
     }
   },
   
@@ -407,7 +425,6 @@ export default {
 
 .enableClick:hover{
     color:#1890ff;
-    font-weight: bold;
     cursor: pointer;
  }
 </style>