姜永辉 hace 1 año
padre
commit
edc2ee03aa

+ 4 - 0
components/dkbase/dk-form-more-items/dk-form-more-items.js

@@ -34,6 +34,10 @@ Component({
     objCol: {
     objCol: {
       type: String
       type: String
     },
     },
+     // 表名,用于上传附件
+     table: {
+      type: String,
+    },
     // 对象列名
     // 对象列名
     objLabel: {
     objLabel: {
       type: String
       type: String

+ 1 - 1
components/dkbase/dk-form-more-items/dk-form-more-items.wxml

@@ -146,7 +146,7 @@
       <view style="display:flex;width:100%;margin: 1vw; padding-top: 20rpx;" wx:if="{{item.type=='uploader'}}">
       <view style="display:flex;width:100%;margin: 1vw; padding-top: 20rpx;" wx:if="{{item.type=='uploader'}}">
         <view style="width: 168rpx; flex:1;color: #95A8CB;font-size: 28rpx;padding-left: 27rpx;">附件</view>
         <view style="width: 168rpx; flex:1;color: #95A8CB;font-size: 28rpx;padding-left: 27rpx;">附件</view>
         <view style="width: calc(100% - 168rpx);text-align: left;">
         <view style="width: calc(100% - 168rpx);text-align: left;">
-          <van-uploader max-count="5" disabled="{{!!item.readonly}}" accept="image" style="margin-left: 4%;border-radius: 15rpx;" preview-size="160rpx;" file-list="{{ fileList }}" bind:delete="deleteImg" bind:after-read="afterRead" multiple="true" imageFit="aspectFit" max-size="{{maxSize}}" bind:oversize="overSize" />
+          <van-uploader max-count="5" disabled="{{!!item.readonly}}" accept="image" style="margin-left: 4%;border-radius: 15rpx;" preview-size="160rpx;" file-list="{{ form['annexPaths']  }}" bind:delete="deleteImg" bind:after-read="afterRead" multiple="true" imageFit="aspectFit" max-size="{{maxSize}}" bind:oversize="overSize" upload-text="添加照片" />
           <view style="margin-left: 27rpx;color: #C8C9CC;font-size: 12px;">
           <view style="margin-left: 27rpx;color: #C8C9CC;font-size: 12px;">
             图片最多上传5张
             图片最多上传5张
           </view>
           </view>

+ 1 - 1
components/dkbase/dk-form-more-items/dk-form-more-items.wxss

@@ -132,7 +132,7 @@
  
  
   top: 0;
   top: 0;
   right: 15px; 
   right: 15px; 
-  width: 125rpx;
+  width: 127rpx;
   height: 90rpx; 
   height: 90rpx; 
   display: flex;
   display: flex;
   justify-content: center;
   justify-content: center;

+ 1 - 1
package-accounts-manage/pages/payment-order/add/add.wxml

@@ -1,6 +1,6 @@
 <loading wx:if="{{loading}}"></loading>
 <loading wx:if="{{loading}}"></loading>
 
 
-<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}" objIdCol="supId" objTitle="supCode" objSubTitle="supName" objCol="supId" objLabel="{{$t['supName']}}" objType="supplier" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData" totalObj="{{totalObj}}" table="{{table}}" amountArr="{{amountArr}}" readonly = "{{readonly}}" bind:chooseObjTypeData="chooseObjTypeData" bind:changeNumber="changeNumber" bind:onCheckChange="onCheckChange">
+<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}" objIdCol="supId" objTitle="supName"   objCol="supId" objLabel="{{$t['supName']}}" objType="supplier" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData" totalObj="{{totalObj}}" table="{{table}}" amountArr="{{amountArr}}" readonly = "{{readonly}}" bind:chooseObjTypeData="chooseObjTypeData" bind:changeNumber="changeNumber" bind:onCheckChange="onCheckChange">
 </dk-form-more-items>
 </dk-form-more-items>
 
 
 <view style="height: 220rpx;"></view>
 <view style="height: 220rpx;"></view>

+ 2 - 2
package-base-select/pages/select-bill/select-bill.wxml

@@ -15,7 +15,7 @@
         <image class="scan-image-icon" fit="fill" src="{{imageUrl+'/order_billing_detail_01.png'}}"></image>
         <image class="scan-image-icon" fit="fill" src="{{imageUrl+'/order_billing_detail_01.png'}}"></image>
       </view>
       </view>
       <view style="display: flex;">
       <view style="display: flex;">
-        {{objInfo.supName?objInfo.supName + "  "  + objInfo.supCode
+        {{objInfo.supName?objInfo.supName  
                         :objInfo.cusName + "  " + objInfo.cusPhone}}
                         :objInfo.cusName + "  " + objInfo.cusPhone}}
       </view>
       </view>
     </view>
     </view>
@@ -51,7 +51,7 @@
             <view style="margin-top: 20rpx;">单据单号: {{item.biznisNo}}</view>
             <view style="margin-top: 20rpx;">单据单号: {{item.biznisNo}}</view>
             <view style="margin-top: 20rpx;">单据类型: {{item.biznisTypeName}}</view>
             <view style="margin-top: 20rpx;">单据类型: {{item.biznisTypeName}}</view>
             <view style="margin-top: 20rpx;">单据金额: {{wxmlUtil.toThousandCents(item.amtShould)}}</view>
             <view style="margin-top: 20rpx;">单据金额: {{wxmlUtil.toThousandCents(item.amtShould)}}</view>
-            <view style="margin-top: 20rpx;">未/已核销: {{wxmlUtil.toThousandCents(item.amtResidue)}}</view>
+            <view style="margin-top: 20rpx;">未/已核销: {{wxmlUtil.toThousandCents(item.amtResidue)}}/{{wxmlUtil.toThousandCents(item.amtHandle)}}</view>
             <view style="margin-top: 20rpx;"> 账务日期: {{item.accDate}}</view>
             <view style="margin-top: 20rpx;"> 账务日期: {{item.accDate}}</view>
           </view>
           </view>