From a5897b58201d6ba8b362605215c9b31f93d033d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Wed, 14 Jun 2023 10:46:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=A0=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AFrem=E5=B8=83=E5=B1=80=E5=BC=95=E5=8F=91=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/phoneView/handlingPage.vue |  7 +-
 .../src/views/phoneView/preHomoMangement.vue  | 86 ++++++++++++++-----
 .../src/views/phoneView/processManagement.vue | 26 +++++-
 jero-web/src/views/phoneView/taskData.vue     |  2 +-
 4 files changed, 92 insertions(+), 29 deletions(-)

diff --git a/jero-web/src/views/phoneView/handlingPage.vue b/jero-web/src/views/phoneView/handlingPage.vue
index 4e0db0339..2ab8211cf 100644
--- a/jero-web/src/views/phoneView/handlingPage.vue
+++ b/jero-web/src/views/phoneView/handlingPage.vue
@@ -50,11 +50,13 @@
         pageNo: 0,
         pageSize: 10,
         loading: false,
-        finished: false
+        finished: false,
+        isDisplay:false,
       }
     },
     mounted() {
       document.title = 'NIO GRP'
+      this.isDisplay = JSON.parse(this.$route.query.isDisplay)
     },
     methods: {
       iconClick() {
@@ -66,7 +68,8 @@
           query: {
             taskDefinitionKey: this.$route.query.taskDefinitionKey,
             projectName:this.$route.query.projectName,
-            id: item.id
+            id: item.id,
+            isDisplay:this.isDisplay
           }
         })
       },
diff --git a/jero-web/src/views/phoneView/preHomoMangement.vue b/jero-web/src/views/phoneView/preHomoMangement.vue
index 703e757d8..c07bffe8b 100644
--- a/jero-web/src/views/phoneView/preHomoMangement.vue
+++ b/jero-web/src/views/phoneView/preHomoMangement.vue
@@ -91,14 +91,20 @@
           {{queryForm.deliveryResult}}
         </div>
       </van-collapse-item>
-      <van-collapse-item :title="$t('sponsorReview')" name="4">
+      <van-collapse-item :title="$t('sponsorReview')" v-if="!isDisplay" name="4">
         <van-form @submit="onSubmit" ref="form">
+          <div class="resultofhandlingClass"
+               v-if="$route.query.taskDefinitionKey == 'Task Review' ||
+                           $route.query.taskDefinitionKey == 'Task responsibility confirmation'"
+               style="margin-bottom: 0.1rem">
+            <span>{{$t('resultofhandling')}}</span>
+            <span class="requiredClass">*</span>
+          </div>
           <van-field name="disposeResult"
                      class="uploader"
                      v-if="$route.query.taskDefinitionKey == 'Task Review' ||
                            $route.query.taskDefinitionKey == 'Task responsibility confirmation'"
-                     :rules="[{ required: true, message: $t('resultofhandling') + $t('cannotEmpty') }]"
-                     :label="$t('resultofhandling')">
+                     :rules="[{ required: true, message: $t('resultofhandling') + $t('cannotEmpty') }]">
             <template #input>
               <van-radio-group @change="disposeResultChange" v-model="form.disposeResult" direction="horizontal">
                 <van-radio name="rzgcssc_tg" v-if="$route.query.taskDefinitionKey == 'Task Review'">
@@ -120,9 +126,9 @@
             v-if="form.disposeResult == 'rzgcssc_tg'"
             v-model.trim="form.reportNumber"
             rows="4"
+            name="reportNumber"
             class="textarea"
             autosize
-            :show-error="false"
             :label="$t('reportNo')"
             maxlength="200"
             :placeholder="$t('pleaseEnter')+$t('reportNo')"
@@ -131,9 +137,9 @@
             v-if="form.disposeResult == 'rzgcssc_tg'"
             v-model.trim="form.productModel"
             rows="4"
+            name="productModel"
             class="textarea"
             autosize
-            :show-error="false"
             :label="$t('productModel')"
             maxlength="200"
             :placeholder="$t('pleaseEnter')+$t('productModel')"
