xiaohaizhao 1 rok pred
rodič
commit
1cce604d03

+ 1 - 2
packageA/returnOne/detail.js

@@ -67,7 +67,6 @@ Page({
         return;
       };
       this.setPreview(res.data);
-      this.partialRenewal();
     })
   },
   /* 设置详情信息 */
@@ -84,7 +83,7 @@ Page({
       }, {
         label: '来源单号',
         value: data.sonum
-      },  {
+      }, {
         label: '是否实物返回',
         value: data.isitemreturn ? '是' : '否'
       }, {

+ 2 - 2
packageA/returnOne/detail.wxml

@@ -21,7 +21,7 @@
 	<Product disabled="{{detail.status != '新建'}}" detail="{{detail}}" slot="商品明细" id="Product" bind:onSuccess="getDetail" />
 	<view style="height: 160rpx;" />
 </Yl_FunTabs>
-<!-- 
+
 <view class="footer">
 	<view class="price">
 		<view class="count">
@@ -33,6 +33,6 @@
 		<van-button custom-class='but' wx:if="{{detail.status=='新建'}}" bind:click="submit">提交申请</van-button>
 		<van-button custom-class='but' wx:if="{{detail.status=='提交'}}" bind:click="notarize">取消申请</van-button>
 	</view>
-</view> -->
+</view>
 
 <wxs src="/utils/hidePrice.wxs" module="handleHide" />

+ 2 - 2
packageA/returnOne/index.wxml

@@ -2,7 +2,7 @@
 	<import src="index.skeleton.wxml" />
 	<template is="skeleton" wx:if="{{loading}}" />
 	<Yl_HeadNav styleType="1" sort='{{content.sort}}' placeholder='搜索' bindonSearch="onSearch" isFilter />
-<!-- 	<van-tabs active="{{ active }}" color='var(--assist)' title-active-color='var(--assist)' bind:change="tabsChange">
+	<!-- 	<van-tabs active="{{ active }}" color='var(--assist)' title-active-color='var(--assist)' bind:change="tabsChange">
 		<van-tab title="全部" />
 		<van-tab title="新建" />
 		<van-tab title="提交" />
@@ -16,7 +16,7 @@
 		<view style="height: 20px;" />
 	</Yl_ListBox>
 </view>
-
+<Yl_FloatingButton bindtap="toAdd" />
 <view class="DrawerClose {{modalName=='viewModal'?'show':''}}" bindtap="hideModal">
 	<text class="cuIcon-pullright"></text>
 </view>

+ 1 - 1
packageA/returnOne/modules/list/index.wxml

@@ -1,6 +1,6 @@
 <navigator url="/packageA/returnOne/detail?id={{item.sa_aftersalesmagid}}" class="item" wx:for="{{list}}" wx:key="sonum">
 	<view class="top">
-		单据日期:{{item.billdate}}
+		单据日期:{{item.billdate||" --"}}
 		<view style="color: {{set.color(item.status)}};">
 			{{item.status}}
 		</view>

+ 0 - 1
packageA/returnOne/modules/product/index.js

@@ -123,7 +123,6 @@ Component({
 						nocache:true,
 						"sa_orderid": detail.sa_orderid, //订单ID
             "sa_aftersalesmagid": detail.sa_aftersalesmagid, //订单ID
-            sys_enterpriseid:"",
 						"pageNumber": 1,
 						"pageTotal": 1,
 						"total": 0,

+ 32 - 10
packageA/returnOne/update.js

@@ -6,16 +6,37 @@ Page({
     showAll: false,
     disabled: true,
     content: {
+      "sa_accountclassid": 0,
       "sa_aftersalesmagid": 0,
       "sa_orderid": "",
-      "reason": "",
-      "billdate": "",
+      sys_enterpriseid: "",
       "type": "退货单"
     },
-
   },
   onLoad(options) {
     let form = [{
+      label: "单据日期",
+      error: false,
+      errMsg: "",
+      type: "date",
+      value: getTime.formatTime(new Date(), '-').split(' ')[0],
+      placeholder: "报价日期",
+      valueName: "billdate",
+      checking: "base",
+      required: true
+    }, {
+      label: "退返类型",
+      error: false,
+      errMsg: "",
+      type: "option",
+      optionNmae: "returncategory",
+      optionType: "radio", //复选   radio 单选
+      value: "",
+      placeholder: "退返类型",
+      valueName: "typemx",
+      checking: "base",
+      required: true
+    }, {
       label: "返退原因",
       error: false,
       errMsg: "",
@@ -24,7 +45,6 @@ Page({
       placeholder: "请输入返退原因",
       valueName: "reason",
       required: false,
-
     }, {
       label: "是否实物退回",
       error: false,
@@ -88,7 +108,7 @@ Page({
       placeholder: "选择订单号",
       valueName: "sa_orderid",
       checking: "base",
-      required: true
+      required: false
     })
     this.setData({
       form
@@ -155,9 +175,12 @@ Page({
       ...this.data.content,
       ...this.selectComponent("#Form").submit()
     }
-    content.sa_orderid = content.sa_orderid[1][0] || '';
-    content.sys_enterpriseid = content.sys_enterpriseid[1][0] || '';
-    
+    content.sa_orderid = (typeof content.sa_orderid) == 'string' ? content.sa_orderid : content.sa_orderid[1][0];
+    if ((typeof content.sys_enterpriseid) == 'string') {
+      delete(content.sys_enterpriseid)
+    } else {
+      content.sys_enterpriseid[1][0];
+    }
     let res = await _Http.basic({
       "id": "20230104160503",
       content
@@ -168,8 +191,7 @@ Page({
       icon: "none",
       mask: true
     })
-
-    setTimeout(() => {
+    if (res.msg == '成功') setTimeout(() => {
       wx.redirectTo({
         url: '/packageA/returnOne/detail?id=' + res.data.sa_aftersalesmagid,
       })