1.入库统计新增日期筛选，新增导出功能

2.测试资产流程并修复测试出来的相关bug
3.新增产品应收款填写与查询
4.优化部分页面操作

src/views/assets/addAssetsOrder.vue

@@ -774,7 +774,9 @@ export default {
         this.couldEdit = this.$route.query.couldEdit === 'true';
         this.couldBack = this.$route.query.couldBack === 'true';
         this.pageParams.back = this.$route.query.back;
-        this.pageParams.row = JSON.parse(this.$route.query.row);
+        if (this.$route.query.row != null || this.$route.query.row != undefined) {
+            this.pageParams.row = JSON.parse(this.$route.query.row);
+        }
         this.getAllotDepartment();
         this.getCustomerCompany(0);
         this.getCustomerCompany(1);

src/views/assets/myOrderList.vue

@@ -111,6 +111,11 @@
                         <span>{{ row.realAmount }}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="产品应收款(元)" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.productionShouldAmount }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="标准收费(元)" align="center" width="150">
                     <template slot-scope="{row}">
                         <span>{{ row.standardAmount }}</span>
@@ -126,11 +131,13 @@
                         <span>{{ row.invoiceRealAmount }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" align="center" width="200" fixed="right">
+                <el-table-column label="操作" align="center" width="280" fixed="right">
                     <template slot-scope="{row}">
                         <el-button type="success" size="mini" @click="orderDetail(row)">查看</el-button>
-                        <el-button type="primary" size="mini" @click="openShouldAmountDialog(row)">填写应收款</el-button>
-                        <el-button v-if="row.currentNodeCode === 'REPORT_OUT_APPLY'" type="text"
+                        <el-button type="primary" size="mini" @click="openShouldAmountDialog(row)">订单应收款</el-button>
+                        <el-button v-if="row.reportNo !== null" type="success" size="mini"
+                            @click="openProShouldAmountDialog(row)">产品应收款</el-button>
+                        <el-button v-if="row.currentNodeCode === 'REPORT_OUT_APPLY'" type="danger" size="mini"
                             @click="openRepertoryOutWarehouse(row)">
                             申请提前出库
                         </el-button>
@@ -168,6 +175,33 @@
                 <el-button type="primary" @click="saveShouldAmount()">确 定</el-button>
             </span>
         </el-dialog>
+        <el-dialog :visible.sync="proShouldAmountDialog" width="35%" center top="35vh" custom-class="doWarehouseClass"
+            @closed="cleanData">
+            <el-form ref="productionFundFrom" :model="productionFundFrom" style="margin-left:40px">
+                <el-row>
+                    <el-col :xs="24" :sm="12" :lg="24" :span="12">
+                        <el-form-item label="产品应收款金额(元)：" prop="productionShouldAmount" 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="productionFundFrom.productionShouldAmount" 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="productionFundFrom.remark"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="proShouldAmountDialog = false">取 消</el-button>
+                <el-button type="primary" @click="saveProShouldAmount()">确 定</el-button>
+            </span>
+        </el-dialog>
         <el-dialog :visible.sync="repertoryOutWarehouseVisible">
             <el-form ref="outWarehouse" :model="outWarehouse" style="margin-left:40px; margin-right: 200px;">
                 <el-row>
@@ -232,6 +266,7 @@ export default {
                 },
             ],
             shouldAmountDialog: false,
