Merge branch 'master' into xqc_971

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/allocationLable.vue

@@ -33,7 +33,7 @@
       <el-table-column align="center" prop="MoneyPoint" label="获得派点" width="90" v-if="typeLable"> </el-table-column>
       <el-table-column align="center" prop="ContractCode" label="操作" v-if="!typeLable">
         <template slot-scope="{ row }">
-          <span v-if="row.IsAllocation == 0" :class="row.IsGray ? '' : 'editsty'" @click="allocationDetail(row)">派点</span>
+          <span v-if="row.IsAllocation == 0 && row.ContractType !=  '打分派点'" :class="row.IsGray ? '' : 'editsty'" @click="allocationDetail(row)">派点</span>
           <span v-if="row.IsAllocation == 1" class="editsty" @click="detailsHandler(row)">派点详情</span>
         </template>
       </el-table-column>

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>

src/views/contract_manage/raiAllocationPage.vue

@@ -121,6 +121,10 @@ export default {
           value: "补充协议",
           label: "补充协议",
         },
+         {
+          value: "打分派点",
+          label: "打分派点",
+        },
       ], // 合同类型
       statusArr: [], // 派点状态
       defaultSalesProps: {