Merge remote-tracking branch 'origin/master'

src/views/admin/system/user/index.vue

@@ -148,16 +148,7 @@
 									>
 										人脸管理
 									</el-button>
-									<el-button
-										type="primary"
-										size="small"
-										v-if="row.isCheckUser && row.processStatus != '2'"
-										link
-										icon="VideoPlay"
-										@click="deal(row)"
-									>
-										开始处理
-									</el-button>
+									<el-button type="primary" size="small" link icon="VideoPlay" @click="deal(row)"> 开始处理 </el-button>
 									<!-- 删除用户 -->
 									<el-tooltip content="admin 不允许被删除" :disabled="row.userId !== '1'" placement="top">
 										<span style="margin-left: 12px">

src/views/hard/hard-order/index.vue

@@ -49,7 +49,7 @@
 				:header-cell-style="tableStyle.headerCellStyle"
 				@selection-change="selectionChangHandle"
 				@sort-change="sortChangeHandle"
-				show-summary
+				:show-summary="false"
 				:summary-method="getSummaries"
 			>
 				<el-table-column type="selection" width="60" align="center" />

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

@@ -88,11 +88,17 @@
 						<el-button icon="delete" text type="primary" v-auth="'supermarket_smErpCgPlan_del'" @click="handleDelete([scope.row.id])">
 							删除
 						</el-button>
+						<el-button type="primary" size="small" v-if="scope.row.checkStatus != '2'" link icon="VideoPlay" @click="deal(scope.row)">
+							开始处理
+						</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 		</div>
+
+		<!-- 审批抽屉 -->
+		<process-drawer ref="processDrawerRef" @task-submit-event="taskSubmitEvent" />
 	</div>
 </template>
 
@@ -103,6 +109,7 @@ import { fetchList, delObjs } from "/@/api/supermarketerp/smErpCgPlan"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import { usePurchase } from "/@/stores/purchase"
+import ProcessDrawer from "/@/components/processDrawer/index.vue"
 
 const { check_status } = useDict("check_status")
 const router = useRouter()
@@ -113,6 +120,7 @@ const showSearch = ref(true)
 const selectObjs = ref([]) as any
 const multiple = ref(true)
 const purchaseStore = usePurchase()
+const processDrawerRef = ref()
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
@@ -174,4 +182,15 @@ const handleDelete = async (ids: string[]) => {
 		useMessage().error(err.msg)
 	}
 }
+
+// 点击开始处理
+const deal = (row: any) => {
+	if (!row.processInstanceId) return useMessage().warning("流程id不存在")
+	processDrawerRef.value.openProcessDrawer(row)
+}
+
+// 审批提交事件
+const taskSubmitEvent = () => {
+	getDataList()
+}
 </script>

src/views/wallet/mch-manage/index.vue

@@ -1,6 +1,28 @@
 <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-row>
+					<el-form-item style="width: 300px" label="商户名" prop="name">
+						<el-input v-model="state.queryForm.name" placeholder="商户名" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="商户类型" prop="types">
+						<dict-select v-model="state.queryForm.types" dict-code="merchant_type" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="是否显示在移动端" prop="visibleMobile">
+						<dict-select v-model="state.queryForm.visibleMobile" dict-code="yes_no_type" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="是否同步正元" prop="isSyncZy">
+						<dict-select v-model="state.queryForm.isSyncZy" dict-code="yes_no_type" />
+					</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-row>
+			</el-form>
 			<el-row>
 				<div class="mb8" style="width: 100%">
 					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'wallet_mchManage_add'">
@@ -134,7 +156,8 @@ import FormDialog from "./form.vue"
 import Setting from "./setting.vue"
 import { useUserInfo } from "/@/stores/userInfo"
 
-const { merchant_type, wallet_type } = useDict("merchant_type", "wallet_type")
+const { merchant_type, wallet_type, yes_no_type } = useDict("merchant_type", "wallet_type", "yes_no_type")
+
 // 定义变量内容
 const formDialogRef = ref()
 const settingDialogRef = ref()