zhoux 1 год назад
Родитель
Сommit
43007b9290

+ 5 - 1
package-accounts-manage/pages/funds-transfer/detail/detail.wxml

@@ -14,8 +14,12 @@
 <dk-save-bottom flagTypeName="funds-transfer-add" totallength="{{2002}}" bind:submit="toClose" bind:allClean="toAdd" />
 
 <!-- 底部编辑 以后要做 todo......... -->
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;"  >
+<!-- <view style="position: fixed;bottom: 230rpx;right: 30rpx;"  >
   <view bind:tap="toEdit" class="btn-add-class">
     <van-icon name="edit" color="#FFFFFF" size="60rpx" />
   </view>
+</view> -->
+<!-- 编辑  -->
+<view style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+  <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>

+ 5 - 1
package-accounts-manage/pages/other-expenditure-orders/detail/detail.wxml

@@ -13,10 +13,14 @@ objTitle ="supName" objSubTitle="contactPhone" cardList="{{cardList}}" contentOb
 <dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{false}}" buttonList="{{buttonFootList}}"   bind:open="openInfo"></dk-save-button>
 
 <!-- 底部编辑 以后要做 todo......... -->
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;"  >
+<!-- <view style="position: fixed;bottom: 230rpx;right: 30rpx;"  >
   <view bind:tap="toEdit" class="btn-add-class">
     <van-icon name="edit" color="#FFFFFF" size="60rpx" />
   </view>
+</view> -->
+<!-- 编辑  -->
+<view  style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+  <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>
 
 <!-- 弹出收付款的信息 -->

+ 5 - 1
package-accounts-manage/pages/other-receipt/detail/detail.wxml

@@ -12,10 +12,14 @@
 <dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{false}}" buttonList="{{buttonFootList}}"  bind:open="openInfo"></dk-save-button>
 
 <!-- 底部编辑 以后要做 todo......... -->
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;"  >
+<!-- <view style="position: fixed;bottom: 230rpx;right: 30rpx;"  >
   <view bind:tap="toEdit" class="btn-add-class">
     <van-icon name="edit" color="#FFFFFF" size="60rpx" />
   </view>
+</view> -->
+<!-- 编辑  -->
+<view style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+  <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>
 
 <!-- 弹出收付款的信息 -->

+ 5 - 1
package-basic-data/pages/customer-follow-up/customer-follow-up.wxml

@@ -27,10 +27,14 @@
 
 <dk-form id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
 </dk-form>
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;" wx:if="{{formType =='detail'}}">
+<!-- <view style="position: fixed;bottom: 230rpx;right: 30rpx;" wx:if="{{formType =='detail'}}">
   <view bind:tap="toEdit" class="btn-add-class-2">
     <van-icon name="edit" color="#FFFFFF" size="60rpx" />
   </view>
+</view> -->
+<!-- 编辑  -->
+<view wx:if="{{formType =='detail'}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+  <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>
 
 <!--  保存 -->

+ 5 - 1
package-basic-data/pages/customer-reception/add/add.wxml

@@ -35,10 +35,14 @@
     <van-icon name="cart-o" color="#FFFFFF" size="60rpx" />
   </view>
 </view>
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;" wx:if="{{formType =='detail'}}">
+<!-- <view style="position: fixed;bottom: 230rpx;right: 30rpx;" wx:if="{{formType =='detail'}}">
   <view bind:tap="toEdit" class="btn-add-class-2">
     <van-icon name="edit" color="#FFFFFF" size="60rpx" />
   </view>
+</view> -->
+<!-- 编辑  -->
+<view wx:if="{{formType =='detail'}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+  <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>
 
 <!--  保存 -->

+ 5 - 1
package-basic-data/pages/customer-reception/measure-to/measure-to.wxml

