大中型我的订单增加评估信息字段

src/api/modules/major.js

@@ -35,5 +35,8 @@ export default {
   },
   doRecall(params){
     return request.get(`major/recall/${params}`)
+  },
+  productionDetail(params1,params2){
+    return request.get(`major/${params1}/${params2}`)
   }
 }

src/components/MoreSearchBar/index.vue

@@ -28,14 +28,14 @@
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="2" :span="6" style="margin-right: 5px;">
                     <el-select v-if="delivery" v-model="listQuery.delivery" @change="searchList" placeholder="送达状态">
-                        <el-option label="(送达)全部">(送达)全部</el-option>
+                        <el-option :value="null" label="(送达)全部">(送达)全部</el-option>
                         <el-option :value="true" label="已送达">已送达</el-option>
                         <el-option :value="false" label="未送达">未送达</el-option>
                     </el-select>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="2" :span="6" style="margin-right: 5px;">
                     <el-select v-if="hasRealAmount" v-model="listQuery.hasRealAmount" @change="searchList" placeholder="收款状态">
-                        <el-option label="(实收款)全部">(实收款)全部</el-option>
+                        <el-option :value="null" label="(实收款)全部">(实收款)全部</el-option>
                         <el-option :value="true" label="已收款">已收款</el-option>
                         <el-option :value="false" label="未收款">未收款</el-option>
                     </el-select>
@@ -90,7 +90,7 @@
                         </el-input>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="3" :span="6">
-                        <el-select v-if="clientManager" clearable filterable v-model="listQuery.clientManagerId"
+                        <el-select v-if="clientManagerX" clearable filterable v-model="listQuery.clientManagerId"
                             placeholder="客户经理">
                             <el-option v-for="(item, id) in clientManagers" :key="id" :label="item.name" :value="item.id" />
                         </el-select>
@@ -185,12 +185,12 @@ export default {
         financial: {
             type: Boolean,
             require: false,
-            default: true
+            default: false
         },
         nodeCode: {
             type: Boolean,
             require: false,
-            default: true
+            default: false
         },
         clientName: {
             type: Boolean,
@@ -220,7 +220,7 @@ export default {
         department: {
             type: Boolean,
             require: false,
-            default: true
+            default: false
         },
         orderDateSearch: {
             type: Boolean,
@@ -237,11 +237,11 @@ export default {
             require: false,
             default: false
         },
-        hasShouldAmount: {
-            type: Boolean,
-            require: false,
-            default: false
-        },
+        // hasShouldAmount: {
+        //     type: Boolean,
+        //     require: false,
+        //     default: false
+        // },
         businessObjectType: {
             type: Boolean,
             require: false,
@@ -264,7 +264,7 @@ export default {
             require: false,
             default: true
         },
-        clientManager: {
+        clientManagerX: {
             type: Boolean,
             require: false,
             default: true

src/views/major/myOrder.vue

@@ -7,8 +7,8 @@
       <template slot="left">
         <MoreSearchBar business="MAJOR_BUSINESS" @fliterSearch="fliterSearch" @resetParams="resetParams"
           :listQuery="listQuery" :nodeCode="false" :financial="false" :delivery="true" :hasRealAmount="true"
-          :hasShouldAmount="true" :clientManager="false" :businessObjectType="false" :department="false" :orderId="true"
-          :productionNo="true" :productionType="true">
+          :clientManagerX="false" :businessObjectType="false" :department="false" :orderId="true"
+          :productionNo="true" :productionType="false" >
           <template v-slot:otherButton>
             <PermissionButton menu-code="_views_major_order" class-name="filter-item" type="danger"
               icon="el-icon-circle-plus-outline" :page-jump="true" round
@@ -132,7 +132,7 @@
           <template slot-scope="{row}">
             <PermissionButton menu-code="_views_myOrder_detail" class-name="filter-item" type="text" :page-jump="true"
               size="mini"
-              :page-query="{ 'couldEdit': true, 'id': row.businessId, 'back': '/major/my/order', 'recall': true, 'couldBack': true, 'orderId': row.orderId }" />
+              :page-query="{ 'couldEdit': true, 'id': row.businessId, 'back': '/major/my/order', 'recall': true, 'couldBack': true, 'orderId': row.orderId,'productionNo':row.productionNo }" />
             <el-button type="text" size="small" @click="openShouldAmountDialog(row)">应收款</el-button>
             <!-- <el-button type="text" size="small" @click="openAllotProductionDialog(row)">实收款分配</el-button> -->
             <el-button  type="text" size="small"

src/views/major/myOrderDetail.vue

@@ -119,6 +119,56 @@
                   <el-row class="row-style">
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item
+                        label="订单号："
+                        prop="orderId"
+                        label-width="120px"
+                        :class="['postInfo-container-item']"
+                      >
+                       <el-input :value="major.orderId" class="filter-item" readonly disabled style=" width: 225px"></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                      <el-form-item
+                        label="产品号："
+                        prop="productionNo"
+                        label-width="120px"
+                        :class="['postInfo-container-item']"
+                      >
+                       <el-input :value="major.productionNo" class="filter-item" readonly disabled style=" width: 225px"></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                      <el-form-item
+                        label="评估面积："
+                        prop="evaluateAcreage"
+                        label-width="120px"
+                        :class="['postInfo-container-item']"
+                      >
+                       <el-input :value="major.evaluateAcreage" class="filter-item" readonly disabled style=" width: 225px">
+                        <template  slot="append">
+                          平米
+                        </template>
+                       </el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                      <el-form-item
+                        label="评估总价："
+                        prop="evaluateAmount"
+                        label-width="120px"
+                        :class="['postInfo-container-item']"
+                      >
+                       <el-input :value="major.evaluateAmount" class="filter-item" readonly disabled style=" width: 225px">
+                        <template  slot="append">
+                          万元
+                        </template>
+                       </el-input>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row class="row-style">
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                      <el-form-item
                         label="对象类型："
                         prop="businessObjectType"
                         label-width="120px"
@@ -729,13 +779,15 @@
           "存量房地产再开发利用投资价值评估、咨询",
           "公共性、公益性房地产评估",],
         saveOrderBtn:null,
-        couldEdit:null
+        couldEdit:null,
+        productionNo:null
 
       }
     },
     created() {
         this.couldEdit = this.$route.query.couldEdit ==='true';
         this.couldBack = this.$route.query.couldBack ==='true';
+        this.productionNo = this.$route.query.productionNo;
         this.saveOrderBtn = this.$route.query.saveOrderBtn;
         this.majorId = this.$route.query.id;
         this.getAllUser();
@@ -813,7 +865,7 @@
       },
       getMajorDetail(){
         if (this.majorId){
-          this.$api.major.detail(this.majorId).then(res=>{
+          this.$api.major.productionDetail(this.majorId,this.productionNo).then(res=>{
             if (res.code === 200){
                 this.major = res.data;
                 this.major.membersId = JSON.parse(this.major.members);
@@ -863,6 +915,8 @@
         }
       },
       findSubClientele(val){
+        console.log("val",val)
+        console.log("clienteleId",this.major.clienteleId)
         if (val===0){
           if (this.major.clienteleId){
             let simpleAll = new Object();