更换正式环境，测试修改

2025-03-25 21:49:33 +08:00
parent f01bc839f7
commit 7fe5d028e4
71 changed files with 930 additions and 2016 deletions
--- a/pageProduct/index/components/baosun.vue
+++ b/pageProduct/index/components/baosun.vue
@@ -110,6 +110,7 @@
 		const res= await productReportDamage(par)
 		infoBox.showToast('提交成功！')
 		popShow.value=false
+		emits('save')
 	}
 </script>

--- a/pageProduct/index/components/control.vue
+++ b/pageProduct/index/components/control.vue
@@ -1,38 +1,13 @@
 <template>
 	<view class="control" :style="getComputedStyle()">
-		<view class="u-flex control1" v-if="showControl1">
-			<!-- <view class="btn" @click="changeShowControl1">批量管理</view> -->
+		<view class="u-flex control1">
 			<view class="btn add font-bold u-font-28 color-fff" @tap="go.to('PAGES_PRODUCT_ADD')">商品添加</view>
-			<!-- <view class="color-999 btn u-flex u-row-center" @click="emitToggleCategory">
-				<text class="u-m-r-10">{{categoryName||'选择分类'}}</text>
-				<view class="arrow-down" :class="{'up':categoryShow}">
-					<uni-icons type="right" size="16" color="#999"></uni-icons>
-				</view>
-			</view> -->
-		</view>
-		<view class="u-flex control2 u-row-between" v-else>
-			<view class="u-flex btn">
-				<view class="u-m-r-58">
-					<label class="radio" @click="changeIsSelectAll">
-						<radio class="scale7" @tap.stop="changeIsSelectAll" :color="ColorMain"  value="" :checked="isSelectAll" />
-						<text>全选</text>
-					</label>
-				</view>
-				<view class="u-p-l-30 u-p-r-30 my-bg-main" @click="changeShowControl1">取消</view>
-				<view class="u-p-l-60 u-p-r-60 borde-r" @click="offShelf">下架</view>
-			</view>
-			<view class=" u-flex u-row-center btn" @click="emitToggleCategory">
-				<text class="u-m-r-10">分类至</text>
-				<uni-icons type="right" size="16" color="#fff"></uni-icons>
-			</view>
 		</view>
 	</view>
 </template>

 <script setup>
-	import {$tbShopCategory} from '@/http/yskApi/goods.js'
 	import go from '@/commons/utils/go.js';
-	import {ColorMain} from '@/commons/color.js'
 	import {
 		onMounted,
 		reactive,
@@ -43,53 +18,18 @@
 			type: [Number, String],
 			default: 30
 		},
-		categoryName:{
-			type:String,
-			default:''
-		},
-		categoryShow:{
-			type:Boolean,
-			default:false
-		}
 	})
 	
-
 	let showControl1 = ref(true)
 	const emits = defineEmits(['toggleCategory','controlChange','allCheckedChange','offShelf','categoryChange'])

-	function emitToggleCategory() {
-		emits('toggleCategory')
-	}
-
-	function changeShowControl1() {
-		showControl1.value = !showControl1.value
-		emits('controlChange',!showControl1.value)
-	}
-
-	let isSelectAll = ref(false)
-
-	function changeIsSelectAll() {
-		isSelectAll.value = !isSelectAll.value
-		emits('allCheckedChange',isSelectAll.value)
-	}

 	function getComputedStyle() {
 		return {
 			bottom: props.bottom + 'rpx'
 		}
 	}
-	//设置是否全选
-	function setisSelectAll(checked){
-		isSelectAll.value =checked
-	}
-	defineExpose({
-		setisSelectAll
-	})
 	
-	//下架
-	function offShelf(){
-		emits('offShelf')
-	}
 </script>

 <style lang="scss" scoped>
--- a/pageProduct/index/components/edit-stock.vue
+++ b/pageProduct/index/components/edit-stock.vue
@@ -15,8 +15,8 @@
 					<template v-if="!isSku">
 						<view class="u-m-b-32" >
 							<view class="u-flex u-row-between">
