姜永辉 2 жил өмнө
parent
commit
fd1bc9cf82

+ 12 - 18
package-inventory/pages/outbound-processing/outbound-processing.wxml

@@ -91,8 +91,8 @@
           </view>
           <!-- 需设计 -->
           <view style="width: calc(50%); height: 49rpx;padding-right:21rpx;" data-item="{{item}}" catchtap="onDesign">
-            <view style="height: 49rpx; display: flex; align-items: center; justify-content: center; border-radius: 6rpx; background-color: red; text-align: center;">
-              <text style=" font-size: 13px;color:  #FFFFFF;">{{item.outStatusName}}</text>
+            <view style="height: 49rpx; display: flex; align-items: center; justify-content: center; border-radius: 6rpx; background-color: #77C5D5; text-align: center;">
+              <text style=" font-size: 13px;color:  #FFFFFF;">{{item.outKindName}}</text>
             </view>
           </view>
           <!-- 状态 -->
@@ -109,13 +109,16 @@
         </view>
       </view>
 
-      <!-- 日期 -->
-      <view wx:if="{{item.outKind =='其他出库'}}" style="display: flex; width: 100%;text-align: right;height: 47rpx">
+       <!-- 日期 -->
+       <view style="display: flex; width: 100%;text-align: right;height: 47rpx">
         <view style="width:  calc(100% - 210rpx);text-align: left;padding-left: 30rpx;">
-
+          <!-- {{item.erpPushStatus}} -->
+          <view wx:if="{{item.erpPushStatus == 3}}">
+            <dk-van-tag catchtap="toOrderStatusApvResult" data-item="{{item}}" color="red" roundFlag="{{true}}" size="medium" value="推送异常"></dk-van-tag>
+          </view>
         </view>
         <view style="height: 47rpx;background-color: #EAF1FF;border-radius: 0px 0px 0px 30px;width: 210rpx;text-align: center;">
-          <text style="font-size: 14px;color: #808080;">{{item.makingDate?item.makingDate:''}}</text>
+          <text style="font-size: 14px;color: #808080;">2024-01-01</text>
         </view>
       </view>
 
@@ -135,19 +138,10 @@
         </view>
       </view>
       <!--业务类型  -->
-      <view  class="table-content-row">
-        <view style="display: flex;">
-          <view class="table-content-row-font">
-            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="业务类型" copyValue="{{item.outKindName}}"></dk-text>
-          </view>
-          <view class="table-content-class">
-            {{item.outKindName?item.outKindName:''}}
-          </view>
-        </view>
-      </view>
+    
 
       <!-- 客户电话 -->
-      <view wx:if="{{item.outKind =='销售出库'}}" class="table-content-row">
+      <view wx:if="{{item.outKind =='出库类型-销售'}}" class="table-content-row">
         <view style="display: flex;">
           <view class="table-content-row-font">
             <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="客户电话" copyValue="{{item.customerPhone}}"></dk-text>
@@ -159,7 +153,7 @@
       </view>
 
       <!-- 客户地址 -->
-      <view wx:if="{{item.outKind =='销售出库'}}" class="table-content-row">
+      <view wx:if="{{item.outKind =='出库类型-销售'}}" class="table-content-row">
         <view style="display: flex;">
           <view class="table-content-row-font">
             <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="客户地址" copyValue="{{item.addressFull ? item.addressFull : ''}}"></dk-text>

+ 8 - 3
package-inventory/pages/warehousing-processing/warehousing-processing.wxml

@@ -110,13 +110,18 @@
         </view>
       </view>
 
+   
+
       <!-- 日期 -->
-      <view wx:if="{{item.entryKind =='其他入库'}}" style="display: flex; width: 100%;text-align: right;height: 47rpx">
+      <view style="display: flex; width: 100%;text-align: right;height: 47rpx">
         <view style="width:  calc(100% - 210rpx);text-align: left;padding-left: 30rpx;">
-
+          <!-- {{item.erpPushStatus}} -->
+          <view wx:if="{{item.erpPushStatus == 3}}">
+            <dk-van-tag catchtap="toOrderStatusApvResult" data-item="{{item}}" color="red" roundFlag="{{true}}" size="medium" value="推送异常"></dk-van-tag>
+          </view>
         </view>
         <view style="height: 47rpx;background-color: #EAF1FF;border-radius: 0px 0px 0px 30px;width: 210rpx;text-align: center;">
-          <text style="font-size: 14px;color: #808080;">{{item.makingDate?item.makingDate:''}}</text>
+          <text style="font-size: 14px;color: #808080;">2024-01-01</text>
         </view>
       </view>
 

+ 1 - 1
project.config.json

@@ -51,7 +51,7 @@
     "compileType": "miniprogram",
     "libVersion": "2.23.4",
     "appid": "wx7b380afaab915872",
-    "projectname": "dk_wx_base",
+    "projectname": "iboss_wx_app",
     "condition": {},
     "editorSetting": {
         "tabIndent": "auto",

+ 1 - 1
project.private.config.json

@@ -1,6 +1,6 @@
 {
     "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-    "projectname": "dk_wx_base",
+    "projectname": "iboss_wx_app",
     "setting": {
         "compileHotReLoad": false
     },