Merge branch '应用tab权限' into 测试

packageA/contract/detail.wxml

@@ -14,11 +14,11 @@
     <Trace slot='跟进动态' id='Trace' ownertable='sa_contract' ownerid='{{detail.sa_contractid}}' />
     <Work slot='任务' id='Work' ownertable='sa_contract' ownerid='{{detail.sa_contractid}}' disabled="{{isAdmin||isLeader}}" />
 
-    <PiscountProduct wx:if="{{detail.type=='经销商合作协议'||detail.type=='直销客户合作协议'}}" slot='产品明细折扣' id='PiscountProduct' disabled="{{(isAdmin||isLeader)&&detail.status!='新建'}}" />
-    <Product wx:else slot='{{detail.type=="工具使用(借用)协议"?  "工具清单": "产品明细折扣"}}' synchronous='{{detail.type=="经销项目协议" && isLeader && detail.status=="新建"}}' disabled="{{(isAdmin||isLeader)&&detail.status!='新建'}}" id='Product' />
-    <PiscountType slot='产品类别折扣' id='PiscountType' synchronous='{{detail.type=="经销项目协议" && isLeader && detail.status=="新建"}}' disabled="{{(isAdmin||isLeader)&&detail.status!='新建'}}" />
+    <PiscountProduct wx:if="{{detail.type=='经销商合作协议'||detail.type=='直销客户合作协议'}}" slot='产品明细折扣' id='PiscountProduct' disabled="{{isAdmin||isLeader&&detail.status=='新建'}}" />
+    <Product wx:else slot='{{detail.type=="工具使用(借用)协议"?  "工具清单": "产品明细折扣"}}' synchronous='{{detail.type=="经销项目协议" && isLeader && detail.status=="新建"}}' disabled="{{isAdmin||isLeader&&detail.status=='新建'}}" id='Product' />
+    <PiscountType slot='产品类别折扣' id='PiscountType' synchronous='{{detail.type=="经销项目协议" && isLeader && detail.status=="新建"}}' disabled="{{isAdmin||isLeader&&detail.status=='新建'}}" />
 
-    <Objective slot='业绩目标' id='Objective' />
+    <Objective slot='业绩目标' id='Objective' disabled="{{isAdmin||isLeader&&detail.status=='新建'}}" />
     <Record slot="操作记录" id="Record" ownertable='sa_contract' ownerid='{{detail.sa_contractid}}' />
     <!-- <view slot='合同条款' /> -->
     <view style="height: 140rpx;" />

packageA/contract/modules/discount/product/index.wxml

@@ -9,4 +9,4 @@
         </navigator>
     </view>
 </view>
-<List list='{{list}}' disabled='{{disabled}}' bind:deleteItem='deleteItems' bindchangeQueue='changeQueue' />
+<List list='{{list}}' disabled='{{!disabled}}' bind:deleteItem='deleteItems' bindchangeQueue='changeQueue' />

packageA/contract/modules/discount/type/index.wxml

@@ -9,5 +9,5 @@
         </navigator>
     </view>
 </view>
-<List list='{{list}}' disabled='{{disabled}}' bind:deleteItem='deleteItems' bindchangeQueue='changeQueue' />
+<List list='{{list}}' disabled='{{!disabled}}' bind:deleteItem='deleteItems' bindchangeQueue='changeQueue' />
 <synchronous id="synchronous" type='类别' bind:confirm='confirm' />

packageA/contract/modules/objective/index.wxml

@@ -12,10 +12,10 @@
     </picker>
 
     <view class="expand">
-        <navigator wx:if="{{!disabled}}" url="#" class="but" bindtap="editObjective">
+        <navigator wx:if="{{disabled}}" url="#" class="but" bindtap="editObjective">
             <van-icon name="edit" />
         </navigator>
-        <navigator wx:if="{{!disabled}}" url="/packageA/contract/modules/objective/setUp?domainList={{domainList}}" class="but">
+        <navigator wx:if="{{disabled}}" url="/packageA/contract/modules/objective/setUp?domainList={{domainList}}" class="but">
             <van-icon name="plus" />
         </navigator>
     </view>

packageA/contract/modules/product/index.wxml

@@ -9,6 +9,6 @@
         </navigator>
     </view>
 </view>
-<List list='{{list}}' disabled='{{disabled}}' bind:deleteItem='deleteItems' bindchangeQueue='changeQueue' />
+<List list='{{list}}' disabled='{{!disabled}}' bind:deleteItem='deleteItems' bindchangeQueue='changeQueue' />
 
 <synchronous id="synchronous" bind:confirm='confirm' />