在库产品查询修改&资产出入库跳转&登记时间非必填

src/components/personalForms/houseCertificate.vue

@@ -313,7 +313,6 @@ export default {
                 bailor2Tel: [{ validator: phoneNumber, trigger: 'blur' }],
                 bailor1IdNo: [{ validator: isIdNumber, trigger: 'blur' }],
                 bailor2IdNo: [{ validator: isIdNumber, trigger: 'blur' }],
-                register: [{ required: true, message: '登记日期不能为空', trigger: 'blur' }],
                 allAcreage: [{ required: true, message: '建筑面积不能为空', trigger: 'blur' }, { validator: isNumber, trigger: 'blur' }],
                 inAcreage: [{ validator: isNumber, trigger: 'blur' }],
                 ensureDebiAmount: [{ validator: isNumber, trigger: 'blur' }],

src/views/assets/todoList.vue

@@ -237,9 +237,9 @@ export default {
             } else if (row.currentNodeCode === 'REPORT_OUT_DEPARTMENT_CHECK') {
                 this.$router.push(`/out/warehouse/check?todoBusinessId=${row.assetsId}&sNo=${row.statementNo}&rNo=${row.reportNo}&tId=${row.recordId}&cId=${row.currentNodeId}&nCode=${row.currentNodeCode}&businessType=ASSET_BUSINESS`)
                 return;
-            } else if (row.nodeCode==='STATEMENT_IN' || row.nodeCode==='STATEMENT_OUT' ||
-                row.nodeCode==='REPORT_IN'|| row.nodeCode==='REPORT_OUT' ||
-                row.nodeCode==='LETTER_IN' || row.nodeCode==='LETTER_OUT'){
+            } else if (row.currentNodeCode==='STATEMENT_IN' || row.currentNodeCode==='STATEMENT_OUT' ||
+                row.currentNodeCode==='REPORT_IN'|| row.currentNodeCode==='REPORT_OUT' ||
+                row.currentNodeCode==='LETTER_IN' || row.currentNodeCode==='LETTER_OUT'){
                     this.$router.push(`/major/production/in?openDialog=${true}`)
                 return;
           }

src/views/complex/index.vue

@@ -1051,9 +1051,9 @@ export default {
       } else if (row.currentNodeCode === 'REPORT_OUT_DEPARTMENT_CHECK') {
         this.$router.push(`/out/warehouse/check?todoBusinessId=${row.assetsId}&sNo=${row.statementNo}&rNo=${row.reportNo}&tId=${row.recordId}&cId=${row.currentNodeId}&nCode=${row.currentNodeCode}&businessType=ASSET_BUSINESS`)
         return;
-      } else if (row.nodeCode==='STATEMENT_IN' || row.nodeCode==='STATEMENT_OUT' ||
-          row.nodeCode==='REPORT_IN'|| row.nodeCode==='REPORT_OUT' ||
-          row.nodeCode==='LETTER_IN' || row.nodeCode==='LETTER_OUT'){
+      } else if (row.currentNodeCode==='STATEMENT_IN' || row.currentNodeCode==='STATEMENT_OUT' ||
+          row.currentNodeCode==='REPORT_IN'|| row.currentNodeCode==='REPORT_OUT' ||
+          row.currentNodeCode==='LETTER_IN' || row.currentNodeCode==='LETTER_OUT'){
             this.$router.push(`/major/production/in?openDialog=${true}`)
           }
       else {

src/views/finance/invoiceCheck.vue

@@ -37,7 +37,12 @@
             <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch1()">重置
             </el-button>
           </template>
-          <parentTable  :data="pageData1.records" slot="table" style="width: 100%;">
+          <el-table ref="table" size="medium" slot="table" :data="pageData1.records" show-summary  border
+            :summary-method="getSummaries" fit stripe highlight-current-row
+            :header-row-style="{ color: '#333333' }" style="
+              border-left: 1px solid #ebeced;
+              border-right: 1px solid #ebeced;
+              color: #333333;">
             <el-table-column label="业务类型" align="center">
               <template slot-scope="{row}">
                 <span>{{ row.businessType}}</span>
@@ -68,7 +73,7 @@
                 <span>{{ row.type }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="待开金额" align="center">
+            <el-table-column label="待开金额" align="center" prop="planAmount">
               <template slot-scope="{row}">
                 <span>{{ row.planAmount }}</span>
               </template>
@@ -104,7 +109,7 @@
                   :page-jump="false"  @click="openMakeDialog(row)" />
               </template>
             </el-table-column>
-          </parentTable>
+          </el-table>
         </y-page-list-layout>
       </el-tab-pane>
       <el-tab-pane label="已开发票" name="done">
@@ -140,7 +145,12 @@
             <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch2()">重置
             </el-button>
           </template>
-          <parentTable  :data="pageData2.records" slot="table" style="width: 100%;">
+          <el-table ref="table" size="medium" slot="table" :data="pageData2.records" show-summary  border
+            :summary-method="getSummaries" fit stripe highlight-current-row
+            :header-row-style="{ color: '#333333' }" style="
+              border-left: 1px solid #ebeced;
+              border-right: 1px solid #ebeced;
+              color: #333333;">
             <el-table-column label="业务类型" align="center">
               <template slot-scope="{row}">
                 <span>{{ row.businessType}}</span>
@@ -171,7 +181,7 @@
                 <span>{{ row.type }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="待开金额" align="center">
+            <el-table-column label="已开金额" align="center" prop="planAmount">
               <template slot-scope="{row}">
                 <span>{{ row.planAmount }}</span>
               </template>
@@ -207,7 +217,7 @@
                   :page-jump="false"  @click="openMakeDialog(row)" />
               </template>
             </el-table-column>
-          </parentTable>
+          </el-table>
         </y-page-list-layout>
       </el-tab-pane>
       <el-tab-pane label="已作废发票" name="cancle">
@@ -243,7 +253,12 @@
             <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch3()">重置
             </el-button>
           </template>
-          <parentTable  :data="pageData3.records" slot="table" style="width: 100%;">
+          <el-table ref="table" size="medium" slot="table" :data="pageData3.records" show-summary  border
+            :summary-method="getSummaries" fit stripe highlight-current-row
+            :header-row-style="{ color: '#333333' }" style="
+              border-left: 1px solid #ebeced;
+              border-right: 1px solid #ebeced;
+              color: #333333;">
             <el-table-column label="业务类型" align="center">
               <template slot-scope="{row}">
                 <span>{{ row.businessType}}</span>
@@ -274,7 +289,7 @@
                 <span>{{ row.type }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="待开金额" align="center">
+            <el-table-column label="已开金额" align="center" prop="planAmount">
               <template slot-scope="{row}">
                 <span>{{ row.planAmount }}</span>
               </template>
@@ -310,7 +325,7 @@
                   :page-jump="false"  @click="openMakeDialog(row)" />
               </template>
             </el-table-column>
-          </parentTable>
+          </el-table>
         </y-page-list-layout>
       </el-tab-pane>
     </el-tabs>
@@ -868,6 +883,33 @@ export default {
               }
             })
           })
+    },
+    getSummaries(param){
+      const { columns, data } = param;
+        const sums = [];
+        columns.forEach((column, index) => {
+          
+          if (index === 0) {
+            sums[index] = '合计';
+            return;
+          }
+          const values = data.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+            sums[index] += ' 元';
+          } else {
+            sums[index] = '-';
+          }
+        });
+
+        return sums;
     }
   },
   

