Merge branch 'release' into dev

src/api/snapshot/centerMark.ts

@@ -3,6 +3,38 @@
  * @description 随手拍-中心标注
  */
 import request from '@/utils/request';
+/**
+ * @description 获取工单标记集合
+ * @param {object} params
+ */
+export const centerMarkList = (params?: object) => {
+  return request({
+    url: '/api/v1/SnapshotOrder/signed',
+    method: 'get',
+    params,
+  });
+};
+/**
+ * @description 获取标记详情
+ * @param {string} id
+ */
+export const centerMarkDetail = (id: string) => {
+  return request({
+    url: `/api/v1/SnapshotOrder/sign/${id}`,
+    method: 'get',
+  });
+};
+/**
+ * @description 修改工单标记
+ * @param {object} data
+ */
+export const centerMarkUpdate = (data: object) => {
+  return request({
+    url: '/api/v1/SnapshotOrder/sign',
+    method: 'put',
+    data,
+  });
+};
 /**
  * @description 获取中心标注列表日志
  * @param {object} params

src/api/snapshot/reSend.ts

@@ -24,4 +24,15 @@ export const citizenRedEnvelopeApproval = (data: object) => {
 		method: 'put',
 		data,
 	});
+};
+/**
+ * @description 获取网格员红包发放列表
+ * @param {object} params
+ */
+export const getGridRedEnvelopeApprovalList = (params?: object) => {
+	return request({
+		url: '/api/v1/RedPack/record/guider',
+		method: 'get',
+		params,
+	});
 };

src/components/OrderDetail/index.vue

@@ -212,6 +212,9 @@
 							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" v-if="['ZiGong', 'LuZhou'].includes(themeConfig.appScope) && state.ruleForm.company">
 								<el-form-item label="工作单位"> {{ state.ruleForm.company }} </el-form-item>
 							</el-col>
+							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" v-if="['ZiGong'].includes(themeConfig.appScope) && state.ruleForm.industryName">
+								<el-form-item label="行业类型"> {{ state.ruleForm.industryName }} </el-form-item>
+							</el-col>
 							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" v-if="['YiBin'].includes(themeConfig.appScope) && state.ruleForm.focusOnEventsName">
 								<el-form-item label="重点标记"> {{ state.ruleForm.focusOnEventsName }} </el-form-item>
 							</el-col>

src/views/snapshot/centerMark/components/record-Edit.vue

@@ -1,7 +1,7 @@
 <template>
 	<el-dialog v-model="state.dialogVisible" width="30%" draggable title="修改标注" destroy-on-close append-to-body @close="close">
-		<el-form :model="state.ruleForm" label-width="90px" ref="ruleFormRef">
-			<el-form-item label="工单标题"> </el-form-item>
+		<el-form :model="state.ruleForm" label-width="90px" ref="ruleFormRef" v-loading="loading">
+			<el-form-item label="工单标题">{{ orderTitle }}</el-form-item>
 			<el-form-item label="工单标记" prop="snapshotLabel" :rules="[{ required: true, message: '请选择工单标记', trigger: 'change' }]">
 				<el-select
 					v-model="state.ruleForm.snapshotLabel"
@@ -31,6 +31,7 @@
 import { reactive, ref } from 'vue';
 import { ElMessage, FormInstance } from 'element-plus';
 import { throttle } from '@/utils/tools';
+import { centerMarkDetail, centerMarkUpdate } from '@/api/snapshot/centerMark';
 // 定义子组件向父组件传值/事件
 const emit = defineEmits(['updateList']);
 
@@ -40,16 +41,30 @@ const state = reactive<any>({
 	ruleForm: {
 		snapshotLabel: [],
 	},
-	ids: [],
 });
 let loading = ref<boolean>(false); // 加载状态
 // 打开弹窗
 const ruleFormRef = ref<RefType>();
 const snapshotLabel = ref<EmptyArrayType>([]);