@@ -142,32 +148,44 @@
             v-if="form.disposeResult == 'rzgcssc_tg'"
             v-model.trim="form.productionEnterpriseName"
             rows="4"
-            class="textarea"
+            class="textarea productionEnterpriseName"
             autosize
-            :show-error="false"
+            name="productionEnterpriseName"
             :label="$t('nameOfManufacturer')"
             maxlength="200"
             :placeholder="$t('pleaseEnter')+$t('nameOfManufacturer')"
           />
+
+          <div class="resultofhandlingClass"
+               v-if="form.disposeResult == 'rzgcssc_th' || form.disposeResult == 'zrrjjrw'">
+            <span>{{$t('feedback')}}</span>
+            <span class="requiredClass">*</span>
+          </div>
+
           <van-field
             v-if="form.disposeResult == 'rzgcssc_th' || form.disposeResult == 'zrrjjrw'"
             v-model.trim="form.reasonForReturn"
             rows="4"
+            name="reasonForReturn"
             class="textarea"
             autosize
             :show-error="false"
             :rules="[{ required: true, message: $t('feedbackMessage') + $t('cannotEmpty') }]"
-            :label="$t('feedback')"
             maxlength="200"
             type="textarea"
             :placeholder="$t('pleaseEnter')+$t('feedbackMessage')"
           />
 
           <div v-if="$route.query.taskDefinitionKey == 'Task handling'">
+
+            <div class="resultofhandlingClass">
+              <span>{{$t('DeliverablesResult')}}</span>
+              <span class="requiredClass">*</span>
+            </div>
+
             <van-field name="uploader" class="uploader"
                        :rules="[{ required: true, message: $t('DeliverablesResult') + $t('cannotEmpty') }]"
-                       v-if="queryForm.valueType == 'file'"
-                       :label="$t('DeliverablesResult')">
+                       v-if="queryForm.valueType == 'file'">
               <template #input>
                 <van-uploader :preview-image="false"
                               accept="*"
@@ -186,15 +204,13 @@
               class="textarea"
               autosize
               :show-error="false"
-              :label="$t('DeliverablesResult')"
               maxlength="200"
               :placeholder="$t('pleaseEnter')+$t('DeliverablesResult')"
             />
             <van-field name="disposeResult"
                        class="uploader"
                        v-else-if="queryForm.valueType == 'select'"
-                       :rules="[{ required: true, message: $t('DeliverablesResult') + $t('cannotEmpty') }]"
-                       :label="$t('DeliverablesResult')">
+                       :rules="[{ required: true, message: $t('DeliverablesResult') + $t('cannotEmpty') }]">
               <template #input>
                 <van-radio-group v-model="form.deliveryResult" direction="horizontal">
                   <van-radio name="1">
@@ -254,6 +270,7 @@
         dataSourceFile: [],
         deliverablesResultFile: [],
         deliveryResultList: [],
+        isDisplay: false,
         url: {
           queryProjectCertificationInventoryById: '/phone/toDoCenter/queryProjectCertificationInventoryById',
           saveBatch: '/project/projectCertificationInventoryEO/saveBatch'
@@ -262,6 +279,7 @@
     },
     mounted() {
       document.title = 'NIO GRP'
+      this.isDisplay = JSON.parse(this.$route.query.isDisplay)
       this.getData()
     },
     methods: {
@@ -313,18 +331,22 @@
         } else if (value == 'zrrjjrw') {
           this.form.reasonForReturn = ''
         }
