Merge branch 'dev-2.19.0' into dev

* dev-2.19.0:
  flx：更改++3345

src/views/business/construction/form.vue

@@ -12,7 +12,7 @@
 			<div class="form">
 				<a-row>
 					<a-col :span="12">
-						<a-form-item class="form-item" label="制度名称" name="systemName" :label-col="{ span: 10 }">
+						<a-form-item class="form-item" label="名称" name="systemName" :label-col="{ span: 10 }">
 							<a-input
 								placeholder="请输入制度名称"
 								style="width: 250px"

src/views/business/construction/index.vue

@@ -28,6 +28,12 @@
 		<div class="list" style="margin-top: 10px">
 			<a-table :dataSource="tableData" :pagination="pagination" :columns="tableColumns">
 				<template #bodyCell="{ column, record }">
+					<template v-if="column.dataIndex == 'sysType'">
+						<div v-if="record.sysType == 1">岗位调整通知</div>
+						<div v-if="record.sysType == 2">制度管理</div>
+						<div v-if="record.sysType == 3">人事任免通知</div>
+					</template>
+
 					<template v-if="column.key === '操作'">
 						<a-button type="link" @click="onView('view', record)">查看</a-button>
 						<a-button type="link" @click="onView('edit', record)">编辑</a-button>
@@ -60,7 +66,7 @@
 				return `${index + 1}`
 			}
 		},
-		{ title: '制度名称', dataIndex: 'systemName' },
+		{ title: '名称', dataIndex: 'systemName' },
 		{ title: '类型', dataIndex: 'sysType' },
 		{ title: '发布内容', dataIndex: 'publishContent' },
 		{ title: '发布时间', dataIndex: 'publishTime' },

src/views/business/enterprise/index.vue

@@ -3,7 +3,7 @@
 		<a-space class="header">
 			<div class="input-box">
 				<div class="silt-title">
-					<span style="width: 70px; margin-right: 12px; display: block">{{ '单位信息' }}</span>
+					<span style="width: 70px; margin-right: 12px; display: block">{{ '企业名称' }}</span>
 					<a-input style="width: 220px" v-model:value="informationData.dwmc" placeholder="请输入" />
 				</div>
 				<div class="input-box-sle">