@@ -52,10 +52,14 @@
 
 
 
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;" wx:if="{{formType =='detail'}}">
+<!-- <view style="position: fixed;bottom: 230rpx;right: 30rpx;" wx:if="{{formType =='detail'}}">
   <view bind:tap="toEdit" class="btn-add-class-2">
     <van-icon name="edit" color="#FFFFFF" size="60rpx" />
   </view>
+</view> -->
+<!-- 编辑  -->
+<view wx:if="{{formType =='detail'}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+  <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>
 
 

+ 5 - 1
package-basic-data/pages/org/org.wxml

@@ -75,8 +75,12 @@
 </dk-popup>
 
 <!-- 底部编辑 以后要做 todo......... -->
-<view wx:if="{{readonly}}" style="z-index: 111; position: fixed;bottom: 230rpx;right: 30rpx;">
+<!-- <view wx:if="{{readonly}}" style="z-index: 111; position: fixed;bottom: 230rpx;right: 30rpx;">
     <view bind:tap="toEdit" class="btn-add-class">
         <van-icon name="edit" color="#FFFFFF" size="60rpx" />
     </view>
+</view> -->
+<!-- 编辑  -->
+<view wx:if="{{readonly}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+  <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>

+ 5 - 1
package-basic-data/pages/org/sub-org-choose/sub-org-choose.wxml

@@ -50,8 +50,12 @@
 </dk-popup>
 
 <!-- 底部编辑 以后要做 todo......... -->
-<view wx:if="{{readonly}}" style="z-index: 111;position: fixed;bottom: 230rpx;right: 30rpx;">
+<!-- <view wx:if="{{readonly}}" style="z-index: 111;position: fixed;bottom: 230rpx;right: 30rpx;">
     <view bind:tap="toEdit" class="btn-add-class">
         <van-icon name="edit" color="#FFFFFF" size="60rpx" />
     </view>
+</view> -->
+<!-- 编辑  -->
+<view wx:if="{{readonly}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+  <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>

+ 5 - 1
package-inventory/pages/inventory-check/detail/detail.wxml

@@ -12,10 +12,14 @@ bind:delItem="setGoods" bind:setGoods="setGoods"  iconCol="imagesUrl"lossReasonF
 
 
 <!-- 底部编辑 以后要做 todo......... -->
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;"  >
+<!-- <view style="position: fixed;bottom: 230rpx;right: 30rpx;"  >
   <view bind:tap="toEdit" class="btn-add-class">
     <van-icon name="edit" color="#FFFFFF" size="60rpx" />
   </view>
+</view> -->
+<!-- 编辑  -->
+<view style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+  <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>
  
  

+ 5 - 1
package-purchase/pages/purchase-order/purchase-order-detail/purchase-order-detail.wxml

@@ -104,8 +104,12 @@
 
 
 <!-- 底部编辑 以后要做 todo......... -->
-<view wx:if="{{item.flgValid}}" style="position: fixed;bottom: 230rpx;right: 30rpx;">
+<!-- <view wx:if="{{item.flgValid}}" style="position: fixed;bottom: 230rpx;right: 30rpx;">
   <view data-item="{{item}}" bind:tap="toEdit" class="btn-add-class">
     <van-icon name="edit" color="#FFFFFF" size="60rpx" />
   </view>
+</view> -->
+<!-- 编辑  -->
+<view wx:if="{{item.flgValid}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+  <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>

+ 40 - 39
package-purchase/pages/purchase-receipt/detail/detail.wxml

@@ -1,64 +1,65 @@
 <!-- 前台导入wxmlUtil.wxs -->
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 
-<loading wx:if="{{loading}}" ></loading>
- 
+<loading wx:if="{{loading}}"></loading>
 
-<view class="detail-top" >
-    <image class="scan-image" fit="fill" src="{{imageUrl+'/detail_sale_order.png'}}"></image>
 