-								<view>{{data.name}}</view>
-								<view class="u-font-24">
+								<view class="up-line-1" style="width: 60%;">{{data.name}}</view>
+								<view class="u-font-24" style="flex-shrink: 1;">
 									<text>变动数量：</text>
 									<text class="number">{{data.stockNumber-data._stockNumber}}</text>
 								</view>
@@ -48,7 +48,7 @@
 									<view>{{item.name}}</view>
 									<view class="u-font-24">
 										<text>变动数量：</text>
-										<text class="number">{{item.stockNumber-item._stockNumber}}</text>
+										<text class="number">{{(item.stockNumber-item._stockNumber).toFixed(2)}}</text>
 									</view>
 								</view>
 								<view class="u-m-t-16">
@@ -110,21 +110,10 @@
 </template>

 <script setup>
-	import {
-		reactive,
-		ref,
-		watch,
-		onMounted,
-		computed 
-	} from 'vue';
-	import {
-		returnSkuSnap,
-		returnTypeEnum,
-		returnCategory
-	} from '@/pageProduct/util.js'
-	import {
-		$tbShopUnit,$getProductStockDetail
-	} from '@/http/yskApi/goods.js'
+	import { reactive, ref, watch, onMounted, computed } from 'vue';
+
+	import { $invoicingType } from '@/commons/goodsData.js'
+	import { productStockFlow  } from '@/http/api/product.js'
 	import go from '@/commons/utils/go.js'
 	const refForm = ref(null)
 	const props = defineProps({
@@ -156,7 +145,6 @@
 		]
 	}) 
 	function toRecodes(){
-		console.log(props.goods.id);
 		go.to('PAGES_PRODUCT_INVOICING_LIST',{
 			productId:props.goods.id
 		})
@@ -185,26 +173,27 @@
 			getProductStockDetail()
 		}
 	})
