xiaohaizhao преди 8 месеца
родител
ревизия
f1f4abc61f

+ 1 - 1
Eservice/agent/serviceBillDetail/index.js

@@ -44,7 +44,7 @@ Page({
       "content": {
         "ownertable": "sa_serviceorder",
         "ownerid": this.data.id,
-        "usetype": "附件" //传空返回有所
+        "usetype": "" //传空返回有所
       }
     })
     this.setData({

+ 4 - 4
Eservice/agent/serviceBillDetail/index.wxml

@@ -57,20 +57,20 @@
                 <view style="height: 50px;" />
             </block>
         </t-tab-panel>
-        <t-tab-panel wx:if="{{orderMainData.servicetype !== '售前' && orderMainData.servicetype !== '历史售后' && orderMainData.status == '新建'}}" label="售后商品" value="1">
+        <t-tab-panel wx:if="{{orderMainData.servicetype !== '售前' && orderMainData.servicetype !== '历史售后'}}" label="售后商品" value="1">
             <view style="padding:10px" wx:if="{{list.length === 0}}">
                 <t-empty icon="cart" description="暂未添加商品">
-                    <t-button slot="action" theme="primary" size="extra-small" bindtap="addProduct">前往添加</t-button>
+                    <t-button wx:if="{{orderMainData.status == '新建'}}" slot="action" theme="primary" size="extra-small" bindtap="addProduct">前往添加</t-button>
                 </t-empty>
             </view>
             <view wx:else>
-                <view style="text-align: right;border:1px solid #f1f2f3">
+                <view wx:if="{{orderMainData.status == '新建'}}" style="text-align: right;border:1px solid #f1f2f3">
                     <t-button theme="primary" size="small" icon="add" variant="text" bindtap="addProduct">
                         继续添加
                     </t-button>
                 </view>
                 <view wx:for="{{list}}" wx:key="{{itemid}}">
-                    <product-card data="{{item}}" isdelete="{{true}}" bind:delete="onDelete"></product-card>
+                    <product-card data="{{item}}" isdelete="{{orderMainData.status == '新建'}}" bind:delete="onDelete"></product-card>
                 </view>
 
             </view>

+ 4 - 1
Eservice/components/productCard/index.js

@@ -14,7 +14,10 @@ Component({
       value: 1
     },
     changeItem: Function,
-    delete: Function
+    delete: Function,
+    isdelete: {
+      type: Boolean
+    }
   },
   methods: {
     onIconTap() {

+ 1 - 1
Eservice/components/productCard/index.wxml

@@ -34,7 +34,7 @@
       </block>
     </view>
   </view>
-  <view wx:if="{{model!=3}}" class="deleteBtn">
+  <view wx:if="{{model!=3 && isdelete}}" class="deleteBtn">
     <t-icon size="36rpx" name="delete" bind:click="onIconTap" />
   </view>
   <block wx:if="{{model==2}}">

+ 1 - 1
Eservice/saler/serviceBillDetail/index.js

@@ -42,7 +42,7 @@ Page({
       "content": {
         "ownertable": "sa_serviceorder",
         "ownerid": this.data.id,
-        "usetype": "附件" //传空返回有所
+        "usetype": "" //传空返回有所
       }
     })
     this.setData({

+ 3 - 3
Eservice/saler/serviceBillDetail/index.wxml

@@ -53,14 +53,14 @@
     <t-tab-panel label="关联工单" value="0">
       <t-cell wx:for="{{linkWorkOrders}}" wx:key="sa_serviceorderid" title="工单编号" bind:click="tolinkWorkOrder" data-item="{{item}}" note="{{item.billno}}" hover arrow />
     </t-tab-panel>
-    <t-tab-panel wx:if="{{orderMainData.servicetype !== '售前' && orderMainData.servicetype !== '历史售后' && orderMainData.status == '新建'}}" label="售后商品" value="1">
+    <t-tab-panel wx:if="{{orderMainData.servicetype !== '售前' && orderMainData.servicetype !== '历史售后'}}" label="售后商品" value="1">
       <view style="padding:10px" wx:if="{{list.length === 0}}">
         <t-empty icon="cart" description="暂未添加商品">
-          <t-button slot="action" theme="primary" size="extra-small" bindtap="addProduct">前往添加</t-button>
+          <t-button wx:if="{{orderMainData.status == '新建'}}" slot="action" theme="primary" size="extra-small" bindtap="addProduct">前往添加</t-button>
         </t-empty>
       </view>
       <view wx:else>
-        <view style="text-align: right;border:1px solid #f1f2f3">
+        <view wx:if="{{orderMainData.status == '新建'}}" style="text-align: right;border:1px solid #f1f2f3">
           <t-button theme="primary" size="small" icon="add" variant="text" bindtap="addProduct">
             继续添加
           </t-button>

+ 1 - 1
Eservice/workerLeader/serviceBillDetail/index.js

@@ -63,7 +63,7 @@ Page({
       "content": {
         "ownertable": "sa_serviceorder",
         "ownerid": this.data.id,
-        "usetype": "附件" //传空返回有所
+        "usetype": "" //传空返回有所
       }
     })
     this.setData({

+ 4 - 4
Eservice/workerLeader/serviceBillDetail/index.wxml

@@ -64,20 +64,20 @@
       <t-cell wx:for="{{linkWorkOrders}}" wx:key="sa_serviceorderid" title="工单编号" note="{{item.billno}}" data-item="{{item}}" bind:click="tolinkWorkOrder" hover arrow />
       <t-empty wx:if="{{linkWorkOrders.length === 0}}" icon="root-list" t-class="empty-cls" t-class-image="t-empty__image" description="暂无工单" />
     </t-tab-panel>
-    <t-tab-panel wx:if="{{orderMainData.servicetype !== '售前' && orderMainData.servicetype !== '历史售后' && orderMainData.status == '新建'}}" label="售后商品" value="1">
+    <t-tab-panel wx:if="{{orderMainData.servicetype !== '售前' && orderMainData.servicetype !== '历史售后'}}" label="售后商品" value="1">
       <view style="padding:10px" wx:if="{{list.length === 0}}">
         <t-empty icon="cart" description="暂未添加商品">
-          <t-button slot="action" theme="primary" size="extra-small" bindtap="addProduct">前往添加</t-button>
+          <t-button wx:if="{{orderMainData.status == '新建'}}" slot="action" theme="primary" size="extra-small" bindtap="addProduct">前往添加</t-button>
         </t-empty>
       </view>
       <view wx:else>
-        <view style="text-align: right;border:1px solid #f1f2f3">
+        <view wx:if="{{orderMainData.status == '新建'}}" style="text-align: right;border:1px solid #f1f2f3">
           <t-button theme="primary" size="small" icon="add" variant="text" bindtap="addProduct">
             继续添加
           </t-button>
         </view>
         <view wx:for="{{list}}" wx:key="{{itemid}}">
-          <product-card data="{{item}}" isdelete="{{true}}" bind:delete="onMXDelete"></product-card>
+          <product-card data="{{item}}" isdelete="{{orderMainData.status == '新建'}}" bind:delete="onMXDelete"></product-card>
         </view>
 
       </view>