- 
-    <view class="detail-top-sup" style="display: flex;">
-      <view style="width: 10%;">
-        <image class="scan-image-icon" fit="fill" src="{{imageUrl+'/order_billing_detail_01.png'}}"></image>
+<view class="detail-top">
+  <image class="scan-image" fit="fill" src="{{imageUrl+'/detail_sale_order.png'}}"></image>
+
+
+  <view class="detail-top-sup" style="display: flex;">
+    <view style="width: 10%;">
+      <image class="scan-image-icon" fit="fill" src="{{imageUrl+'/order_billing_detail_01.png'}}"></image>
+    </view>
+
+    <view>
+      <view style="display: flex;">
+        {{itemData.supplierName?itemData.supplierName:''}}
       </view>
 
-      <view>
+      <view style="z-index: 2;padding-top: 20rpx;">
         <view style="display: flex;">
-          {{itemData.supplierName?itemData.supplierName:''}}
-        </view>
-
-        <view style="z-index: 2;padding-top: 20rpx;">
-          <view style="display: flex;">
-            <view>
-              {{itemData.orgName?itemData.orgName:''}}
-            </view>
-            <view style="padding-left: 20rpx;">
-              {{itemData.staffName?itemData.staffName:''}}
-            </view>
-          </view>
-        </view>
-        <!-- 日期 -->
-        <view   style="display: flex; width: 100%; padding-top: 16rpx;padding-bottom: 15rpx;padding-right: 15rpx; justify-content: space-between; font-size: 24rpx;">
-          <view style="display: flex;  line-height: 36rpx;">
-            {{$t['makingTime']}}:{{ itemData.makeTime?wxmlUtil.formatDate(itemData.makeTime):'' }}
+          <view>
+            {{itemData.orgName?itemData.orgName:''}}
           </view>
-          <view style="display: flex;  line-height: 36rpx;" catchtap="openData">
-            {{$t['intoDate']}}:{{ itemData.pickupDate?wxmlUtil.formatDate(itemData.pickupDate):'' }}
+          <view style="padding-left: 20rpx;">
+            {{itemData.staffName?itemData.staffName:''}}
           </view>
-        </view> 
-       
+        </view>
+      </view>
+      <!-- 日期 -->
+      <view style="display: flex; width: 100%; padding-top: 16rpx;padding-bottom: 15rpx;padding-right: 15rpx; justify-content: space-between; font-size: 24rpx;">
+        <view style="display: flex;  line-height: 36rpx;">
+          {{$t['makingTime']}}:{{ itemData.makeTime?wxmlUtil.formatDate(itemData.makeTime):'' }}
+        </view>
+        <view style="display: flex;  line-height: 36rpx;" catchtap="openData">
+          {{$t['intoDate']}}:{{ itemData.pickupDate?wxmlUtil.formatDate(itemData.pickupDate):'' }}
+        </view>
       </view>
+
     </view>
   </view>
- 
-<dk-form-bill type="purInto" id="{{formName}}"  routeObjName="{{routeObjName}}" 
-cardList="{{cardList}}"    titleCol="skuModel"  iconCol="imagesUrl" descCol="skuName" priceCol="priceInto" pupPriceCol="sumPrice" quantityCol="{{intoStatusflag?'intoingQty':'intoQty'}}"  sumAmountCol ="itemAmt"sumQuantityCol="itemQty"
-contentObj="{{contentObj}}" model:value="{{formData}}" popContent = "{{popContent}}" 
-bind:chooseData = "chooseData"  popType = "sale" priceTitle = "{{$t['referencePrice']+':'}}" bind:delItem="setGoods" bind:setGoods="setGoods" bind:editItems="setGoods">
+</view>
+
+<dk-form-bill type="purInto" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleCol="skuModel" iconCol="imagesUrl" descCol="skuName" priceCol="priceInto" pupPriceCol="sumPrice" quantityCol="{{intoStatusflag?'intoingQty':'intoQty'}}" sumAmountCol="itemAmt" sumQuantityCol="itemQty" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="{{$t['referencePrice']+':'}}" bind:delItem="setGoods" bind:setGoods="setGoods" bind:editItems="setGoods">
 </dk-form-bill>
 
 <view style="height: 200rpx;"></view>
 
 