+	let getTypeName = (type) => {
+		let item = $invoicingType.filter(item=> item.value == type)[0]
+		return item?item.text:''
+	}
 	async function getProductStockDetail(){
-		const {content}=await $getProductStockDetail({
-			page:0,
-			size:2,
-			productId:props.goods.id,
-			column:'/api/tbProductStockDetail/stock/count',
-			shopId:uni.getStorageSync('shopId'),
-			createdAt:[]
+		const { records }=await productStockFlow({
+			page: 1,
+			size: 2,
+			productId: props.goods.id,
 		})
-		console.log(content);
-		recoders.list=content.map(v=>{
+		console.log(records);
+		recoders.list = records.map(v=>{
 			return {
 				...v,
-				title:v.createdAt,
-				content:v.type+':'+Math.abs(v.stockNumber) 
+				title: v.createTime,
+				content: getTypeName(v.inOutItem)+':'+Math.abs(v.inOutNumber) 
 			}
 		})
 	}
 	const isSku = computed(() => {
-		// return data.value.typeEnum == '多规格'
+		// return data.value.type == 'sku'
 		return false
 	})
 	watch(() => popShow.value, (newval) => {
@@ -223,6 +212,7 @@
 		refForm.value.validate().then(valid => {
 			if (valid) {
 				emits('save', {
+					remark: form.note,
 					...data.value,
 				})
 			} else {
@@ -232,28 +222,7 @@
 			// 处理验证错误  
 		});
 	}
-	// function save() {
-	// 	const skuSnap = returnSkuSnap(data.value)
-	// 	let typeEnum = returnTypeEnum(data.value.typeEnum)
-	// 	let lowPrice = undefined
-	// 	typeEnum = typeEnum ? typeEnum : 'normal'
-	// 	const findCategory = returnCategory(data.value.categoryName, props.category)
-	// 	console.log(typeEnum);
-	// 	console.log(findCategory);
-	// 	const categoryId = findCategory ? findCategory.id : ''
-	// 	if (typeEnum == 'normal') {
-	// 		// 单规格
-	// 		lowPrice = data.value.skuList[0].salePrice
-	// 	}
-	// 	emits('save', {
-	// 		...data.value,
-	// 		lowPrice,
-	// 		typeEnum,
-	// 		images: data.value.images ? data.value.images : [data.value.coverImg],
-	// 		categoryId,
-	// 		skuSnap: JSON.stringify(skuSnap)
-	// 	})
-	// }
+
 	
 	onMounted(()=>{
 		// #ifndef H5
--- a/pageProduct/index/components/goods.vue
+++ b/pageProduct/index/components/goods.vue
@@ -12,7 +12,7 @@
 				</view>
 			</view>
 			<view>
-				<text class="u-font-28 color-666" @click="changePrice">改价</text>
+				<!-- <text class="u-font-28 color-666" @click="changePrice">改价</text> -->
 				<text class="u-font-28 color-red u-m-l-24" @click="baosun">报损</text>
 			</view>
 		</view>
@@ -90,7 +90,6 @@
 			</view>
 			<view class="u-flex">
 				<!-- <view class="btn-default btn" @tap="xiajia">下架商品</view> -->
-				<!-- <view class="btn-default btn" @tap="del">删除</view> -->
 				<view class="btn-primary btn u-m-l-38" @click="toEdit">编辑</view>
 			</view>
 		</view>
@@ -104,7 +103,7 @@
 	import go from '@/commons/utils/go.js';
 	import {hasPermission} from '@/commons/utils/hasPermission.js';
 	import { ColorMain } from '@/commons/color.js'
-	const emits = defineEmits(['radioClick', 'changeClick', 'xiajia', 'del', 'changePrice', 'baosun', 'guigeClick','update',
+	const emits = defineEmits(['radioClick', 'xiajia', 'del', 'changePrice', 'baosun', 'guigeClick','update',
 		'editStock'
 	])
 	const props = defineProps({
@@ -145,7 +144,6 @@
 		const max=247;
 		for(let i in  props.data.skuList){
 			const sku=props.data.skuList[i]
-			console.log(sku)
 			width+=(fontSize*sku.specInfo.length+boxWith+gap)
 			if(width>max){
 				isOne=false
@@ -232,10 +230,6 @@
 		console.log(props.index);
 		emits('radioClick', props.index)
 	}
-
-	function changeClick() {
-		emits('changeClick', props.index)
-	}
 	
 	function reportDamage () {
 		emits('reportDamage', props.index)
--- a/pageProduct/index/index.vue
+++ b/pageProduct/index/index.vue
@@ -43,9 +43,9 @@
 			<template v-if="pageData.goodsList.length">
 				<view class="u-m-b-32" v-for="(item,index) in pageData.goodsList" :key="index">
 					<my-goods :key="item.id" @update="getGoodsList" @changePrice="changePriceShow"
-						@changeClick="goodsChangeClick" @edit="toGoodsDetail" @editStock="changeStockShow"
-						@guigeClick="editGuigeShow" @baosun="baosunShow" @radioClick="goodsRadioClick" :index="index"
-						:data="item" @del="goodsDel" :showChecked="showChecked"
+						@edit="toGoodsDetail" @editStock="changeStockShow"
+						@guigeClick="editGuigeShow" @baosun="baosunShow" :index="index"
+						:data="item" 
 						:showDetail="pageData.showGoodsDetail"></my-goods>
 				</view>
 			</template>
@@ -61,39 +61,11 @@
 		</view>

 		<my-control ref="control" :categoryShow="pageData.categoryShow" :categoryName="pageData.categoryName"
-			@offShelf="offShelf" @allCheckedChange="allCheckedChange" @controlChange="controlChange"
-			@toggleCategory="toggleCategory" :bottom="pageData.componentBottom"></my-control>
-		<!-- <my-category ref="category" @change="onCategoryShowChange" @cateClick="cateClick"
-			:bottom="pageData.componentBottom+100"></my-category> -->
+			:bottom="pageData.componentBottom"></my-control>
+	
+			
 		<!-- 下架弹窗 -->
 		<my-model :desc="pageData.modelDesc" ref="model" @confirm="modelConfirm"></my-model>
-		<!-- 商品库存修改弹窗 -->
-		<my-model ref="goodsStockModel" title="商品修改" @close="goodsStockModelClose">
-			<template #desc>
-				<view class="u-p-40 u-text-left">
-					<view>
-						<view class="">排序:</view>
-						<view class="u-m-t-24">
-							<uni-easyinput v-model="goodsStockData.orderBy" placeholder="请输入排序"></uni-easyinput>
-						</view>
-					</view>
-					<view class="u-flex u-m-t-32">
-						<view class="">库存开关:</view>
-						<view class="u-m-l-46 ">
-							<my-switch v-model="goodsStockData.isStock"></my-switch>
-						</view>
-					</view>
-				</view>
-
-			</template>
-			<template #btn>
-				<view class="stock-btns u-p-b-40">
-					<my-button shape="circle" @tap="goodsStockModelSave">保存</my-button>
-					<my-button shape="circle" type="default" @tap="goodsStockModelCancel">取消</my-button>
-				</view>
-			</template>
-		</my-model>
-
 		<!-- 分类 -->
 		<my-category v-model:isShow="pageData.categoryShow" @confirm="setCategory"></my-category>
 		<!-- 修改价格弹窗 -->
@@ -107,7 +79,7 @@
 			:goods="popup.guige.data"></edit-guige>
 		<!-- 报损 -->
 		<baosun-vue :category="pageData.categoryList" v-model:show="popup.baosun.show"
-			:goods="pageData.selGoods"></baosun-vue>
+			:goods="pageData.selGoods" @save="getGoodsList"></baosun-vue>
 	</view>

 </template>
@@ -115,34 +87,21 @@
 <script setup>
 	import { onLoad, onShow } from '@dcloudio/uni-app';
 	import { reactive, ref, watch } from 'vue';
+	
 	import go from '@/commons/utils/go.js';
 	import { hasPermission } from '@/commons/utils/hasPermission.js';
+	
 	import myGoods from './components/goods.vue'
 	import myControl from './components/control.vue'
 	import myCategory from './components/category.vue'
-	import infoBox from "@/commons/utils/infoBox.js"
 	import editPrice from './components/edit-price.vue';
 	import editGuige from './components/edit-guige.vue';
 	import editStock from './components/edit-stock.vue';
 	import baosunVue from './components/baosun.vue';
-	import {
-		$updateProduct,
-		$getProductDetail,
-		$delProduct,
-		$tbShopCategory,
-		$updateProductStatus,
-		$tbProductV2,
-		$updateProductData
-	} from "@/http/yskApi/goods.js"
-	import {
-		getProductPage,
-		getCategoryList,
-		updateProduct
-	} from '@/http/api/product.js'
+
+	import { getProductPage, getCategoryList, updateProduct, productModifyStock } from '@/http/api/product.js'
 	
-	import {
-		returnAllCategory
-	} from '@/pageProduct/util.js'
+	import { returnAllCategory } from '@/pageProduct/util.js'

 	const pageData = reactive({
 		modelDesc: '是否下架',
@@ -181,8 +140,6 @@
 	const tabsList = ['简洁', '详情']
 	const control = ref(null)
 	const model = ref(null)
-	const goodsStockModel = ref(null)
-	let reportDamage = ref(null) //报损组件
 	watch(() => pageData.query.categoryId, (newval) => {
 		getGoodsList()
 	})
@@ -250,7 +207,10 @@
 		})
 	}
 	
-	//报损弹窗展示
+	/**
+	 * 报损弹窗展示
+	 * @param {Object} index
+	 */
 	function baosunShow(index) {
 		pageData.selGoodsIndex = index
 		const goods = pageData.goodsList[index]
@@ -290,7 +250,6 @@
 	 * @param {Object} goods
 	 */
 	async function changePriceConfirm(goods) {
-		
 		let goodsArr = []
 		if (goods.type == 'sku') {
 			goodsArr = goods.skuList.map(v => {
@@ -313,13 +272,15 @@
 			}]
 		}
 		const res = await updateProduct(goodsArr)
-		infoBox.showToast('修改成功')
+		uni.$utils.showToast('修改成功')
 		popup.price.show = false
 		getGoodsList()
 	}

-
-	// 修改库存弹窗展示
+	/**
+	 * 修改库存弹窗展示
+	 * @param {Object} index
+	 */
 	async function changeStockShow(index) {
 		const res = await hasPermission('允许修改商品库存')
 		if (!res) {
@@ -341,26 +302,29 @@
 		}
 		popup.stock.show = true
 	}
-	async function changeStockConfirm(goods) {
-		let goodsArr = []
 	
-		goodsArr = [{
-			shopId: uni.getStorageSync('shopId'),
-			isSku: false,
+	/**
+	 * 库存修改确认
+	 * @param {Object} goods
+	 */
+	async function changeStockConfirm(goods) {
+		const res = await productModifyStock({
 			id: goods.id,
-			key: 'stockNumber',
-			value: goods.stockNumber
-		}]
-		const res = await $updateProductData(goodsArr)
-		infoBox.showToast('修改成功')
+			stockNumber: goods.stockNumber,
+			remark: goods.remark
+		})
+		uni.$utils.showToast('修改成功')
 		popup.stock.show = false
 		getGoodsList()
 	}

-	//修改规格上下架，售罄
+	/**
+	 * 修改规格上下架，售罄
+	 * @param {Object} goodsIndex
+	 * @param {Object} guigeIndex
+	 */
 	function editGuigeShow(goodsIndex, guigeIndex) {
 		const goodsGuige = pageData.goodsList[goodsIndex].skuList[guigeIndex]
-		console.log(goodsIndex, guigeIndex);
 		popup.guige.data = goodsGuige
 		popup.guige.goodsIndex = goodsIndex
 		popup.guige.guigeIndex = guigeIndex
@@ -373,7 +337,6 @@
 	 */
 	function isGroundingChange(e) {
 		const { goodsIndex, guigeIndex } = popup.guige
-		console.log(goodsIndex,guigeIndex)
 		pageData.goodsList[goodsIndex].skuList[guigeIndex].isGrounding = e
 	}
 	
@@ -383,15 +346,21 @@
 	 */
 	function isPauseSaleChange(e) {
 		const { goodsIndex, guigeIndex } = popup.guige
-		console.log(goodsIndex,guigeIndex)
 		pageData.goodsList[goodsIndex].skuList[guigeIndex].isPauseSale = e
 	}
-
+	
+	/**
+	 * 分类筛选打开
+	 * @param {Object} show
+	 */
 	function onCategoryShowChange(show) {
-		console.log(show);
 		pageData.categoryShow = show
 	}
-
+	
+	/**
+	 * 分类筛选确定
+	 * @param {Object} category
+	 */
 	function setCategory(category) {
 		pageData.query.categoryId = category.id
 		pageData.categoryName = category.name
@@ -413,88 +382,10 @@

 	}
 	
-
-
-	// 商品报损
-	function reportDamageClick(index) {
-		pageData.reportData = pageData.goodsList[index]
-		reportDamage.value.open();
-	}
-
-	function returnGoodsStockData() {
-		return reactive({
-			sort: 0,
-			isStock: false,
-			isDistribute: false,
-			isSoldStock: false,
-			isGrounding: false,
-			stockNumber: 0,
-		})
-	}
-	let goodsStockData = returnGoodsStockData()
-
-	function goodsStockModelClose() {
-		console.log('goodsStockModelClose');
-		goodsStockData = returnGoodsStockData()
-	}
-
-	function goodsStockModelCancel() {
-		console.log('goodsStockModelCancel');
-		goodsStockModel.value.close()
-		goodsStockData = returnGoodsStockData()
-	}
-
-	async function goodsStockModelSave() {
-		const item = pageData.goodsList[pageData.selGoodsIndex]
-		const goods = await $getProductDetail(item.id, false)
-		$updateProduct({
-			...goods,
-			sort: goodsStockData.sort,
-			isStock: goodsStockData.isStock
-		}).then(res => {
-			item.sort = goodsStockData.sort
-			item.isStock = goodsStockData.isStock
-			item.stockNumber = goodsStockData.stockNumber
-			goodsStockModelCancel()
-		})
-	}
-
-
-
-	//点击修改按钮弹出修改商品弹窗
-	function goodsChangeClick(index) {
-		pageData.selGoodsIndex = index
-		const goods = pageData.goodsList[index]
-		Object.assign(goodsStockData, goods)
-		goodsStockModel.value.open()
-	}
-
-	//删除商品
-	function goodsDel(index) {
-		const goods = pageData.goodsList[index]
-		uni.showModal({
-			title: '提示',
-			content: '确认删除该商品',
-			success: function(res) {
-				if (res.confirm) {
-					$delProduct([goods.id]).then(res => {
-						uni.showToast({
-							title: '删除成功',
-							icon: 'none'
-						})
-						pageData.goodsList.splice(index, 1)
-					})
-				} else if (res.cancel) {}
-			}
-		});
-	}
-
-	function resetQuery() {
-		pageData.totalElements = 0;
-		pageData.query.page = 1;
-		getGoodsList()
-	}
-
+	/**
+	 * 商品修改
+	 * @param {Object} id
+	 */
 	async function toGoodsDetail(id) {
 		const res = await hasPermission('允许修改商品')
 		if (!res) {
@@ -513,109 +404,35 @@
 	function statesTableClick(index) {
 		pageData.stateCurrent = index;
 		pageData.query.status = pageData.statesTabsList[index].value
-		resetQuery()
-	}
-	let test = ref(false)
-
-	function tabsChange(i) {
-		console.log(i);
-		pageData.showGoodsDetail = i ? true : false
-
-	}
-
-
-	//改变商品的选中状态
-	function changeGoodsChecked(checked, index) {
-		if (index !== undefined) {
-			pageData.goodsList[index].checked = checked
-		} else {
-			pageData.goodsList.map(v => {
-				v.checked = checked
-			})
-		}
-		control.value.setisSelectAll(isAllChecked() ? true : false)
-	}
-
-
-	// 获取已经选中的商品
-	function getChechkedGoodsList() {
-		return pageData.goodsList.filter(v => v.checked)
-	}
-	//是否全部选中
-	function isAllChecked() {
-		return getChechkedGoodsList().length === pageData.goodsList.length
-	}
-	// 是否有商品选中
-	function isHasChekdGoods() {
-		return getChechkedGoodsList().length ? true : false
+		searchFunc()
 	}

+	/**
+	 * 搜索
+	 */
 	function searchFunc() {
-		console.log('searchFunc');
-		resetQuery()
+		pageData.totalElements = 0;
+		pageData.query.page = 1;
 		getGoodsList()
 	}

-	let showChecked = ref(false)
-
-	//商品start
-
-	function goodsRadioClick(index) {
-		var checked = !pageData.goodsList[index].checked
-		changeGoodsChecked(checked, index)
-	}
-
-
-	//下架
-	function offShelf() {
-		const hasCheckedArr = getChechkedGoodsList()
-		const hasChecked = isHasChekdGoods()
-		if (!hasChecked) {
-			return infoBox.showToast('您还没有选中商品！')
-		}
-		model.value.open()
-	}
-	//下架确认
+	/**
+	 * 下架确认
+	 */
 	function modelConfirm() {
 		console.log('confirm');
 		model.value.close()
 	}

-	//商品end
-
-	//控制条
-	function controlChange(bol) {
-		showChecked.value = bol
-	}
-
-
-
-	// 全选
-	function allCheckedChange(checked) {
-		changeGoodsChecked(checked)
-	}
-
-	// 页数改变事件
+	/**
+	 * 页数改变事件
+	 * @param {Object} page
+	 */
 	function pageChange(page) {
-		console.log(page);
 		pageData.query.page = page
 		getGoodsList()
 	}

-	//分类
-	const category = ref(null)
-
-	function toggleCategory() {
-		category.value.toggle()
-	}
-
-	function cateClick(cate) {
-		console.log(cate);
-		pageData.query.categoryId = cate.id
-		pageData.categoryName = cate.name
-		pageData.category = cate
-		getGoodsList()
-	}
 </script>
 <style scoped>
 	page {