-        this.form = { ...this.form }
+        this.$nextTick(() => {
+          this.form = { ...this.form }
+        })
       },
       onSubmit() {
-        this.textLoading = this.$t('Submitting')
-        this.show = true
-        if (this.$route.query.taskDefinitionKey == 'Task Review') {
-          this.ApprovedClick()
-        } else if (this.$route.query.taskDefinitionKey == 'Task handling') {
-          this.submitClick()
-        } else if (this.$route.query.taskDefinitionKey == 'Task responsibility confirmation') {
-          this.ApprovedClick()
-        }
+        this.$refs.form.validate().then(() => {
+          this.textLoading = this.$t('Submitting')
+          this.show = true
+          if (this.$route.query.taskDefinitionKey == 'Task Review') {
+            this.ApprovedClick()
+          } else if (this.$route.query.taskDefinitionKey == 'Task handling') {
+            this.submitClick()
+          } else if (this.$route.query.taskDefinitionKey == 'Task responsibility confirmation') {
+            this.ApprovedClick()
+          }
+        })
       },
       submitClick() {
         let query = {
@@ -880,4 +902,22 @@
   .content-box-text-color {
     color: #01A0AC;
   }
+
+  .resultofhandlingClass {
+    font-size: 0.38rem;
+    font-family: PingFang SC-Regular, PingFang SC;
+    font-weight: 500;
+    color: #595E72;
+    width: 100%;
+  }
+
+  .requiredClass {
+    color: #E83030;
+    font-size: 0.38rem;
+    margin-left: 0.02rem;
+  }
+
+  ::v-deep .productionEnterpriseName .van-field__error-message {
+    display: none;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/phoneView/processManagement.vue b/jero-web/src/views/phoneView/processManagement.vue
index 2719435ec..01e726554 100644
--- a/jero-web/src/views/phoneView/processManagement.vue
+++ b/jero-web/src/views/phoneView/processManagement.vue
@@ -105,10 +105,13 @@
       </van-collapse-item>
       <van-collapse-item :title="examineTitle" name="4" v-if="!queryData.isDisplay">
         <van-form @submit="onSubmit" ref="form">
+          <div class="resultofhandlingClass" style="margin-bottom: 0.1rem">
+            <span>{{$t('resultofhandling')}}</span>
+            <span class="requiredClass">*</span>
+          </div>
           <van-field name="disposeResult"
                      class="uploader"
-                     :rules="[{ required: true, message: $t('resultofhandling') + $t('cannotEmpty') }]"
-                     :label="$t('resultofhandling')">
+                     :rules="[{ required: true, message: $t('resultofhandling') + $t('cannotEmpty') }]">
             <template #input>
               <van-radio-group v-model="form.disposeResult" direction="horizontal">
                 <van-radio name="Accepted" v-if="queryData.TaskKey == 'zrrqr' || queryData.TaskKey == 'dezrrqr'">
@@ -146,6 +149,10 @@
             </template>
           </van-field>
 
+          <div class="resultofhandlingClass">
+            <span>{{$t('feedback')}}</span>
+            <span class="requiredClass">*</span>
+          </div>
           <van-field
             v-model.trim="form.approvalOpinion"
             rows="4"
@@ -153,7 +160,6 @@
             autosize
             :show-error="false"
             :rules="[{ required: true, message: $t('feedbackMessage') + $t('cannotEmpty') }]"
-            :label="$t('feedback')"
             maxlength="200"
             type="textarea"
             :placeholder="$t('pleaseEnter')+$t('feedbackMessage')"
@@ -865,4 +871,18 @@
     background: #f1f1f3;
     color: #707486;
   }
+
+  .resultofhandlingClass {
+    font-size: 0.38rem;
+    font-family: PingFang SC-Regular, PingFang SC;
+    font-weight: 500;
+    color: #595E72;
+    width: 100%;
+  }
+
+  .requiredClass {
+    color: #E83030;
+    font-size: 0.38rem;
+    margin-left: 0.06rem;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/phoneView/taskData.vue b/jero-web/src/views/phoneView/taskData.vue
index 5c4c90a7f..fde6d12c4 100644
--- a/jero-web/src/views/phoneView/taskData.vue
+++ b/jero-web/src/views/phoneView/taskData.vue
@@ -406,7 +406,7 @@
   }
 
   .parame-box-top-text-left-one {
-    flex: 1.4;
+    flex: 1.1;
   }
 
   .parame-box-top-text-right {