zhengxin 5 лет назад
Родитель
Сommit
33d7d84a10

+ 67 - 63
ghs/src/pagesStore/me/incomeExpenses.vue

@@ -1,69 +1,73 @@
-
 <template>
-    <div>
-       <block v-if="!$util.isEmpty(list.data)">
-        <AppTabel
-                :headerBackgroundColor="'#F0F2F6'"
-                :columns="columns"
-                :dataList="list"
-            >
-            </AppTabel>
-        </block>
-        <block v-else>
-            <AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
-        </block>
-    </div>
+	<div>
+		<block v-if="!$util.isEmpty(list.data)">
+			<t-table :headerBackgroundColor="'#F0F2F6'">
+				<t-tr header>
+					<t-th v-for="(item, index) in columns" :key="index" :align="item.align">
+						{{ item.name }}
+					</t-th>
+				</t-tr>
+				<t-tr v-for="(item, index) in list" :key="index">
+					<t-td
+						v-for="(column, colIndex) in columns"
+						:key="colIndex"
+						:align="column.align"
+						:color="column.color"
+					>
+						<view>
+							{{ item[column.dataIndex] || "" }}
+						</view>
+					</t-td>
+				</t-tr>
+			</t-table>
+		</block>
+		<block v-else>
+			<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
+		</block>
+	</div>
 </template>
 
 <script>
-    import AppTabel from "@/components/app-table";
-    import AppWrapperEmpty from "@/components/app-wrapper-empty";
-    export default {
-        name:'IncomeExpenses', //收支记录
-        components:{
-            AppTabel,
-            AppWrapperEmpty
-        },
-        data(){
-            return {
-                    columns: [
-                    {
-                        name: "事项",
-                        dataIndex: "typeName",
-                        color: "info",
-                        align: "center"
-                    },
-                    {
-                        name: "提现记录",
-                        dataIndex: "typeName",
-                        color: "info",
-                        align: "center"
-                    },
-                    {
-                        name: "余额",
-                        dataIndex: "typeName",
-                        color: "info",
-                        align: "center"
-                    },
-                    {
-                        name: "状态",
-                        dataIndex: "typeName",
-                        color: "info",
-                        align: "center"
-                    }
-                ],
-                list:[{ time:'1221',typeName:'hahah',stock:'121255'}]
-            }
-        },
-        methods:{
-
-        },
-        onPullDownRefresh(){
-
-        }
-    }
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+export default {
+	name: "IncomeExpenses", //收支记录
+	components: {
+		AppWrapperEmpty
+	},
+	data() {
+		return {
+			columns: [
+				{
+					name: "事项",
+					dataIndex: "typeName",
+					color: "info",
+					align: "center"
+				},
+				{
+					name: "提现记录",
+					dataIndex: "typeName",
+					color: "info",
+					align: "center"
+				},
+				{
+					name: "余额",
+					dataIndex: "typeName",
+					color: "info",
+					align: "center"
+				},
+				{
+					name: "状态",
+					dataIndex: "typeName",
+					color: "info",
+					align: "center"
+				}
+			],
+			list: [{ time: "1221", typeName: "hahah", stock: "121255" }]
+		};
+	},
+	methods: {},
+	onPullDownRefresh() {}
+};
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

+ 67 - 62
ghs/src/pagesStore/me/withdraw.vue

@@ -1,68 +1,73 @@
 <template>
-    <div>
-       <block v-if="!$util.isEmpty(list.data)">
-        <AppTabel
-                :headerBackgroundColor="'#F0F2F6'"
-                :columns="columns"
-                :dataList="list"
-            >
-            </AppTabel>
-        </block>
-        <block v-else>
-            <AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
-        </block>
-    </div>
+	<div>
+		<block v-if="!$util.isEmpty(list.data)">
+			<t-table :headerBackgroundColor="'#F0F2F6'">
+				<t-tr header>
+					<t-th v-for="(item, index) in columns" :key="index" :align="item.align">
+						{{ item.name }}
+					</t-th>
+				</t-tr>
+				<t-tr v-for="(item, index) in list" :key="index">
+					<t-td
+						v-for="(column, colIndex) in columns"
+						:key="colIndex"
+						:align="column.align"
+						:color="column.color"
+					>
+						<view>
+							{{ item[column.dataIndex] || "" }}
+						</view>
+					</t-td>
+				</t-tr>
+			</t-table>
+		</block>
+		<block v-else>
+			<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
+		</block>
+	</div>
 </template>
 
 <script>
