Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud

src/api/supermarketerp/smErpSupplier.ts

@@ -2,7 +2,7 @@ import request from '/@/utils/request';
 
 export function fetchList(query?: Object) {
 	return request({
-		url: '/supermarketerp/smErpSupplier/page',
+		url: '/supermarket/smErpSupplier/page',
 		method: 'get',
 		params: query,
 	});
@@ -10,7 +10,7 @@ export function fetchList(query?: Object) {
 
 export function addObj(obj?: Object) {
 	return request({
-		url: '/supermarketerp/smErpSupplier',
+		url: '/supermarket/smErpSupplier',
 		method: 'post',
 		data: obj,
 	});
@@ -18,14 +18,14 @@ export function addObj(obj?: Object) {
 
 export function getObj(id?: string) {
 	return request({
-		url: '/supermarketerp/smErpSupplier/' + id,
+		url: '/supermarket/smErpSupplier/' + id,
 		method: 'get',
 	});
 }
 
 export function delObjs(ids?: Object) {
 	return request({
-		url: '/supermarketerp/smErpSupplier',
+		url: '/supermarket/smErpSupplier',
 		method: 'delete',
 		data: ids,
 	});
@@ -33,7 +33,7 @@ export function delObjs(ids?: Object) {
 
 export function putObj(obj?: Object) {
 	return request({
-		url: '/supermarketerp/smErpSupplier',
+		url: '/supermarket/smErpSupplier',
 		method: 'put',
 		data: obj,
 	});
@@ -41,7 +41,7 @@ export function putObj(obj?: Object) {
 
 export function getSupplierTypeOptions(): any {
 	return request({
-		url: '/supermarketerp/smErpSupplierType/simpleAll',
+		url: '/supermarket/smErpSupplierType/simpleAll',
 		method: 'get',
 	});
 }

src/api/supermarketerp/smErpSupplierType.ts

@@ -2,7 +2,7 @@ import request from "/@/utils/request"
 
 export function fetchList(query?: Object) {
   return request({
-    url: '/supermarketerp/smErpSupplierType/page',
+    url: '/supermarket/smErpSupplierType/page',
     method: 'get',
     params: query
   })
@@ -10,7 +10,7 @@ export function fetchList(query?: Object) {
 
 export function addObj(obj?: Object) {
   return request({
-    url: '/supermarketerp/smErpSupplierType',
+    url: '/supermarket/smErpSupplierType',
     method: 'post',
     data: obj
   })
@@ -18,14 +18,14 @@ export function addObj(obj?: Object) {
 
 export function getObj(id?: string) {
   return request({
-    url: '/supermarketerp/smErpSupplierType/' + id,
+    url: '/supermarket/smErpSupplierType/' + id,
     method: 'get'
   })
 }
 
 export function delObjs(ids?: Object) {
   return request({
-    url: '/supermarketerp/smErpSupplierType',
+    url: '/supermarket/smErpSupplierType',
     method: 'delete',
     data: ids
   })
@@ -33,7 +33,7 @@ export function delObjs(ids?: Object) {
 
 export function putObj(obj?: Object) {
   return request({
-    url: '/supermarketerp/smErpSupplierType',
+    url: '/supermarket/smErpSupplierType',
     method: 'put',
     data: obj
   })

src/api/supermarketerp/supermarketAuxiliaryCode.ts

@@ -1,4 +1,4 @@
-import request from "/@/utils/request"
+import request from "/src/utils/request"
 
 export function fetchList(query?: Object) {
   return request({

src/api/supermarketerp/supermarketBrand.ts

@@ -1,4 +1,4 @@
-import request from "/@/utils/request"
+import request from "/src/utils/request"
 
 export function fetchList(query?: Object) {
   return request({

src/api/supermarketerp/supermarketCategory.ts

@@ -1,4 +1,4 @@
-import request from "/@/utils/request"
+import request from "/src/utils/request"
 
 export function fetchList(query?: Object) {
   return request({

src/api/supermarketerp/supermarketSpu.ts

@@ -1,4 +1,4 @@
-import request from '/@/utils/request';
+import request from '/src/utils/request';
 
 export function fetchList(query?: Object) {
 	return request({

src/api/supermarketerp/supermarketUnit.ts

@@ -1,4 +1,4 @@
-import request from '/@/utils/request';
+import request from '/src/utils/request';
 
 export function fetchList(query?: Object) {
 	return request({

src/views/supermarketerp/supermarketAuxiliaryCode/form.vue

@@ -29,7 +29,7 @@
 
 <script setup lang="ts" name="SupermarketAuxiliaryCodeDialog">
 import { useMessage } from '/@/hooks/message';
-import { getObj, addObj, putObj } from '/@/api/supermarket/supermarketAuxiliaryCode';
+import { getObj, addObj, putObj } from '/src/api/supermarketerp/supermarketAuxiliaryCode';
 const emit = defineEmits(['refresh']);
 
 // 定义变量内容

src/views/supermarketerp/supermarketAuxiliaryCode/index.vue

@@ -87,7 +87,7 @@
 
 <script setup lang="ts" name="systemSupermarketAuxiliaryCode">
 import { BasicTableProps, useTable } from '/@/hooks/table';
-import { fetchList, delObjs } from '/@/api/supermarket/supermarketAuxiliaryCode';
+import { fetchList, delObjs } from '/src/api/supermarketerp/supermarketAuxiliaryCode';
 import { useMessage, useMessageBox } from '/@/hooks/message';
 
 // 引入组件

src/views/supermarketerp/supermarketBrand/form.vue

@@ -55,7 +55,7 @@
 <script setup lang="ts" name="SupermarketBrandDialog">
 import { useDict } from "/@/hooks/dict"
 import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj } from "/@/api/supermarket/supermarketBrand"
+import { getObj, addObj, putObj } from "/src/api/supermarketerp/supermarketBrand"
 import { rule } from "/@/utils/validate"
 const emit = defineEmits(["refresh"])
 

src/views/supermarketerp/supermarketBrand/index.vue

@@ -100,7 +100,7 @@
 
 <script setup lang="ts" name="systemSupermarketBrand">
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchList, delObjs } from "/@/api/supermarket/supermarketBrand"
+import { fetchList, delObjs } from "/src/api/supermarketerp/supermarketBrand"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 

src/views/supermarketerp/supermarketCategory/form.vue

@@ -56,7 +56,7 @@
 <script setup lang="ts" name="SupermarketCategoryDialog">
 import { useDict } from "/@/hooks/dict"
 import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj } from "/@/api/supermarket/supermarketCategory"
+import { getObj, addObj, putObj } from "/src/api/supermarketerp/supermarketCategory"
 import { rule } from "/@/utils/validate"
 const emit = defineEmits(["refresh"])
 

src/views/supermarketerp/supermarketCategory/index.vue

@@ -101,7 +101,7 @@
 
 <script setup lang="ts" name="systemSupermarketCategory">
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchList, delObjs } from "/@/api/supermarket/supermarketCategory"
+import { fetchList, delObjs } from "/src/api/supermarketerp/supermarketCategory"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 

src/views/supermarketerp/supermarketSpu/form.vue

@@ -67,21 +67,26 @@
 								<upload-img v-model:imageUrl="form.picUrl"></upload-img>
 							</el-form-item>
 						</el-col>
-						<el-col :span="24" class="mb20">
+<!--						<el-col :span="24" class="mb20">
 							<el-form-item label="商品轮播图" prop="sliderPicUrls">
 								<upload-imgs v-model:imageUrl="form.sliderPicUrls"></upload-imgs>
 							</el-form-item>
-						</el-col>
+						</el-col>-->
 						<el-col :span="12" class="mb20">
 							<el-form-item label="排序字段" prop="sort">
 								<el-input-number :min="0" :max="1000" :precision="0" v-model="form.sort" />
 							</el-form-item>
 						</el-col>
-						<el-col :span="12" class="mb20">
+            <el-col :span="12" class="mb20">
+              <el-form-item label="总库存" prop="stock">
+                <el-input-number v-model="form.stock" :min="0" :precision="0" />
+              </el-form-item>
+            </el-col>
+<!--						<el-col :span="12" class="mb20">
 							<el-form-item label="单位" prop="unit">
 								<el-input v-model="form.unit" placeholder="请输入单位" />
 							</el-form-item>
-						</el-col>
+						</el-col>-->
 						<el-col :span="24" class="mb20">
 							<el-form-item label="商品状态" prop="status">
 								<el-radio-group v-model="form.status">
@@ -96,16 +101,11 @@
 						<!--								<el-input-number v-model="form.costPrice" placeholder="请输入成本单价，单位:分"></el-input-number>-->
 						<!--							</el-form-item>-->
 						<!--						</el-col>-->
-						<el-col :span="12" class="mb20">
-							<el-form-item label="库存" prop="stock">
-								<el-input-number v-model="form.stock" :min="0" :precision="0" />
-							</el-form-item>
-						</el-col>
-						<el-col :span="12" class="mb20">
+<!--						<el-col :span="12" class="mb20">
 							<el-form-item label="赠送积分" prop="giveIntegral">
 								<el-input-number v-model="form.giveIntegral" :min="0" :precision="0" />
 							</el-form-item>
-						</el-col>
+						</el-col>-->
 						<!--						<el-col :span="12" class="mb20">-->
 						<!--							<el-form-item label="规格" prop="specification">-->
 						<!--								<el-input v-model="form.specification" placeholder="请输入规格" />-->
@@ -171,11 +171,11 @@
 								<el-input type="textarea" v-model="form.introduction" rows="4" placeholder="请输入商品简介" maxlength="400" show-word-limit />
 							</el-form-item>
 						</el-col> -->
-						<el-col :span="24" class="mb20">
+<!--						<el-col :span="24" class="mb20">
 							<el-form-item label="商品详情" prop="description">
 								<editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>
 							</el-form-item>
-						</el-col>
+						</el-col>-->
 						<el-col :span="12" class="mb20">
 							<el-form-item label="库存上限" prop="inventoryUpperLimit">
 								<el-input-number v-model="form.inventoryUpperLimit" :min="0" :precision="0" />
@@ -218,15 +218,15 @@
 </template>
 
 <script setup lang="ts">
-import { useDict } from "/@/hooks/dict"
-import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj, getSupermarketCategory, getSupermarketBrand } from "/@/api/supermarket/supermarketSpu"
-import { getSupplierTypeOptions } from "/@/api/supermarketerp/smErpSupplier"
-import { rule } from "/@/utils/validate"
+import { useDict } from "/src/hooks/dict"
+import { useMessage } from "/src/hooks/message"
+import { getObj, addObj, putObj, getSupermarketCategory, getSupermarketBrand } from "/src/api/supermarketerp/supermarketSpu"
+import { getSupplierTypeOptions } from "/src/api/supermarketerp/smErpSupplier"
+import { rule } from "/src/utils/validate"
 import supermarketAuxiliaryCode from "./components/supermarketAuxiliaryCode/index.vue"
 import supermarketUnit from "./components/supermarketUnit/index.vue"
 import { TabPaneName } from "element-plus"
-import { displayPrice, storePrice } from "/@/utils/formatMoney"
+import { displayPrice, storePrice } from "/src/utils/formatMoney"
 
 const emit = defineEmits(["refresh"])
 
@@ -283,7 +283,7 @@ const dataRules = {
 	productCode: [{ required: true, message: "货号不能为空", trigger: "blur" }],
 	barcode: [{ required: true, message: "自编码/条码不能为空", trigger: "blur" }],
 	productName: [{ required: true, message: "商品名称不能为空", trigger: "blur" }],
-	unit: [{ required: true, message: "单位不能为空", trigger: "blur" }],
+	stock: [{ required: true, message: "单位不能为空", trigger: "blur" }],
 	categoryId: [{ required: true, message: "商品分类不能为空", trigger: "blur" }],
 	brandId: [{ required: true, message: "品牌不能为空", trigger: "blur" }],
 	picUrl: [{ required: true, message: "商品封面图不能为空", trigger: "blur" }],

src/views/supermarketerp/supermarketSpu/index.vue

@@ -134,10 +134,10 @@
 </template>
 
 <script setup lang="ts" name="systemSupermarketSpu">
-import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchList, delObjs, getSupermarketCategory, getSupermarketBrand } from "/@/api/supermarket/supermarketSpu"
-import { useMessage, useMessageBox } from "/@/hooks/message"
-import { useDict } from "/@/hooks/dict"
+import { BasicTableProps, useTable } from "/src/hooks/table"
+import { fetchList, delObjs, getSupermarketCategory, getSupermarketBrand } from "/src/api/supermarketerp/supermarketSpu"
+import { useMessage, useMessageBox } from "/src/hooks/message"
+import { useDict } from "/src/hooks/dict"
 const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH
 
 // 引入组件

src/views/supermarketerp/supermarketUnit/form.vue

@@ -52,8 +52,8 @@
 </template>
 
 <script setup lang="ts" name="SupermarketAuxiliaryCodeDialog">
-import { useMessage } from '/@/hooks/message';
-import { getObj, addObj, putObj } from '/@/api/supermarket/supermarketUnit';
+import { useMessage } from '/src/hooks/message';
+import { getObj, addObj, putObj } from '/src/api/supermarketerp/supermarketUnit';
 const emit = defineEmits(['refresh']);
 
 // 定义变量内容

src/views/supermarketerp/supermarketUnit/index.vue

@@ -86,9 +86,9 @@
 </template>
 
 <script setup lang="ts" name="systemSupermarketAuxiliaryCode">
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { fetchList, delObjs } from '/@/api/supermarket/supermarketUnit';
-import { useMessage, useMessageBox } from '/@/hooks/message';
+import { BasicTableProps, useTable } from '/src/hooks/table';
+import { fetchList, delObjs } from '/src/api/supermarketerp/supermarketUnit';
+import { useMessage, useMessageBox } from '/src/hooks/message';
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));

src/views/wallet/wallet-foreign/index.vue

@@ -65,18 +65,25 @@
 						<span>{{ row.applyEndTime }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column prop="count" label="申请数量" />
-				<el-table-column prop="useCount" label="使用数量" />
-				<el-table-column prop="processStatus" label="审核状态">
+				<el-table-column prop="count" width="100" label="申请数量" />
+				<el-table-column prop="useCount" width="100" label="使用数量" />
+				<el-table-column prop="processStatus" width="100" label="审核状态">
 					<template #default="{ row }">
 						<dict-tag :options="check_status" :value="row.processStatus" />
 					</template>
 				</el-table-column>
+				<el-table-column prop="processTime" label="审核时间" />
 				<el-table-column prop="createTime" label="创建时间" />
 				<el-table-column label="操作" width="200">
 					<template #default="{ row }">
 						<el-button icon="Promotion" text type="primary" @click="doInfo(row)"> 查看审批 </el-button>
-						<el-button icon="InfoFilled" text type="primary" @click="codeUseTableRef.openDialog(row.id)">
+						<el-button
+							v-if="row.processStatus == 2"
+							icon="InfoFilled"
+							text
+							type="primary"
+							@click="codeUseTableRef.openDialog(row.id)"
+						>
 							使用情况
 						</el-button>
 						<el-button

src/views/wallet/wallet-freeze/index.vue

@@ -75,6 +75,7 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="remark" label="备注" />
+				<el-table-column prop="processTime" label="审核时间" />
 				<el-table-column prop="createTime" label="创建时间" />
 				<el-table-column label="操作" width="200">
 					<template #default="{ row }">

src/views/wallet/wallet-recharge-apply/index.vue

@@ -97,7 +97,7 @@
 							>数据</el-button
 						>
 						<el-button
-							v-if="row.importTime && row.processStatus != 1 && row.processStatus != 2"
+							v-if="row.importTime && !row.processId"
 							icon="Connection"
 							text
 							type="primary"
@@ -204,8 +204,12 @@ const doApply = async (row: any) => {
 		await walletRechargeApplyApi.apply({ id: row.id })
 		useMessage().success("提交成功")
 		getDataList()
-	} finally {
 		setTimeout(() => loading.close(), 500)
+	} catch (error: any) {
+		loading.close()
+		if (error && error.code != 0) {
+			useMessage().error(error.msg)
+		}
 	}
 }
 

src/views/wallet/wallet-recharge-water/index.vue

@@ -93,6 +93,11 @@
 						</div>
 					</template>
 				</el-table-column>
+				<el-table-column prop="processStatus" label="审核状态">
+					<template #default="{ row }">
+						<dict-tag :options="check_status" :value="row.processStatus" />
+					</template>
+				</el-table-column>
 				<el-table-column prop="processTime" label="审核时间" align="center" />
 				<el-table-column prop="beforePrice" label="操作前的金额" align="center">
 					<template #default="{ row }">
@@ -130,7 +135,12 @@ import { useDict } from "/@/hooks/dict"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import * as walletRechargeImportApi from "/@/api/wallet/wallet-recharge-import"
 
-const { wallet_biz_recharge, wallet_type } = useDict("wallet_biz_recharge", "wallet_type", "check_status")
+const { wallet_biz_recharge, wallet_type, check_status } = useDict(
+	"wallet_biz_recharge",
+	"wallet_type",
+	"check_status",
+	"check_status",
+)
 // 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)

src/views/wallet/wallet-stride/index.vue

@@ -58,13 +58,14 @@
 				<el-table-column type="index" label="#" width="40" />
 				<el-table-column prop="username" label="申请人" />
 				<el-table-column prop="deptName" label="部门" />
-				<el-table-column prop="count" label="申请数量" />
-				<el-table-column prop="useCount" label="使用数量" />
-				<el-table-column prop="processStatus" label="审核状态">
+				<el-table-column prop="count" width="100" label="申请数量" />
+				<el-table-column prop="useCount" width="100" label="使用数量" />
+				<el-table-column prop="processStatus" width="100" label="审核状态">
 					<template #default="{ row }">
 						<dict-tag :options="check_status" :value="row.processStatus" />
 					</template>
 				</el-table-column>
+				<el-table-column prop="processTime" label="审核时间" />
 				<el-table-column prop="createTime" label="创建时间" />
 				<el-table-column label="操作" width="200">
 					<template #default="{ row }">
@@ -87,7 +88,13 @@
 							>删除</el-button
 						>
 						<el-button icon="Promotion" text type="primary" @click="doInfo(row)"> 查看审批 </el-button>
-						<el-button icon="InfoFilled" text type="primary" @click="codeUseTableRef.openDialog(row.id)">
+						<el-button
+							v-if="row.processStatus == 2"
+							icon="InfoFilled"
+							text
+							type="primary"
+							@click="codeUseTableRef.openDialog(row.id)"
+						>
 							使用情况
 						</el-button>
 					</template>