shish 4 yıl önce
ebeveyn
işleme
9ac8610007

+ 1 - 0
ghs/src/views/item-class/list.vue

@@ -252,6 +252,7 @@ export default {
 						placeholder: '分类名称'
 					}
 				})
+				.set('pagination', {size: 100})
 				.set('layout', [
 					['slot-tabs'],
 					['flex1', 'slot-add-goods-btn', 'refresh-btn'],

+ 15 - 29
ghs/src/views/item/list.vue

@@ -9,8 +9,6 @@
       </template>
 
 	<template #table-column-cover="{ scope }">
-		<!-- <cl-avatar shape="square" :size="32" :src="scope.row.cover" :style="{ margin: 'auto' }"></cl-avatar> -->
-
 		<el-popover placement="right" width="200" trigger="hover">
 			<div style="width:200px;height:200px;">
 				<img style="width:100%;height:100%;object-fit: cover;" :src="scope.row.bigCover" />
@@ -105,14 +103,7 @@
 		<el-button type="text" v-if="scope.row.delStatus==1" @click.native.stop="setDelStatusFun(scope.row.id,0)" >恢复</el-button>
 
 	</template>
-
-		<template #table-header-cost>
-			<div class="set-sort">
-				<span>每扎成本</span>
-				<el-button v-if="!costPrice" icon="el-icon-edit-outline" size="small" type="text" @click="showCost" class="show"></el-button>
-				<el-button class="hide" v-else size="mini" @click="commitChange('cost')" type="primary">完成</el-button>
-			</div>
-		</template>
+		
 		<template #table-column-cost="{scope}">
 			<span v-if="!costPrice">{{ scope.row.cost }}</span>
 			<el-input style="width:80%;" ref="sort-input" focus size="mini" v-else v-model="scope.row.cost" @blur="changeInputValue(scope.row, 'cost')" ></el-input>
@@ -598,10 +589,10 @@ export default {
 				'min-width': 60,
 			},
             {
-              prop: 'cost',
-              label: '每扎成本',
+              prop: 'price',
+              label: '售价',
               align: 'center',
-              'min-width': 120
+              minWidth:110
             },
             {
               prop: 'addPrice',
@@ -610,16 +601,16 @@ export default {
               'min-width': 130
             },
             {
-              prop: 'price',
-              label: '售价',
+              prop: 'stockWarning',
+              label: '库存预警',
               align: 'center',
-              minWidth:110
+              'min-width': 130
             },
             {
-              prop: 'stockWarning',
-              label: '库存预警',
+              prop: 'cost',
+              label: '每扎成本',
               align: 'center',
-              'min-width': 125
+              'min-width': 90
             },
 			{
               prop: 'status',
@@ -665,9 +656,9 @@ export default {
             },
             {
               prop: 'unit',
-              label: '大小单位',
+              label: '单位',
               align: 'center',
-              'min-width': 80
+              'min-width': 70
             },
             {
               prop: 'id',
@@ -700,14 +691,9 @@ export default {
 		.set('pagination', {
 			size: 50
 		})
-        .set('layout', [['slot-tabs'],['search-key'],['flex1', 'slot-addNew-goods-btn','slot-add-goods-btn','slot-download-price-btn', 'refresh-btn'],['data-table'],['flex1', 'pagination']])
-		  .on('refresh', async (params, { next }) => {
-			  // 继续执行刷新
-			  let  asset  = await next(params);
-			  console.log(asset,'-------')
-		  })
-        .done();
-      app.refresh({ classId: this.classId,status:this.status,showPage: 1});
+        .set('layout', [['slot-tabs'],['search-key'],['flex1', 'slot-addNew-goods-btn','slot-add-goods-btn','slot-download-price-btn', 'refresh-btn'],
+		['data-table'],['flex1', 'pagination']]).done();
+		app.refresh({ classId: this.classId,status:this.status,showPage: 1,delStatus:0});
     },
     uploadSuccess() {
 		console.log('valid',this.$refs['replaceForm'].validateField('cover'))

+ 1 - 1
pt/src/views/item-class/list.vue

@@ -270,7 +270,7 @@ export default {
 					}
 				})
 				.set('pagination', {
-					size: 50
+					size: 100
 				})
 				.set('layout', [
 					['slot-tabs'],

+ 1 - 1
pt/src/views/item/list.vue

@@ -475,7 +475,7 @@ export default {
 						},
 						{
 							prop: 'unit',
-							label: '大小单位',
+							label: '单位',
 							align: 'center',
 							minWidth: 100,
 						},