+            proShouldAmountDialog: false,
             fund: {
                 id: null,
                 businessType: null,
@@ -258,7 +293,18 @@ export default {
             businessSubId: null,
             businessMinId: null,
             recordId: null,
-            currentNodeId: null
+            currentNodeId: null,
+            // 产品收款信息
+            productionFundFrom: {
+                id: null,
+                businessType: null,
+                businessId: null,
+                productionNo: null,
+                productionType: null,
+                orderFundId: null,
+                productionShouldAmount: null,
+                remark: null
+            }
         }
     },
     created() {
@@ -305,7 +351,7 @@ export default {
                 path: "/assets/orderDetail",
                 query: {
                     row: JSON.stringify(row),
-                    back: '/assets/allList',
+                    back: '/assets/myOrderList',
                     couldEdit: false,
                     couldBack: false,
                     disabledStatus: true
@@ -323,6 +369,37 @@ export default {
             this.fund.orderId = row.orderId;
             this.fund.orderName = row.name;
         },
+        openProShouldAmountDialog(row) {
+            if (row.orderFundId !== null) {
+                this.proShouldAmountDialog = true;
+                this.productionFundFrom.id = row.productionFundId;
+                this.productionFundFrom.businessType = 'ASSET_BUSINESS';
+                this.productionFundFrom.businessId = row.assetsId;
+                this.productionFundFrom.orderFundId = row.orderFundId;
+                this.productionFundFrom.productionNo = row.reportNo;
+                this.productionFundFrom.productionShouldAmount = row.productionShouldAmount;
+                if (row.reportNo.includes('川友评报字')) {
+                    this.productionFundFrom.productionType = 'REPORT'
+                } else if (row.reportNo.includes('川友咨报字')) {
+                    this.productionFundFrom.productionType = 'CONSULT'
+                } else if (row.reportNo.includes('川友字')) {
+                    this.productionFundFrom.productionType = 'LETTER'
+                } else {
+                    this.productionFundFrom.productionType = 'STATEMENT'
+                }
+                this.productionFundFrom.productionType = row.productionType;
+                this.productionFundFrom.productionShouldAmount = row.productionShouldAmount;
+                this.productionFundFrom.remark = row.remark;
+            } else {
+                this.$notify({
+                    title: '警告',
+                    message: '需要先填写订单应收款',
+                    type: 'error',
+                    duration: 3000
+                });
+            }
+
+        },
         saveShouldAmount() {
             this.$refs.fund.validate(valid => {
                 if (valid) {
@@ -331,7 +408,7 @@ export default {
                             if (res.code === 200 && res.data) {
                                 this.$notify({
                                     title: '成功',
-                                    message: '订单应收款已修改',
+                                    message: '订单应收款保存成功',
                                     type: 'success',
                                     duration: 1000
                                 });
@@ -351,7 +428,7 @@ export default {
                             if (res.code === 200 && res.data) {
                                 this.$notify({
                                     title: '成功',
-                                    message: '订单应收款已新增',
+                                    message: '订单应收款保存成功',
                                     type: 'success',
                                     duration: 1000
                                 });
@@ -436,16 +513,16 @@ export default {
             }).then(() => {
                 this.$api.productionOutWarehouse.detail(row.warehouseId).then(res => {
                     if (res.departmentCheckState !== '审核中') {
-                    this.$notify({
-                        title: '警告',
-                        message: '出库申请'+ res.departmentCheckState +'，无法撤销。',
-                        type: 'error',
-                        duration: 2000
-                    });
-                    return;
-                }
+                        this.$notify({
+                            title: '警告',
+                            message: '出库申请' + res.departmentCheckState + '，无法撤销。',
+                            type: 'error',
+                            duration: 2000
+                        });
+                        return;
+                    }
                 })
-                
+
                 if (row.id) {
                     this.$api.productionOutWarehouse.cancel(row.id).then(res => {
                         if (res.code === 200 && res.data) {
@@ -487,6 +564,53 @@ export default {
                     });
                 }
             })
+        },
+        saveProShouldAmount() {
+            this.$refs.productionFundFrom.validate(valid => {
+                if (valid) {
+                    if (this.productionFundFrom.id) {
+                        this.$api.productionFund.edit(this.productionFundFrom).then(res => {
+                            if (res.code === 200 && res.data) {
+                                this.$notify({
+                                    title: '成功',
+                                    message: '产品应收款保存成功',
+                                    type: 'success',
+                                    duration: 1000
+                                });
+                                this.selectMyOrderPage();
+                                this.proShouldAmountDialog = false;
+                            } else {
+                                this.$notify({
+                                    title: '失败',
+                                    message: '产品应收款保存错误',
+                                    type: 'error',
+                                    duration: 1000
+                                });
+                            }
+                        })
+                    } else {
+                        this.$api.productionFund.add(this.productionFundFrom).then(res => {
+                            if (res.code === 200 && res.data) {
+                                this.$notify({
+                                    title: '成功',
+                                    message: '产品应收款保存成功',
+                                    type: 'success',
+                                    duration: 1000
+                                });
+                                this.selectMyOrderPage();
+                                this.proShouldAmountDialog = false;
+                            } else {
+                                this.$notify({
+                                    title: '失败',
+                                    message: '产品应收款保存错误',
+                                    type: 'error',
+                                    duration: 1000
+                                });
+                            }
+                        })
+                    }
+                }
+            })
         }
     }
 }

src/views/assets/orderDetail.vue

@@ -5,7 +5,7 @@
         <template slot="title">
           <span style="font-size:20px; margin-left:20px;letter-spacing:2px;color:red">
             <i class="el-icon-warning"></i>
-            <span> 当前节点：{{currentNode==null ?'???':currentNode.nodeName?currentNode.nodeName:'结束'}}</span>
+            <span> 当前节点：{{ currentNode == null ? '???' : currentNode.nodeName ? currentNode.nodeName : '结束' }}</span>
             <!-- <span v-if = "currentNode.tasks.length>0" style="margin-left:30px">任务：</span>  -->
             <!-- <span v-for="( t,index) in currentNode.tasks" :key=index  >{{t.info}}</span> -->
             <!-- <span style="margin-left:30px" v-if="statementNo || reportNo">该流程已取：<el-tag type="success" v-if="statementNo">{{statementNo}}</el-tag> <el-tag type="danger" v-if="reportNo">{{reportNo}}</el-tag></span> -->
@@ -365,8 +365,8 @@
                 </div>
               </el-col>
               <el-col :span="2">
-                <el-button v-if="currentNode.nodeCode === 'SPOT_RECONNAISSANCE_DETERMINE_PRICE' && couldEdit" type="danger"
-                  @click="openTargetDialog(), changeStatus('add')" round>添加评估对象</el-button>
+                <el-button v-if="currentNode.nodeCode === 'SPOT_RECONNAISSANCE_DETERMINE_PRICE' && couldEdit"
+                  type="danger" @click="openTargetDialog(), changeStatus('add')" round>添加评估对象</el-button>
               </el-col>
               <el-col :span="2" v-if="currentNode.nodeCode === 'GENERATE_STATEMENT' && couldEdit">
                 <el-tooltip class="item" effect="dark" content="全选取主号，多次取号(主号-子号)" placement="right">
@@ -378,10 +378,9 @@
                   <el-button type="success" @click="takeAssetsReportProductionNo" round>报告取号</el-button>
                 </el-tooltip>
               </el-col>
-              <el-col :span="2"
-                v-if="(currentNode.nodeCode === 'GENERATE_STATEMENT' || currentNode.nodeCode === 'WRITE_REPORT') 
-                && couldEdit 
-                &&(writeProductionStatementNos.length > 0 || writeProductionReportNos.length > 0)">
+              <el-col :span="2" v-if="(currentNode.nodeCode === 'GENERATE_STATEMENT' || currentNode.nodeCode === 'WRITE_REPORT')
+                && couldEdit
+                && (writeProductionStatementNos.length > 0 || writeProductionReportNos.length > 0)">
                 <el-tooltip class="item" effect="dark" content="请仔细确认产品内容" placement="right">
                   <el-button type="success" @click="openWriteProductionDialog(false, 'add')" round>撰写产品信息</el-button>
                 </el-tooltip>
@@ -465,7 +464,7 @@
                 </h3>
               </el-divider>
             </div>
-            <span style="margin-top: 5px;" v-if="currentNode.nodeCode === 'GENERATE_STATEMENT' && couldEdit ">
+            <span style="margin-top: 5px;" v-if="currentNode.nodeCode === 'GENERATE_STATEMENT' && couldEdit">
               选择要提交的意见书：
               <el-select v-model="commitProductionNo" @change="pushProductionNo()" placeholder="请选择要提交的产品"
                 style="width: 300px;">
@@ -473,7 +472,7 @@
                   :label="pro.productionNo" :value="pro.productionNo" :key="pro.id"></el-option>
               </el-select>
             </span>
-            <span v-if="currentNode.nodeCode === 'WRITE_REPORT' && couldEdit ">
+            <span v-if="currentNode.nodeCode === 'WRITE_REPORT' && couldEdit">
               选择要提交的报告：
               <el-select v-model="commitProductionNo" @change="pushProductionNo()" placeholder="请选择要提交的产品"
                 style="width: 300px;">
@@ -1708,9 +1707,9 @@ export default {
 
   },
   created() {
-    this.disabledStatus = this.$route.query.disabledStatus ==='true';
-    this.couldEdit = this.$route.query.couldEdit ==='true';
-    this.couldBack = this.$route.query.couldBack ==='true';
+    this.disabledStatus = this.$route.query.disabledStatus === 'true';
+    this.couldEdit = this.$route.query.couldEdit === 'true';
+    this.couldBack = this.$route.query.couldBack === 'true';
     this.nodeBusinessInfo.doWorkflow = true;
     // 获取页面参数
     this.pageParams.back = this.$route.query.back;
@@ -2403,7 +2402,9 @@ export default {
           }
           this.assetsProductionForm.filePath = JSON.stringify(this.assetsProductionForm.filePath);
           this.assetsProductionForm.signatory = JSON.stringify(this.assetsProductionForm.signatory);
-          this.$api.assets.assetsProductionUpdate(this.assetsProductionForm).then(res => {
+          this.taskRecordDTO.recordId = this.currentNode.tasks[0].recordId;
+          this.taskRecordDTO.taskData = this.assetsProductionForm;
+          this.$api.assets.assetsProductionUpdate(this.taskRecordDTO).then(res => {
             if (res.code === 200) {
               this.$notify({
                 title: '成功',
@@ -2725,35 +2726,43 @@ export default {
         }
       })
       const curNode = this.currentNode.nodeCode;
-      if (!this.isCheckValue && !(curNode === 'REVIEW_STATEMENT' || curNode === 'CHECK_REPORT')) {
-        this.productionCheckDialogVisible = true;
-        this.productionPerformanceForm.businessType = 'ASSET_BUSINESS';
-        if (curNode === 'REVIEW_STATEMENT' || curNode === 'CHECK_REPORT') {
-          this.productionPerformanceForm.checkLoop = "初审";
-        }
-        if (curNode === 'REEXAMINE_STATEMENT' || curNode === 'RECHECK_REPORT') {
-          this.productionPerformanceForm.checkLoop = "复审";
-        }
-        if (curNode === 'FOURTH_CHECK_REPORT') {
-          this.productionPerformanceForm.checkLoop = "四审";
+      if (curNode === 'REVIEW_STATEMENT' || curNode === 'CHECK_REPORT') {
+        if (this.isCheckValue) {
+          this.initProQuality(curNode);
+        } else {
+          this.$notify({
+            title: '警告',
+            message: '评估对象需要进行审核定价',
+            type: 'error',
+            duration: 3000
+          });
         }
-        this.$api.businessProductionPerformance.getProductionPerformance(this.productionPerformanceForm).then(res => {
-          if (res.code === 200 && res.data != null) {
-            this.productionPerformanceForm.id = res.data.id;
-            this.productionPerformanceForm.fatalMistake = res.data.fatalMistake;
-            this.productionPerformanceForm.hardMistake = res.data.hardMistake;
-            this.productionPerformanceForm.normalMistake = res.data.normalMistake;
-            this.productionPerformanceForm.reason = res.data.reason;
-          }
-        })
       } else {
-        this.$notify({
-          title: '警告',
-          message: '评估对象需要进行审核定价',
-          type: 'error',
-          duration: 3000
-        });
+        this.initProQuality(curNode);
+      }
+    },
+    // 质检信息基础信息赋值
+    initProQuality(curNode) {
+      this.productionCheckDialogVisible = true;
+      this.productionPerformanceForm.businessType = 'ASSET_BUSINESS';
+      if (curNode === 'REVIEW_STATEMENT' || curNode === 'CHECK_REPORT') {
+        this.productionPerformanceForm.checkLoop = "初审";
+      }
+      if (curNode === 'REEXAMINE_STATEMENT' || curNode === 'RECHECK_REPORT') {
+        this.productionPerformanceForm.checkLoop = "复审";
+      }
+      if (curNode === 'FOURTH_CHECK_REPORT') {
+        this.productionPerformanceForm.checkLoop = "四审";
       }
+      this.$api.businessProductionPerformance.getProductionPerformance(this.productionPerformanceForm).then(res => {
+        if (res.code === 200 && res.data != null) {
+          this.productionPerformanceForm.id = res.data.id;
+          this.productionPerformanceForm.fatalMistake = res.data.fatalMistake;
+          this.productionPerformanceForm.hardMistake = res.data.hardMistake;
+          this.productionPerformanceForm.normalMistake = res.data.normalMistake;
+          this.productionPerformanceForm.reason = res.data.reason;
+        }
+      })
     },
     // 保存产品质检信息(新增与保存都是这个方法)
     saveQuality() {
@@ -2772,7 +2781,9 @@ export default {
                 type: 'success',
                 duration: 3000
               });
-              this.updateProductionFileInfo();
+              if (this.currentNode.nodeCode === 'RECHECK_REPORT' || this.currentNode.nodeCode === 'FOURTH_CHECK_REPORT') {
+                this.updateProductionFileInfo();
+              }
               this.productionCheckDialogVisible = false;
             }
           })
@@ -2785,7 +2796,9 @@ export default {
                 type: 'success',
                 duration: 3000
               });
-              this.updateProductionFileInfo();
+              if (this.currentNode.nodeCode === 'RECHECK_REPORT' || this.currentNode.nodeCode === 'FOURTH_CHECK_REPORT') {
+                this.updateProductionFileInfo();
+              }
               this.productionCheckDialogVisible = false;
             }
           })

src/views/assets/repertoryList.vue

@@ -6,26 +6,36 @@
         <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="selectRepertoryPage">
             <template slot="left">
                 <el-input style="margin-left: 20px;width: 300px;float: left;" class="filter-item"
-                    v-model="listQuery.keyWord" placeholder="项目编号/报告号/项目名称/业务来源" clearable>
+                    v-model="listQuery.keyWord" placeholder="项目编号/报告号/项目名称" clearable>
                 </el-input>
+                <el-date-picker style="margin-left: 20px;float: left;" v-model="selectDate" type="datetimerange"
+                    :picker-options="pickerOptions" format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd" range-separator="至"
+                    start-placeholder="开始日期" end-placeholder="结束日期" align="right">
+                </el-date-picker>
                 <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="searchList"
                     round>搜索
                 </el-button>
                 <el-button class="filter-item" style="float: left;" round type="success" @click="resetParams()">重置
                 </el-button>
             </template>
+            <template slot="right">
+                <el-button class="filter-item" style="float: right;" round type="primary" :disabled="exportStatus"
+                    @click="repertoryExport()">导出
+                </el-button>
+            </template>
+
             <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;">
                 <el-table-column label="项目编号" align="center" width="150">
                     <template slot-scope="{row}">
                         <span>{{ row.orderId }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="项目名称" align="center" width="150">
+                <el-table-column label="项目名称" align="center" width="300">
                     <template slot-scope="{row}">
                         <span>{{ row.orderName }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="报告号" align="center" width="150">
+                <el-table-column label="报告号" align="center" width="250">
                     <template slot-scope="{row}">
                         <span>{{ row.reportNo }}</span>
                     </template>
@@ -40,17 +50,17 @@
                         <span>{{ row.methodName }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="评估作业开始日" align="center" width="150">
+                <el-table-column label="评估作业开始日" align="center" width="200">
                     <template slot-scope="{row}">
                         <span>{{ row.startTime }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="估价作业结束日" align="center" width="150">
+                <el-table-column label="估价作业结束日" align="center" width="200">
                     <template slot-scope="{row}">
                         <span>{{ row.endTime }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="估价时点" align="center" width="150">
+                <el-table-column label="估价时点" align="center" width="200">
                     <template slot-scope="{row}">
                         <span>{{ row.valuationBasisDate }}</span>
                     </template>
@@ -65,9 +75,69 @@
                         <span>{{ row.evaluatePrice }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="评估部门" align="center" width="150">
+                <el-table-column label="委托人" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.evaluateDepartment }}</span>
+                        <span>{{ row.bailor }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="委托人电话" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.bailorContactTel }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="第一报告人" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.firstReporter }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="第一报告人注册号" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.firstReporterRegistrationNo }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="参与报告人" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>待开发</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="参与报告人注册号" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>待开发</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="客户名称" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.customerName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="业务来源" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.customerSubName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="项目经理" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.managerName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="项目负责人" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.principalName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="入库时间" align="center" width="200">
+                    <template slot-scope="{row}">
+                        <span>{{ row.repertoryInTime }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="出库时间" align="center" width="200">
+                    <template slot-scope="{row}">
+                        <span>{{ row.repertoryOutTime }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="归档时间" align="center" width="200">
+                    <template slot-scope="{row}">
+                        <span>{{ row.archivedTime }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="市场部门" align="center" width="150">
@@ -75,6 +145,16 @@
                         <span>{{ row.marketDepartment }}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="评估部门" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.evaluateDepartment }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="产品实收金额" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.productionRealAmount }}</span>
+                    </template>
+                </el-table-column>
             </parentTable>
         </y-page-list-layout>
     </div>
@@ -96,20 +176,18 @@ export default {
         return {
             pageData: { records: [] },
             listLoading: false,
+            // 时间
+            selectDate: '',
             listQuery: {
                 page: 1,
                 size: 10,
                 current: 1,
-                // 节点code
-                nodeCode: null,
-                // 客户经理id
-                clientManagerId: null,
-                // 项目负责人id
-                principalId: null,
-                // 业务类型
-                assetsBusinessGener: null,
                 // 关键字
-                keyWord: null
+                keyWord: null,
+                // 开始时间
+                startTime: null,
+                // 结束时间
+                endTime: null
             },
             // 用户下拉列表
             allUsers: [],
@@ -131,7 +209,35 @@ export default {
                     value: '其他',
                     label: '其他'
                 }
-            ]
+            ],
+            pickerOptions: {
+                shortcuts: [{
+                    text: '最近一周',
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                        picker.$emit('pick', [start, end]);
+                    }
+                }, {
+                    text: '最近一个月',
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                        picker.$emit('pick', [start, end]);
+                    }
+                }, {
+                    text: '最近三个月',
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                        picker.$emit('pick', [start, end]);
+                    }
+                }]
+            },
+            exportStatus: true
         }
     },
     created() {
@@ -141,9 +247,19 @@ export default {
     methods: {
         // 无条件分页查询
         selectRepertoryPage() {
+            if (this.selectDate) {
+                this.listQuery.startTime = this.selectDate[0] + ' 00:00:00';
+                this.listQuery.endTime = this.selectDate[1] + ' 23:59:59';
+            }
             this.$api.assets.selectRepertoryPage(this.listQuery).then(res => {
                 if (res.code === 200) {
                     this.pageData = res.data;
+                    if (this.listQuery.startTime !== null && this.listQuery.endTime !== null && res.data.records.length > 0) {
+                        console.log(this.listQuery.startTime)
+                        this.exportStatus = false;
+                    }else {
+                        this.exportStatus = true;
+                    }
                 }
             })
         },
@@ -156,12 +272,21 @@ export default {
         },
         // 重置搜索条件
         resetParams() {
+            this.exportStatus = true;
+            this.selectDate = '';
             this.$router.push({ query: {} });
             this.listQuery = {
                 current: 1,
                 size: 10,
             }
             this.selectRepertoryPage();
+        },
+        // 资产入库数据导出
+        repertoryExport() {
+            this.$utils.exportUtil(
+                "/assets/repertoryExport", this.listQuery,
+                "导出"
+            );
         }
     }
 }

src/views/assets/todoList.vue

@@ -223,7 +223,7 @@ export default {
                 path: "/assets/orderDetail",
                 query: {
                     row: JSON.stringify(row),
-                    back: '/assets/allList',
+                    back: '/assets/todoList',
                     couldEdit: true,
                     couldBack: true,
                     disabledStatus: true