+const orderTitle = ref<string>('');
 const openDialog = (val: any) => {
-	state.ids = val;
 	console.log(val, '11');
 	state.dialogVisible = true;
+	getDetail(val.orderId);
+};
+// 获取详情
+const getDetail = async (id: string) => {
+	loading.value = true;
+	try {
+		const { result } = await centerMarkDetail(id);
+		snapshotLabel.value = result.lables;
+		orderTitle.value = result.title;
+		loading.value = false;
+		console.log(result);
+	} catch (e) {
+		console.log(e);
+		loading.value = false;
+	}
 };
 // 关闭弹窗
 const closeDialog = () => {
@@ -73,11 +88,11 @@ const onSubmit = throttle(async (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	await formEl.validate((valid: boolean) => {
 		if (!valid) return;
-		/*	loading.value = true;
-		addAreaUser(state.ruleForm)
+		loading.value = true;
+		centerMarkUpdate(state.ruleForm)
 			.then(() => {
 				ElMessage({
-					message: '操作成功',
+					message: '修改成功',
 					type: 'success',
 				});
 				emit('updateList');
@@ -86,7 +101,7 @@ const onSubmit = throttle(async (formEl: FormInstance | undefined) => {
 			.finally(() => {
 				loading.value = false;
 				closeDialog();
-			});*/
+			});
 	});
 }, 300);
 // 暴露变量

src/views/snapshot/centerMark/list.vue

@@ -86,9 +86,9 @@
 <script lang="tsx" setup name="snapshotCenterMarkList">
 import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { FormInstance } from 'element-plus';
-import { getOrderMarkList } from '@/api/snapshot/handle';
 import Other from '@/utils/other';
 import { defaultTimeStartEnd, shortcuts } from '@/utils/constants';
+import { centerMarkList } from '@/api/snapshot/centerMark';
 
 // 引入组件
 const pagination = defineAsyncComponent(() => import('@/components/ProTable/components/Pagination.vue')); // 分页
@@ -150,7 +150,7 @@ const gridOptions = reactive<any>({
 			},
 		},
 		{
-			field: 'no',
+			field: 'sourceChannel',
 			title: '来源渠道',
 			width: 110,
 		},
