1.资产业务类型修改

2.资产评估对象选择其他时可以自定义填写
3.撰写产品信息，委托方电话、资产持有人改为非必填
4.资产台账页面修改

src/views/assets/addAssetsOrder.vue

@@ -650,20 +650,26 @@ export default {
             // 业务类型下拉列表
             assetsBusinessGeners: [
                 {
+                    value: '企业价值',
+                    label: '企业价值'
+                }, {
                     value: '单项资产',
                     label: '单项资产'
                 }, {
-                    value: '整体资产',
-                    label: '整体资产'
+                    value: '资产组合',
+                    label: '资产组合'
                 }, {
                     value: '无形资产',
                     label: '无形资产'
                 }, {
-                    value: '债权',
-                    label: '债权'
+                    value: '森林资源资产',
+                    label: '森林资源资产'
                 }, {
-                    value: '其他',
-                    label: '其他'
+                    value: '珠宝首饰艺术品',
+                    label: '珠宝首饰艺术品'
+                }, {
+                    value: '其他资产评估',
+                    label: '其他资产评估'
                 }
             ],
             // 客户类型

src/views/assets/allList.vue

@@ -158,20 +158,26 @@ export default {
             // 业务类型下拉列表
             assetsBusinessGeners: [
                 {
+                    value: '企业价值',
+                    label: '企业价值'
+                }, {
                     value: '单项资产',
                     label: '单项资产'
                 }, {
-                    value: '整体资产',
-                    label: '整体资产'
+                    value: '资产组合',
+                    label: '资产组合'
                 }, {
                     value: '无形资产',
                     label: '无形资产'
                 }, {
-                    value: '债权',
-                    label: '债权'
+                    value: '森林资源资产',
+                    label: '森林资源资产'
+                }, {
+                    value: '珠宝首饰艺术品',
+                    label: '珠宝首饰艺术品'
                 }, {
-                    value: '其他',
-                    label: '其他'
+                    value: '其他资产评估',
+                    label: '其他资产评估'
                 }
             ]
         }

src/views/assets/archivedList.vue

@@ -192,20 +192,26 @@ export default {
             // 业务类型下拉列表
             assetsBusinessGeners: [
                 {
+                    value: '企业价值',
+                    label: '企业价值'
+                }, {
                     value: '单项资产',
                     label: '单项资产'
                 }, {
-                    value: '整体资产',
-                    label: '整体资产'
+                    value: '资产组合',
+                    label: '资产组合'
                 }, {
                     value: '无形资产',
                     label: '无形资产'
                 }, {
-                    value: '债权',
-                    label: '债权'
+                    value: '森林资源资产',
+                    label: '森林资源资产'
+                }, {
+                    value: '珠宝首饰艺术品',
+                    label: '珠宝首饰艺术品'
                 }, {
-                    value: '其他',
-                    label: '其他'
+                    value: '其他资产评估',
+                    label: '其他资产评估'
                 }
             ]
         }

src/views/assets/departmentTodoList.vue

@@ -161,20 +161,26 @@ export default {
             // 业务类型下拉列表
             assetsBusinessGeners: [
                 {
+                    value: '企业价值',
+                    label: '企业价值'
+                }, {
                     value: '单项资产',
                     label: '单项资产'
                 }, {
-                    value: '整体资产',
-                    label: '整体资产'
+                    value: '资产组合',
+                    label: '资产组合'
                 }, {
                     value: '无形资产',
                     label: '无形资产'
                 }, {
-                    value: '债权',
-                    label: '债权'
+                    value: '森林资源资产',
+                    label: '森林资源资产'
+                }, {
+                    value: '珠宝首饰艺术品',
+                    label: '珠宝首饰艺术品'
                 }, {
-                    value: '其他',
-                    label: '其他'
+                    value: '其他资产评估',
+                    label: '其他资产评估'
                 }
             ]
         }

src/views/assets/orderDetail.vue

@@ -790,7 +790,7 @@
             </el-col>
           </el-row>
           <el-row class="row-style">
-            <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-col :xs="24" :sm="12" :lg="12" :span="3">
               <el-form-item label="评估对象：" prop="evaluationTypeId" label-width="200px" class="postInfo-container-item">
                 <el-select v-model="targetForm.evaluationTypeId"
                   @change="getTypeList(targetForm.evaluationTypeId, 2), targetForm.evaluationTypeSecId = null"
@@ -800,7 +800,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-col :xs="24" :sm="12" :lg="12" :span="3">
               <el-form-item prop="evaluationTypeSecId" label-width="10px" class="postInfo-container-item">
                 <el-select v-model="targetForm.evaluationTypeSecId" style="width: 70%">
                   <el-option v-for="(t, id) in assetsSecEvaluationTargetType" :label="t.typeName" :value="t.id"
@@ -808,6 +808,12 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="12" :span="3" v-if="targetForm.evaluationTypeSecId && [15,20,34,47].includes(targetForm.evaluationTypeSecId)">
+              <el-form-item prop="evaluationTypeDefinedSec" label-width="200px" class="postInfo-container-item">
+                <el-input v-model="targetForm.evaluationTypeDefinedSec" multiple style="width: 100%;">
+                </el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row class="row-style">
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
@@ -1565,20 +1571,26 @@ export default {
       // 业务类型下拉列表
       assetsBusinessGeners: [
         {
+          value: '企业价值',
+          label: '企业价值'
+        }, {
           value: '单项资产',
           label: '单项资产'
         }, {
-          value: '整体资产',
-          label: '整体资产'
+          value: '资产组合',
+          label: '资产组合'
         }, {
           value: '无形资产',
           label: '无形资产'
         }, {
-          value: '债权',
-          label: '债权'
+          value: '森林资源资产',
+          label: '森林资源资产'
         }, {
-          value: '其他',
-          label: '其他'
+          value: '珠宝首饰艺术品',
+          label: '珠宝首饰艺术品'
+        }, {
+          value: '其他资产评估',
+          label: '其他资产评估'
         }
       ],
       // 接单部门
@@ -1612,6 +1624,8 @@ export default {
         evaluationTypeId: null,
         // 资产评估对象类型二级id
         evaluationTypeSecId: null,
+        // 其他自定义二级资产评估对象类型
+        evaluationTypeDefinedSec: null,
         // 产权持有人
         theHolder: null,
         // 资产价值类型id
@@ -1668,6 +1682,9 @@ export default {
         evaluationTypeSecId: [
           { required: true, message: '请选择评估对象', trigger: 'change' }
         ],
+        evaluationTypeDefinedSec: [
+          { required: true, message: '请填写其他', trigger: 'change' }
+        ],
         theHolder: [
           { required: true, message: '请填写产权持有人', trigger: 'blur' }
         ],
@@ -1777,9 +1794,9 @@ export default {
         clientName: [
           { required: true, message: '请填写委托方名称', trigger: 'blur' }
         ],
-        clientTel: [
-          { required: true, message: '请填写委托方电话', trigger: 'blur' }
-        ],
+        // clientTel: [
+        //   { required: true, message: '请填写委托方电话', trigger: 'blur' }
+        // ],
         valuationBasisDate: [
           { required: true, message: '请选择估价基准日', trigger: 'change' }
         ],
@@ -1792,9 +1809,9 @@ export default {
         evaluateAmount: [
           { required: true, message: '请填写评估总价', trigger: 'blur' }
         ],
-        owner: [
-          { required: true, message: '请填写持有人', trigger: 'blur' }
-        ],
+        // owner: [
+        //   { required: true, message: '请填写持有人', trigger: 'blur' }
+        // ],
         createProductionDate: [
           { required: true, message: '请选择产品出具日期', trigger: 'change' }
         ],

src/views/assets/repertoryList.vue

@@ -199,20 +199,26 @@ export default {
             // 业务类型下拉列表
             assetsBusinessGeners: [
                 {
+                    value: '企业价值',
+                    label: '企业价值'
+                }, {
                     value: '单项资产',
                     label: '单项资产'
                 }, {
-                    value: '整体资产',
-                    label: '整体资产'
+                    value: '资产组合',
+                    label: '资产组合'
                 }, {
                     value: '无形资产',
                     label: '无形资产'
                 }, {
-                    value: '债权',
-                    label: '债权'
+                    value: '森林资源资产',
+                    label: '森林资源资产'
+                }, {
+                    value: '珠宝首饰艺术品',
+                    label: '珠宝首饰艺术品'
                 }, {
-                    value: '其他',
-                    label: '其他'
+                    value: '其他资产评估',
+                    label: '其他资产评估'
                 }
             ],
             pickerOptions: {
@@ -263,7 +269,7 @@ export default {
                     this.pageData = res.data;
                     if (this.listQuery.startTime !== null && this.listQuery.endTime !== null && res.data.records.length > 0) {
                         this.exportStatus = false;
-                    }else {
+                    } else {
                         this.exportStatus = true;
                     }
                 }

src/views/assets/terminateList.vue

@@ -151,20 +151,26 @@ export default {
             // 业务类型下拉列表
             assetsBusinessGeners: [
                 {
+                    value: '企业价值',
+                    label: '企业价值'
+                }, {
                     value: '单项资产',
                     label: '单项资产'
                 }, {
-                    value: '整体资产',
-                    label: '整体资产'
+                    value: '资产组合',
+                    label: '资产组合'
                 }, {
                     value: '无形资产',
                     label: '无形资产'
                 }, {
-                    value: '债权',
-                    label: '债权'
+                    value: '森林资源资产',
+                    label: '森林资源资产'
+                }, {
+                    value: '珠宝首饰艺术品',
+                    label: '珠宝首饰艺术品'
                 }, {
-                    value: '其他',
-                    label: '其他'
+                    value: '其他资产评估',
+                    label: '其他资产评估'
                 }
             ]
         }

src/views/assets/todoList.vue

@@ -150,20 +150,26 @@ export default {
             // 业务类型下拉列表
             assetsBusinessGeners: [
                 {
+                    value: '企业价值',
+                    label: '企业价值'
+                }, {
                     value: '单项资产',
                     label: '单项资产'
                 }, {
-                    value: '整体资产',
-                    label: '整体资产'
+                    value: '资产组合',
+                    label: '资产组合'
                 }, {
                     value: '无形资产',
                     label: '无形资产'
                 }, {
-                    value: '债权',
-                    label: '债权'
+                    value: '森林资源资产',
+                    label: '森林资源资产'
+                }, {
+                    value: '珠宝首饰艺术品',
+                    label: '珠宝首饰艺术品'
                 }, {
-                    value: '其他',
-                    label: '其他'
+                    value: '其他资产评估',
+                    label: '其他资产评估'
                 }
             ]
         }
@@ -237,12 +243,12 @@ 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.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 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;
-          }
+            }
             else {
                 // 根据节点预设需要激活的tab页面
                 let activeTabName = 'baseInfo';

src/views/finance/assetsRealFundStat.vue

@@ -7,15 +7,15 @@
             <y-page-list-layout :get-page-list="getAssetsSate" :page-list="pageData" :page-para="listQuery">
                 <template slot="left">
                     <el-input v-model="listQuery.keyword" placeholder="项目编号、产品号" clearable
-                    style="width: 300px;float: left;">
+                        style="width: 300px;float: left;">
                     </el-input>
                     <el-date-picker style="margin-left: 20px;float: left;" v-model="selectDate" type="daterange"
                         :picker-options="pickerOptions" format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd"
                         range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right">
                     </el-date-picker>
-                    <el-date-picker  clearable v-model="paymentDate" type="daterange" align="center" unlink-panels
-                        range-separator="至" start-placeholder="到账日期（开始）" end-placeholder="到账日期（结束）" :picker-options="pickerOptions"
-                        value-format="yyyy-MM-dd" style="margin-left: 20px;float: left;">
+                    <el-date-picker clearable v-model="paymentDate" type="daterange" align="center" unlink-panels
+                        range-separator="至" start-placeholder="到账日期（开始）" end-placeholder="到账日期（结束）"
+                        :picker-options="pickerOptions" value-format="yyyy-MM-dd" style="margin-left: 20px;float: left;">
                     </el-date-picker>
                     <!-- <el-input v-model="listQuery.orderId" placeholder="项目编号" clearable style="width: 200px;margin-right: 20px;float: left;">
                     </el-input>
@@ -35,8 +35,9 @@
                     <el-select v-model="listQuery.assetsBusinessGener" placeholder="资产业务类型" clearable
                         style="width: 100px;margin-left: 20px;float: left;">
                         <el-option v-for="(s, value) in assetsBusinessGeners" :label="s.label" :value="s.value"></el-option>
-                    </el-select> 
-                    <el-select v-model="listQuery.ifSaveFile" placeholder="是否归档" clearable style="width: 100px;margin-left: 20px;float: left;">
+                    </el-select>
+                    <el-select v-model="listQuery.ifSaveFile" placeholder="是否归档" clearable
+                        style="width: 100px;margin-left: 20px;float: left;">
                         <el-option label="已归档" value="true"></el-option>
                         <el-option label="未归档" value="false"></el-option>
                     </el-select>
@@ -200,29 +201,35 @@ export default {
                 claimAmount: null,
                 assetsBusinessGener: null,
                 ifSaveFile: null,
-                keyword:null,
-                payStartTime:null,
-                payEndTime:null
+                keyword: null,
+                payStartTime: null,
+                payEndTime: null
             },
             // 用户下拉列表
             allUsers: [],
             // 业务类型下拉列表
             assetsBusinessGeners: [
                 {
+                    value: '企业价值',
+                    label: '企业价值'
+                }, {
                     value: '单项资产',
                     label: '单项资产'
                 }, {
-                    value: '整体资产',
-                    label: '整体资产'
+                    value: '资产组合',
+                    label: '资产组合'
                 }, {
                     value: '无形资产',
                     label: '无形资产'
                 }, {
-                    value: '债权',
-                    label: '债权'
+                    value: '森林资源资产',
+                    label: '森林资源资产'
+                }, {
+                    value: '珠宝首饰艺术品',
+                    label: '珠宝首饰艺术品'
                 }, {
-                    value: '其他',
-                    label: '其他'
+                    value: '其他资产评估',
+                    label: '其他资产评估'
                 }
             ],
             pickerOptions: {
@@ -282,7 +289,7 @@ export default {
         resetParams() {
             this.exportStatus = true;
             this.selectDate = '';
-            this.paymentDate = '' ;
+            this.paymentDate = '';
             this.$router.push({ query: {} });
             this.listQuery = {
                 current: 1,
@@ -304,7 +311,7 @@ export default {
                     this.pageData = res.data;
                     if (this.listQuery.startTime !== null && this.listQuery.endTime !== null && res.data.records.length > 0) {
                         this.exportStatus = false;
-                    }else {
+                    } else {
                         this.exportStatus = true;
                     }
                 }

src/views/statistical/assets/ledgerList.vue

@@ -38,7 +38,8 @@
                         :disabled="exportStatus">导出
                     </el-button>
                 </template>
-                <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;" class="tableFull">
+                <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;"
+                    class="tableFull">
                     <el-table-column label="项目编号" width="120" align="center">
                         <template slot-scope="{row}">
                             <span>{{ row.orderId }}</span>
@@ -69,6 +70,11 @@
                             <span>{{ row.createReportDate }}</span>
                         </template>
                     </el-table-column>
+                    <el-table-column label="打印份数" width="120" align="center">
+                        <template slot-scope="{row}">
+                            <span>{{ row.reportPrintCount }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="项目名称" width="300" align="center">
                         <template slot-scope="{row}">
                             <span>{{ row.projectName }}</span>
@@ -154,32 +160,32 @@
                             <span>{{ row.purposeName }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="评估对象价值类型" width="120" align="center">
+                    <el-table-column label="评估对象价值类型" width="220" align="center">
                         <template slot-scope="{row}">
                             <span>{{ row.valueTypeName }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="评估对象" width="120" align="center">
+                    <el-table-column label="评估对象" width="220" align="center">
                         <template slot-scope="{row}">
-                            <span>{{ row.targetTypename }}</span>
+                            <span>{{ row.targetTypeName }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="评估方法" width="120" align="center">
+                    <el-table-column label="评估方法" width="220" align="center">
                         <template slot-scope="{row}">
                             <span>{{ row.evaluationMethods }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="自定义其他评估方法" width="120" align="center">
+                    <el-table-column label="自定义其他评估方法" width="220" align="center">
                         <template slot-scope="{row}">
                             <span>{{ row.definedEvaluationMethod }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="最终选择的评估方法" width="120" align="center">
+                    <el-table-column label="最终选择的评估方法" width="220" align="center">
                         <template slot-scope="{row}">
                             <span>{{ row.choiceEvaluationMethods }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="最终选择的自定义其他评估方法" width="120" align="center">
+                    <el-table-column label="最终选择的自定义其他评估方法" width="220" align="center">
                         <template slot-scope="{row}">
                             <span>{{ row.choiceDefinedEvaluationMethod }}</span>
                         </template>
@@ -281,20 +287,26 @@ export default {
             // 业务类型下拉列表
             assetsBusinessGeners: [
                 {
+                    value: '企业价值',
+                    label: '企业价值'
+                }, {
                     value: '单项资产',
                     label: '单项资产'
                 }, {
-                    value: '整体资产',
-                    label: '整体资产'
+                    value: '资产组合',
+                    label: '资产组合'
                 }, {
                     value: '无形资产',
                     label: '无形资产'
                 }, {
-                    value: '债权',
-                    label: '债权'
+                    value: '森林资源资产',
+                    label: '森林资源资产'
+                }, {
+                    value: '珠宝首饰艺术品',
+                    label: '珠宝首饰艺术品'
                 }, {
-                    value: '其他',
-                    label: '其他'
+                    value: '其他资产评估',
+                    label: '其他资产评估'
                 }
             ],
             // 接单部门
@@ -395,8 +407,8 @@ export default {
 </script>
 <style scoped lang="scss">
 /* el-table 列数据为空自动显示 - */
-.tableFull :empty::before{
-	content:'-';
-	color:gray;
+.tableFull :empty::before {
+    content: '-';
+    color: gray;
 }
 </style>