Merge remote-tracking branch 'origin/master'

src/api/admin/user.ts

@@ -144,7 +144,7 @@ export function validatePhone(rule: any, value: any, callback: any, isEdit: bool
 }
 
 // 获取简要用户信息
-export function getSimpleUserAll(params?: { name?: string; mobile?: string }) {
+export function getSimpleUserAll(params?: { name?: string; mobile?: string; userId?: string }) {
 	return request({
 		url: "/admin/user/getSimpleUserAll",
 		method: "get",

src/components/Select/SelectHandlerUser.vue

@@ -41,10 +41,7 @@ const props = withDefaults(defineProps<Props>(), {
 	isDisplayName: false,
 })
 
-const queryForm = reactive<any>({
-	current: 1,
-	size: 10,
-})
+const queryForm = reactive<any>({})
 
 const state = reactive<any>({
 	loading: true,
@@ -57,6 +54,7 @@ watch(
 	(newVal, oldValue) => {
 		if (newVal == oldValue) return
 		state.selectId = newVal
+		queryForm.userId = newVal
 		getOptions()
 	},
 	{ immediate: true },
@@ -65,10 +63,7 @@ watch(
 async function getOptions() {
 	try {
 		state.loading = true
-		const _pa = {
-			...queryForm,
-		}
-		const { data } = await getSimpleUserAll(_pa)
+		const { data } = await getSimpleUserAll(queryForm)
 		state.options = data ?? []
 	} finally {
 		setTimeout(() => (state.loading = false), 500)
@@ -81,9 +76,4 @@ function remoteSearch(params: string) {
 		getOptions()
 	}
 }
-
-function clear() {
-	state.selectId = null
-	getOptions()
-}
 </script>

src/components/Select/SelectSupplier.vue

@@ -54,6 +54,7 @@ watch(
 	(newVal, oldValue) => {
 		if (newVal == oldValue) return
 		state.selectId = newVal
+		queryForm.supplierId = newVal
 		getOptions()
 	},
 	{ immediate: true },
@@ -62,10 +63,7 @@ watch(
 async function getOptions() {
 	try {
 		state.loading = true
-		const _pa = {
-			...queryForm,
-		}
-		const { data } = await getSupplierSimpleAll(_pa)
+		const { data } = await getSupplierSimpleAll(queryForm)
 		state.options = data ? data.filter((item: any) => item.supplierId) : []
 	} finally {
 		setTimeout(() => (state.loading = false), 500)
@@ -78,9 +76,4 @@ function remoteSearch(params: string) {
 		getOptions()
 	}
 }
-
-function clear() {
-	state.selectId = null
-	getOptions()
-}
 </script>

src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue

@@ -13,7 +13,12 @@
 					</div>
 					<div style="width: 33.33%; height: 28px; line-height: 28px">
 						<span class="font-bold">经办人：</span>
-						<span>{{ baseDataForm.handlerUserId }}</span>
+						<SelectHandlerUser
+							v-model.trim="baseDataForm.handlerUserId"
+							placeholder="请选择经办人"
+							style="width: 200px"
+							:isDisplayName="true"
+						/>
 					</div>
 					<div style="width: 33.33%; height: 28px; line-height: 28px">
 						<span class="font-bold">关联补货申请：</span>
@@ -21,7 +26,7 @@
 					</div>
 					<div style="width: 33.33%; height: 28px; line-height: 28px">
 						<span class="font-bold">货商：</span>
-						<span>{{ baseDataForm.supplierId }}</span>
+						<select-supplier v-model="baseDataForm.supplierId" style="width: 200px" :disabled="disabled" :isDisplayName="true" />
 					</div>
 					<div style="width: 33.33%; height: 28px; line-height: 28px">
 						<span class="font-bold">备注：</span>
@@ -290,14 +295,14 @@ const getInitData = async () => {
 				const unitObj = item.erpUnitVos.find((unit: any) => unit.id === item.unitId)
 				return {
 					...item,
-					unitObj: { ...unitObj, realPrice: item?.realPrice || 0 },
+					unitObj: { ...unitObj, realPrice: displayPrice(item?.realPrice, "") || 0 },
 				}
 			})
 			state.erpSpuItemsMemo = cgPlanData.data.items.map((item: any) => {
 				const unitObj = item.erpUnitVos.find((unit: any) => unit.id === item.unitId)
 				return {
 					...item,
-					unitObj: { ...unitObj, realPrice: item?.realPrice || 0 },
+					unitObj: { ...unitObj, realPrice: displayPrice(item?.realPrice, "") || 0 },
 				}
 			})
 		}

src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue

@@ -18,11 +18,11 @@
 					<el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
 					</el-form-item>
-					<el-form-item label="审批状态" prop="checkStatus">
+					<!-- <el-form-item label="审批状态" prop="checkStatus">
 						<el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态">
 							<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />
 						</el-select>
-					</el-form-item>
+					</el-form-item> -->
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
 						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -70,11 +70,11 @@
 				<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
 				<el-table-column prop="productName" label="入库商品" show-overflow-tooltip />
 				<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
-				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
+				<!-- <el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
 					<template #default="scope">
 						<dict-tag :options="check_status" :value="scope.row.checkStatus" />
 					</template>
-				</el-table-column>
+				</el-table-column> -->
 				<el-table-column prop="supplierName" label="货商" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 				<el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip>
@@ -84,21 +84,13 @@
 				</el-table-column>
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
+						<el-button icon="MessageBox" text type="success" @click="edit({ ...scope.row, checkStatus: 2 })">详情</el-button>
 						<el-button
-							icon="MessageBox"
-							text
-							type="success"
-							@click="edit(scope.row)"
-						>
-							详情
-						</el-button>
-						<el-button
-
 							icon="edit-pen"
 							text
 							type="primary"
 							v-auth="'supermarket_smErpInventoryRecords_edit'"
-							@click="edit(scope.row)"
+							@click="edit({ ...scope.row, checkStatus: null })"
 						>
 							编辑
 						</el-button>
@@ -111,7 +103,7 @@
 						>
 							删除
 						</el-button>
-						<el-button
+						<!-- <el-button
 							type="primary"
 							size="small"
 							v-if="scope.row.checkStatus == '1' && scope.row.taskId"
@@ -120,7 +112,7 @@
 							@click="deal(scope.row)"
 						>
 							开始处理
-						</el-button>
+						</el-button> -->
 					</template>
 				</el-table-column>
 			</el-table>
@@ -130,7 +122,7 @@
 		<sm-form v-else :formId="processFormState.formId" :disabled="processFormState.formDisabled" @close="formClose" />
 
 		<!-- 审批抽屉 -->
-		<process-drawer ref="processDrawerRef" @task-submit-event="taskSubmitEvent" />
+		<!-- <process-drawer ref="processDrawerRef" @task-submit-event="taskSubmitEvent" /> -->
 	</div>
 </template>
 

src/views/thirdparty/third-pay-log/index.vue

@@ -1,6 +1,23 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
+			<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+				<el-form-item style="width: 250px" label="发起方" prop="paySourceType">
+					<dict-select v-model="state.queryForm.apiType" dict-code="third_key_type" />
+				</el-form-item>
+				<el-form-item style="width: 250px" label="接口类型" prop="bizType">
+					<dict-select v-model="state.queryForm.bizType" dict-code="third_pay_api_type" />
+				</el-form-item>
+				<el-form-item style="width: 400px" label="请求时间" prop="createTimeList">
+					<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
+				</el-form-item>
+				<el-form-item>
+					<el-button icon="Search" type="primary" @click="getDataList">
+						{{ $t("common.queryBtn") }}
+					</el-button>
+					<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
+				</el-form-item>
+			</el-form>
 			<el-row>
 				<div class="mb8" style="width: 100%">
 					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'third_thirdPayLog_add'">
@@ -35,24 +52,53 @@
 				@selection-change="selectionChangHandle"
 				@sort-change="sortChangeHandle"
 			>
-				<el-table-column type="selection" width="40" align="center" />
-				<el-table-column type="index" label="#" width="40" />
-				<el-table-column prop="paySourceType" label="支付发起方类型id" show-overflow-tooltip />
-				<el-table-column prop="bizType" label="支付类型" show-overflow-tooltip />
-				<el-table-column prop="bizId" label="支付类型id" show-overflow-tooltip />
-				<el-table-column prop="apiUrl" label="api-url" show-overflow-tooltip />
-				<el-table-column prop="res" label="res" show-overflow-tooltip />
-				<el-table-column prop="req" label="req" show-overflow-tooltip />
-				<el-table-column prop="error" label="调用错误" show-overflow-tooltip />
-				<el-table-column prop="timeConsuming" label="耗时(毫秒)" show-overflow-tooltip />
-				<el-table-column label="操作" width="150">
+				<el-table-column type="index" label="#" width="80" />
+				<el-table-column prop="paySourceType" label="发起方" width="120">
+					<template #default="{ row }">
+						<dict-tag :options="third_key_type" :value="row.paySourceType" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="bizType" label="接口类型" width="120">
+					<template #default="{ row }">
+						<dict-tag :options="third_pay_api_type" :value="row.bizType" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="apiUrl" label="api-url" width="250" />
+				<el-table-column prop="res" label="res" width="180">
+					<template #default="{ row }">
+						<preview-json :json="row.res" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="req" label="req" width="180">
+					<template #default="{ row }">
+						<preview-json :json="row.req" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="error" label="调用错误" width="180"></el-table-column>
+				<el-table-column prop="timeConsuming" label="耗时(毫秒)" width="180"></el-table-column>
+				<el-table-column prop="createTime" label="调用时间" width="180" />
+				<el-table-column label="操作" fixed="right" width="80" v-if="false">
 					<template #default="scope">
-						<el-button icon="edit-pen" text type="primary" v-auth="'third_thirdPayLog_edit'" @click="formDialogRef.openDialog(scope.row.id)"
-							>编辑</el-button
+						<el-button
+							v-if="false"
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'third_thirdPayLog_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)"
 						>
-						<el-button icon="delete" text type="primary" v-auth="'third_thirdPayLog_del'" @click="handleDelete([scope.row.id])"
-							>删除</el-button
+							编辑
+						</el-button>
+						<el-button
+							v-if="false"
+							icon="delete"
+							text
+							type="primary"
+							v-auth="'third_thirdPayLog_del'"
+							@click="handleDelete([scope.row.id])"
 						>
+							删除
+						</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -73,7 +119,7 @@ import { useDict } from "/@/hooks/dict"
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 // 定义查询字典
-
+const { third_key_type, third_pay_api_type } = useDict("third_key_type", "third_pay_api_type")
 // 定义变量内容
 const formDialogRef = ref()
 // 搜索变量