@@ -192,7 +192,7 @@ const gridOptions = reactive<any>({
 			width: 160,
 		},
 		{
-			field: 'signName',
+			field: 'signUserName',
 			title: '标注人',
 			width: 120,
 		},
@@ -221,12 +221,11 @@ const requestParams = ref<EmptyObjectType>({});
 const queryList = () => {
 	state.loading = true;
 	gridOptions.loading = true;
+	requestParams.value = Other.deepClone(state.queryParams);
 	requestParams.value.BeginSignTime = state.queryParams.bzTime === null ? null : state.queryParams.bzTime[0]; // 标注时间
 	requestParams.value.EndSignTime = state.queryParams.bzTime === null ? null : state.queryParams.bzTime[1];
 	Reflect.deleteProperty(requestParams.value, 'bzTime'); // 删除无用的参数
-	requestParams.value = Other.deepClone(state.queryParams);
-	requestParams.value = Other.deepClone(state.queryParams);
-	getOrderMarkList(requestParams.value)
+	centerMarkList(requestParams.value)
 		.then((res) => {
 			state.loading = false;
 			gridOptions.data = res.result.items ?? [];

src/views/snapshot/centerMark/log.vue

@@ -81,7 +81,6 @@
 <script lang="tsx" setup name="snapshotCenterMarkLog">
 import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { FormInstance } from 'element-plus';
-import { getOrderMarkList } from '@/api/snapshot/handle';
 import Other from '@/utils/other';
 import { defaultTimeStartEnd, shortcuts } from '@/utils/constants';
 import { centerMarkListLog } from '@/api/snapshot/centerMark';
@@ -242,12 +241,6 @@ const resetQuery = (formEl: FormInstance | undefined) => {
 	ruleFormRef.value?.resetFields();
 	queryList();
 };
-
-// 修改u
-const recordEditRef = ref<RefType>();
-const onEdit = (row: any) => {
-	recordEditRef.value.openDialog(row);
-};
 // 页面加载时
 onMounted(() => {
 	queryList();

src/views/snapshot/reSend/grid/index.vue

@@ -1,29 +1,23 @@
 <template>
 	<div class="snapshot-re-send-grid-container layout-padding">
 		<div class="layout-padding-auto layout-padding-view pd20">
-			<vxe-grid v-bind="gridOptions" ref="gridRef" @checkbox-all="selectAllChangeEvent" @checkbox-change="selectChangeEvent">
+			<vxe-grid v-bind="gridOptions" ref="gridRef">
 				<template #form>
 					<el-form :model="state.queryParams" ref="ruleFormRef" inline @submit.native.prevent :disabled="gridOptions.loading">
-						<el-form-item label="发送状态" prop="isPass">
-							<el-radio-group v-model="state.queryParams.isPass">
-								<el-radio value="0">发送成功</el-radio>
-								<el-radio value="1">发送失败</el-radio>
-								<el-radio value="2">婉拒</el-radio>
-								<el-radio value="3">未发送</el-radio>
+						<el-form-item label="发送状态" prop="Status">
+							<el-radio-group v-model="state.queryParams.Status" @change="handleQuery">
+								<el-radio :value="0">发送成功</el-radio>
+								<el-radio :value="1">发送失败</el-radio>
+								<el-radio :value="3">婉拒</el-radio>
+								<el-radio :value="2">未发送</el-radio>
 							</el-radio-group>
 						</el-form-item>
-						<el-form-item label="工单编码" prop="CaseName">
-							<el-input
-								v-model="state.queryParams.CaseName"
-								placeholder="请填写工单编码"
-								clearable
-								@keyup.enter="handleQuery"
-								class="keyword-input"
-							/>
+						<el-form-item label="工单编码" prop="No">
+							<el-input v-model="state.queryParams.No" placeholder="请填写工单编码" clearable @keyup.enter="handleQuery" class="keyword-input" />
 						</el-form-item>
-						<el-form-item label="手机号" prop="IndustryName">
+						<el-form-item label="手机号" prop="PhoneNumber">
 							<el-input
-								v-model="state.queryParams.IndustryName"
+								v-model="state.queryParams.PhoneNumber"
 								placeholder="请填写手机号"
 								clearable
 								@keyup.enter="handleQuery"
@@ -37,7 +31,7 @@
 					</el-form>
 				</template>
 				<template #order_detail="{ row }">
-					<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
+					<order-detail :order="{ id: row.orderId }" @updateList="queryList">{{ row.no }}</order-detail>
 				</template>
 				<template #pager>
 					<pagination
@@ -77,10 +71,11 @@
 </template>
 
 <script lang="tsx" setup name="snapshotReSendGrid">
-import { computed, defineAsyncComponent, onMounted, reactive, ref } from 'vue';
+import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { FormInstance } from 'element-plus';
-import { getClueList } from '@/api/snapshot/config';
 import { defaultTimeStartEnd, shortcuts } from '@/utils/constants';
+import Other from '@/utils/other';
+import { getGridRedEnvelopeApprovalList } from '@/api/snapshot/reSend';
 
 // 引入组件
 const pagination = defineAsyncComponent(() => import('@/components/ProTable/components/Pagination.vue')); // 分页
@@ -93,9 +88,13 @@ const state = reactive<any>({
 		// 查询参数
 		PageIndex: 1,
 		PageSize: 20,
-		CaseName: null, // 线索名称
+		No: null, // 工单编码
+		PhoneNumber: null, // 手机号
 		IndustryName: null, // 行业类型
 		zjTime: [],
+		BeginCreationTime: null,
+		EndCreationTime: null,
+		Status: 0,
 	},
 	total: 0, // 总条数
 });
@@ -128,38 +127,42 @@ const gridOptions = reactive<any>({
 	height: 'auto',
 	columns: [
 		{
-			field: 'name',
+			field: 'no',
 			title: '工单编码',
 			slots: { default: 'order_detail' },
 		},
 		{
-			field: 'citizenReadPackAmountTxt',
+			field: 'creationTime',
 			title: '增加时间',
-			// formatter: 'formatDate',
+			formatter: 'formatDate',
 		},
 		{
-			field: 'guiderReadPackAmountTxt',
+			field: 'phoneNumber',
 			title: '手机号',
 		},
 		{
-			field: 'displayOrder',
+			field: 'name',
+			title: '姓名',
+		},
+		{
+			field: 'amount',
 			title: '金额',
 		},
 		{
-			field: 'citizenReadPackAmountTxt',
+			field: 'receiveTime',
 			title: '发放时间',
-			// formatter: 'formatDate',
+			formatter: 'formatDate',
 		},
 		{
-			field: 'citizenReadPackAmountTxt',
+			field: 'distributionStateTxt',
 			title: '状态',
 		},
 		{
-			field: 'citizenReadPackAmountTxt',
+			field: 'u',
 			title: '领取状态',
 		},
 		{
-			field: 'displayOrder',
+			field: 'remark',
 			title: '备注',
 			minWidth: 200,
 		},
@@ -172,10 +175,15 @@ const handleQuery = () => {
 	queryList();
 };
 // 获取参数列表
+const requestParams = ref<EmptyObjectType>({});
 const queryList = () => {
 	state.loading = true;
 	gridOptions.loading = true;
-	getClueList(state.queryParams)
+	requestParams.value = Other.deepClone(state.queryParams);
+	requestParams.value.BeginCreationTime = state.queryParams.zjTime === null ? null : state.queryParams.zjTime[0]; // 增加时间
+	requestParams.value.EndCreationTime = state.queryParams.zjTime === null ? null : state.queryParams.zjTime[1];
+	Reflect.deleteProperty(requestParams.value, 'zjTime'); // 删除无用的参数
+	getGridRedEnvelopeApprovalList(requestParams.value)
 		.then((res) => {
 			state.loading = false;
 			gridOptions.data = res.result.items ?? [];
@@ -197,30 +205,6 @@ const resetQuery = (formEl: FormInstance | undefined) => {
 	ruleFormRef.value?.resetFields();
 	queryList();
 };
-
-const checkTable = ref<EmptyArrayType>([]);
-const gridRef = ref<RefType>();
-const selectAllChangeEvent = ({ checked }) => {
-	if (gridRef.value) {
-		const records = gridRef.value.getCheckboxRecords();
-		checkTable.value = records;
-		console.log(checked ? '所有勾选事件' : '所有取消事件', records);
-	}
-};
-
-const selectChangeEvent = ({ checked }) => {
-	if (gridRef.value) {
-		const records = gridRef.value.getCheckboxRecords();
-		checkTable.value = records;
-		console.log(checked ? '勾选事件' : '取消事件', records);
-	}
-};
-const isChecked = computed(() => {
-	return !Boolean(checkTable.value.length);
-});
-
-// 批量发送红包
-const onSend = () => {};
 // 页面加载时
 onMounted(() => {
 	queryList();

src/views/todo/seats/accept/zgAccept.vue

@@ -249,7 +249,7 @@
 												<el-col :xs="24" :sm="24" :md="24" :lg="16" :xl="16">
 													<el-input v-model="state.ruleForm.street" placeholder="请填写详细地址" clearable> </el-input>
 												</el-col>
-												<!--												<el-col :xs="24" :sm="24" :md="24" :lg="7" :xl="7" :offset="1">
+<!--																								<el-col :xs="24" :sm="24" :md="24" :lg="7" :xl="7" :offset="1">
 													<el-button type="primary" link @click="selectLocation"><SvgIcon name="ele-Location" size="16px" /> 地图定位</el-button>
 												</el-col>-->
 											</el-form-item>