2 次代碼提交 ebdbfcfd31 ... aadb3cc220

作者 SHA1 備註 提交日期
  wzq aadb3cc220 Merge branch 'dev-2.19.0' into dev 4 月之前
  wzq 676be3c3e2 flx:更改++3345 4 月之前

+ 1 - 1
src/views/business/construction/form.vue

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

+ 7 - 1
src/views/business/construction/index.vue

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

+ 2 - 2
src/views/business/enterprise/index.vue

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

+ 24 - 4
src/views/business/grain/grainDel.vue

@@ -71,17 +71,37 @@
71 71
 
72 72
 					<a-form-item
73 73
 						class="form-item"
74
-						label="有效仓容"
74
+						label="库点类别"
75 75
 						:rules="[{ required: true, message: 'Please input your username!' }]"
76 76
 						name="effectiveCapacity"
77 77
 						:label-col="{ span: 10 }"
78 78
 					>
79 79
 						<a-input :disabled="code" v-model:value="formState.effectiveCapacity" />
80 80
 					</a-form-item>
81
+
82
+					<a-form-item
83
+						class="form-item"
84
+						label="设计仓容(T)"
85
+						:rules="[{ required: true, message: 'Please input your username!' }]"
86
+						name="effectiveCapacity"
87
+						:label-col="{ span: 10 }"
88
+					>
89
+						<a-input :disabled="code" v-model:value="formState.effectiveCapacity" />
90
+					</a-form-item>
91
+
81 92
 					<a-form-item
82 93
 						class="form-item"
94
+						label="有效仓容(T)"
83 95
 						:rules="[{ required: true, message: 'Please input your username!' }]"
84
-						label="有效罐容"
96
+						name="effectiveCapacity"
97
+						:label-col="{ span: 10 }"
98
+					>
99
+						<a-input :disabled="code" v-model:value="formState.effectiveCapacity" />
100
+					</a-form-item>
101
+					<a-form-item
102
+						class="form-item"
103
+						:rules="[{ required: true, message: 'Please input your username!' }]"
104
+						label="有效罐容(T)"
85 105
 						name="yxgr	"
86 106
 						:label-col="{ span: 10 }"
87 107
 					>
@@ -89,9 +109,9 @@
89 109
 					</a-form-item>
90 110
 					<a-form-item
91 111
 						class="form-item"
92
-						label="库点面积"
112
+						label="库点面积(平方米)"
93 113
 						name="depotArea"
94
-						:label-col="{ span: 10 }"
114
+						:label-col="{ span: 11 }"
95 115
 						:rules="[{ required: true, message: 'Please input your username!' }]"
96 116
 					>
97 117
 						<a-input :disabled="code" v-model:value="formState.depotArea" />

+ 55 - 3
src/views/business/locationInformation/locationInformationDel.vue

@@ -44,7 +44,36 @@
44 44
 						<a-input :disabled="code" v-model:value="formState.storagetankName" />
45 45
 					</a-form-item>
46 46
 
47
-					<!--  -->
47
+					<!-- 这里 -->
48
+
49
+					<!-- <a-form-item
50
+						:rules="[{ required: true, message: 'Please input your username!' }]"
51
+						class="form-item"
52
+						label="库点类别"
53
+						name="tankCapacity"
54
+						:label-col="{ span: 10 }"
55
+					>
56
+						<a-input :disabled="code" v-model:value="formState.tankCapacity" />
57
+					</a-form-item>
58
+					<a-form-item
59
+						:rules="[{ required: true, message: 'Please input your username!' }]"
60
+						class="form-item"
61
+						label="设计仓容(T)"
62
+						name="tankCapacity"
63
+						:label-col="{ span: 10 }"
64
+					>
65
+						<a-input :disabled="code" v-model:value="formState.tankCapacity" />
66
+					</a-form-item>
67
+					<a-form-item
68
+						:rules="[{ required: true, message: 'Please input your username!' }]"
69
+						class="form-item"
70
+						label="有效仓容(T)"
71
+						name="tankCapacity"
72
+						:label-col="{ span: 10 }"
73
+					>
74
+						<a-input :disabled="code" v-model:value="formState.tankCapacity" />
75
+					</a-form-item> -->
76
+
48 77
 					<a-form-item
