启用前更新

src/components/MoreSearchBar/index.vue

@@ -157,7 +157,7 @@ export default {
     props: {
         listQuery: {
             type: Object,
-            require: true
+            require: false
         },
         keyword: {
             type: Boolean,
@@ -166,7 +166,7 @@ export default {
         },
         business: {
             type: String,
-            require: true,
+            require: false,
         },
         financial: {
             type: Boolean,

src/views/complex/index.vue

@@ -199,7 +199,7 @@
               </svg>
               <div class="icon-word">我的收入</div>
             </div>
-            <div class="icon-area" @click="jumpToProductivityPlatform()">
+            <!-- <div class="icon-area" @click="jumpToProductivityPlatform()">
               <svg t="1729559237544" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
                 p-id="4820" width="48" height="48">
                 <path
@@ -213,7 +213,7 @@
                   fill="#FFFFFF" p-id="4822"></path>
               </svg>
               <div class="icon-word">生产力平台</div>
-            </div>
+            </div> -->
           </div>
         </el-card>
 
@@ -925,7 +925,7 @@ export default {
       handler(newv) {
         if (newv) {
           const postList = newv.postList.map(item => item.name)
-          const marketPosts = ['销售代表', '客户经理', '客户经理-业务员', '市场一部经理', '市场二部经理', '销售主管']
+          const marketPosts = ['销售代表', '客户经理', '客户经理-业务员', '市场一部经理', '市场二部经理', '销售主管','市场部经理']
           postList.forEach(element => {
             if (marketPosts.includes(element)) {
               this.hasOpenBar = true;

src/views/income/major/evaluate.vue

@@ -45,6 +45,11 @@
             <span>{{ row.reportNo?row.reportNo:'--' }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="产品类型"  align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.production }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="对象类别" align="center">
           <template slot-scope="{row}">
             <span>{{ row.businessObjectType }}</span>

src/views/income/major/market.vue

@@ -50,6 +50,11 @@
             <span>{{ row.reportNo ? row.reportNo : '--' }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="产品类型"  align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.production }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="对象类别" align="center">
           <template slot-scope="{row}">
             <span>{{ row.businessObjectType }}</span>

src/views/major/detail.vue

@@ -1085,6 +1085,22 @@
                           </el-date-picker>
                         </el-form-item>
                     </el-col>
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                      <el-form-item label="评估目的：" prop="workPurpose"
+                        :rules="{ required: true, message: '估价目的不能为空', trigger: 'blur' }" label-width="120px"
+                        class="postInfo-container-item">
+                        <el-select v-model="props.row.workPurpose" placeholder="请选择" style=" width: 100%" filterable default-first-option allow-create    disabled readonly                     >
+                          <el-option label="抵押" value="抵押"></el-option>
+                          <el-option label="咨询" value="咨询"></el-option>
+                          <el-option label="融资" value="融资"></el-option>
+                          <el-option label="司法" value="司法"></el-option>
+                          <el-option label="可行性研究" value="可行性研究"></el-option>
+                          <el-option label="不良资产价值评估" value="不良资产价值评估"></el-option>
+                          <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" v-if="props.row.production==='REPORT'">
                         <el-form-item  prop="signatory"
                         label-width="120px"

src/views/major/myOrderDetail.vue

@@ -558,7 +558,61 @@
           this.changeType();
           this.getAllotDepartment();
         }
-    },
+      },
+      'major.clienteleType'(nv,ov){
+          if (nv=='个人'){
+            let simpleAll = new Object();
+            simpleAll.ccId = 1;
+            this.$api.customerLinkman.simpleAll(simpleAll).then(res=>{
+            if (res.code === 200){
+                this.customerContract = res.data;
+            }
+          })
+          }
+        },
+        'major.clienteleId'(nv,ov){
+          let simpleAll = new Object();
+          simpleAll.terminal=0;
+          simpleAll.parentId= nv;
+          this.$api.customerCompany.simpleAll(simpleAll).then(res=>{
+              if (res.code === 200){
+                  this.subCustomerCompany = res.data;
+              }
+          })
+        },
+        'major.clienteleSubId'(nv,ov){
+            let simpleAll = new Object();
+            simpleAll.ccId = nv;
+            this.$api.customerLinkman.simpleAll(simpleAll).then(res=>{
+            if (res.code === 200){
+                this.customerContract = res.data;
+            }
+          })
+        },
+        'major.terminalClienteleType'(nv,ov){
+            console.log(nv)
+            if (nv=='企业'){
+              this.getCustomerCompany(1);
+              let simpleAll = new Object();
+              simpleAll.terminal=1;
+              simpleAll.ccId = this.personal.terminalClienteleId;
+              this.$api.customerLinkman.simpleAll(simpleAll).then(res=>{
+              if (res.code === 200){
+                this.tCustomerContract =res.data;
+              }
+            })
+            }else{
+              let simpleAll = new Object();
+              simpleAll.ccId = 2;
+              simpleAll.terminal = 1;
+              this.$api.customerLinkman.simpleAll(simpleAll).then(res=>{
+                if (res.code === 200){
+                    this.tCustomerCompany = res.data;
+                }
+              })
+            }
+              
+        }
     },
     data() {
       return {

src/views/personal/order.vue

@@ -760,6 +760,61 @@
         YDetailPageLayout,
       },
       watch:{
+        'personal.clienteleType'(nv,ov){
+          if (nv=='个人'){
+            let simpleAll = new Object();
+            simpleAll.ccId = 1;
+            this.$api.customerLinkman.simpleAll(simpleAll).then(res=>{
+            if (res.code === 200){
+                this.customerContract = res.data;
+            }
+          })
+          }
+        },
+        'personal.clienteleId'(nv,ov){
+          let simpleAll = new Object();
+          simpleAll.terminal=0;
+          simpleAll.parentId= nv;
+          this.$api.customerCompany.simpleAll(simpleAll).then(res=>{
+              if (res.code === 200){
+                  this.subCustomerCompany = res.data;
+              }
+          })
+        },
+        'personal.clienteleSubId'(nv,ov){
+            let simpleAll = new Object();
+            simpleAll.ccId = nv;
+            this.$api.customerLinkman.simpleAll(simpleAll).then(res=>{
+            if (res.code === 200){
+                this.customerContract = res.data;
+            }
+          })
+        },
+        'personal.terminalClienteleType'(nv,ov){
+            console.log(nv)
+            if (nv=='企业'){
+              this.getCustomerCompany(1);
+              let simpleAll = new Object();
+              simpleAll.terminal=1;
+              simpleAll.ccId = this.personal.terminalClienteleId;
+              this.$api.customerLinkman.simpleAll(simpleAll).then(res=>{
+              if (res.code === 200){
+                this.tCustomerContract =res.data;
+              }
+            })
+            }else{
+              let simpleAll = new Object();
+              simpleAll.ccId = 2;
+              simpleAll.terminal = 1;
+              this.$api.customerLinkman.simpleAll(simpleAll).then(res=>{
+                if (res.code === 200){
+                    this.tCustomerCompany = res.data;
+                }
+              })
+            }
+              
+        }
+
       },
       computed: {
   
@@ -798,7 +853,7 @@
               bailoraTel:null,
               bailorB:null,
               bailorbTel:null,
-              terminalClienteleType:'企业',
+              terminalClienteleType:null,
               tterminalClienteleName:null,
               tterminalClienteleContactName:null,
               tmobile:null,