项目商机合同调整

src/HDrpManagement/contractManage/components/addContract.vue

@@ -513,7 +513,7 @@
                   v-model="agentVisible"
                   width="500">
 
-                  <selectAgent ref="member" type="21" :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
+                  <selectAgent ref="member" type="22" :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
 
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename" placeholder="请选择居间商"></el-input>
                 </el-popover>

src/HDrpManagement/contractManage/components/editContract.vue

@@ -516,7 +516,7 @@
                   v-model="accountVisible"
                   width="400">
 
-                    <selectAgent ref="member" type="21"  :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="accountVisible = false"></selectAgent>
+                    <selectAgent ref="member" type="22"  :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="accountVisible = false"></selectAgent>
 
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -185,6 +185,12 @@
           <div v-else-if="scope.column.columnname === 'amount'">
             <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.column.data.amount,2)}}</p>
           </div>
+          <div v-else-if="scope.column.columnname === 'afterrebateprice'">
+            <p>¥&nbsp;{{scope.column.data.afterrebateprice?tool.formatAmount(scope.column.data.afterrebateprice,2):'0.00'}}</p>
+          </div>
+          <div v-else-if="scope.column.columnname === 'afterrebateamount'">
+            <p>¥&nbsp;{{scope.column.data.afterrebateamount?tool.formatAmount(scope.column.data.afterrebateamount,2):'0.00'}}</p>
+          </div>
           <div v-else-if="scope.column.columnname === 'stockname'">
             <el-select v-model="scope.column.data.stockno" size="mini" @visible-change="queryStock(scope.column.data)" placeholder="请选择">
               <el-option

src/HDrpManagement/projectChange/modules/modules/contract/components/add.vue

@@ -302,7 +302,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24" v-if="form.calculatemodel==2">
-              <el-form-item label="居间产品折扣(%):" :rules="{ required: false, message: '请填写折扣', trigger: 'blur' }">
+              <el-form-item label="居间产品折扣(%):" prop="productdiscount">
                 <el-input type="number" size="small" v-model.number="form.productdiscount" placeholder="请输入0-100%" @change="productdiscountChange"></el-input>
               </el-form-item>
             </el-col>