49 78
 						:rules="[{ required: true, message: 'Please input your username!' }]"
50 79
 						class="form-item"
@@ -54,6 +83,29 @@
54 83
 					>
55 84
 						<a-input :disabled="code" v-model:value="formState.tankCapacity" />
56 85
 					</a-form-item>
86
+
87
+					<!-- <a-form-item
88
+						:rules="[{ required: true, message: 'Please input your username!' }]"
89
+						class="form-item"
90
+						label="有效罐容(T)"
91
+						name="tankCapacity"
92
+						:label-col="{ span: 10 }"
93
+					>
94
+						<a-input :disabled="code" v-model:value="formState.tankCapacity" />
95
+					</a-form-item> -->
96
+
97
+					<!-- <a-form-item
98
+						:rules="[{ required: true, message: 'Please input your username!' }]"
99
+						class="form-item"
100
+						label="库点面积(平方米)"
101
+						name="tankCapacity"
102
+						:label-col="{ span: 10 }"
103
+					>
104
+						<a-input :disabled="code" v-model:value="formState.tankCapacity" />
105
+					</a-form-item> -->
106
+
107
+					<!-- ================= -->
108
+
57 109
 					<a-form-item
58 110
 						class="form-item"
59 111
 						label="建造时间"
@@ -106,10 +158,10 @@
106 158
 							:options="options"
107 159
 						></a-select>
108 160
 					</a-form-item>
109
-					<a-form-item class="form-item" label="罐内直径" name="diameter" :label-col="{ span: 10 }">
161
+					<a-form-item class="form-item" label="罐内直径(米)" name="diameter" :label-col="{ span: 10 }">
110 162
 						<a-input :disabled="code" v-model:value="formState.diameter" />
111 163
 					</a-form-item>
112
-					<a-form-item class="form-item" label="罐内高度" name="height" :label-col="{ span: 10 }">
164
+					<a-form-item class="form-item" label="罐内高度(米)" name="height" :label-col="{ span: 10 }">
113 165
 						<a-input :disabled="code" v-model:value="formState.height" />
114 166
 					</a-form-item>
115 167
 					<a-form-item class="form-item" label="检定方式" name="checkWay" :label-col="{ span: 10 }">

+ 11 - 5
src/views/business/personnel/personnelDel.vue

@@ -146,7 +146,10 @@
146 146
 					<a-form-item class="form-item" label="专业" name="major" :label-col="{ span: 10 }">
147 147
 						<a-input placeholder="请输入专业" :disabled="code" v-model:value="formState.major" />
148 148
 					</a-form-item>
149
-					<a-form-item class="form-item" label="个人简介" :label-col="{ span: 10 }">
149
+				</div>
150
+
151
+				<div class="attachment">
152
+					<a-form-item class="form-item" label="个人简介" :label-col="{ span: 3 }">
150 153
 						<a-textarea
151 154
 							style="width: 620px"
152 155
 							placeholder="请输入个人简介"
@@ -155,10 +158,13 @@
155 158
 							allow-clear
156 159
 						/>
157 160
 					</a-form-item>
158
-				</div>
159
-
160
-				<div class="attachment">
161
-					<a-form-item ref="uploadDataList" class="form-item" label="附件" name="certificate" :label-col="{ span: 3 }">
161
+					<a-form-item
162
+						ref="uploadDataList"
163
+						class="form-item"
164
+						label="上传证书"
165
+						name="certificate"
166
+						:label-col="{ span: 3 }"
167
+					>
162 168
 						<DIYUPLoad
163 169
 							:beforeUpload="beforeUpload"
164 170
 							multiple