src/views/major/productionIn.vue

@@ -6,13 +6,16 @@
     <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getList"> 
       <template slot="left">
         <el-switch v-model="warehouseDialog" style="margin-top: 5px;margin-left: 20px;" active-text="开启出入库" inactive-text="关闭出入库"></el-switch>
-        <el-input v-model="listQuery.keyword" placeholder="关键字搜索..." clearable
-          style="margin-left: 20px;width: 500px;float: left;">
+        <el-input v-model="listQuery.reportNo" placeholder="产品号" clearable
+          style="margin-left: 20px;width: 300px;float: left;">
         </el-input>
         <el-select style="margin-left: 20px;width: 170px;float: left;" v-model="listQuery.production" clearable placeholder="产品类型">
-          <el-option value="STATEMENT" label="价值意见书">价值意见书</el-option>
-          <el-option value="REPORT" label="报告">报告</el-option>
-          <el-option value="LETTER" label="复评函">复评函</el-option>
+          <el-option value="价值意见书" label="价值意见书">价值意见书</el-option>
+          <el-option value="报告" label="报告">报告</el-option>
+          <el-option value="复评函" label="复评函">复评函</el-option>
+          <el-option value="技术报告" label="价值意见书">技术报告</el-option>
+          <el-option value="结果报告" label="报告">结果报告</el-option>
+          <el-option value="咨询报告" label="复评函">咨询报告</el-option>
         </el-select>
         <el-date-picker
           style="margin-left: 20px;float: left;"
@@ -31,34 +34,19 @@
         </el-button>
       </template>
       <parentTable  :data="pageData.records" slot="table" style="width: 100%;" :isBoard=600>
-        <el-table-column label="产品报告号" align="center" width='300' >
+        <el-table-column label="业务类型" align="center"  >
           <template slot-scope="{row}">
-            <span>{{ row.reportNo }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="产品类型" align="center" width='120'  >
-          <template slot-scope="{row}">
-            <span>{{ aliasProductionType(row.production) }}</span>
+            <span>{{ row.businessType }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="负责人" align="center" width='120'>
+        <el-table-column label="产品号" align="center"  >
           <template slot-scope="{row}">
-            <span>{{ row.principal }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="项目名称" align="center" width='300' show-overflow-tooltip>
-          <template slot-scope="{row}">
-            <span>{{ row.name }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="评估总价(万元)" align="center">
-          <template slot-scope="{row}">
-            <span>{{ row.evaluateAmount/10000 }}</span>
+            <span>{{ row.reportNo }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="委托方名称" align="center">
+        <el-table-column label="产品类型" align="center"   >
           <template slot-scope="{row}">
-            <span>{{ row.clientName }}</span>
+            <span>{{ row.production}}</span>
           </template>
         </el-table-column>
         <el-table-column label="库存状态" align="center">