-    import AppTabel from "@/components/app-table";
-    import AppWrapperEmpty from "@/components/app-wrapper-empty";
-    export default {
-        name:'withDraw', //提现记录
-        components:{
-            AppTabel,
-            AppWrapperEmpty
-        },
-        data(){
-            return {
-                    columns: [
-                    {
-                        name: "事项",
-                        dataIndex: "typeName",
-                        color: "info",
-                        align: "center"
-                    },
-                    {
-                        name: "提现记录",
-                        dataIndex: "typeName",
-                        color: "info",
-                        align: "center"
-                    },
-                    {
-                        name: "余额",
-                        dataIndex: "typeName",
-                        color: "info",
-                        align: "center"
-                    },
-                    {
-                        name: "状态",
-                        dataIndex: "typeName",
-                        color: "info",
-                        align: "center"
-                    }
-                ],
-                list:[{ time:'1221',typeName:'hahah',stock:'121255'}]
-            }
-        },
-        methods:{
-
-        },
-        onPullDownRefresh(){
-
-        }
-    }
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+export default {
+	name: "withDraw", //提现记录
+	components: {
+		AppWrapperEmpty
+	},
+	data() {
+		return {
+			columns: [
+				{
+					name: "事项",
+					dataIndex: "typeName",
+					color: "info",
+					align: "center"
+				},
+				{
+					name: "提现记录",
+					dataIndex: "typeName",
+					color: "info",
+					align: "center"
+				},
+				{
+					name: "余额",
+					dataIndex: "typeName",
+					color: "info",
+					align: "center"
+				},
+				{
+					name: "状态",
+					dataIndex: "typeName",
+					color: "info",
+					align: "center"
+				}
+			],
+			list: [{ time: "1221", typeName: "hahah", stock: "121255" }]
+		};
+	},
+	methods: {},
+	onPullDownRefresh() {}
+};
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

+ 33 - 19
ghs/src/pagesStorehouse/allot/addExDetails.vue

@@ -51,25 +51,40 @@
 			</view>
 			<view class="space-view ex-table">
 				<block v-if="!$util.isEmpty(selectList)">
-					<Tabel :columns="columns" :dataList="selectList">
-						<template v-slot="{ row, column }">
-							<view v-if="column.custom == 'icon'" class="list-icon">
-								<image class="icon-image" :src="row.cover" alt="商品图" />
-								<view class="icon-info">
-									<view class="info-name">
-										{{ row.itemName }}
-									</view>
-									<view class="info-type">
-										B级
+					<t-table :headerBackgroundColor="'#F0F2F6'">
+						<t-tr header>
+							<t-th v-for="(item, index) in columns" :key="index" :align="item.align">
+								{{ item.name }}
+							</t-th>
+						</t-tr>
+						<t-tr v-for="(item, index) in selectList" :key="index">
+							<t-td
+								v-for="(column, colIndex) in columns"
+								:key="colIndex"
+								:align="column.align"
+								:color="column.color"
+							>
+								<view v-if="column.custom == 'icon'" class="list-icon">
+									<image class="icon-image" :src="item.cover" alt="商品图" />
+									<view class="icon-info">
+										<view class="info-name">
+											{{ item.itemName }}
+										</view>
+										<view class="info-type">
+											B级
+										</view>
 									</view>
 								</view>
-							</view>
-							<view v-else-if="column.custom == 'excount'">
-								<text v-if="row.bigCount > 0">{{ `${row.bigCount}/` }}</text>
-								<text>{{ row.smallCount }}</text>
-							</view>
-						</template>
-					</Tabel>
+								<view v-else-if="column.custom == 'excount'">
+									<text v-if="item.bigCount > 0">{{ `${item.bigCount}/` }}</text>
+									<text>{{ item.smallCount }}</text>
+								</view>
+								<view v-else>
+									{{ item[column.dataIndex] || "" }}
+								</view>
+							</t-td>
+						</t-tr>
+					</t-table>
 				</block>
 				<view v-else class="btn-bar">
 					<button class="admin-button-com big blue" @click="gotoSelectPage">
@@ -91,12 +106,11 @@
 	</view>
 </template>
 <script>
