改价

ghsApp/src/admin/billing/index.vue

@@ -4,7 +4,9 @@
 			<app-search-module v-model="py" placeholder="请输入关键词，支持拼音首字母搜索" @input="searchFn" />
 		</view>
 		<view class="scroll-middle_bx">
+
 			<scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop" >
+				<!--分类 start -->
 				<div v-for="(item, index) in filterProductInfo" :key="index" class="tab-bar-item" :class="classIndex == index ? 'active' : ''" :data-current="index" @tap.stop="swichClass(index)">
 					<text>{{ item.className || "" }}</text>
 					<text class="tag" v-if=" getSelectClassById(item.classId).bigCount > 0 || getSelectClassById(item.classId).smallCount > 0">
@@ -15,25 +17,19 @@
 						<text v-if="getSelectClassById(item.classId).smallCount > 0">{{ getSelectClassById(item.classId).smallCount }}</text>
 					</text>
 				</div>
+				<!--分类 end -->
 				<view style="height: 120rpx"></view>
-				<!-- <view class="switchover-unit" @tap="isSmallCount = !isSmallCount">{{isSmallCount?'支':'扎'}}</view> -->
 			</scroll-view>
 
-			<scroll-view scroll-y class="right-box" :scroll-into-view="scroll_into_view" scroll-with-animation="true"
-																@scroll="scroll_detail"
-																lower-threshold="100"
-																@scrolltolower="scroll_bottom">
-				<!--内容部分 start -->
+			<scroll-view scroll-y class="right-box" :scroll-into-view="scroll_into_view" scroll-with-animation="true" @scroll="scroll_detail" lower-threshold="100" @scrolltolower="scroll_bottom">
+				<!--花材列表 start -->
 				<block v-if="!$util.isEmpty(filterProductInfo)">
 					<view class="item_list_bx selectAll" v-for="(classItem, classIndex) in filterProductInfo" :key="classIndex" :id="`class_${classIndex}`">
-						<view class="item_list_title">
-							{{ classItem.className }}
-						</view>
-
+						<view class="item_list_title">{{ classItem.className }}</view>
 						<template v-for="(productItem, productIndex) in classItem.child">
 							<view style="height: 160rpx" :id="`class_${classItem.classId}_${productItem.id}`" :key="productIndex">
 								<Commondity v-if="classItem.isActive"
-																				:offVerifyRepertory="true"
+									:offVerifyRepertory="true"
 									:info="productItem"
 									:bigCount="getSelectItemById(productItem.id, classItem.classId).bigCount"
 									:smallCount="getSelectItemById(productItem.id, classItem.classId).smallCount"
@@ -44,24 +40,16 @@
 									@del="delEvent"
 								></Commondity>
 							</view>
-							<!-- <Commondity
-							:type="COMMODITY_TYPE.CHANGE"
-							@customNum="customNum"
-						></Commondity> -->
 						</template>
 					</view>
 				</block>
 				<block v-else>
-					<app-wrapper-empty
-						title="暂无数据"
-						:is-empty="$util.isEmpty(filterProductInfo)"
-					/>
+					<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(filterProductInfo)" />
 				</block>
-				<!--内容部分 end -->
+				<!--花材列表 end -->
 			</scroll-view>
 
 		</view>
-		<!-- :maskClosable="false" -->
 		<modal-module :show="isModel" @cancel="modalCancel" @click="affirm" :title="customData.itemName" color="#333" :size="32" padding="30rpx 30rpx" >
 			<template slot="customContent">
 				<view class="select-cmd_bx" v-if="customData">
@@ -77,6 +65,7 @@
 				</view>
 			</template>
 		</modal-module>
+		<!-- 花材不足提示框 -->
 		<modal-module
 			:show="showSubmitModel"
 			@cancel="cancelEvent"
