lilei преди 1 година
родител
ревизия
84f343c3a6

+ 5 - 5
pages/codeBar/codeBar.vue

@@ -41,11 +41,11 @@
 		<view class="p-body">
 			<view class="uni-table">
 				 <!-- 表头行 -->
-				 <uni-tr>
-				 	<uni-td width="30%" align="center">产品编码</uni-td>
-				 	<uni-td width="40%" align="center">产品名称</uni-td>
-				 	<uni-td width="30%" align="center">条形码</uni-td>
-				 </uni-tr>
+				<uni-tr>
+					<uni-td width="30%" align="center">产品编码</uni-td>
+					<uni-td width="40%" align="center">产品名称</uni-td>
+					<uni-td width="30%" align="center">条形码</uni-td>
+				</uni-tr>
 			</view>
 			<scroll-view enable-flex scroll-y="true" class="table-scroll-body" @scrolltolower="scrolltolower">
 				<uni-table style="width: 100%;" border :loading="loading">

+ 4 - 4
pages/purchasing/index.vue

@@ -23,10 +23,10 @@
 			</view>
 			<view style="justify-content: flex-start;flex-wrap: wrap;"  v-for="(item,bindex) in baseData" :key="item.id">
 				<view>总款数:{{ item.totalPutCategory }}</view>
-				<view>本次发货数量合计: {{ item.totalPutQty }}</view>
-				<view>本次发货金额合计: {{ item.totalPutAmount?toThousands(item.totalPutAmount,2):'0.00' }}</view>
-				<view>本次入库数量合计: {{ item && (item.totalRealPutQty || item.totalRealPutQty==0) ? item.totalRealPutQty : '--' }}</view>
-				<view>本次入库金额合计: {{ item && (item.totalRealPutAmount || item.totalRealPutAmount==0) ? toThousands(item.totalRealPutAmount, 2) : '--' }}</view>
+				<view>发货数量: {{ item.totalPutQty }}</view>
+				<view>发货金额: {{ item.totalPutAmount?toThousands(item.totalPutAmount,2):'0.00' }}</view>
+				<view>入库数量: {{ item && (item.totalRealPutQty || item.totalRealPutQty==0) ? item.totalRealPutQty : '--' }}</view>
+				<view>入库金额: {{ item && (item.totalRealPutAmount || item.totalRealPutAmount==0) ? toThousands(item.totalRealPutAmount, 2) : '--' }}</view>
 			</view>
 		</view>
 		<view class="p-body">

+ 34 - 22
uni_modules/uni-table/components/uni-tr/uni-tr.vue

@@ -63,33 +63,41 @@ export default {
 			this.ishead = false
 			this.head.init(this)
 		}
-		this.border = this.root.border
-		this.selection = this.root.type
-		this.root.trChildren.push(this)
-		const rowData = this.root.data.find(v => v[this.root.rowKey] === this.keyValue)
-		if(rowData){
-			this.rowData = rowData
+		if(this.root){
+			this.border = this.root.border
+			this.selection = this.root.type
+			this.root.trChildren.push(this)
+			const rowData = this.root.data.find(v => v[this.root.rowKey] === this.keyValue)
+			if(rowData){
+				this.rowData = rowData
+			}
+			this.root.isNodata()
 		}
-		this.root.isNodata()
 	},
 	mounted() {
 		if (this.widthThArr.length > 0) {
 			const selectionWidth = this.selection === 'selection' ? 50 : 0
-			this.root.minWidth = this.widthThArr.reduce((a, b) => Number(a) + Number(b)) + selectionWidth
+			if(this.root){
+				this.root.minWidth = this.widthThArr.reduce((a, b) => Number(a) + Number(b)) + selectionWidth
+			}
 		}
 	},
 	// #ifndef VUE3
 	destroyed() {
-		const index = this.root.trChildren.findIndex(i => i === this)
-		this.root.trChildren.splice(index, 1)
-		this.root.isNodata()
+		if(this.root){
+			const index = this.root.trChildren.findIndex(i => i === this)
+			this.root.trChildren.splice(index, 1)
+			this.root.isNodata()
+		}
 	},
 	// #endif
 	// #ifdef VUE3
 	unmounted() {
-		const index = this.root.trChildren.findIndex(i => i === this)
-		this.root.trChildren.splice(index, 1)
-		this.root.isNodata()
+		if(this.root){
+			const index = this.root.trChildren.findIndex(i => i === this)
+			this.root.trChildren.splice(index, 1)
+			this.root.isNodata()
+		}
 	},
 	// #endif
 	methods: {
@@ -98,16 +106,20 @@ export default {
 		},
 		// 选中
 		checkboxSelected(e) {
-			let rootData = this.root.data.find(v => v[this.root.rowKey] === this.keyValue)
-			this.checked = e.checked
-			this.root.check(rootData||this, e.checked,rootData? this.keyValue:null)
+			if(this.root){
+				let rootData = this.root.data.find(v => v[this.root.rowKey] === this.keyValue)
+				this.checked = e.checked
+				this.root.check(rootData||this, e.checked,rootData? this.keyValue:null)
+			}
 		},
 		change(e) {
-			this.root.trChildren.forEach(item => {
-				if (item === this) {
-					this.root.check(this, e.detail.value.length > 0 ? true : false)
-				}
-			})
+			if(this.root){
+				this.root.trChildren.forEach(item => {
+					if (item === this) {
+						this.root.check(this, e.detail.value.length > 0 ? true : false)
+					}
+				})
+			}
 		},
 		/**
 		 * 获取父元素实例

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


Файловите разлики са ограничени, защото са твърде много
+ 2 - 10
unpackage/dist/dev/app-plus/app-view.js


Някои файлове не бяха показани, защото твърде много файлове са промени