فهرست منبع

reactor:督办催办调整;

zhangchong 11 ماه پیش
والد
کامیت
349dc4adc4

+ 4 - 1
src/views/business/supervise/components/Order-supervise-detail.vue

@@ -37,6 +37,9 @@
 					<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
 						<el-form-item label="被督办部门">{{ state.superviseDetail.orgName }}</el-form-item>
 					</el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+            <el-form-item label="督办内容">{{ state.superviseDetail.applyContent }}</el-form-item>
+          </el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 						<el-form-item label="附件" prop="handleResult" :rules="[{ required: false, message: '请选择附件', trigger: 'change' }]">
 							<annex-list name="督办申请附件" readonly classify="督办申请" v-model="state.superviseDetail.files" />
@@ -61,7 +64,7 @@
 		</div>
 		<template #footer>
 			<span class="dialog-footer">
-				<el-button @click="closeDialog" class="default-button">取 消</el-button>
+				<el-button @click="closeDialog" class="default-button">关 闭</el-button>
 			</span>
 		</template>
 	</el-dialog>

+ 12 - 9
src/views/business/supervise/components/Order-supervise-reply.vue

@@ -15,31 +15,34 @@
 			<el-form label-width="110px" ref="ruleFormRef" :model="state.ruleForm">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="工单编码"> {{ state.orderDetail.no }} </el-form-item>
+						<el-form-item label="工单编码" class="mb5"> {{ state.orderDetail.no }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="工单标题"> {{ state.orderDetail.title }} </el-form-item>
+						<el-form-item label="工单标题" class="mb5"> {{ state.orderDetail.title }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="督办人"> {{ state.superviseDetail.crUser }} </el-form-item>
+						<el-form-item label="督办人" class="mb5"> {{ state.superviseDetail.crUser }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="督办部门"> {{ state.superviseDetail.creatorOrgName }} </el-form-item>
+						<el-form-item label="督办部门" class="mb5"> {{ state.superviseDetail.creatorOrgName }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="督办时间"> {{ formatDate(state.superviseDetail.creationTime, 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
+						<el-form-item label="督办时间" class="mb5"> {{ formatDate(state.superviseDetail.creationTime, 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="督办回复时限"> {{ formatDate(state.superviseDetail.replyLimitTime, 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
+						<el-form-item label="督办回复时限" class="mb5"> {{ formatDate(state.superviseDetail.replyLimitTime, 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-						<el-form-item label="被督办部门">{{ state.superviseDetail.orgName }}</el-form-item>
+						<el-form-item label="被督办部门" class="mb5">{{ state.superviseDetail.orgName }}</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="督办回复时间"> {{ formatDate(Date(), 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
+						<el-form-item label="督办回复时间" class="mb5"> {{ formatDate(Date(), 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
 					</el-col>
           <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-            <el-form-item label="附件" prop="handleResult" :rules="[{ required: false, message: '请选择附件', trigger: 'change' }]">
+            <el-form-item label="督办内容" class="mb5">{{ state.superviseDetail.applyContent }}</el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+            <el-form-item label="附件"  class="mb5" prop="handleResult" :rules="[{ required: false, message: '请选择附件', trigger: 'change' }]">
               <annex-list name="督办申请附件" readonly classify="督办申请" v-model="state.superviseDetail.files"/>
             </el-form-item>
           </el-col>

+ 3 - 0
src/views/business/urge/components/Order-urge-detail.vue

@@ -21,6 +21,9 @@
 					<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
 						<el-form-item label="被催办部门">{{ state.urgeDetail.orgName }}</el-form-item>
 					</el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+            <el-form-item label="催办内容">{{ state.urgeDetail.applyContent }}</el-form-item>
+          </el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 						<el-form-item label="附件" prop="handleResult" :rules="[{ required: false, message: '请选择附件', trigger: 'change' }]">
               <annex-list name="催办附件" readonly classify="催办附件" v-model="state.urgeDetail.files"/>

+ 1 - 1
src/views/business/urge/todo.vue

@@ -96,7 +96,7 @@ const columns = ref<any[]>([
 	},
 	{ prop: 'orgName', label: '被催办部门', width: 150 },
 	{ prop: 'applyContent', label: '催办内容', width: 200 },
-	{ prop: 'operation', label: '操作', fixed: 'right', width: 140, align: 'center' },
+	{ prop: 'operation', label: '操作', fixed: 'right', width: 170, align: 'center' },
 ]);
 const state = reactive({
 	queryParams: {

+ 1 - 1
src/views/knowledge/index/edit.vue

@@ -367,7 +367,7 @@ const state = reactive<any>({
 });
 const ruleFormRef = ref<any>(); // 表单ref
 // 选择热点分类
-const chooseHotSpot = (val: any, e: any) => {
+const chooseHotSpot = (val: any) => {
 	state.ruleForm.hotspotSpliceName = val.hotSpotFullName; // 热点分类拼接名称
 	state.ruleForm.hotspotName = val.hotSpotName; // 热点分类名称
 	state.ruleForm.hotspotCode = val.provinceCode; // 热点分类code