- 
+
 <!-- 新建按钮 -->
-<dk-save-button   btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="save"></dk-save-button>
+<dk-save-button btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="save"></dk-save-button>
 
 <!-- 底部编辑 以后要做 todo......... -->
-<view wx:if="{{itemData.flgValid}}" style="position: fixed;bottom: 230rpx;right: 30rpx;">
+<!-- <view wx:if="{{itemData.flgValid}}" style="position: fixed;bottom: 230rpx;right: 30rpx;">
   <view data-item="{{itemData}}"  bind:tap="toEdit" class="btn-add-class">
     <van-icon name="edit" color="#FFFFFF" size="60rpx" />
   </view>
 </view>
- 
+  -->
+<!-- 编辑  -->
+<view wx:if="{{itemData.flgValid}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" data-item="{{itemData}}" bindtap="toEdit">
+  <image src="{{imageUrl + 'edit.png'}} " class="edit-class" />
+</view>

+ 6 - 1
package-purchase/pages/purchase-return/detail/detail.wxml

@@ -47,10 +47,15 @@
 <!-- 空高度  -->
 <view style="width: 100%;height: 200px;"></view>
 
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;" >
+<!-- <view style="position: fixed;bottom: 230rpx;right: 30rpx;" >
   <view data-item="{{item}}" bind:tap="toDetail" class="btn-add-class">
     <van-icon name="edit" color="#FFFFFF" size="60rpx" />
   </view>
+</view> -->
+
+<!-- 编辑  -->
+<view  style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" data-item="{{item}}"  bindtap="toDetail">
+  <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>
 
 <!-- 新建按钮 -->

+ 5 - 1
package-sales/pages/customer-collection/detail/detail.wxml

@@ -58,8 +58,12 @@
 
 </view>
 
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;">
+<!-- <view style="position: fixed;bottom: 230rpx;right: 30rpx;">
   <view bind:tap="toDetail" class="btn-add-class">
     <van-icon name="edit" color="#FFFFFF" size="60rpx" />
   </view>
+</view> -->
+<!-- 编辑  -->
+<view style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toDetail">
+  <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>

+ 5 - 1
package-sales/pages/customer-collection/refund-detail/refund-detail.wxml

@@ -55,8 +55,12 @@ objCol="customerId" objLabel="客户名称" amountTitle="客户欠款" chooseTex
 
 </view>
 
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;">
+<!-- <view style="position: fixed;bottom: 230rpx;right: 30rpx;">
   <view bind:tap="toDetail" class="btn-add-class">
     <van-icon name="edit" color="#FFFFFF" size="60rpx" />
   </view>
+</view> -->
+<!-- 编辑  -->
+<view style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toDetail">
+  <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>

+ 5 - 1
package-sales/pages/order-billing/detail/detail.wxml

@@ -96,10 +96,14 @@
 <dk-form-bill type="sale" id="dk-form-bill" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel" descCol="skuName" subCol="calculationFormula"priceCol="priceSale" quantityCol="itemQty" sumAmountCol="sumAmount"  iconCol="imagesUrl"  discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}"  popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" readonly="{{true}}"  bind:editItems="editItems" saleStaffAndOrgFlag="{{false}}" bind:customersChoose="customersChoose" popType="sale" priceTitle="售价:">
 </dk-form-bill>
 <view style="height: 200rpx;"></view>
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;" wx:if="{{formMode =='other'}}">
+<!-- <view style="position: fixed;bottom: 230rpx;right: 30rpx;" wx:if="{{formMode =='other'}}">
   <view bind:tap="toEdit" class="btn-add-class">
     <van-icon name="edit" color="#FFFFFF" size="60rpx" />
   </view>
+</view> -->
+<!-- 编辑  -->
+<view wx:if="{{formMode =='other'}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+  <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>
 <!--  保存 -->
 <dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" contentList="{{contentSaveList}}" bind:open="saveButton"></dk-save-button>