Sfoglia il codice sorgente

Merge remote-tracking branch 'origin/master' into dev

GouGengquan 11 mesi fa
parent
commit
13e38b2c96

+ 2 - 2
src/api/modules/department.js

@@ -37,8 +37,8 @@ export default {
   permissionPage(params) {
     return request.get(`department/permission/page`, { params: params })
   },
-  allot() { // 下拉
-    return request.get(`department/allot`)
+  allot(params) { // 下拉
+    return request.get(`department/allot/${params}`)
   },
   trunDep(params){
     return request.get(`sortedDepartment/simpleAll/${params}`)

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

@@ -291,7 +291,7 @@ export default {
             })
         },
         getAllotDepartment(){
-            this.$api.department.allot().then(res=>{
+            this.$api.department.allot(this.business).then(res=>{
             if (res.code === 200){
                 this.allotDepartment = res.data;
             }

+ 1 - 1
src/views/assets/addAssetsOrder.vue

@@ -924,7 +924,7 @@ export default {
         },
         // 获取部门下拉列表
         getAllotDepartment() {
-            this.$api.department.allot().then(res => {
+            this.$api.department.allot('ASSETS_BUSINESS').then(res => {
                 if (res.code === 200) {
                     this.allotDepartment = res.data;
                 }

+ 1 - 1
src/views/assets/allList.vue

@@ -244,7 +244,7 @@ export default {
         },
         // 获取部门下拉列表
         getAllotDepartment() {
-            this.$api.department.allot().then(res => {
+            this.$api.department.allot('ASSETS_BUSINESS').then(res => {
                 if (res.code === 200) {
                     this.allotDepartment = res.data;
                 }

+ 1 - 1
src/views/assets/archivedList.vue

@@ -274,7 +274,7 @@ export default {
         },
         // 获取部门下拉列表
         getAllotDepartment() {
-            this.$api.department.allot().then(res => {
+            this.$api.department.allot('ASSETS_BUSINESS').then(res => {
                 if (res.code === 200) {
                     this.allotDepartment = res.data;
                 }

+ 1 - 1
src/views/assets/departmentDoneList.vue

@@ -188,7 +188,7 @@ export default {
         },
         // 获取部门下拉列表
         getAllotDepartment() {
-            this.$api.department.allot().then(res => {
+            this.$api.department.allot('ASSETS_BUSINESS').then(res => {
                 if (res.code === 200) {
                     this.allotDepartment = res.data;
                 }

+ 1 - 1
src/views/assets/departmentTodoList.vue

@@ -295,7 +295,7 @@ export default {
         },
         // 获取部门下拉列表
         getAllotDepartment() {
-            this.$api.department.allot().then(res => {
+            this.$api.department.allot('ASSETS_BUSINESS').then(res => {
                 if (res.code === 200) {
                     this.allotDepartment = res.data;
                 }

+ 1 - 1
src/views/assets/myOrderList.vue

@@ -1186,7 +1186,7 @@ export default {
         },
         // 获取部门下拉列表
         getAllotDepartment() {
-            this.$api.department.allot().then(res => {
+            this.$api.department.allot('ASSETS_BUSINESS').then(res => {
                 if (res.code === 200) {
                     this.allotDepartment = res.data;
                 }

+ 1 - 1
src/views/assets/orderDetail.vue

@@ -2027,7 +2027,7 @@ export default {
     },
     // 获取部门下拉列表
     getAllotDepartment() {
-      this.$api.department.allot().then(res => {
+      this.$api.department.allot('ASSETS_BUSINESS').then(res => {
         if (res.code === 200) {
           this.allotDepartment = res.data;
         }

+ 1 - 1
src/views/assets/repertoryList.vue

@@ -296,7 +296,7 @@ export default {
         },
         // 获取部门下拉列表
         getAllotDepartment() {
-            this.$api.department.allot().then(res => {
+            this.$api.department.allot('ASSETS_BUSINESS').then(res => {
                 if (res.code === 200) {
                     this.allotDepartment = res.data;
                 }

+ 1 - 1
src/views/assets/terminateList.vue

@@ -248,7 +248,7 @@ export default {
         },
         // 获取部门下拉列表
         getAllotDepartment() {
-            this.$api.department.allot().then(res => {
+            this.$api.department.allot('ASSETS_BUSINESS').then(res => {
                 if (res.code === 200) {
                     this.allotDepartment = res.data;
                 }

+ 9 - 4
src/views/finance/fundList.vue

@@ -48,11 +48,11 @@
             <span>{{ row.payerBank?row.payerBank:'-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="付款账号" align="center" width='100'>
+        <!-- <el-table-column label="付款账号" align="center" width='100'>
           <template slot-scope="{row}">
             <span>{{ row.payerAccount?row.payerAccount:'-' }}</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="付款金额(元)" align="center" >
           <template slot-scope="{row}">
             <span>{{ row.amount }}</span>
@@ -83,13 +83,18 @@
             <span>{{ row.created}}</span> 
           </template>
         </el-table-column>
-        <el-table-column label="全部认领" align="center" show-overflow-tooltip>
+        <el-table-column label="备注" align="center" width='170'>
+          <template slot-scope="{row}">
+            <span>{{ row.remark}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="全部认领" align="center" >
           <template slot-scope="{row}">
             <i v-if="row.notClaimAmount<=0" style="font-size:20px; color:green" class="el-icon-success"></i>
             <i v-else style="font-size:20px; color:RGB(255,106,106)" class="el-icon-warning"></i>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="300" fixed="right">
+        <el-table-column label="操作" align="center" width="250" fixed="right">
           <template slot-scope="{row}">
               <PermissionButton menu-code="_views_claim_list" class-name="filter-item" type="primary"
               :page-jump="false" round size="mini" @click="clamiList(row.id,row.notClaimAmount,row.payer,row.amount)" />

+ 19 - 5
src/views/major/detail.vue

@@ -1445,10 +1445,12 @@
                 label-width="120px"
                 class="postInfo-container-item"
               >
-                <el-checkbox-group v-model="landTarget.rights" >
+                <!-- <el-checkbox-group v-model="landTarget.rights" >
                   <el-checkbox-button label="出让" name="rights"></el-checkbox-button>
                   <el-checkbox-button label="划拨" name="rights"></el-checkbox-button>
-                </el-checkbox-group>
+                </el-checkbox-group> -->
+                <el-radio v-model="landTarget.rightType" label="出让" size="mini">出让</el-radio>
+                <el-radio v-model="landTarget.rightType" label="划拨" size="mini">划拨</el-radio>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="12" :span="8">
@@ -1594,6 +1596,16 @@
               </el-col>
             </el-row>
             <el-row>
+              <el-col :xs="24" :sm="12" :lg="12" :span="6" v-if="eMethods.includes('其他')">
+                <el-form-item label="其他评估方法:" label-width="160px" prop="definedEvaluationMethod"
+                  :class="['postInfo-container-item', 'task-class']"
+                  :rules="{ required: true, message: '其他评估方法不能为空', trigger: 'blur' }">
+                  <el-input v-model="landTarget.definedEvaluationMethod">
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
               <el-col :xs="24" :sm="12" :lg="12" :span="6">
                 <el-form-item
                   label="初步定价:"
@@ -2769,7 +2781,7 @@
         
       },
       getAllotDepartment(){
-        this.$api.department.allot().then(res=>{
+        this.$api.department.allot('MAJOR_BUSINESS').then(res=>{
           if (res.code === 200){
               this.allotDepartment = res.data;
           }
@@ -2927,8 +2939,10 @@
           }
           
           this.landTarget = row;
-          this.landTarget.rights = JSON.parse(this.landTarget.rightType);
-          this.landTarget.sites = JSON.parse(this.landTarget.siteIds);
+          // this.landTarget.rights = JSON.parse(this.landTarget.rightType);
+          // this.landTarget.sites = JSON.parse(this.landTarget.siteIds);
+          this.landTarget.rights = this.landTarget.rightType;
+          this.landTarget.sites = this.landTarget.siteIds;
           this.eMethods = [];
           this.houseUseTO = [];
           if (JSON.parse(this.landTarget.evaluateMethods)){

+ 1 - 1
src/views/major/myOrderDetail.vue

@@ -927,7 +927,7 @@
         }
       },
       getAllotDepartment(){
-        this.$api.department.allot().then(res=>{
+        this.$api.department.allot('MAJOR_BUSINESS').then(res=>{
           if (res.code === 200){
               this.allotDepartment = res.data;
           }

+ 74 - 89
src/views/major/todoDetail.vue

@@ -79,10 +79,8 @@
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                      <el-form-item label="接单部门:" prop="departmentId" label-width="120px"
-                        class="postInfo-container-item">
-                        <el-select v-model="major.departmentId" placeholder="请选择" readonly disabled
-                          style=" width: 100%">
+                      <el-form-item label="接单部门:" prop="departmentId" label-width="120px" class="postInfo-container-item">
+                        <el-select v-model="major.departmentId" placeholder="请选择" readonly disabled style=" width: 100%">
                           <el-option v-for="(d, id) in allotDepartment" :label="d.name" :value="d.id"></el-option>
                         </el-select>
                       </el-form-item>
@@ -138,8 +136,7 @@
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="major.businessObjectType === '房地产'">
-                      <el-form-item label="特殊类型:" prop="specialType" label-width="120px"
-                        class="postInfo-container-item">
+                      <el-form-item label="特殊类型:" prop="specialType" label-width="120px" class="postInfo-container-item">
                         <el-select v-model="major.specialType" placeholder="请选择" readonly disabled style=" width: 100%">
                           <el-option label="在建工程" value="在建工程"></el-option>
                           <el-option label="加油加气站" value="加油加气站"></el-option>
@@ -151,8 +148,7 @@
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item label="业务类型:" prop="businessGener" label-width="120px"
                         class="postInfo-container-item">
-                        <el-select v-model="major.businessGener" placeholder="请选择" readonly disabled
-                          style=" width: 100%">
+                        <el-select v-model="major.businessGener" placeholder="请选择" readonly disabled style=" width: 100%">
                           <el-option label="部门轮单" value="轮单"></el-option>
                           <el-option label="部门指派" value="指派"></el-option>
                         </el-select>
@@ -178,10 +174,8 @@
                       <el-form-item label="再次委托:" prop="entrustAgain"
                         :rules="{ required: true, message: '再次委托不能为空', trigger: 'blur' }" label-width="120px"
                         class="postInfo-container-item">
-                        <el-radio v-model="major.entrustAgain" :label="false" size="medium" readonly
-                          disabled>否</el-radio>
-                        <el-radio v-model="major.entrustAgain" :label="true" size="medium" readonly
-                          disabled>是</el-radio>
+                        <el-radio v-model="major.entrustAgain" :label="false" size="medium" readonly disabled>否</el-radio>
+                        <el-radio v-model="major.entrustAgain" :label="true" size="medium" readonly disabled>是</el-radio>
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
@@ -210,22 +204,19 @@
                       <el-form-item label="客户类型:" prop="clienteleType"
                         :rules="{ required: true, message: '客户类型不能为空', trigger: 'blur' }" label-width="120px"
                         class="postInfo-container-item">
-                        <el-select v-model="major.clienteleType" placeholder="请选择" readonly disabled
-                          style=" width: 100%">
+                        <el-select v-model="major.clienteleType" placeholder="请选择" readonly disabled style=" width: 100%">
                           <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="clienteleId" label-width="120px"
-                        class="postInfo-container-item">
+                      <el-form-item label="客户名称:" prop="clienteleId" label-width="120px" class="postInfo-container-item">
                         <el-input :value="major.cclienteleName" 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="clienteleId" label-width="120px"
-                        class="postInfo-container-item">
+                      <el-form-item label="业务来源:" prop="clienteleId" label-width="120px" class="postInfo-container-item">
                         <el-input :value="major.cclienteleSubName" class="filter-item" readonly disabled />
                       </el-form-item>
                     </el-col>
@@ -454,24 +445,21 @@
                   @click="openLandDialog(major.businessObjectType)">添加估价对象</el-button>
               </el-col>
               <el-col :span="2" v-if="currentNode.nodeCode === 'WRITE_STATEMENT'">
-                <el-tooltip v-if="ifTakeNumber" class="item" effect="dark" content="全选取主号,多次取号(主号-子号)"
-                  placement="right">
+                <el-tooltip v-if="ifTakeNumber" class="item" effect="dark" content="全选取主号,多次取号(主号-子号)" placement="right">
                   <el-button type="success" :disabled="!takeNumberItems.length > 0" round
                     @click="takeStatementNoOrLettertNo('STATEMENT')">取价值意见书号</el-button>
                 </el-tooltip>
                 <!-- <el-button v-if="ifCreatePorduction" type="danger"  round @click="createProduction(reportNo)">创建产品</el-button> -->
               </el-col>
               <el-col :span="2" v-if="currentNode.nodeCode === 'WRITE_REPORT'">
-                <el-tooltip v-if="ifTakeNumber" class="item" effect="dark" content="全选取主号,多次取号(主号-子号)"
-                  placement="right">
+                <el-tooltip v-if="ifTakeNumber" class="item" effect="dark" content="全选取主号,多次取号(主号-子号)" placement="right">
                   <el-button type="danger" :disabled="!takeNumberItems.length > 0" round
                     @click="takeNumberDialog = true">取报告号</el-button>
                 </el-tooltip>
                 <!-- <el-button v-if="ifCreatePorduction" type="danger"  round @click="createProduction(reportNo)">创建产品</el-button> -->
               </el-col>
               <el-col :span="2" v-if="currentNode.nodeCode === 'WRITE_LETTER'">
-                <el-tooltip v-if="ifTakeNumber" class="item" effect="dark" content="全选取主号,多次取号(主号-子号)"
-                  placement="right">
+                <el-tooltip v-if="ifTakeNumber" class="item" effect="dark" content="全选取主号,多次取号(主号-子号)" placement="right">
                   <el-button :disabled="!takeNumberItems.length > 0" round
                     @click="takeStatementNoOrLettertNo('LETTER')">取复评函号</el-button>
                 </el-tooltip>
@@ -562,24 +550,21 @@
                   @click="openLandDialog(major.businessObjectType)">添加估价对象</el-button>
               </el-col>
               <el-col :span="2" v-if="currentNode.nodeCode === 'WRITE_STATEMENT'">
-                <el-tooltip v-if="ifTakeNumber" class="item" effect="dark" content="全选取主号,多次取号(主号-子号)"
-                  placement="right">
+                <el-tooltip v-if="ifTakeNumber" class="item" effect="dark" content="全选取主号,多次取号(主号-子号)" placement="right">
                   <el-button type="success" :disabled="!takeNumberItems.length > 0" round
                     @click="takeStatementNoOrLettertNo('STATEMENT')">取价值意见书号</el-button>
                 </el-tooltip>
                 <!-- <el-button v-if="ifCreatePorduction" type="danger"  round @click="createProduction(reportNo)">创建产品</el-button> -->
               </el-col>
               <el-col :span="2" v-if="currentNode.nodeCode === 'WRITE_REPORT'">
-                <el-tooltip v-if="ifTakeNumber" class="item" effect="dark" content="全选取主号,多次取号(主号-子号)"
-                  placement="right">
+                <el-tooltip v-if="ifTakeNumber" class="item" effect="dark" content="全选取主号,多次取号(主号-子号)" placement="right">
                   <el-button type="danger" :disabled="!takeNumberItems.length > 0" round
                     @click="takeNumberDialog = true">取报告号</el-button>
                 </el-tooltip>
                 <!-- <el-button v-if="ifCreatePorduction" type="danger"  round @click="createProduction(reportNo)">创建产品</el-button> -->
               </el-col>
               <el-col :span="2" v-if="currentNode.nodeCode === 'WRITE_LETTER'">
-                <el-tooltip v-if="ifTakeNumber" class="item" effect="dark" content="全选取主号,多次取号(主号-子号)"
-                  placement="right">
+                <el-tooltip v-if="ifTakeNumber" class="item" effect="dark" content="全选取主号,多次取号(主号-子号)" placement="right">
                   <el-button :disabled="!takeNumberItems.length > 0" round
                     @click="takeStatementNoOrLettertNo('LETTER')">取复评函号</el-button>
                 </el-tooltip>
@@ -757,11 +742,11 @@
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                      <el-form-item prop="validateCode" label-width="140px" class="postInfo-container-item" label="打印二维码:">
+                      <el-form-item prop="validateCode" label-width="140px" class="postInfo-container-item"
+                        label="打印二维码:">
                         <div class="qr-code-div">
-                          <img id="validateCode" class="qr-code"  @click="printQR(props.row.validateCode)"
-                          :src="props.row.qrCode" 
-                          alt="没有产品" />
+                          <img id="validateCode" class="qr-code" @click="printQR(props.row.validateCode)"
+                            :src="props.row.qrCode" alt="没有产品" />
                         </div>
                       </el-form-item>
                     </el-col>
@@ -809,8 +794,7 @@
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item prop="valueTiming" :rules="{ required: true, message: '价值时点不能为空', trigger: 'blur' }"
                         label-width="120px" class="postInfo-container-item" label="价值时点:">
-                        <el-date-picker v-model="props.row.valueTiming" type="date" placeholder="选择日期"
-                          style="width:100%">
+                        <el-date-picker v-model="props.row.valueTiming" type="date" placeholder="选择日期" style="width:100%">
                         </el-date-picker>
                       </el-form-item>
                     </el-col>
@@ -917,29 +901,25 @@
                     </el-form-item>
                   </el-col>
                   <el-col :xs="24" :sm="12" :lg="4" :span="6">
-                    <el-form-item prop="productionType" label-width="120px" class="postInfo-container-item"
-                      label="产品类型:">
+                    <el-form-item prop="productionType" label-width="120px" class="postInfo-container-item" label="产品类型:">
                       <el-input style="width:100%;" disabled readonly :value="performance.productionType"
                         class="filter-item" />
                     </el-form-item>
                   </el-col>
                   <el-col :xs="24" :sm="12" :lg="5" :span="6">
-                    <el-form-item prop="productionName" label-width="120px" class="postInfo-container-item"
-                      label="项目名称:">
+                    <el-form-item prop="productionName" label-width="120px" class="postInfo-container-item" label="项目名称:">
                       <el-input style="width:100%;" disabled readonly :value="performance.productionName"
                         class="filter-item" />
                     </el-form-item>
                   </el-col>
                   <el-col :xs="24" :sm="12" :lg="4" :span="6">
-                    <el-form-item prop="productionName" label-width="120px" class="postInfo-container-item"
-                      label="负责人:">
+                    <el-form-item prop="productionName" label-width="120px" class="postInfo-container-item" label="负责人:">
                       <el-input style="width:100%;" disabled readonly :value="performance.principal"
                         class="filter-item" />
                     </el-form-item>
                   </el-col>
                 </el-row>
-                <el-card shadow="hover" style="width:80%;margin-left:3%" v-for="(p, id) in performance.info"
-                  :index="id">
+                <el-card shadow="hover" style="width:80%;margin-left:3%" v-for="(p, id) in performance.info" :index="id">
                   <el-divider content-position="left">
                     <h3 class="title">
                       {{ p.checkLoop }}
@@ -1040,8 +1020,7 @@
               </el-divider>
               <el-row class="row-style">
                 <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                  <el-form-item label-width="120px" class="postInfo-container-item" prop="prodRealAmount"
-                    label="产品实收金额:">
+                  <el-form-item label-width="120px" class="postInfo-container-item" prop="prodRealAmount" label="产品实收金额:">
                     <el-input :value="item.prodRealAmount" class="filter-item" type="type" readonly disabled>
                       <template slot="append">元</template>
                     </el-input>
@@ -1063,8 +1042,7 @@
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                  <el-form-item label-width="120px" class="postInfo-container-item" prop="standardAmount"
-                    label="产品标准收费:">
+                  <el-form-item label-width="120px" class="postInfo-container-item" prop="standardAmount" label="产品标准收费:">
                     <el-input :value="item.standardAmount" class="filter-item" type="type" readonly disabled>
                       <template slot="append">元</template>
                     </el-input>
@@ -1202,8 +1180,7 @@
                   :readonly="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'"
                   :disabled="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'">出让</el-radio>
                 <el-radio v-model="landTarget.rightType" label="划拨" size="mini"
-                  @click.native="cleanResidueYears(landTarget)"
-                  :readonly="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'"
+                  @click.native="cleanResidueYears(landTarget)" :readonly="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'"
                   :disabled="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'">划拨</el-radio>
               </el-form-item>
             </el-col>
@@ -1286,8 +1263,8 @@
             <el-col :xs="24" :sm="12" :lg="12" :span="8">
               <el-form-item label="实勘人:" prop="sites" :rules="{ required: true, message: '实勘人不能为空', trigger: 'blur' }"
                 label-width="120px" class="postInfo-container-item">
-                <el-select v-model="landTarget.sites" placeholder="请选择" multiple filterable clearable
-                  style="width:350px" @change="sitesChange()" :readonly="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'"
+                <el-select v-model="landTarget.sites" placeholder="请选择" multiple filterable clearable style="width:350px"
+                  @change="sitesChange()" :readonly="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'"
                   :disabled="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'">
                   <el-option v-for="(u, id) in allUsers" :label="u.name" :value="u.id" :key="u.id"></el-option>
                 </el-select>
@@ -1321,12 +1298,16 @@
                   </el-checkbox-group>
                 </el-form-item>
               </el-col>
-            <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="eMethods.includes('其他')">
-              <el-form-item prop="definedEvaluationMethod" class="postInfo-container-item">
-                <el-input v-model="landTarget.definedEvaluationMethod">
-                </el-input>
-              </el-form-item>
-            </el-col>
+            </el-row>
+            <el-row>
+              <el-col :xs="24" :sm="12" :lg="12" :span="6" v-if="eMethods.includes('其他')">
+                <el-form-item label="其他评估方法:" label-width="160px" prop="definedEvaluationMethod"
+                  :class="['postInfo-container-item', 'task-class']"
+                  :rules="{ required: true, message: '其他评估方法不能为空', trigger: 'blur' }">
+                  <el-input v-model="landTarget.definedEvaluationMethod">
+                  </el-input>
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row>
               <el-col :xs="24" :sm="12" :lg="12" :span="6">
@@ -1548,8 +1529,8 @@
     <el-dialog :visible.sync="takeNumberDialog" width="20%" title="请选择取号年份">
       <el-card shadow="always">
         <div>
-          <el-date-picker v-model="year" type="year" placeholder="请选择取号年份" :picker-options="pickerOptions"
-            format="yyyy年" value-format="yyyy">
+          <el-date-picker v-model="year" type="year" placeholder="请选择取号年份" :picker-options="pickerOptions" format="yyyy年"
+            value-format="yyyy">
           </el-date-picker>
           <el-button slot="append" @click="takeNumber">确认取号</el-button>
         </div>
@@ -1569,8 +1550,8 @@
           <i style="font-size:30px;" class="el-icon-warning-outline"></i>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="21" :span="6">
-          <span>系统检测到意见书</span><span
-            style="color:rgb(131,201,94);font-style: italic;">【{{statementNo}}】</span><span>当前没有对应的实收款记录,</span>
+          <span>系统检测到意见书</span><span style="color:rgb(131,201,94);font-style: italic;">【{{ statementNo
+          }}】</span><span>当前没有对应的实收款记录,</span>
           <span>后期是否需要收款?
             <el-tooltip class="item" effect="dark" content="收款:继续流程需归档;不收款:终止流程无需归档;" placement="bottom-start">
               <span><i style="font-size:15px" class="el-icon-question"></i></span>
@@ -1655,7 +1636,7 @@ export default {
             this.validFeed = true;
           }
           else if (ps.includes("REPORT") && ps.includes("LETTER")) {
-           
+
             this.validFeed = true;
           } else if ((ps.includes("REPORT") && ps.includes("NONE")) || (ps.includes("LETTER") && ps.includes("NONE"))) {
             this.$message({
@@ -2070,7 +2051,7 @@ export default {
       }
     },
     getAllotDepartment() {
-      this.$api.department.allot().then(res => {
+      this.$api.department.allot('MAJOR_BUSINESS').then(res => {
         if (res.code === 200) {
           this.allotDepartment = res.data;
         }
@@ -2311,7 +2292,8 @@ export default {
           });
           return;
         }
-        if(!this.landTarget.definedEvaluationMethod){
+        if (!this.landTarget.definedEvaluationMethod && this.eMethods.includes('其他')) {
+          console.log(this.landTarget.definedEvaluationMethod);
           this.$notify({
             title: '失败',
             message: '请填写其他评估方法',
@@ -2353,7 +2335,7 @@ export default {
           });
           return;
         }
-        if(!this.landTarget.definedEvaluationMethod){
+        if (!this.landTarget.definedEvaluationMethod && this.eMethods.includes('其他')) {
           this.$notify({
             title: '失败',
             message: '请填写其他评估方法',
@@ -2810,7 +2792,7 @@ export default {
     },
     handleAttachmentPreview(file) {
       // window.open(file.url)
-      this.officeFileView(file.name,file.url);
+      this.officeFileView(file.name, file.url);
     },
     beforeRemove(file, fileList) {
       let index = fileList[0].index;
@@ -3469,20 +3451,20 @@ export default {
     cleanSecondCheck() {
       this.secondCheckUserId = null;
     },
-    closeLandTarget(){
+    closeLandTarget() {
       this.houseToUse = [];
-      for (let k in this.landTarget){
-          this.landTarget[k] = null;
+      for (let k in this.landTarget) {
+        this.landTarget[k] = null;
       }
     },
-    getFinanceInvoiceAmountInfo(){
+    getFinanceInvoiceAmountInfo() {
       const obj = new Object();
-      obj.majorId= this.majorId;
+      obj.majorId = this.majorId;
       obj.productionNos = [];
-      if (this.businessSubId){
+      if (this.businessSubId) {
         obj.productionNos.push(this.businessSubId);
       }
-      if (this.businessMinId){
+      if (this.businessMinId) {
         obj.productionNos.push(this.businessMinId);
       }
       this.$api.financeInvoice.getInvoiceAmountInfo(obj).then(res => {
@@ -3491,8 +3473,8 @@ export default {
         }
       })
     },
-    printQR(path){
-      if (path){
+    printQR(path) {
+      if (path) {
         let routeUrl = this.$router.resolve({
           path: `/print/code?path=${path}`
         });
@@ -3580,27 +3562,30 @@ export default {
 .error-type:hover {
   cursor: pointer;
 }
-.qr-code-div{
-  border-radius:10px;
-  background-color: RGB(245,245,245); 
-  width: 200px; 
-  height: 200px; 
-  position:absolute;
-  right:0;
+
+.qr-code-div {
+  border-radius: 10px;
+  background-color: RGB(245, 245, 245);
+  width: 200px;
+  height: 200px;
+  position: absolute;
+  right: 0;
   display: flex;
   justify-content: center;
   align-items: center;
 }
-.qr-code{
-  width: 190px; 
-  height: 190px; 
+
+.qr-code {
+  width: 190px;
+  height: 190px;
   z-index: 999;
-  }
+}
+
 .qr-code-div:hover {
   cursor: pointer;
   // background-color:RGB(220,220,220); 
-  width: 205px; 
-  height: 205px; 
+  width: 205px;
+  height: 205px;
 
 }
 </style>

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

@@ -25,17 +25,17 @@
         </el-table-column>
         <el-table-column label="面积" align="center" width="130">
           <template slot-scope="{row}">
-            <span>{{ row.acreage }}</span>
+            <span>{{ row.acreage?row.acreage:'-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="单价" align="center" width="130">
           <template slot-scope="{row}">
-            <span>{{ row.price }}</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 }}</span>
+            <span>{{ row.amount?row.amount:'-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="客户名称" align="center" width="130">