Merge branch 'dev-2.19.0' of province-vue-qh/province-vue-all into dev

src/views/enforcementSupervision/caseInquiry/index.vue

@@ -50,11 +50,10 @@
 				<div class="silt-title" style="width: 400px">
 					<span style="width: 70px; display: block">{{ '受理日期' }}</span>
 					<a-range-picker
-						show-time
 						style="width: 340px"
 						v-model:value="dateValue"
-						@change="handleChange1"
-						valueFormat="YYYY-MM-DD HH:mm:ss"
+						@change="handleChange"
+						valueFormat="YYYY-MM-DD"
 					>
 					</a-range-picker>
 				</div>
@@ -92,6 +91,7 @@ import enforcementSupervisionApi from '@/api/enforcementSupervision.info/enforce
 import DetailFrom from '../caseManagement/form.vue'
 import * as echarts from 'echarts'
 import { cloneDeep } from 'lodash-es'
+import dayjs from 'dayjs'
 import { Empty } from 'ant-design-vue'
 const dateValue = ref([])
 const simpleImage = Empty.PRESENTED_IMAGE_SIMPLE
@@ -160,7 +160,10 @@ const columns = [
 		title: '案件日期',
 		dataIndex: 'caseDate',
 		align: 'center',
-		key: 'caseDate'
+		key: 'caseDate',
+		customRender: ({ text, record, index }) => {
+			return dayjs(text).format('YYYY-MM-DD')
+		}
 	},
 	{
 		title: '操作',

src/views/enforcementSupervision/caseManagement/form.vue

@@ -72,13 +72,11 @@
 					></a-col>
 					<a-col :span="8"
 						><a-form-item
-							:rules="[
-								{ required: true, message: '请输入身份证号', trigger: 'blur' },
-								{ validator: isSocialCreditOrIdCode, trigger: 'blur' }
-							]"
+							:rules="[{ required: true, message: '请输入身份证号', trigger: 'blur' }]"
 							label="身份证号"
 							name="idCardNumbers"
 						>
+							<!-- { validator: validateMultipleIDCards, trigger: 'blur' } -->
 							<a-input
 								:disabled="flag == 2 || flag == 4"
 								class="int-box"

src/views/enforcementSupervision/caseManagement/index.vue

@@ -27,11 +27,10 @@
 				<div class="silt-title" style="width: 400px">
 					<span style="width: 70px; display: block">{{ '受理日期' }}</span>
 					<a-range-picker
-						show-time
 						style="width: 340px"
 						v-model:value="dateValue"
 						@change="handleChange"
-						valueFormat="YYYY-MM-DD HH:mm:ss"
+						valueFormat="YYYY-MM-DD"
 					>
 					</a-range-picker>
 				</div>
@@ -73,6 +72,8 @@
 // import AddForm from './add.vue'
 import enforcementSupervisionApi from '@/api/enforcementSupervision.info/enforcementSupervision.js'
 // import EditForm from './edit.vue'
+import dayjs from 'dayjs'
+
 import DetailFrom from './form.vue'
 import { Modal } from 'ant-design-vue'
 const dateValue = ref('')
@@ -141,7 +142,10 @@ const columns = [
 		title: '案件日期',
 		dataIndex: 'caseDate',
 		align: 'center',
-		key: 'caseDate'
+		key: 'caseDate',
+		customRender: ({ text, record, index }) => {
+			return dayjs(text).format('YYYY-MM-DD')
+		}
 	},
 	{
 		title: '操作',

src/views/enforcementSupervision/enforcementBasis/form.vue

@@ -78,7 +78,7 @@
 			</a-form>
 			<div class="btn-box">
 				<a-button @click="isClose">取消</a-button>
-				<a-button @click="submit" style="background-color: #25c8c8; color: white">保存</a-button>
+				<a-button @click="submit" v-if="flag!=2" style="background-color: #25c8c8; color: white">保存</a-button>
 			</div>
 		</a-modal>
 	</div>

src/views/enforcementSupervision/management/form.vue

@@ -141,7 +141,7 @@
 						</a-form-item>
 					</a-col>
 					<a-col :span="8"
-						><a-form-item :rules="[{ required: true }]" label="所属行政管理点位" name="administrativeUnit">
+						><a-form-item :rules="[{ required: true }]" label="所属行政管理单位" name="administrativeUnit">
 							<a-input
 								autocomplete="off"
 								v-model:value="formState.administrativeUnit"
@@ -158,7 +158,7 @@
 			</a-form>
 			<div class="btn-box">
 				<a-button @click="isClose">取消</a-button>
-				<a-button @click="submit" style="background-color: #25c8c8; color: white">保存</a-button>
+				<a-button @click="submit" v-if="flag!=2" style="background-color: #25c8c8; color: white">保存</a-button>
 			</div>
 		</a-modal>
 	</div>

src/views/enforcementSupervision/processManagement/courseManagement/form.vue

@@ -133,7 +133,7 @@
 			</a-form>
 			<div class="btn-box">
 				<a-button @click="isClose">取消</a-button>
-				<a-button @click="submit" style="background-color: #169bd5; color: white">保存</a-button>
+				<a-button @click="submit" v-if="flag!=2" style="background-color: #169bd5; color: white">保存</a-button>
 			</div>
 		</a-modal>
 	</div>

src/views/enforcementSupervision/processManagement/processManagement/form.vue

@@ -127,7 +127,7 @@
 			</a-form>
 			<div class="btn-box">
 				<a-button @click="isClose">取消</a-button>
-				<a-button @click="submit" style="background-color: #169bd5; color: white">保存</a-button>
+				<a-button @click="submit" v-if="flag!=2" style="background-color: #169bd5; color: white">保存</a-button>
 			</div>
 		</a-modal>
 	</div>

src/views/enforcementSupervision/supervisionPersonnel/form.vue

@@ -228,7 +228,7 @@
 			</a-form>
 			<div class="btn-box">
 				<a-button @click="isClose">取消</a-button>
-				<a-button @click="submit" style="background-color: #25c8c8; color: white">保存</a-button>
+				<a-button @click="submit" v-if="flag!=2" style="background-color: #25c8c8; color: white">保存</a-button>
 			</div>
 		</a-modal>
 	</div>