1.新增大中型定价选择其他的时候填写其他方法

2.新增大中型客户经理申请出库必须填写应收款
3.资产我的订单标记送达优化
4.资产市场人员申报新增标记送达校验

src/views/assets/myOrderList.vue

@@ -963,6 +963,7 @@ export default {
                         type: 'success',
                         duration: 1000
                     });
+                    this.selectMyOrderPage();
                 }
             })
         },

src/views/income/assets/market.vue

@@ -271,18 +271,28 @@ export default {
       })
     },
     openDeclareDialog(row) {
-      this.getSimpleAllUser();
-      this.declareDialog = true;
-      this.declareForm.orderId = row.orderId;
-      this.declareForm.name = row.orderName;
-      this.declareForm.reportNo = row.reportNo;
-      this.declareForm.businessId = row.businessId;
-      this.declareForm.productionId = row.productionId;
-      this.businessPerformanceDistributionForm.businessId = row.businessId;
-      this.businessPerformanceDistributionForm.businessType = 'ASSET_BUSINESS';
-      this.businessPerformanceDistributionForm.reportNo = row.reportNo;
-      // 人员类型（市场人员/评估人员）
-      this.businessPerformanceDistributionForm.userType = '市场人员';
+      if (row.delivery) {
+        this.getSimpleAllUser();
+        this.declareDialog = true;
+        this.declareForm.orderId = row.orderId;
+        this.declareForm.name = row.orderName;
+        this.declareForm.reportNo = row.reportNo;
+        this.declareForm.businessId = row.businessId;
+        this.declareForm.productionId = row.productionId;
+        this.businessPerformanceDistributionForm.businessId = row.businessId;
+        this.businessPerformanceDistributionForm.businessType = 'ASSET_BUSINESS';
+        this.businessPerformanceDistributionForm.reportNo = row.reportNo;
+        // 人员类型（市场人员/评估人员）
+        this.businessPerformanceDistributionForm.userType = '市场人员';
+      } else {
+        this.$notify({
+          title: '失败',
+          message: '产品需先标记送达',
+          type: 'error',
+          duration: 2000
+        });
+      }
+
     },
     declareMarket() {
       this.$refs.declareForm.validate(valid => {

src/views/major/myOrder.vue

@@ -6,8 +6,8 @@
     <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getList">
       <template slot="left">
         <PermissionButton menu-code="_views_major_order" class-name="filter-item" type="danger"
-            icon="el-icon-circle-plus-outline" :page-jump="true" round style="position: absolute;left:1100px;z-index:9"
-            :page-query="{ 'couldEdit': true, 'couldBack': true}" />
+          icon="el-icon-circle-plus-outline" :page-jump="true" round style="position: absolute;left:1100px;z-index:9"
+          :page-query="{ 'couldEdit': true, 'couldBack': true }" />
         <MoreSearchBar business="MAJOR_BUSINESS" @fliterSearch="fliterSearch" @resetParams="resetParams"
           :listQuery="listQuery" :nodeCode="false" :financial="false" :clientManager="false" :businessObjectType="false"
           :department="false"></MoreSearchBar>
@@ -82,7 +82,8 @@
           <template slot-scope="{row}">
             <div>
               <PermissionButton menu-code="_views_myOrder_detail" class-name="filter-item" type="text" :page-jump="true"
-                size="mini" :page-query="{ 'couldEdit': false, 'id': row.id, 'back': '/major/my/order', 'recall': true, 'couldBack': true }" />
+                size="mini"
+                :page-query="{ 'couldEdit': false, 'id': row.id, 'back': '/major/my/order', 'recall': true, 'couldBack': true }" />
               <el-button type="text" size="small" @click="openShouldAmountDialog(row)">应收款</el-button>
               <el-button type="text" size="small" @click="openAllotProductionDialog(row)">实收款分配</el-button>
             </div>
@@ -367,17 +368,15 @@
           <el-card style="margin-top:20px" shadow="hover">
             <div slot="header" class="clearfix">
               <!-- <span style="font-size:16px;font-weight:bold;">{{aliasProductionType(r.production)}}</span> -->
-              <span
-                style="margin-left:30px;font-size:16px;font-weight:bold; color:red">实收款金额：{{ r.realAmount != null ? r.realAmount : 0 }}￥</span>
+              <span style="margin-left:30px;font-size:16px;font-weight:bold; color:red">实收款金额：{{ r.realAmount != null ?
+                r.realAmount : 0 }}￥</span>
               <el-button
                 v-if="(r.productionNo === reportNo && r.production != 'STATEMENT' && r.repertoryState != null && !r.repertoryState)"
                 style="float: right; padding: 3px 0;margin-left:10px" type="text"
                 @click="openApplyOutWarehouseList(r)">出库申请</el-button>
-              <el-button
-                v-if="r.productionNo === statementNo && !r.delivery && r.production === 'STATEMENT'"
+              <el-button v-if="r.productionNo === statementNo && !r.delivery && r.production === 'STATEMENT'"
                 style="float: right; padding: 3px 0;" type="text" @click="confirmDelivery(r.id)">确认送达</el-button>
-              <el-button
-                v-if="!r.delivery && r.production != 'STATEMENT' &&  r.repertoryState"
+              <el-button v-if="!r.delivery && r.production != 'STATEMENT' && r.repertoryState"
                 style="float: right; padding: 3px 0;" type="text" @click="noTaskConfirmDelivery(r.id)">确认送达</el-button>
             </div>
             <el-form :model="r">
@@ -916,14 +915,24 @@ export default {
       })
     },
     openApplyOutWarehouseList(row) {
-      this.getListByBizTypeProductionId('MAJOR_BUSINESS', row.id);
-      this.outWarehouseListDialog = true;
-      this.outWarehouse.productionFundId = row.productionFundId;
-      this.outWarehouse.realAmount = row.realAmount
-      this.outWarehouse.ifProductionFund = row.realAmount != null
-      this.outWarehouse.id = row.id;
-      this.outWarehouse.businessType = 'MAJOR_BUSINESS';
-      this.outWarehouse.standardAmount = row.standardAmount;
+      if (row.orderShouldAmount) {
+        this.getListByBizTypeProductionId('MAJOR_BUSINESS', row.id);
+        this.outWarehouseListDialog = true;
+        this.outWarehouse.productionFundId = row.productionFundId;
+        this.outWarehouse.realAmount = row.realAmount
+        this.outWarehouse.ifProductionFund = row.realAmount != null
+        this.outWarehouse.id = row.id;
+        this.outWarehouse.businessType = 'MAJOR_BUSINESS';
+        this.outWarehouse.standardAmount = row.standardAmount;
+      } else {
+        this.$notify({
+          title: '失败',
+          message: '请先填写应收款',
+          type: 'error',
+          duration: 2000
+        });
+      }
+
     },
     openOutWarehouseDialog() {
       if (this.outApllyList.length > 0) {
@@ -1037,31 +1046,31 @@ export default {
       }
       return name;
     },
-    noTaskConfirmDelivery(id){
+    noTaskConfirmDelivery(id) {
       this.$confirm('确认执行产品送达操作？', '提示', {
         confirmButtonText: '确认送达',
         cancelButtonText: '取消',
         type: 'warning',
         center: true
       }).then(() => {
-           this.$api.majorProduction.noTaskConfirmDelivery(id).then(res=>{
-            if (res.code === 200 && res.data) {
-                this.$notify({
-                title: '成功',
-                message: '产品送达状态修改成功',
-                type: 'success',
-                duration: 2000
-              });
-              this.productionListDialog = false;
-            }else {
+        this.$api.majorProduction.noTaskConfirmDelivery(id).then(res => {
+          if (res.code === 200 && res.data) {
+            this.$notify({
+              title: '成功',
+              message: '产品送达状态修改成功',
+              type: 'success',
+              duration: 2000
+            });
+            this.productionListDialog = false;
+          } else {
             this.$notify({
               title: '失败',
               message: '产品送达状态修改失败',
               type: 'error',
               duration: 2000
             });
-            }
-          })
+          }
+        })
       })
     },
     confirmDelivery(id) {
@@ -1122,7 +1131,7 @@ export default {
         }
       })
     },
-    
+
     openAllotProductionDialog(row) {
       if (!row.orderFundId) {
         this.$notify({

src/views/major/todoDetail.vue

@@ -1304,7 +1304,7 @@
             v-if="currentNode.nodeCode === 'INITIAL_PRICE' || currentNode.nodeCode === 'REVIEW_QUOTATION' || hanlderType() === '查看'">
             <el-divider content-position="left">【土地】定价信息</el-divider>
             <el-row>
-              <el-col :xs="24" :sm="12" :lg="24" :span="6">
+              <el-col :xs="24" :sm="12" :lg="14" :span="6">
                 <el-form-item label="评估方法：" prop="eMethods"
                   :rules="{ required: true, message: '评估方法不能为空', trigger: 'blur' }" label-width="160px"
                   :class="['postInfo-container-item', 'task-class']">
@@ -1318,6 +1318,12 @@
                   </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">
@@ -1876,7 +1882,8 @@ export default {
         planPurpose: null,
         realPurpose: null,
         siteLocated: null,
-        useRightType: null
+        useRightType: null,
+        definedEvaluationMethod: null
       },
       houseToUse: [],
       eMethods: [],
@@ -2304,6 +2311,16 @@ export default {
           });
           return;
         }
+        if(!this.landTarget.definedEvaluationMethod){
+          this.$notify({
+            title: '失败',
+            message: '请填写其他评估方法',
+            type: 'info',
+            duration: 1000,
+            offset: 100
+          });
+          return;
+        }
         if (this.major.businessObjectType === '房地产' && this.houseToUse.length == 0) {
           this.$notify({
             title: '失败',
@@ -2336,6 +2353,16 @@ export default {
           });
           return;
         }
+        if(!this.landTarget.definedEvaluationMethod){
+          this.$notify({
+            title: '失败',
+            message: '请填写其他评估方法',
+            type: 'info',
+            duration: 1000,
+            offset: 100
+          });
+          return;
+        }
         this.landTarget.evaluateMethods = JSON.stringify(this.eMethods);
         if (checkeds.includes(null)) {
           this.editLandTarget();