Merge branch 'crm_15.4.1' into debug

src/views/contract_manage/components/allocationDetail.vue

@@ -34,7 +34,7 @@
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button @click="handleClose">取 消</el-button>
-      <el-button v-if="allocationDetailForm.isDlgType != '关联合同'" :disabled="IsGray" type="primary" @click="addAllocationHandler">修 改</el-button>
+      <el-button v-if="allocationDetailForm.isDlgType != '关联合同' && allocationDetailForm.ContractType != '打分派点'" :disabled="IsGray" type="primary" @click="addAllocationHandler">修 改</el-button>
     </span>
   </el-dialog>
 </template>

src/views/contract_manage/components/allocationNumber.vue

@@ -39,7 +39,7 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="handleClose">取 消</el-button>
-        <el-button type="primary" @click="addAllocationHandler">确 定</el-button>
+        <el-button v-if="allocationForm.ContractType != '打分派点'" type="primary" @click="addAllocationHandler">确 定</el-button>
       </span>
     </el-dialog>
   </div>