Merge branch 'dev-2.19.0' of http://101.36.160.140:21044/province-vue-qh/province-vue-all into dev-2.19.0

src/api/basic.info/unitInfoApi.js

@@ -40,5 +40,9 @@ export default {
 	// 单位信息获取
 	getInfoDataList(data) {
 		return request1('list', data, 'get')
+	},
+
+	getCityUnitInfoList(data) {
+		return request('getCityUnitInfo', data, 'get')
 	}
 }

src/api/business/personnelApi.js

@@ -172,5 +172,9 @@ export default {
 	//view
 	RCGHauditRequest(data) {
 		return requestPAG('/auditRequest/detail', data, 'get')
+	},
+
+	getStatisticalChart(data) {
+		return request('emPersonInfo/getStatisticalChart', data, 'get')
 	}
 }

src/views/Sales/analysis/pink.js

@@ -6,10 +6,11 @@ export function useaddA(datav, arr) {
 			actValue: item.value,
 			label: {
 				show: true,
-				position: 'outside',
+				position: 'inner',
+				// position: 'outside',
 				borderRadius: 5,
 				padding: [5, 5, 5, 5],
-				color: colorList[index],
+				color: '#464646',
 				textStyle: {
 					fontSize: 14,
 					lineHeight: 20
@@ -51,7 +52,7 @@ export function useaddA(datav, arr) {
 				radius: '65%',
 				center: ['50%', '50%'],
 				label: {
-					show: true,
+					show: false,
 					// formatter: '{b} {d}%',
 					formatter: '{d}%'
 				},

src/views/basic.info/unitInfo/index.vue

@@ -14,7 +14,8 @@
 			<div class="btnBox">
 				<a-button style="margin-right: 16px" @click="searchData">查询</a-button>
 				<a-button style="margin-right: 16px" @click="reset">重置</a-button>
-				<a-button type="primary" @click="addData">新增</a-button>
+				<a-button style="margin-right: 16px" type="primary" @click="addData">新增</a-button>
+				<a-button type="primary" @click="getView">分地区统计</a-button>
 			</div>
 		</a-space>
 		<a-table
@@ -45,12 +46,60 @@
 		/> -->
 		<!-- 查看--编辑--新增等操作 -->
 		<DetailedList :dataObj="dataObj" @isVisible="isVisible" />
+		<a-modal
+			v-model:visible="AddEditDialog.open"
+			:title="AddEditDialog.title"
+			:footer="null"
+			:closable="false"
+			:maskClosable="false"
+			width="800px"
+		>
+			<div class="acc_del">
+				<a-table :dataSource="AddEditDialoglist" :pagination="false" :columns="AddEditDialogtable">
+					<template #bodyCell="{ column, record }">
+						<template v-if="column.dataIndex === 'checkResult'">
+							<div v-if="record.checkResult == 0">不合格</div>
+							<div v-if="record.checkResult == 1">合格</div>
+						</template>
+					</template>
+				</a-table>
+			</div>
+			<div class="btn-box">
+				<!-- <a-button v-if="dataObj.isType !== '3'" style="margin-right: 16px" type="primary" @click="handleOk"
+					>保存</a-button
+				> -->
+				<a-button @click="onDialogOk">关闭</a-button>
+			</div>
+		</a-modal>
 	</div>
 </template>
 
 <script setup name="unitInfo">
 	import unitInfoApi from '@/api/basic.info/unitInfoApi'
 	import DetailedList from './detailedList.vue'
+
+	const getView = () => {
+		AddEditDialog.value.open = true
+		AddEditDialoglist.value = []
+		AddEditDialoglistDEl()
+	}
+	const AddEditDialog = ref({
+		open: false,
+		title: '分地区统计'
+	})
+	const onDialogOk = () => {
+		AddEditDialog.value.open = false
+		AddEditDialoglist.value = []
+	}
+	const AddEditDialoglist = ref([])
+	const AddEditDialogtable = [
+		{ title: '地区', width: '10%', align: 'center', dataIndex: 'cityName' },
+		{ title: '企业数量', width: '10%', align: 'center', dataIndex: 'unitCount' }
+	]
+	const AddEditDialoglistDEl = async () => {
+		const res = await unitInfoApi.getCityUnitInfoList()
+		AddEditDialoglist.value = res
+	}
 	const columns = [
 		{
 			title: '序号',
@@ -314,4 +363,8 @@
 	::v-deep .ant-pagination-options {
 		display: none !important;
 	}
+	.btn-box {
+		text-align: center;
+		margin-top: 10px;
+	}
 </style>

src/views/business/enterprise/detailedList.vue

@@ -16,11 +16,11 @@
 							<a-input autocomplete="off" :disabled="showLock" v-model:value="formState.tydwbm" /> </a-form-item
 					></a-col>
 					<a-col :span="8"
-						><a-form-item label="单位名称" name="dwmc">
+						><a-form-item label="企业名称" name="dwmc">
 							<a-input autocomplete="off" :disabled="showLock" v-model:value="formState.dwmc" /> </a-form-item
 					></a-col>
 					<a-col :span="8"
-						><a-form-item label="单位代码" name="dwdm">
+						><a-form-item label="统一社会信用代码" name="dwdm">
 							<a-input
 								autocomplete="off"
 								placeholder="请输入18位统一社会信用代码"
@@ -39,7 +39,7 @@
 							/> </a-form-item
 					></a-col>
 					<a-col :span="8"
-						><a-form-item label="注册资本" name="zczb">
+						><a-form-item label="注册资本（万元）" name="zczb">
 							<a-input
 								class="int-box"
 								@input="onInput"
@@ -47,12 +47,12 @@
 								:disabled="showLock"
 								v-model:value="formState.zczb"
 							>
-								<template #suffix>万元</template>
+								<!-- <template #suffix>万元</template> -->
 							</a-input></a-form-item
 						></a-col
 					>
 					<a-col :span="8"
-						><a-form-item label="资产总额" name="zcze">
+						><a-form-item label="资产总额（万元）" name="zcze">
 							<a-input
 								class="int-box"
 								@input="onChangeInput"
@@ -60,7 +60,7 @@
 								:disabled="showLock"
 								v-model:value="formState.zcze"
 							>
-								<template #suffix>万元</template>
+								<!-- <template #suffix>万元</template> -->
 							</a-input></a-form-item
 						></a-col
 					>
@@ -75,7 +75,7 @@
 							<a-input autocomplete="off" :disabled="showLock" v-model:value="formState.frsfzh" /> </a-form-item
 					></a-col>
 					<a-col :span="8"
-						><a-form-item label="法人联系方式" name="frlxfs">
+						><a-form-item label="法人联系方式" name="frlxfs" :rules="[{ validator: isMobileData, trigger: 'blur' }]">
 							<a-input autocomplete="off" :disabled="showLock" v-model:value="formState.frlxfs" /> </a-form-item
 					></a-col>
 				</a-row>
@@ -97,6 +97,7 @@
 					<a-col :span="16"
 						><a-form-item v-model:validation-status="formState.zcdz" label="注册地址" name="zcdz" class="from-item">
 							<a-cascader
+								:allowClear="false"
 								:disabled="showLock"
 								class="address-box"
 								:options="cascaOptions"
@@ -196,6 +197,28 @@
 							</a-select>
 						</a-form-item></a-col
 					>
+					<a-col :span="8"
+						><a-form-item label="总仓容">
+							<a-input
+								autocomplete="off"
+								:disabled="showLock"
+								v-model:value="formState.totalWarehouseCapacity"
+							/> </a-form-item
+					></a-col>
+				</a-row>
+				<a-row>
+					<a-col :span="12">
+						<a-form-item ref="uploadDataList" label="上传电子扫描件">
+							<UPLoadData
+								:beforeUpload="beforeUpload"
+								:disabled="showLock"
+								listType="picture-card"
+								multiple
+								v-model:urls="formState.electronicScan"
+								:change="changeUpload"
+							/>
+						</a-form-item>
+					</a-col>
 				</a-row>
 			</a-form>
 			<div class="btn-box">
@@ -209,8 +232,9 @@
 </template>
 
 <script setup>
-	import unitInfoApi from '@/api/basic.info/unitInfoApi-zq'
+	import unitInfoApi from '@/api/basic.info/unitInfoApi'
 	import { message } from 'ant-design-vue'
+	import global from '@/api/basic.info/global'
 	import {
 		isSocialCreditOrIdCode,
 		isLongitude,
@@ -223,7 +247,7 @@
 		isSocialCreditCode,
 		administrativeDivision,
 		isUnitCode
-	} from '@/utils/validator-zq'
+	} from '@/utils/validator'
 	const props = defineProps({
 		dataObj: {
 			type: Object,
@@ -253,7 +277,9 @@
 		kqs: '',
 		cfs: '',
 		ygs: '',
-		dwzt: ''
+		dwzt: '',
+		totalWarehouseCapacity: '',
+		electronicScan: ''
 	})
 	const cascaOptions = ref([])
 	const unitTypeList = ref([])
@@ -287,11 +313,7 @@
 		kqs: [{ required: true, message: '请输入库区数', trigger: 'blur' }],
 		cfs: [{ required: true, message: '请输入仓房数', trigger: 'blur' }],
 		ygs: [{ required: true, message: '请输入油罐数', trigger: 'blur' }],
-		dwzt: [{ required: true, message: '请选择单位状态', trigger: 'change' }],
-		frlxfs: [
-			{ required: true, message: '请输入法人联系方式', trigger: 'change' },
-			{ validator: isMobileData, trigger: 'change' }
-		]
+		dwzt: [{ required: true, message: '请选择单位状态', trigger: 'change' }]
 	})
 	const auditStatus = ref([
 		{ name: '正常', dwzt: 1 },
@@ -316,6 +338,17 @@
 			unitTypeList.value = res
 		})
 	}
+	// 文件预览方式
+	function changeUpload(ev) {
+		return global.uploadFile(ev).then((reg) => {
+			return reg
+		})
+	}
+	const uploadDataList = ref(null)
+	function beforeUpload() {
+		uploadDataList.value.clearValidate()
+	}
+
 	// 取消按钮
 	const handleCancel = () => {
 		visible.value = false
@@ -334,6 +367,19 @@
 			.then(() => {
 				formState.value.zczb = Number(formState.value.zczb)
 				formState.value.zcze = Number(formState.value.zcze)
+				// 判断附件内容存在与否
+				if (Array.isArray(formState.value.electronicScan)) {
+					if (formState.value.electronicScan[0].url) {
+						let arrList = formState.value.electronicScan
+						formState.value.electronicScan = []
+						arrList.forEach((item) => {
+							formState.value.electronicScan.push(item.url)
+						})
+						formState.value.electronicScan = formState.value.electronicScan.join(',')
+					} else {
+						formState.value.electronicScan = formState.value.electronicScan.join(',')
+					}
+				}
 				// isTypeData === '1' 新增  2是编辑 3是查看
 				if (isTypeData.value === '1') return addData()
 				if (isTypeData.value === '2') return editData()
@@ -390,18 +436,22 @@
 	// 注册地址选择一栏
 	const getChangeData = (val, selectedOptions) => {
 		// 将选择好的id循环取出push到formState.value里面
-		if (selectedOptions.length === 1) {
-			register = { zcdzProvince: '', zcdzCity: '', zcdzArea: '' }
-			register.zcdzProvince = selectedOptions[0].id
-		} else if (selectedOptions.length === 2) {
-			register = { zcdzProvince: '', zcdzCity: '', zcdzArea: '' }
-			register.zcdzProvince = selectedOptions[0].id
-			register.zcdzCity = selectedOptions[1].id
+		if (selectedOptions.slice(-1)[0].sortCode.toString().length >= 6) {
+			if (selectedOptions.length === 1) {
+				register = { zcdzProvince: '', zcdzCity: '', zcdzArea: '' }
+				register.zcdzProvince = selectedOptions[0].id
+			} else if (selectedOptions.length === 2) {
+				register = { zcdzProvince: '', zcdzCity: '', zcdzArea: '' }
+				register.zcdzProvince = selectedOptions[0].id
+				register.zcdzCity = selectedOptions[1].id
+			} else {
+				register = { zcdzProvince: '', zcdzCity: '', zcdzArea: '' }
+				register.zcdzProvince = selectedOptions[0].id
+				register.zcdzCity = selectedOptions[1].id
+				register.zcdzArea = selectedOptions[2].id
+			}
 		} else {
-			register = { zcdzProvince: '', zcdzCity: '', zcdzArea: '' }
-			register.zcdzProvince = selectedOptions[0].id
-			register.zcdzCity = selectedOptions[1].id
-			register.zcdzArea = selectedOptions[2].id
+			formState.value.zcdz = ''
 		}
 	}
 
@@ -437,6 +487,10 @@
 	const detailData = (id) => {
 		unitInfoApi.unitInfoDetail({ id: id }).then((res) => {
 			formState.value = { ...res }
+			if (res.electronicScan) {
+				formState.value.electronicScan = []
+				formState.value.electronicScan = res.electronicScan.split(',') || ''
+			}
 		})
 	}
 	const isClose = () => {

src/views/business/enterprise/index.vue

@@ -14,7 +14,7 @@
 			<div class="btnBox">
 				<a-button style="margin-right: 16px" @click="searchData">查询</a-button>
 				<a-button style="margin-right: 16px" @click="reset">重置</a-button>
-				<!-- <a-button type="primary" @click="addData">新增</a-button> -->
+				<a-button type="primary" @click="getView">分地区统计</a-button>
 			</div>
 		</a-space>
 		<a-table
@@ -45,12 +45,61 @@
 		/> -->
 		<!-- 查看--编辑--新增等操作 -->
 		<DetailedList :dataObj="dataObj" @isVisible="isVisible" />
+
+		<a-modal
+			v-model:visible="AddEditDialog.open"
+			:title="AddEditDialog.title"
+			:footer="null"
+			:closable="false"
+			:maskClosable="false"
+			width="800px"
+		>
+			<div class="acc_del">
+				<a-table :dataSource="AddEditDialoglist" :pagination="false" :columns="AddEditDialogtable">
+					<template #bodyCell="{ column, record }">
+						<template v-if="column.dataIndex === 'checkResult'">
+							<div v-if="record.checkResult == 0">不合格</div>
+							<div v-if="record.checkResult == 1">合格</div>
+						</template>
+					</template>
+				</a-table>
+			</div>
+			<div class="btn-box">
+				<!-- <a-button v-if="dataObj.isType !== '3'" style="margin-right: 16px" type="primary" @click="handleOk"
+					>保存</a-button
+				> -->
+				<a-button @click="onDialogOk">关闭</a-button>
+			</div>
+		</a-modal>
 	</div>
 </template>
 
 <script setup name="unitInfo">
 	import unitInfoApi from '@/api/basic.info/unitInfoApi'
 	import DetailedList from './detailedList.vue'
+	const getView = () => {
+		AddEditDialog.value.open = true
+		AddEditDialoglist.value = []
+		AddEditDialoglistDEl()
+	}
+	const AddEditDialog = ref({
+		open: false,
+		title: '分地区统计'
+	})
+	const onDialogOk = () => {
+		AddEditDialog.value.open = false
+		AddEditDialoglist.value = []
+	}
+	const AddEditDialoglist = ref([])
+	const AddEditDialogtable = [
+		{ title: '地区', width: '10%', align: 'center', dataIndex: 'cityName' },
+		{ title: '企业数量', width: '10%', align: 'center', dataIndex: 'unitCount' }
+	]
+	const AddEditDialoglistDEl = async () => {
+		const res = await unitInfoApi.getCityUnitInfoList()
+		AddEditDialoglist.value = res
+	}
+
 	const columns = [
 		{
 			title: '序号',
@@ -312,4 +361,8 @@
 	::v-deep .ant-pagination-options {
 		display: none !important;
 	}
+	.btn-box {
+		text-align: center;
+		margin-top: 10px;
+	}
 </style>

src/views/business/personnel/data.js

@@ -0,0 +1,174 @@
+import * as echarts from 'echarts'
+
+export function useaddA(datav, arr) {
+	var seriesData = datav.map((item, index) => {
+		return {
+			...item,
+			actValue: item.value,
+			label: {
+				show: true,
+				position: 'inner',
+				borderRadius: 5,
+				padding: [5, 5, 5, 5],
+				color: '#464646',
+				textStyle: {
+					fontSize: 14,
+					lineHeight: 20
+				},
+				formatter: '{b}\n{c}\n{d}%'
+			}
+		}
+	})
+	return {
+		backgroundColor: '#fff',
+		grid: {
+			top: 0,
+			bottom: 0,
+			left: 0,
+			right: 0
+		},
+		title: {
+			text: '',
+			x: 'center'
+		},
+		tooltip: {
+			trigger: 'item',
+			axisPointer: {
+				type: 'shadow',
+				textStyle: {
+					color: '#012366'
+				}
+			},
+			textStyle: {
+				color: '#fff'
+			},
+			backgroundColor: '#3D5667',
+			borderColor: 'rgba(0, 58, 99, 0.8)',
+			confine: true,
+			formatter: '{a} <br/>{b} : {c} ({d}%)'
+		},
+		// tooltip: {
+		// 	trigger: 'item',
+		// 	formatter: '{a} <br/>{b} : {c} ({d}%)',
+		// 	textStyle: {
+		// 		fontSize: 12
+		// 	}
+		// },
+		legend: {
+			show: true,
+			// orient: 'vertical',
+			left: 'center',
+			textStyle: {
+				color: '#012366'
+			},
+			bottom: 0,
+			data: arr
+		},
+		series: [
+			{
+				color: ['#FFFF54', '#75FBFD', '#ABF04B', '#75FBFD'],
+				name: '',
+				type: 'pie',
+				radius: '65%',
+				center: ['50%', '50%'],
+				label: {
+					show: true,
+					// formatter: '{b} {d}%',
+					formatter: '{d}%'
+				},
+				// itemStyle: {
+				//   //饼图之间颜色
+				//   normal: {
+				//     borderColor: "#fff",
+				//     borderWidth: 4,
+				//   },
+				// },
+				labelLine: {
+					length: 10,
+					length2: 10
+				},
+				data: seriesData
+			}
+		]
+	}
+}
+
+export function useaddB(datav, arr) {
+	var seriesData = datav.map((item, index) => {
+		return {
+			...item,
+			actValue: item.value,
+			label: {
+				show: true,
+				position: 'inner',
+				borderRadius: 5,
+				padding: [5, 5, 5, 5],
+				color: '#464646',
+				textStyle: {
+					fontSize: 14,
+					lineHeight: 20
+				},
+				formatter: '{b}\n{c}\n{d}%'
+			}
+		}
+	})
+	return {
+		backgroundColor: '#fff',
+		grid: {
+			top: 0,
+			bottom: 0,
+			left: 0,
+			right: 0
+		},
+		title: {
+			text: '',
+			x: 'center'
+		},
+		tooltip: {
+			trigger: 'item',
+			axisPointer: {
+				type: 'shadow',
+				textStyle: {
+					color: '#012366'
+				}
+			},
+			textStyle: {
+				color: '#fff'
+			},
+			backgroundColor: '#3D5667',
+			borderColor: 'rgba(0, 58, 99, 0.8)',
+			confine: true,
+			formatter: '{a} <br/>{b} : {c} ({d}%)'
+		},
+		legend: {
+			show: true,
+			// orient: 'vertical',
+			left: 'center',
+			textStyle: {
+				color: '#012366'
+			},
+			bottom: 0,
+			data: arr
+		},
+		series: [
+			{
+				color: ['#FFFF54', '#AE7731', '#C72A28', '#75FBFD'],
+				name: '',
+				type: 'pie',
+				radius: '65%',
+				center: ['50%', '50%'],
+				label: {
+					show: true,
+					// formatter: '{b} {d}%',
+					formatter: '{d}%'
+				},
+
+				labelLine: {
+					length: 10,
+					length2: 10
+				},
+				data: seriesData
+			}
+		]
+	}
+}

src/views/business/personnel/index.vue

@@ -10,6 +10,7 @@
 				<div class="btnBox">
 					<a-button type="primary" class="primarySele" @click="Search"> 查询 </a-button>
 					<a-button class="snowy-buttom-left" @click="onReset"> 重置 </a-button>
+					<a-button type="primary" @click="getView">汇总统计</a-button>
 					<a-button type="primary" class="primarySele" @click="onView('add')"> 新增 </a-button>
 				</div>
 			</a-space>
@@ -29,6 +30,29 @@
 				</template>
 			</a-table>
 		</div>
+
+		<a-modal
+			v-model:visible="AddEditDialog.open"
+			:title="AddEditDialog.title"
+			:footer="null"
+			:closable="false"
+			:maskClosable="false"
+			width="800px"
+		>
+			<div class="acc_del">
+				<div>
+					<h3>人员性别统计</h3>
+					<Ecs width="350px" height="400px" :options="coclistA" @load="load" id="FoodsLineA" />
+				</div>
+				<div>
+					<h3>岗位性质统</h3>
+					<Ecs width="350px" height="400px" :options="coclistB" @load="load" id="FoodsLineB" />
+				</div>
+			</div>
+			<div class="btn-box">
+				<a-button @click="onDialogOk">关闭</a-button>
+			</div>
+		</a-modal>
 	</div>
 </template>
 <script setup>
@@ -36,23 +60,57 @@
 	import { listPagination } from '@/hook/listlistPagination.js'
 	import { reactive, ref, watch } from 'vue'
 	import { useRouter, useRoute } from 'vue-router'
-	import { defineComponent } from 'vue'
-	import useRouterdel from '@/router/index'
+	import { useaddA, useaddB } from './data.js'
+
 	const formRef = ref(null)
 	const router = useRouter()
 	const route = useRoute()
-	onMounted(() => {
-		// onSearch()
+	const getView = () => {
+		coclistA.value = {}
+		coclistB.value = {}
+		AddEditDialog.value.open = true
+		AddEditDialoglistDEl()
+		AddEditDialoglistDElB()
+	}
+	const AddEditDialog = ref({
+		open: false,
+		title: '汇总统计'
 	})
-	// useRouterdel.beforeResolve((to, from, next) => {
-	// 	console.log(to.fullPath == '/business/personnel')
-	// 	if (to.fullPath == '/business/personnel') {
-	// 		next()
-	// 		onSearch()
-	// 	} else {
-	// 		next()
-	// 	}
-	// })
+	const onDialogOk = () => {
+		coclistA.value = {}
+		coclistB.value = {}
+		AddEditDialog.value.open = false
+	}
+	const coclistA = ref({})
+	const coclistB = ref({})
+	const AddEditDialoglistDEl = async () => {
+		const res = await business.getStatisticalChart({ chartType: 1 })
+		const nameDataA = res.map((item) => item.genderName)
+		let dataA = res.map((item) => {
+			return {
+				value: item.count,
+				name: item.genderName
+			}
+		})
+		coclistA.value = useaddA(dataA, nameDataA)
+	}
+
+	const AddEditDialoglistDElB = async () => {
+		const res = await business.getStatisticalChart({ chartType: 2 })
+		const nameDataB = res.map((item) => item.genderName)
+		let dataB = res.map((item) => {
+			return {
+				value: item.count,
+				name: item.genderName
+			}
+		})
+		coclistB.value = useaddB(dataB, nameDataB)
+	}
+
+	const load = (v) => {}
+
+	onMounted(() => {})
+
 	watch(
 		() => route,
 		(newVal) => {
@@ -79,7 +137,6 @@
 		{ title: '联系方式', dataIndex: 'contact' },
 		{ title: '操作', key: '操作' }
 	]
-	const SiteOptions = []
 
 	const { tableData, onSearch, handlePageChange, pagination, Search, onReset, SearchFormDel } = listPagination(
 		{ name: '' },
@@ -143,4 +200,14 @@
 	.silt-title {
 		display: flex;
 	}
+	.btn-box {
+		text-align: center;
+		margin-top: 10px;
+	}
+	.acc_del {
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 20px;
+		text-align: center;
+	}
 </style>