@@ -101,7 +90,7 @@ import ModalModule from "@/components/plugin/modal";
 import { COMMODITY_TYPE } from "@/utils/declare";
 import productMins from "@/mixins/product";
 export default {
-	name: "Billing", // 开单
+	name: "Billing",//开单
 	components: {
 		AppTabs,
 		AppSearchModule,

ghsApp/src/admin/billing/priceChange.vue

@@ -1,19 +1,19 @@
 <template>
   <view class="billing_box_bg">
     <view class="input-wrap">
-      <app-search-module v-model="py" placeholder="请输入关键词，支持拼音首字母搜索"
-                         @input="searchFnContrapose" />
+      <app-search-module v-model="py" placeholder="请输入关键词，支持拼音首字母搜索" @input="searchFnContrapose" />
     </view>
     <view class="scroll-middle_bx">
         <!--内容部分 start -->
         <block v-if="!$util.isEmpty(filterProductInfoContrapose)">
           <view style="width:100%;padding: 30rpx">
             <template v-for="(productItem, productIndex) in filterProductInfoContrapose">
-              <Commondity :type="COMMODITY_TYPE.CHANGE"
-                                      :key="productIndex"
-                                      :info="productItem"
-                                      :autoPrice="productItem.priceLabel=='2'?productItem.price:null"
-              ></Commondity>
+              <Commondity :type="COMMODITY_TYPE.CHANGE" 
+              :key="productIndex" 
+              :info="productItem" 
+              :autoPrice="productItem.priceLabel=='2'?productItem.price:null"
+              >
+              </Commondity>
             </template>
           </view>
         </block>
@@ -34,7 +34,6 @@ import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import Commondity from "@/components/module/app-commodity";
 import { COMMODITY_TYPE } from "@/utils/declare";
 import productMins from "@/mixins/productContrapose";
-import { autoPriceByIdApi, changePriceByIdApi } from '@/api/product/index'
 
 export default {
   name: "Billing", // 开单
@@ -58,7 +57,6 @@ export default {
   data () {
     return {
       pageType: "price_change",
-					 // offShowPage: true,
       COMMODITY_TYPE,
     };
   },

ghsApp/src/admin/home/workbench.vue

@@ -192,7 +192,7 @@ export default {
 				{
 					name: "改价",
 					img: `${this.$constant.imgUrl}/ghs/home/gj.png`,
-					url: "/admin/billing/priceChange"
+					url: "/admin/changePrice/list"
 				},
 				{
 					name: "采购单",

ghsApp/src/api/product/index.js

@@ -25,15 +25,16 @@ export const autoPriceByIdApi = data => {
 	return https.post("/product/auto-price", data);
 };
 
-/**
- * 改价
- * productId
- * price
- */
+//改价
 export const changePriceByIdApi = data => {
 	return https.post("/product/change-price", data);
 };
 
+//批量改价
+export const batchChangePrice = data => {
+	return https.post("/product/batch-change-price", data);
+};
+
 //添加花材
 export const addProduct = data => {
 	return https.post("/product/add", data);

ghsApp/src/pages.json

@@ -14,7 +14,6 @@
 		{"path": "common/pageSuccess","style": {"navigationBarBackgroundColor": "#ffffff","navigationBarTextStyle": "black"}}
 	],
 	"subPackages": [
-
 		{
 			"root": "pagesClient",
 			"pages": [
@@ -63,6 +62,12 @@
 				{"path": "me/rechargeSuccess","style": {"navigationBarTitleText": "充值成功"}}
 			]
 		},
+		{
+			"root": "admin/changePrice",
+			"pages": [
+				{"path": "list","style": {"navigationBarTitleText": "批量改价"}}
+			]
+		},
 		{
 			"root": "admin/ghs",
 			"pages": [
@@ -175,13 +180,7 @@
 						"navigationBarTitleText": "开单"
 					}
 				},
-				{
-					"path": "priceChange",
-					"style": {
-						"navigationBarTitleText": "改价",
-						"enablePullDownRefresh": true
-					}
-				},
+
 				{
 					"path": "result",
 					"style": {
@@ -208,7 +207,6 @@
 				}
 			]
 		},
-
 		{
 			"root": "pagesStorehouse/shop/",
 			"pages": [