shish 3 лет назад
Родитель
Сommit
b704fb1aaa
3 измененных файлов с 15 добавлено и 13 удалено
  1. 10 12
      ghsApp/src/admin/changePrice/changeList.vue
  2. 4 0
      ghsApp/src/api/item/index.js
  3. 1 1
      ghsApp/src/pages.json

+ 10 - 12
ghsApp/src/admin/changePrice/changeList.vue

@@ -6,23 +6,21 @@
 				<block v-if="!$util.isEmpty(list.data)">
 					<t-table :headerBackgroundColor="'#F0F2F6'">
 						<t-tr header>
-							<t-th><view style="width:160upx;color:#333333;font-size:30upx;font-weight:bold;">时间</view></t-th>
-							<t-th><view style="color:#333333;font-size:30upx;font-weight:bold;">名称</view></t-th>
-							<t-th><view style="width:180upx;color:#333333;font-size:30upx;font-weight:bold;">事项</view></t-th>
-							<t-th><view style="color:#333333;font-size:30upx;font-weight:bold;">变动</view></t-th>
-							<t-th><view style="color:#333333;font-size:30upx;font-weight:bold;">剩余</view></t-th>
+							<t-th><view style="width:200upx;color:#333333;font-size:30upx;font-weight:bold;">时间</view></t-th>
+							<t-th><view style="color:#333333;font-size:30upx;font-weight:bold;">操作人</view></t-th>
+							<t-th><view style="color:#333333;font-size:30upx;font-weight:bold;">批发价</view></t-th>
+							<t-th><view style="color:#333333;font-size:30upx;font-weight:bold;">零售价</view></t-th>
 						</t-tr>
 						<t-tr v-for="(item, index) in list.data" :key="index">
 							<t-td align="center" color="info">
-								<view style="width:160upx;color:#333333;font-size:30upx;">
+								<view style="width:200upx;color:#333333;font-size:30upx;">
 									<view>{{ item.addTime.substr(5,11) }}</view>
 									<view>{{item.ptStyle==1?'零售':'批发'}}</view>
 								</view>
 							</t-td>
-							<t-td><view style="color:#333333;font-size:30upx;">{{item.relateName}}</view></t-td>
-							<t-td><view style="width:180upx;color:#333333;font-size:30upx;">{{item.typeName}}</view></t-td>
-							<t-td><view style="color:#333333;font-size:30upx;">{{parseFloat(item.itemNum)}}</view></t-td>
-							<t-td><view style="color:#333333;font-size:30upx;">{{parseFloat(item.newStock)}}</view></t-td>
+							<t-td><view style="color:#333333;font-size:30upx;">{{item.staffName}}</view></t-td>
+							<t-td><view style="color:#333333;font-size:30upx;">{{item.price?parseFloat(item.price):0}}</view></t-td>
+							<t-td><view style="color:#333333;font-size:30upx;">{{item.skPrice?parseFloat(item.skPrice):0}}</view></t-td>
 						</t-tr>
 					</t-table>
 				</block>
@@ -36,7 +34,7 @@
 </template>
 <script>
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
-import { getStockDetailApi } from "@/api/storehouse/stock";
+import { getPriceChangeList } from "@/api/item";
 import { list } from "@/mixins";
 import { mapGetters} from "vuex";
 export default {
@@ -69,7 +67,7 @@ export default {
 			this.getChangeList(this.option.id);
 		},
 		getChangeList(id) {
-			return getStockDetailApi({id:id,page: this.list.page}).then(res => {
+			return getPriceChangeList({id:id,page: this.list.page}).then(res => {
 				this.completes(res);
 			});
 		}

+ 4 - 0
ghsApp/src/api/item/index.js

@@ -2,4 +2,8 @@ import https from '@/plugins/luch-request_0.0.7/request'
 
 export const getColorList = data => {
 	return https.get('/item/color-list', data)
+}
+
+export const getPriceChangeList = data => {
+	return https.get('/price-change/list', data)
 }

+ 1 - 1
ghsApp/src/pages.json

@@ -112,7 +112,7 @@
 			"root": "admin/changePrice",
 			"pages": [
 				{"path": "list","style": {"navigationBarTitleText": "改价"}},
-				{"path": "changeList","style": {"navigationBarTitleText": "价格变动记录"}}
+				{"path": "changeList","style": {"navigationBarTitleText": "价格变动"}}
 			]
 		},
 		{