Liuzhenyu пре 1 месец
родитељ
комит
ddc3df9de2

+ 2 - 1
.env.development

@@ -15,8 +15,9 @@ VITE_APP_AES_KY = cgRUqDDXqUiySqib
 VITE_APP_TOKEN =  6617e72a5a7e41eb6c30aa4fa3000022
 
 # 开发接口地址
-VITE_APP_API_URL = "http://libai1024.gnway.cc:80"
+# VITE_APP_API_URL = "http://libai1024.gnway.cc:80"
 # VITE_APP_API_URL = "http://106.75.213.212:7070"
+VITE_APP_API_URL = "http://192.168.101.73:7070"
 
 # 是否在打包时开启压缩,支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip

+ 3 - 3
src/components/notificationDetailsParts/receivingUnitDealOpinion.vue

@@ -26,10 +26,10 @@
             label="采取措施" 
           >
             <el-select
-              v-if="isEditable"
               v-model="formData.takeMeasures"
               placeholder="请选择采取措施"
               clearable
+              :disabled="!isEditable"
             >
               <el-option
                 v-for="item in takeMeasuresOption"
@@ -38,7 +38,6 @@
                 :value="item.value"
               />
             </el-select>
-            <div v-else>{{ formData.takeMeasures }}</div>
           </el-form-item>
           
           <!-- 其他措施说明(条件编辑) -->
@@ -182,7 +181,8 @@ watch(
     formData.doom = newVal.doom,
     formData.rarp = newVal.rarp,
     formData.operationTime = newVal.operationTime,
-    formData.attachment = newVal.attachment
+    formData.attachment = newVal.attachment,
+    formData.opinions = newVal.opinions
   },
   { immediate: true, deep: true }
 );

+ 26 - 8
src/views/notificationInfoManage/myReceptionDisposal/components/detail.vue

@@ -22,11 +22,11 @@
 			v-if="route.query.operationRecord === '2'
 			|| route.query.operationRecord === '3'
 			|| route.query.operationRecord === '5'"
-			:formData="formData?.logVoList[formData?.logVoList.length - 1]"
+			:formData="formData?.logVoList[0]"
 			ref="dealOpinionRef"
 		/>
 		<!-- 处置结束关闭 -->
-		<DisposalEndClose v-if="route.query.operationRecord === '3'" ref="disposalEndCloseRef" />
+		<DisposalEndClose v-if="route.query.operationRecord === '3' && route.query.type !== 'detail'" ref="disposalEndCloseRef" />
 		<!-- 违法信息处置完成 -->
 		<DisposalCompleted v-if="route.query.operationRecord === '5'" :formData="formData" />
 		<div class="book flex">
@@ -108,20 +108,38 @@ onBeforeUnmount(() => {
 
 const handleSubmit = async () => {
   // 调用子组件的校验方法
+	const endValid = ref();
+	const endForm = ref();
+	const dealValid = ref();
+	const dealForm = ref();
+	if (route.query.operationRecord === '3') {
+		endValid.value = await disposalEndCloseRef.value.validateForm() || true;
+		endForm.value = await disposalEndCloseRef.value.getFormData();
+	}
+	if (route.query.operationRecord === '2'
+		|| route.query.operationRecord === '3'
+		|| route.query.operationRecord === '5') {
+			dealValid.value = await dealOpinionRef.value.validateForm() || true;
+			dealForm.value = await dealOpinionRef.value.getFormData();
+		}
+	// 	submitFormData.value = {
+	// 	...(dealForm.value && dealForm.value),
+	// 	...(endForm.value && endForm.value),
+	// };
+	// console.log(submitFormData.value);
+	// 	return
   const noticeValid = await noticeChildRef.value.validateForm() || true;
-  const dealValid = await dealOpinionRef.value.validateForm() || true;
-  const endValid = await disposalEndCloseRef.value.validateForm() || true;
+  // const dealValid = await dealOpinionRef.value.validateForm() || true;
   const questionValid = await questionInfoRef.value.validateForm() || true;
 	// 获取组件信息
   const noticeForm = await noticeChildRef.value.getFormData();
-  const dealForm = await dealOpinionRef.value.getFormData();
-  const endForm = await disposalEndCloseRef.value.getFormData();
+  // const dealForm = await dealOpinionRef.value.getFormData();
   const questionForm = await questionInfoRef.value.getFormData();
 	const { type, notifiedMattersId, operationRecord, subOperationRecord } = route.query;
 	submitFormData.value = {
   ...(noticeForm && { middleList: noticeForm }),
-  ...(dealForm && dealForm),
-  ...(endForm && endForm),
+  ...(dealForm.value && dealForm.value),
+  ...(endForm.value && endForm.value),
   ...(questionForm && questionForm)
 };
 	onOperateThing({ operationRecord: subOperationRecord, notifiedMattersId, ...submitFormData.value })