xiaohaizhao 3 месяцев назад
Родитель
Сommit
4875fe26a1

+ 1 - 1
packageA/fittings/modules/product/index.js

@@ -249,7 +249,7 @@ Component({
                 //2025121119452803
                 wx.navigateTo({
                     url: `/select/addPreciseSearch/index?params=${JSON.stringify({
-                        "id": 2025080510465203,
+                        "id": 2025121119452803 || 2025080510465203,
                         "content": { "sys_enterpriseid": detail.sys_enterpriseid, "where": { "sku": "", "cardno": "", "name": "", "phonenumber": "" } }
                     }
                     )}&butText=添加产品`

+ 3 - 2
packageA/orderForm/detail.js

@@ -612,7 +612,7 @@ Page({
 					"id": 20221108153402,
 					"content": {
 						sa_orderid: that.data.sa_orderid,
-						// sa_order_v: that.data.detail.sa_order_v,
+						sa_order_v: that.data.detail.sa_order_v,
 					},
 				}).then(s => {
 					console.log("提交订单", s)
@@ -635,7 +635,8 @@ Page({
 				if (res.confirm) _Http.basic({
 					"id": 20230301190202,
 					"content": {
-						sa_orderid: that.data.sa_orderid
+						sa_orderid: that.data.sa_orderid,
+						sa_order_v: that.data.detail.sa_order_v
 					},
 				}).then(s => {
 					console.log("撤回订单", s)

+ 2 - 1
packageA/orderForm/modules/product/list/index.js

@@ -68,10 +68,11 @@ Component({
 				sa_promotion_itemsid: data.sa_promotion_itemsid || 0,
 				cheek: data.cheek,
 				color: data.color,
+				custamount: data.custamount || 0,
 				material: data.material,
 				spec: data.spec,
 				custom: data.custom,
-				// sa_orderitems_v: data.sa_orderitems_v || "",
+				sa_orderitems_v: data.sa_orderitems_v || "",
 				index
 			})
 		},

+ 3 - 2
pages/index/index.js

@@ -166,7 +166,7 @@ Page({
 					key: "wAccessoriesApplication",
 					path: "/packageA/fittings/index",
 					icon: "work-dingdan"
-				},{
+				}, {
 					name: "配件申请明细",
 					key: "wAccessoriesApplicationRows",
 					path: "/packageA/fittings/rows",
@@ -184,7 +184,8 @@ Page({
 						authList[s.name] = {
 							options: s.meta.auth.map(a => a.option),
 							optionnames: s.meta.auth.map(a => a.optionname),
-							forms: s.meta.forms
+							forms: s.meta.forms,
+							tables: s.meta.tables,
 						}
 						if (authList[s.name].options.some(s => s == "read")) {
 							let i = paths.findIndex(k => k.key == s.name || k.name == s.meta.title);

+ 1 - 1
project.private.config.json

@@ -20,7 +20,7 @@
     "bigPackageSizeSupport": false,
     "useIsolateContext": true
   },
-  "libVersion": "3.9.2",
+  "libVersion": "3.12.1",
   "condition": {
     "miniprogram": {
       "list": [

+ 16 - 8
select/addPreciseSearch/index.js

@@ -12,11 +12,20 @@ Page({
     showAll: false
   },
   onLoad(options) {
+    let tableid = 985;
+    try {
+      tableid = wx.getStorageSync('auth').wAccessoriesApplication.tables.swcard.tableid;
+    } catch (error) {
+      console.error(error)
+    }
+
     if (options.params) {
       let params = JSON.parse(options.params);
       if (!params.content.pageNumber || !params.content.pageTotal) {
         params.content.pageNumber = 1;
         params.content.pageTotal = 1;
+        params.content.tableid = tableid;
+        params.content.where.tablefilter = {};
       }
       this.setData({
         params
@@ -152,22 +161,21 @@ Page({
       showmenu: true
     })
   },
-  /* 开始搜索 */
-  startSearch(e) {
+  onInput(e) {
     let detail = e.detail,
       name = e.currentTarget.dataset.name,
-      condition = this.data.params.content.where[name];
+      condition = this.data.params.content.where.tablefilter[name];
     if (detail == condition) return;
-    this.data.params.content.where[name] = detail
-    this.setData({
-      params: this.data.params
-    });
+    this.data.params.content.where.tablefilter[name] = detail
+  },
+  /* 开始搜索 */
+  startSearch(e) {
     this.getList(true);
   },
   /* 取消搜索 */
   onClear(e) {
     let name = e.currentTarget.dataset.name;
-    this.data.params.content.where[name] = ''
+    this.data.params.content.where.tablefilter[name] = ''
     this.setData({
       params: this.data.params
     });

+ 5 - 5
select/addPreciseSearch/index.wxml

@@ -1,14 +1,14 @@
 <custom id="Custom" />
 <view class="search-box">
-    <van-search class="search" use-action-slot value="{{ params.content.where.sku }}" data-name="sku" shape="round" placeholder="序列号" bind:search='startSearch' bind:clear='onClear'>
+    <van-search class="search" use-action-slot value="{{ params.content.where.tablefilter.sku }}" data-name="sku" shape="round" placeholder="序列号" bind:change='onInput' bind:search='startSearch' bind:clear='onClear'>
         <view slot="action" bind:tap='changeShowAll'>{{ showAll?'隐藏部分条件':'展开所有条件' }}</view>
     </van-search>
     <view class="total1"></view>
     <van-transition show="{{ showAll }}" custom-class="block">
-        <van-search class="search" value="{{ params.content.where.cardno }}" data-name="cardno" shape="round" placeholder="保修卡号" bind:search='startSearch' bind:clear='onClear' />
-        <van-search class="search" value="{{ params.content.where.name }}" data-name="name" shape="round" placeholder="客户名称" bind:search='startSearch' bind:clear='onClear' />
-        <van-search class="search" value="{{ params.content.where.phonenumber }}" data-name="phonenumber" shape="round" placeholder="客户手机号" bind:search='startSearch' bind:clear='onClear' />
-        <van-search class="search" value="{{ params.content.where.address }}" data-name="address" shape="round" placeholder="客户地址(不含省市县)" bind:search='startSearch' bind:clear='onClear' />
+        <van-search class="search" value="{{ params.content.where.tablefilter.cardno }}" data-name="cardno" shape="round" placeholder="保修卡号" bind:change='onInput' bind:search='startSearch' bind:clear='onClear' />
+        <van-search class="search" value="{{ params.content.where.tablefilter.name }}" data-name="name" shape="round" placeholder="客户名称" bind:change='onInput' bind:search='startSearch' bind:clear='onClear' />
+        <van-search class="search" value="{{ params.content.where.tablefilter.phonenumber }}" data-name="phonenumber" shape="round" placeholder="客户手机号" bind:change='onInput' bind:search='startSearch' bind:clear='onClear' />
+        <!-- <van-search class="search" value="{{ params.content.where.address }}" data-name="address" shape="round" placeholder="客户地址(不含省市县)" bind:search='startSearch' bind:clear='onClear' /> -->
     </van-transition>
     <!-- <view style="width: 100%;display: flex;justify-content: center;">
         <view class="switch" bind:tap='changeShowAll'>{{ showAll?'隐藏部分条件':'展开所有条件' }}</view>

+ 50 - 23
select/product/index.js

@@ -16,11 +16,24 @@ Page({
 		idname: "itemid", //idkey
 		showName: "itemname",
 		privacyFieldC: [],
-		cardno: null
+		cardno: null,
+		showAll: false,
+		isInit: false
 	},
 	onLoad(options) {
+		let tableid = 984;
+		try {
+			tableid = wx.getStorageSync('auth').wAccessoriesApplication.tables.productlist.tableid;
+			console.log("tableid", tableid)
+
+		} catch (error) {
+			console.error(error)
+		}
+
 		if (options.params) {
 			let params = JSON.parse(options.params);
+			params.content.tableid = tableid;
+			params.content.where.tablefilter = {};
 			if (!params.content.pageNumber || !params.content.pageTotal) {
 				params.content.pageNumber = 1;
 				params.content.pageTotal = 1;
@@ -38,11 +51,13 @@ Page({
 					"content": {
 						"itemid": cardno.itemid,
 						"sa_orderid": _Http.sa_orderid,
+						tableid,
 						pageNumber: 1,
 						pageTotal: 1,
 						pageSize: 20,
 						where: {
 							condition: "",
+							tablefilter: {}
 						}
 					},
 				},
@@ -79,12 +94,14 @@ Page({
 				title: res.msg,
 				icon: "none"
 			})
-			if (res.pageNumber == 1 && res.data.length == 0 && params.id == '2025080511204503') {
-				this.setData({
-					params: this.data.copyParams
-				})
-				this.getList(true)
-				return;
+			if (!this.data.isInit) {
+				if (res.pageNumber == 1 && res.data.length == 0 && params.id == '2025080511204503') {
+					this.setData({
+						params: this.data.copyParams
+					})
+					this.getList(true)
+					return;
+				}
 			}
 			const CNY = num => currency(num, {
 				symbol: "¥",
@@ -105,7 +122,7 @@ Page({
 				if (newPrice) value.newPrice = CNY(value[newPrice] || 0);
 				value.brandName = value.brand.map(name => name.brandname)
 				value.tradefields = value.tradefield.map(name => name.tradefield)
-				value.qty = value.orderminqty || 1;
+				value.qty = value.orderminqty || value.qty || 1;
 				value.width = 0;
 				value.length = 0;
 				if (value.iscustomsize) value.customText = getCustomText(value);
@@ -116,7 +133,8 @@ Page({
 				'params.content.pageTotal': res.pageTotal,
 				'params.content.total': res.total,
 				list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),
-				loading: false
+				loading: false,
+				isInit: true
 			})
 		})
 	},
@@ -208,23 +226,32 @@ Page({
 			showmenu: true
 		})
 	},
-	/* 开始搜索 */
-	startSearch({
-		detail
-	}) {
-		let condition = this.data.content ? this.data.content.where.condition : this.data.params.content.where.condition;
-		if (detail == condition) return;
+	changeShowAll() {
+		let that = this;
 		this.setData({
-			'content.where.condition': detail,
-			'params.content.where.condition': detail
-		});
+			showAll: !this.data.showAll
+		})
+		setTimeout(() => {
+			that.selectComponent("#ListBox").setHeight(!this.data.showAll ? ".total1" : ".total", that);
+		}, 350)
+	},
+	onInput(e) {
+		let detail = e.detail,
+			name = e.currentTarget.dataset.name,
+			condition = this.data.params.content.where.tablefilter[name];
+		if (detail == condition) return;
+		this.data.params.content.where.tablefilter[name] = detail
+	},
+	/* 开始搜索 */
+	startSearch() {
 		this.getList(true);
 	},
 	/* 取消搜索 */
-	onClear() {
+	onClear(e) {
+		let name = e.currentTarget.dataset.name;
+		this.data.params.content.where.tablefilter[name] = ''
 		this.setData({
-			'content.where.condition': "",
-			'params.content.where.condition': ""
+			params: this.data.params
 		});
 		this.getList(true);
 	},
@@ -266,9 +293,9 @@ Page({
 		} = e.currentTarget.dataset;
 		let item = this.data.list[index];
 		if (e.type == 'plus') {
-			item.qty += (item.orderaddqty) - 0
+			item.qty += (item.orderaddqty || 1) - 0
 		} else {
-			item.qty -= item.orderaddqty
+			item.qty -= item.orderaddqty || 1
 		}
 		this.setData({
 			[`list[${index}]`]: item

+ 2 - 1
select/product/index.json

@@ -1,6 +1,7 @@
 {
 	"usingComponents": {
 		"van-stepper": "@vant/weapp/stepper/index",
-		"custom": "../../pages/index/collect/modules/custom"
+		"custom": "../../pages/index/collect/modules/custom",
+		"van-transition": "@vant/weapp/transition/index"
 	}
 }

+ 15 - 3
select/product/index.wxml

@@ -2,7 +2,20 @@
 <template is="skeleton" wx:if="{{loading}}" />
 <custom id="Custom" />
 
-<van-search class="search" value="{{ params.content.where.condition }}" shape="round" placeholder="请输入搜索关键词" bind:search='startSearch' bind:clear='onClear' />
+<!-- <van-search class="search" value="{{ params.content.where.condition }}" shape="round" placeholder="请输入搜索关键词" bind:search='startSearch' bind:clear='onClear' /> -->
+
+<view class="search-box">
+    <van-search class="search" use-action-slot value="{{ params.content.where.tablefilter.itemname }}" data-name="itemname" shape="round" placeholder="搜索品名" bind:change='onInput' bind:search='startSearch' bind:clear='onClear'>
+        <view slot="action" bind:tap='changeShowAll'>{{ showAll?'隐藏部分条件':'展开所有条件' }}</view>
+    </van-search>
+    <view class="total1"></view>
+    <van-transition show="{{ showAll }}" custom-class="block">
+        <van-search class="search" value="{{ params.content.where.tablefilter.itemno }}" data-name="itemno" shape="round" placeholder="搜索品号" bind:change='onInput' bind:search='startSearch' bind:clear='onClear' />
+        <van-search class="search" value="{{ params.content.where.tablefilter.model }}" data-name="model" shape="round" placeholder="搜索型号" bind:change='onInput' bind:search='startSearch' bind:clear='onClear' />
+    </van-transition>
+</view>
+
+
 <view class="cardno" wx:if="{{cardno}}">
     <view class="item" style="width: 25%;">
         <view class="label">客户名</view>
@@ -64,8 +77,7 @@
         <view class="bottom">
             <view class="check" bindtap="changeResults" data-item="{{item}}">
                 <view class="label-class">
-                    起订量:{{item.orderminqty}},增减量:{{item.orderaddqty}}
-                    <!-- ,包装量:{{item.packageqty}} -->
+                    <text wx:if="{{item.orderminqty}}">起订量:{{item.orderminqty}},</text><text wx:if="{{item.orderaddqty}}">增减量:{{item.orderaddqty}}</text>
                 </view>
             </view>
             <van-stepper value="{{ item.qty }}" min="{{item.orderminqty}}" step="{{item.orderaddqty||1}}" input-class='input-class' data-index="{{index}}" data-iscatch="catch" catch:minus='stepperChange' catch:plus='stepperChange' catch:blur='inputBlur' />

+ 2 - 2
utils/Http.js

@@ -11,8 +11,8 @@ class HTTP {
 		if (this.ENV === 'release') { // 正式版
 			this.baseUrl = "https://crm.meida.com:16691";
 		} else {
-			// this.baseUrl = "http://61.164.207.46:8300";
-			this.baseUrl = "https://crm.meida.com:16691";
+			this.baseUrl = "http://61.164.207.46:8300";
+			// this.baseUrl = "https://crm.meida.com:16691";
 		}