-import Tabel from "@/components/app-table";
 import TuiListCell from "@/components/plugin/list-cell";
 import productMins from "@/mixins/product";
 
 export default {
-	components: { TuiListCell, Tabel },
+	components: { TuiListCell },
 	mixins: [productMins],
 
 	data() {

+ 39 - 27
ghs/src/pagesStorehouse/allot/exDetails.vue

@@ -36,33 +36,46 @@
 			</view>
 			<view class="space-view ex-table">
 				<block v-if="!$util.isEmpty(outData.itemInfo)">
-					<Tabel :columns="columns" :dataList="outData.itemInfo">
-						<template v-slot="{ row, column }">
-							<view v-if="column.custom == 'icon'" class="list-icon">
-								<image class="icon-image" :src="row.itemCover" alt="商品图" />
-								<view class="icon-info">
-									<view class="info-name">
-										{{ row.itemName }}
-									</view>
-									<view class="info-type">
-										B级
+					<t-table :headerBackgroundColor="'#F0F2F6'">
+						<t-tr header>
+							<t-th v-for="(item, index) in columns" :key="index" :align="item.align">
+								{{ item.name }}
+							</t-th>
+						</t-tr>
+						<t-tr v-for="(item, index) in outData.itemInfo" :key="index">
+							<t-td
+								v-for="(column, colIndex) in columns"
+								:key="colIndex"
+								:align="column.align"
+								:color="column.color"
+							>
+								<view v-if="column.custom == 'icon'" class="list-icon">
+									<image class="icon-image" :src="item.itemCover" alt="商品图" />
+									<view class="icon-info">
+										<view class="info-name">
+											{{ item.itemName }}
+										</view>
+										<view class="info-type"> {{ item.rank }}级 </view>
 									</view>
 								</view>
-							</view>
-							<view v-else-if="column.custom == 'stock'">
-								<text v-if="row.bigNumStock > 0"> {{ row.bigNumStock }}/ </text>
-								<text>
-									{{ row.smallNumStock }}
-								</text>
-							</view>
-							<view v-else-if="column.custom == 'put'">
-								<text v-if="row.bigNum > 0"> {{ row.bigNum }}/ </text>
-								<text>
-									{{ row.smallNum }}
-								</text>
-							</view>
-						</template>
-					</Tabel>
+								<view v-else-if="column.custom == 'stock'">
+									<text v-if="item.bigNumStock > 0"> {{ item.bigNumStock }}/ </text>
+									<text>
+										{{ item.smallNumStock }}
+									</text>
+								</view>
+								<view v-else-if="column.custom == 'put'">
+									<text v-if="item.bigNum > 0"> {{ item.bigNum }}/ </text>
+									<text>
+										{{ item.smallNum }}
+									</text>
+								</view>
+								<view v-else>
+									{{ item[column.dataIndex] || "" }}
+								</view>
+							</t-td>
+						</t-tr>
+					</t-table>
 				</block>
 				<block v-else>
 					<AppWrapperEmpty
@@ -94,7 +107,6 @@
 	</view>
 </template>
 <script>
-import Tabel from "@/components/app-table";
 import { OUT_STATUS } from "@/utils/declare";
 import {
 	getStockOutDetailApi,
@@ -104,7 +116,7 @@ import {
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 
 export default {
-	components: { Tabel, AppWrapperEmpty },
+	components: { AppWrapperEmpty },
 	data() {
 		return {
 			OUT_STATUS,

+ 39 - 27
ghs/src/pagesStorehouse/allot/putDetails.vue

@@ -36,33 +36,46 @@
 			</view>
 			<view class="space-view ex-table">
 				<block v-if="!$util.isEmpty(putData.itemInfo)">
-					<Tabel :columns="columns" :dataList="putData.itemInfo">
-						<template v-slot="{ row, column }">
-							<view v-if="column.custom == 'icon'" class="list-icon">
-								<image class="icon-image" :src="row.itemCover" alt="商品图" />
-								<view class="icon-info">
-									<view class="info-name">
-										{{ row.itemName }}
-									</view>
-									<view class="info-type">
-										B级
+					<t-table :headerBackgroundColor="'#F0F2F6'">
+						<t-tr header>
+							<t-th v-for="(item, index) in columns" :key="index" :align="item.align">
+								{{ item.name }}
+							</t-th>
+						</t-tr>
+						<t-tr v-for="(item, index) in putData.itemInfo" :key="index">
+							<t-td
+								v-for="(column, colIndex) in columns"
+								:key="colIndex"
+								:align="column.align"
+								:color="column.color"
+							>
+								<view v-if="column.custom == 'icon'" class="list-icon">
+									<image class="icon-image" :src="item.itemCover" alt="商品图" />
+									<view class="icon-info">
+										<view class="info-name">
+											{{ item.itemName }}
+										</view>
+										<view class="info-type"> {{ item.rank }}级 </view>
 									</view>
 								</view>
-							</view>
-							<view v-else-if="column.custom == 'stock'">
-								<text v-if="row.bigNumStock > 0"> {{ row.bigNumStock }}/ </text>
-								<text>
-									{{ row.smallNumStock }}
-								</text>
-							</view>
-							<view v-else-if="column.custom == 'put'">
-								<text v-if="row.bigNum > 0"> {{ row.bigNum }}/ </text>
-								<text>
-									{{ row.smallNum }}
-								</text>
-							</view>
-						</template>
-					</Tabel>
+								<view v-else-if="column.custom == 'stock'">
+									<text v-if="item.bigNumStock > 0"> {{ item.bigNumStock }}/ </text>
+									<text>
+										{{ item.smallNumStock }}
+									</text>
+								</view>
+								<view v-else-if="column.custom == 'put'">
+									<text v-if="item.bigNum > 0"> {{ item.bigNum }}/ </text>
+									<text>
+										{{ item.smallNum }}
+									</text>
+								</view>
+								<view v-else>
+									{{ item[column.dataIndex] || "" }}
+								</view>
+							</t-td>
+						</t-tr>
+					</t-table>
 				</block>
 				<block v-else>
 					<AppWrapperEmpty
@@ -83,13 +96,12 @@
 	</view>
 </template>
 <script>
-import Tabel from "@/components/app-table";
 import { PUT_STATUS } from "@/utils/declare";
 import { getStockInDetailApi, confirmOrderApi } from "@/api/storehouse/stock";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 
 export default {
-	components: { Tabel, AppWrapperEmpty },
+	components: { AppWrapperEmpty },
 	data() {
 		return {
 			PUT_STATUS,

+ 53 - 39
ghs/src/pagesStorehouse/inventory/details.vue

@@ -29,45 +29,60 @@
 				</view>
 			</view>
 			<view class="space-view ex-table">
-				<Tabel :columns="columns" :dataList="dataInfo.itemInfo || []">
-					<template v-slot="{ row, column }">
-						<view v-if="column.custom == 'icon'" class="list-icon">
-							<image class="icon-image" :src="row.itemCover" alt="商品图" />
-							<view class="icon-info">
-								<view class="info-name">
-									{{ row.itemName }}
-								</view>
-								<view class="info-type">
-									B级
+				<t-table>
+					<t-tr header>
+						<t-th v-for="(item, index) in columns" :key="index" :align="item.align">
+							{{ item.name }}
+						</t-th>
+					</t-tr>
+					<t-tr v-for="(item, index) in dataInfo.itemInfo || []" :key="index">
+						<t-td
+							v-for="(column, colIndex) in columns"
+							:key="colIndex"
+							:align="column.align"
+							:color="column.color"
+						>
+							<view v-if="column.custom == 'icon'" class="list-icon">
+								<image class="icon-image" :src="item.itemCover" alt="商品图" />
+								<view class="icon-info">
+									<view class="info-name">
+										{{ item.itemName }}
+									</view>
+									<view class="info-type">
+										B级
+									</view>
 								</view>
 							</view>
-						</view>
-						<view v-else-if="column.custom == 'stock'">
-							<text v-if="row.bigNum > 0">
-								{{ `${row.bigNum}/` }}
-							</text>
-							<text>
-								{{ row.smallNum }}
-							</text>
-						</view>
-						<view v-else-if="column.custom == 'inventory'">
-							<text v-if="row.bigNumStock > 0">
-								{{ `${row.bigNumStock}/` }}
-							</text>
-							<text>
-								{{ row.smallNumStock }}
-							</text>
-						</view>
-						<view v-else-if="column.custom == 'profit'">
-							<text v-if="row.bigNumProfitLoss > 0">
-								{{ `${row.bigNumProfitLoss}/` }}
-							</text>
-							<text>
-								{{ row.smallNumProfitLoss }}
-							</text>
-						</view>
-					</template>
-				</Tabel>
+							<view v-else-if="column.custom == 'stock'">
+								<text v-if="item.bigNum > 0">
+									{{ `${item.bigNum}/` }}
+								</text>
+								<text>
+									{{ item.smallNum }}
+								</text>
+							</view>
+							<view v-else-if="column.custom == 'inventory'">
+								<text v-if="item.bigNumStock > 0">
+									{{ `${item.bigNumStock}/` }}
+								</text>
+								<text>
+									{{ item.smallNumStock }}
+								</text>
+							</view>
+							<view v-else-if="column.custom == 'profit'">
+								<text v-if="item.bigNumProfitLoss > 0">
+									{{ `${item.bigNumProfitLoss}/` }}
+								</text>
+								<text>
+									{{ item.smallNumProfitLoss }}
+								</text>
+							</view>
+							<view v-else>
+								{{ item[column.dataIndex] || "" }}
+							</view>
+						</t-td>
+					</t-tr>
+				</t-table>
 			</view>
 		</view>
 		<view class="bar-view">
@@ -82,12 +97,11 @@
 	</view>
 </template>
 <script>
-import Tabel from "@/components/app-table";
 import { getCheckOrderDetailApi } from "@/api/inventory/index";
 import { INVENTORY_STATUS } from "@/utils/declare";
 
 export default {
-	components: { Tabel },
+	components: {},
 	data() {
 		return {
 			INVENTORY_STATUS,

+ 34 - 24
ghs/src/pagesStorehouse/stockWarn/detailed.vue

@@ -6,30 +6,41 @@
 		<scroll-view scroll-y scroll-with-animation class="main-view">
 			<view class="space-view ex-table">
 				<block v-if="!$util.isEmpty(list.data)">
-					<Tabel
-						:headerBackgroundColor="'#F0F2F6'"
-						:columns="columns"
-						:dataList="list.data"
-					>
-						<template v-slot="{ row, column }">
-							<view v-if="column.custom == 'change'">
-								{{ `${row.smallNumOrder}/${row.bigNumOrder}` }}
-							</view>
-							<view v-else-if="column.custom == 'stock'">
-								{{ `${row.smallNumStock}/${row.bigNumStock}` }}
-							</view>
-							<view v-else-if="column.custom == 'time'">
-								<view class="icon-info">
-									<view class="info-name">
-										{{ row.addTime }}
-									</view>
-									<!-- <view class="info-type">
-										{{ row.addTime }}
+					<t-table :headerBackgroundColor="'#F0F2F6'">
+						<t-tr header>
+							<t-th v-for="(item, index) in columns" :key="index" :align="item.align">
+								{{ item.name }}
+							</t-th>
+						</t-tr>
+						<t-tr v-for="(item, index) in list.data" :key="index">
+							<t-td
+								v-for="(column, colIndex) in columns"
+								:key="colIndex"
+								:align="column.align"
+								:color="column.color"
+							>
+								<view v-if="column.custom == 'change'">
+									{{ `${item.smallNumOrder}/${item.bigNumOrder}` }}
+								</view>
+								<view v-else-if="column.custom == 'stock'">
+									{{ `${item.smallNumStock}/${item.bigNumStock}` }}
+								</view>
+								<view v-else-if="column.custom == 'time'">
+									<view class="icon-info">
+										<view class="info-name">
+											{{ item.addTime }}
+										</view>
+										<!-- <view class="info-type">
+										{{ item.addTime }}
 									</view> -->
+									</view>
+								</view>
+								<view v-else>
+									{{ item[column.dataIndex] || "" }}
 								</view>
-							</view>
-						</template>
-					</Tabel>
+							</t-td>
+						</t-tr>
+					</t-table>
 				</block>
 				<block v-else>
 					<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
@@ -39,7 +50,6 @@
 	</view>
 </template>
 <script>
-import Tabel from "@/components/app-table";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 
 import SelectList from "@/components/plugin/selectList";
@@ -47,7 +57,7 @@ import { getStockDetailApi } from "@/api/storehouse/stock";
 import { list } from "@/mixins";
 
 export default {
-	components: { Tabel, SelectList, AppWrapperEmpty },
+	components: { SelectList, AppWrapperEmpty },
 	mixins: [list],
 	data() {
 		return {