@@ -110,7 +110,7 @@
 			}
 		},
 		{
-			title: '单位信息',
+			title: '企业名称',
 			dataIndex: 'dwmc',
 			align: 'center',
 			key: 'dwmc'

src/views/business/grain/grainDel.vue

@@ -71,17 +71,37 @@
 
 					<a-form-item
 						class="form-item"
-						label="有效仓容"
+						label="库点类别"
 						:rules="[{ required: true, message: 'Please input your username!' }]"
 						name="effectiveCapacity"
 						:label-col="{ span: 10 }"
 					>
 						<a-input :disabled="code" v-model:value="formState.effectiveCapacity" />
 					</a-form-item>
+
+					<a-form-item
+						class="form-item"
+						label="设计仓容(T)"
+						:rules="[{ required: true, message: 'Please input your username!' }]"
+						name="effectiveCapacity"
+						:label-col="{ span: 10 }"
+					>
+						<a-input :disabled="code" v-model:value="formState.effectiveCapacity" />
+					</a-form-item>
+
 					<a-form-item
 						class="form-item"
+						label="有效仓容(T)"
 						:rules="[{ required: true, message: 'Please input your username!' }]"
-						label="有效罐容"
+						name="effectiveCapacity"
+						:label-col="{ span: 10 }"
+					>
+						<a-input :disabled="code" v-model:value="formState.effectiveCapacity" />
+					</a-form-item>
+					<a-form-item
+						class="form-item"
+						:rules="[{ required: true, message: 'Please input your username!' }]"
+						label="有效罐容(T)"
 						name="yxgr	"
 						:label-col="{ span: 10 }"
 					>
@@ -89,9 +109,9 @@
 					</a-form-item>
 					<a-form-item
 						class="form-item"
-						label="库点面积"
+						label="库点面积(平方米)"
 						name="depotArea"
-						:label-col="{ span: 10 }"
+						:label-col="{ span: 11 }"
 						:rules="[{ required: true, message: 'Please input your username!' }]"
 					>
 						<a-input :disabled="code" v-model:value="formState.depotArea" />

src/views/business/locationInformation/locationInformationDel.vue

@@ -44,7 +44,36 @@
 						<a-input :disabled="code" v-model:value="formState.storagetankName" />
 					</a-form-item>
 
-					<!--  -->
+					<!-- 这里 -->
+
+					<!-- <a-form-item
+						:rules="[{ required: true, message: 'Please input your username!' }]"
+						class="form-item"
+						label="库点类别"
+						name="tankCapacity"
+						:label-col="{ span: 10 }"
+					>
+						<a-input :disabled="code" v-model:value="formState.tankCapacity" />
+					</a-form-item>
+					<a-form-item
+						:rules="[{ required: true, message: 'Please input your username!' }]"
+						class="form-item"
+						label="设计仓容(T)"
+						name="tankCapacity"
+						:label-col="{ span: 10 }"
+					>
+						<a-input :disabled="code" v-model:value="formState.tankCapacity" />
+					</a-form-item>
+					<a-form-item
+						:rules="[{ required: true, message: 'Please input your username!' }]"
+						class="form-item"
+						label="有效仓容(T)"
+						name="tankCapacity"
+						:label-col="{ span: 10 }"
+					>
+						<a-input :disabled="code" v-model:value="formState.tankCapacity" />
+					</a-form-item> -->
+
 					<a-form-item
 						:rules="[{ required: true, message: 'Please input your username!' }]"
 						class="form-item"
@@ -54,6 +83,29 @@
 					>
 						<a-input :disabled="code" v-model:value="formState.tankCapacity" />
 					</a-form-item>
+
+					<!-- <a-form-item
+						:rules="[{ required: true, message: 'Please input your username!' }]"
+						class="form-item"
+						label="有效罐容(T)"
+						name="tankCapacity"
+						:label-col="{ span: 10 }"
+					>
+						<a-input :disabled="code" v-model:value="formState.tankCapacity" />
+					</a-form-item> -->
+
+					<!-- <a-form-item
+						:rules="[{ required: true, message: 'Please input your username!' }]"
+						class="form-item"
+						label="库点面积(平方米)"
+						name="tankCapacity"
+						:label-col="{ span: 10 }"
+					>
+						<a-input :disabled="code" v-model:value="formState.tankCapacity" />
+					</a-form-item> -->
+
+					<!-- ================= -->
+
 					<a-form-item
 						class="form-item"
 						label="建造时间"
@@ -106,10 +158,10 @@
 							:options="options"
 						></a-select>
 					</a-form-item>
-					<a-form-item class="form-item" label="罐内直径" name="diameter" :label-col="{ span: 10 }">
+					<a-form-item class="form-item" label="罐内直径(米)" name="diameter" :label-col="{ span: 10 }">
 						<a-input :disabled="code" v-model:value="formState.diameter" />
 					</a-form-item>
-					<a-form-item class="form-item" label="罐内高度" name="height" :label-col="{ span: 10 }">
+					<a-form-item class="form-item" label="罐内高度(米)" name="height" :label-col="{ span: 10 }">
 						<a-input :disabled="code" v-model:value="formState.height" />
 					</a-form-item>
 					<a-form-item class="form-item" label="检定方式" name="checkWay" :label-col="{ span: 10 }">

src/views/business/personnel/personnelDel.vue

@@ -146,7 +146,10 @@
 					<a-form-item class="form-item" label="专业" name="major" :label-col="{ span: 10 }">
 						<a-input placeholder="请输入专业" :disabled="code" v-model:value="formState.major" />
 					</a-form-item>
-					<a-form-item class="form-item" label="个人简介" :label-col="{ span: 10 }">
+				</div>
+
+				<div class="attachment">
+					<a-form-item class="form-item" label="个人简介" :label-col="{ span: 3 }">
 						<a-textarea
 							style="width: 620px"
 							placeholder="请输入个人简介"
@@ -155,10 +158,13 @@
 							allow-clear
 						/>
 					</a-form-item>
-				</div>
-
-				<div class="attachment">
-					<a-form-item ref="uploadDataList" class="form-item" label="附件" name="certificate" :label-col="{ span: 3 }">
+					<a-form-item
+						ref="uploadDataList"
+						class="form-item"
+						label="上传证书"
+						name="certificate"
+						:label-col="{ span: 3 }"
+					>
 						<DIYUPLoad
 							:beforeUpload="beforeUpload"
 							multiple